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

Assets/Res/Config/EventConditionConfig.json

@@ -149,7 +149,7 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1005
+        1006
       ],
       "finishCount": 1,
       "RelatedEvents": [
@@ -165,7 +165,7 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1006
+        1007
       ],
       "finishCount": 1,
       "RelatedEvents": [
@@ -194,7 +194,7 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1007
+        1008
       ],
       "finishCount": 1,
       "RelatedEvents": [

Assets/Res/Config/EventLinkConfig.json

@@ -8197,7 +8197,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        1004
+        1005
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -8217,7 +8217,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        1005
+        1006
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -8237,7 +8237,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        1006
+        1007
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -8257,7 +8257,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        1007
+        1008
       ],
       "ResultType": 2,
       "ResultOptions": [

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;