Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Global Volume Profile.asset

@@ -0,0 +1,63 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-8040186756344281628
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3}
+  m_Name: Bloom
+  m_EditorClassIdentifier: 
+  active: 1
+  skipIterations:
+    m_OverrideState: 0
+    m_Value: 1
+  threshold:
+    m_OverrideState: 1
+    m_Value: 0.9
+  intensity:
+    m_OverrideState: 1
+    m_Value: 46.75
+  scatter:
+    m_OverrideState: 0
+    m_Value: 0.7
+  clamp:
+    m_OverrideState: 0
+    m_Value: 65472
+  tint:
+    m_OverrideState: 0
+    m_Value: {r: 1, g: 1, b: 1, a: 1}
+  highQualityFiltering:
+    m_OverrideState: 0
+    m_Value: 0
+  downscale:
+    m_OverrideState: 0
+    m_Value: 0
+  maxIterations:
+    m_OverrideState: 0
+    m_Value: 6
+  dirtTexture:
+    m_OverrideState: 0
+    m_Value: {fileID: 0}
+    dimension: 1
+  dirtIntensity:
+    m_OverrideState: 0
+    m_Value: 0
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
+  m_Name: Global Volume Profile
+  m_EditorClassIdentifier: 
+  components:
+  - {fileID: -8040186756344281628}

Assets/Global Volume Profile.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: BnNKtS/5VH6vll3QaXVGC+VZ/CmyO29qmO2LS11ob88fJ3oWxV73rSg9XRjp
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/HeroModelConfig.json

@@ -412,8 +412,8 @@
       "model": "gw_xianhe",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 100,
-      "hp": 400,
+      "attack": 120,
+      "hp": 240,
       "def": 100,
       "shield": 400,
       "speed_atk": 0.0,
@@ -470,8 +470,8 @@
       "model": "gw_huli",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 100,
-      "hp": 400,
+      "attack": 120,
+      "hp": 240,
       "def": 100,
       "shield": 400,
       "speed_atk": 0.0,

Assets/Res/Config/ItemConfig.json

@@ -360,7 +360,7 @@
       "ID": 1201,
       "itemName": 250,
       "itemDesc": 259,
-      "icon": "icon_item_1201",
+      "icon": "icon_dujiedan",
       "itemTag": 3,
       "quality": 3,
       "stack": 0,
@@ -391,7 +391,7 @@
       "ID": 1202,
       "itemName": 251,
       "itemDesc": 260,
-      "icon": "icon_item_1202",
+      "icon": "icon_dujiedan",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -422,7 +422,7 @@
       "ID": 1203,
       "itemName": 252,
       "itemDesc": 261,
-      "icon": "icon_item_1203",
+      "icon": "icon_dujiedan",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -453,7 +453,7 @@
       "ID": 1204,
       "itemName": 253,
       "itemDesc": 262,
-      "icon": "icon_item_1204",
+      "icon": "icon_dujiedan",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -903,7 +903,7 @@
       "ID": 1502,
       "itemName": 1948,
       "itemDesc": 1950,
-      "icon": "icon_haogandugift",
+      "icon": "icon_haogandugift2",
       "itemTag": 6,
       "quality": 4,
       "stack": 0,

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
+    - _pos: {r: -10.699951, g: -5, b: -30, a: 0}
   m_BuildTextureStacks: []

Assets/xiuxian/cs/cj01.asset

@@ -33,10 +33,10 @@ MonoBehaviour:
     m_Value: 1
   threshold:
     m_OverrideState: 1
-    m_Value: 1.2
+    m_Value: 4.05
   intensity:
     m_OverrideState: 1
-    m_Value: 4
+    m_Value: 5.93
   scatter:
     m_OverrideState: 1
     m_Value: 0.7

UserSettings/EditorUserSettings.asset

@@ -42,13 +42,13 @@ EditorUserSettings:
       value: 545007550304585a545d5e76157b0844454f1b7a2d2c7666782f4961b7b9623b
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 0150565056040b095b0a0d7143725944101648287f2a72352b7e1967e7e2356e
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 060255045d5150585957587212750944444f412c2e7c20342c7b4c67e3b26d60
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615