浏览代码

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

lzx 6 天之前
父节点
当前提交
ecd7da96ed

文件差异内容过多而无法显示
+ 112 - 112
Assets/Res/Config/EventConfig.json


文件差异内容过多而无法显示
+ 112 - 112
Assets/Res/Config/HeroPowerUpConfig.json


+ 148 - 148
Assets/Res/Config/LanguageChineseConfig.json

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

文件差异内容过多而无法显示
+ 194 - 194
Assets/Res/Config/LanguageChineseConfig_skill.json


二进制
Excel2Json/Excel/EventConfig.xlsx


二进制
Excel2Json/Excel/HeroModel.xlsx


二进制
Excel2Json/Excel/HeroPowerUp.xlsx


二进制
Excel2Json/Excel/Item.xlsx


二进制
Excel2Json/Excel/Language.xlsx


二进制
Excel2Json/Excel/Language_skill.xlsx


二进制
Excel2Json/Excel/skill.xlsx


部分文件因为文件数量过多而无法显示