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

Assets/Res/Config/LanguageChineseConfig.json

@@ -13366,7 +13366,7 @@
     },
     {
       "ID": 4082,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4083,
@@ -13402,7 +13402,7 @@
     },
     {
       "ID": 4091,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4092,
@@ -13438,7 +13438,7 @@
     },
     {
       "ID": 4100,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4101,
@@ -39214,579 +39214,579 @@
     },
     {
       "ID": 10544,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10545,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10546,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10547,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10548,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10549,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10550,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10551,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10552,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10553,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10554,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10555,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10556,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10557,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10558,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10559,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10560,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10561,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10562,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10563,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10564,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10565,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10566,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10567,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10568,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10569,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10570,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10571,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10572,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10573,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10574,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10575,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10576,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10577,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10578,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10579,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10580,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10581,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10582,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10583,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10584,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10585,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10586,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10587,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10588,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10589,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10590,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10591,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10592,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10593,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10594,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10595,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10596,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10597,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10598,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10599,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10600,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10601,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10602,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10603,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10604,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10605,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10606,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10607,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10608,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10609,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10610,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10611,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10612,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10613,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10614,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10615,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10616,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10617,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10618,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10619,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10620,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10621,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10622,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10623,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10624,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10625,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10626,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10627,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10628,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10629,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10630,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10631,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10632,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10633,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10634,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10635,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10636,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10637,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10638,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10639,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10640,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10641,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10642,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10643,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10644,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10645,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10646,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10647,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10648,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10649,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10650,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10651,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10652,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10653,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10654,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10655,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10656,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10657,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10658,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10659,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10660,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10661,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10662,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10663,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10664,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10665,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10666,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10667,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10668,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10669,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10670,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10671,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10672,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10673,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10674,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10675,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10676,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10677,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10678,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10679,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10680,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10681,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10682,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10683,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10684,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10685,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10686,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10687,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10688,

Assets/Res/Config/LanguageChineseConfig_skill.json

@@ -2402,19 +2402,19 @@
     },
     {
       "ID": 1114022,
-      "txt": "飞出{0}道巨龙，对敌人造成{1}火系伤害。\n如果敌人处于灼烧中对其有{2}%*层数的概率造成胆摄，眩晕敌人{3}秒。"
+      "txt": "飞出{0}道巨龙，对敌人造成{1}火系伤害。\n如果敌人处于灼烧造成伤害时，每层燃烧有{2}%的概率对其眩晕{3}秒。"
     },
     {
       "ID": 1114023,
-      "txt": "飞出{0}道巨龙，对敌人造成{1}火系伤害。\n如果敌人处于灼烧中对其有{2}%*层数的概率造成胆摄，眩晕敌人{3}秒。"
+      "txt": "飞出{0}道巨龙，对敌人造成{1}火系伤害。\n如果敌人处于灼烧造成伤害时，每层燃烧有{2}%的概率对其眩晕{3}秒。"
     },
     {
       "ID": 1114024,
-      "txt": "飞出{0}道巨龙，对敌人造成{1}火系伤害。\n并施加一层灼烧\n如果敌人处于灼烧中对其有{2}%*层数的概率造成胆摄，眩晕敌人{3}秒。"
+      "txt": "飞出{0}道巨龙，对敌人造成{1}火系伤害。\n并施加一层灼烧\n如果敌人处于灼烧造成伤害时，每层燃烧有{2}%的概率对其眩晕{3}秒。"
     },
     {
       "ID": 1114025,
-      "txt": "飞出{0}道巨龙，对敌人造成{1}火系伤害。\n如果敌人处于灼烧中对其有{2}%*层数的概率造成胆摄，眩晕敌人{3}秒\n并施加一层灼烧\n飞龙命中目标后引发天雷，对敌人额外造成{4}%伤害。"
+      "txt": "飞出{0}道巨龙，对敌人造成{1}火系伤害。\n如果敌人处于灼烧造成伤害时，每层燃烧有{2}%的概率对其眩晕{3}秒\n并施加一层灼烧\n飞龙命中目标后引发天雷，对敌人额外造成{4}%伤害。"
     },
     {
       "ID": 1114030,
@@ -4114,7 +4114,7 @@
     },
     {
       "ID": 1211011,
-      "txt": "飞剑数量+2"
+      "txt": "飞剑数量+1"
     },
     {
       "ID": 1211012,
@@ -4162,7 +4162,7 @@
     },
     {
       "ID": 1211033,
-      "txt": "刀气+2"
+      "txt": "刀气+1"
     },
     {
       "ID": 1211034,
@@ -4178,7 +4178,7 @@
     },
     {
       "ID": 1211042,
-      "txt": "飞刀数量+2"
+      "txt": "飞刀数量+1"
     },
     {
       "ID": 1211043,
@@ -4186,7 +4186,7 @@
     },
     {
       "ID": 1211044,
-      "txt": "飞刀数量+2"
+      "txt": "飞刀数量+1"
     },
     {
       "ID": 1211045,
@@ -4278,7 +4278,7 @@
     },
     {
       "ID": 1212052,
-      "txt": "冰刀数量+2"
+      "txt": "冰刀数量+1"
     },
     {
       "ID": 1212053,
@@ -4286,7 +4286,7 @@
     },
     {
       "ID": 1212054,
-      "txt": "冰刀数量+2"
+      "txt": "冰刀数量+1"
     },
     {
       "ID": 1212055,
@@ -4338,7 +4338,7 @@
     },
     {
       "ID": 1213042,
-      "txt": "竹刺数量+2"
+      "txt": "竹刺数量+1"
     },
     {
       "ID": 1213043,
@@ -4346,7 +4346,7 @@
     },
     {
       "ID": 1213044,
-      "txt": "竹刺数量+2"
+      "txt": "竹刺数量+1"
     },
     {
       "ID": 1213045,
@@ -4358,7 +4358,7 @@
     },
     {
       "ID": 1213052,
-      "txt": "飞叶数量+3"
+      "txt": "飞叶数量+1"
     },
     {
       "ID": 1213053,
@@ -4366,7 +4366,7 @@
     },
     {
       "ID": 1213054,
-      "txt": "飞叶数量+3"
+      "txt": "飞叶数量+1"
     },
     {
       "ID": 1213055,
@@ -4374,7 +4374,7 @@
     },
     {
       "ID": 1214011,
-      "txt": "剑柄数量+2"
+      "txt": "剑柄数量+1"
     },
     {
       "ID": 1214012,
@@ -4382,7 +4382,7 @@
     },
     {
       "ID": 1214013,
-      "txt": "剑柄数量+4"
+      "txt": "剑柄数量+1"
     },
     {
       "ID": 1214014,
@@ -4430,7 +4430,7 @@
     },
     {
       "ID": 1214035,
-      "txt": "出现2只大手但单发伤害降低"
+      "txt": "每只手指额外发射一个弹道"
     },
     {
       "ID": 1214041,
@@ -4446,7 +4446,7 @@
     },
     {
       "ID": 1214044,
-      "txt": "火球数量+2"
+      "txt": "火球数量+1"
     },
     {
       "ID": 1214045,
@@ -4458,7 +4458,7 @@
     },
     {
       "ID": 1214052,
-      "txt": "火刃数量+2"
+      "txt": "火刃数量+1"
     },
     {
       "ID": 1214053,
@@ -4466,7 +4466,7 @@
     },
     {
       "ID": 1214054,
-      "txt": "火刃数量+2"
+      "txt": "火刃数量+1"
     },
     {
       "ID": 1214055,
@@ -4474,7 +4474,7 @@
     },
     {
       "ID": 1215011,
-      "txt": "土刺数量+2"
+      "txt": "土刺数量+1"
     },
     {
       "ID": 1215012,
@@ -4482,7 +4482,7 @@
     },
     {
       "ID": 1215013,
-      "txt": "土刺数量+2"
+      "txt": "土刺数量+1"
     },
     {
       "ID": 1215014,
@@ -4490,7 +4490,7 @@
     },
     {
       "ID": 1215015,
-      "txt": "土刺数量+2"
+      "txt": "土刺数量+1"
     },
     {
       "ID": 1215021,
@@ -4538,7 +4538,7 @@
     },
     {
       "ID": 1215052,
-      "txt": "小石头数量+3"
+      "txt": "小石头数量+1"
     },
     {
       "ID": 1215053,
@@ -4546,7 +4546,7 @@
     },
     {
       "ID": 1215054,
-      "txt": "小石头数量+3"
+      "txt": "小石头数量+1"
     },
     {
       "ID": 1215055,
@@ -5134,23 +5134,23 @@
     },
     {
       "ID": 1235021,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235022,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235023,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235024,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235025,
-      "txt": "0"
+      "txt": ""
     }
   ]
 }

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;