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

Assets/Art/cs3.scene

@@ -134477,15 +134477,15 @@ PrefabInstance:
     - target: {fileID: 5785192706951711686, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_SceneBindings.Array.data[18].key
       value: 
-      objectReference: {fileID: -187308720475102267, guid: 822da268b8f78b140a38e469ee654bf3, type: 2}
+      objectReference: {fileID: 0}
     - target: {fileID: 5785192706951711686, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_SceneBindings.Array.data[19].key
       value: 
-      objectReference: {fileID: 4352955522647890059, guid: 822da268b8f78b140a38e469ee654bf3, type: 2}
+      objectReference: {fileID: 0}
     - target: {fileID: 5785192706951711686, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_SceneBindings.Array.data[20].key
       value: 
-      objectReference: {fileID: 4663568820971706894, guid: 822da268b8f78b140a38e469ee654bf3, type: 2}
+      objectReference: {fileID: 0}
     - target: {fileID: 5785192706951711686, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_SceneBindings.Array.data[16].value
       value: 
@@ -332200,6 +332200,22 @@ PrefabInstance:
       propertyPath: m_Name
       value: fx_gf1302_sf2
       objectReference: {fileID: 0}
+    - target: {fileID: 3967213755633566040, guid: e362d21003c2f684ba044af67b122094, type: 3}
+      propertyPath: randomSeed
+      value: 8703
+      objectReference: {fileID: 0}
+    - target: {fileID: 3967213755633566040, guid: e362d21003c2f684ba044af67b122094, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6170846557819681638, guid: e362d21003c2f684ba044af67b122094, type: 3}
+      propertyPath: randomSeed
+      value: 8703
+      objectReference: {fileID: 0}
+    - target: {fileID: 6170846557819681638, guid: e362d21003c2f684ba044af67b122094, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7100723655998593905, guid: e362d21003c2f684ba044af67b122094, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0.998
@@ -332240,6 +332256,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8025827519092539881, guid: e362d21003c2f684ba044af67b122094, type: 3}
+      propertyPath: randomSeed
+      value: 8703
+      objectReference: {fileID: 0}
+    - target: {fileID: 8025827519092539881, guid: e362d21003c2f684ba044af67b122094, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -359778,6 +359802,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6100924131400922851, guid: 03de1747a26aee94da5d6e2aa2ee4b03, type: 3}
+      propertyPath: randomSeed
+      value: 5157
+      objectReference: {fileID: 0}
+    - target: {fileID: 6100924131400922851, guid: 03de1747a26aee94da5d6e2aa2ee4b03, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7036358892822395403, guid: 03de1747a26aee94da5d6e2aa2ee4b03, type: 3}
       propertyPath: m_Name
       value: fx_gf1302_sf_q1

Assets/Res/Config/GameConstantConfig.json

@@ -29,7 +29,7 @@
         160
       ],
       "DetectEventCount": 100,
-      "DadaoPerCircle": 6.0,
+      "BasicCDperSkill": 2000.0,
       "Daoyoushowuptime": 180,
       "DaoyouguajiDuration": [
         120,

Assets/Res/Config/HeroModelConfig.json

@@ -70,7 +70,7 @@
       "hp": 89,
       "def": 50,
       "shield": 72,
-      "speed_atk": 2.0,
+      "speed_atk": 0.0,
       "Linggen": [
         100,
         100,
@@ -128,7 +128,7 @@
       "hp": 81,
       "def": 65,
       "shield": 51,
-      "speed_atk": 2.0,
+      "speed_atk": 0.0,
       "Linggen": [
         100,
         100,
@@ -186,7 +186,7 @@
       "hp": 80,
       "def": 50,
       "shield": 63,
-      "speed_atk": 2.0,
+      "speed_atk": 0.0,
       "Linggen": [
         100,
         100,
@@ -244,7 +244,7 @@
       "hp": 150,
       "def": 50,
       "shield": 0,
-      "speed_atk": 10.0,
+      "speed_atk": 0.0,
       "Linggen": [
         100,
         100,

Assets/Res/Config/LanguageChineseConfig.json

@@ -862,7 +862,7 @@
     },
     {
       "ID": 216,
-      "txt": "你被怪物击败了，事件结束。"
+      "txt": "你被怪物击败，神识也随之消散了。"
     },
     {
       "ID": 217,
@@ -8374,7 +8374,7 @@
     },
     {
       "ID": 2094,
-      "txt": "继续飞行一段时间{0}/{1}"
+      "txt": "继续飞行一段时间继续飞行一段时间{0}/{1}"
     },
     {
       "ID": 2095,

Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -75,9 +75,9 @@ public int DetectEventCount;
 
 
 		/// <summary>
-		///大道的默认转速（秒/圈）
+		///角色每有一个功法槽位，圈速增加的基础毫秒数 怪物每有一个功法，全速增加的基础毫秒秒数
 		/// </summary>
-public float DadaoPerCircle;
+public float BasicCDperSkill;
 
 
 		/// <summary>