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

Assets/Res/Config/BuffConfig.json

@@ -5,8 +5,8 @@
       "nameTest": "寒气",
       "decTest": "每到寒气对敌人的功法运转速度降低{0}%",
       "icon": "icon_b1001",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10721,
+      "buffEffectDes": 10754,
       "buffGroup": 1001,
       "overlayCount": 15,
       "effectValue": [
@@ -25,8 +25,8 @@
       "nameTest": "冻结",
       "decTest": "敌人不能做任何作用，功法将会被封住。",
       "icon": "icon_b1002",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10722,
+      "buffEffectDes": 10755,
       "buffGroup": 1002,
       "overlayCount": 1,
       "effectValue": [
@@ -45,8 +45,8 @@
       "nameTest": "毒",
       "decTest": "每层毒对敌人每秒照成{0}%木属性伤害，{1}层毒时毒气会入侵五脏,敌人每使用一次功法对应功法的伤势增加1",
       "icon": "icon_b1003",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10723,
+      "buffEffectDes": 10756,
       "buffGroup": 1003,
       "overlayCount": 15,
       "effectValue": [
@@ -67,8 +67,8 @@
       "nameTest": "灼热",
       "decTest": "对敌人照成{0}火属性灼烧伤害，满层时敌人会受到痛苦，敌人使用功法时自身受到当前生命{1}%伤害",
       "icon": "icon_b1005",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10725,
+      "buffEffectDes": 10758,
       "buffGroup": 1005,
       "overlayCount": 15,
       "effectValue": [
@@ -88,8 +88,8 @@
       "nameTest": "昏厥",
       "decTest": "敌人眩晕状态不能做任何事",
       "icon": "icon_b1006",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10726,
+      "buffEffectDes": 10759,
       "buffGroup": 1006,
       "overlayCount": 1,
       "effectValue": [
@@ -108,8 +108,8 @@
       "nameTest": "剑意",
       "decTest": "剑祖的剑意标记",
       "icon": "icon_b1007",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10727,
+      "buffEffectDes": 10760,
       "buffGroup": 1007,
       "overlayCount": 50,
       "effectValue": [
@@ -128,8 +128,8 @@
       "nameTest": "封禁",
       "decTest": "法宝封禁不能充能，不能使用",
       "icon": "icon_b1008",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10728,
+      "buffEffectDes": 10761,
       "buffGroup": 1008,
       "overlayCount": 1,
       "effectValue": [
@@ -148,8 +148,8 @@
       "nameTest": "五行混乱",
       "decTest": "敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算",
       "icon": "icon_b1009",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10729,
+      "buffEffectDes": 10762,
       "buffGroup": 1009,
       "overlayCount": 1,
       "effectValue": [
@@ -168,8 +168,8 @@
       "nameTest": "流血",
       "decTest": "敌人持续流血{0}金属性伤害，满层后每隔{1}秒放血一次",
       "icon": "icon_b1011",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10731,
+      "buffEffectDes": 10764,
       "buffGroup": 1011,
       "overlayCount": 15,
       "effectValue": [
@@ -189,8 +189,8 @@
       "nameTest": "放血",
       "decTest": "敌人受到一次大量{0}%金属性命值伤害，后续流血伤害提升{1}%",
       "icon": "icon_b1012",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10732,
+      "buffEffectDes": 10765,
       "buffGroup": 1012,
       "overlayCount": 1,
       "effectValue": [
@@ -210,8 +210,8 @@
       "nameTest": "土沙",
       "decTest": "每一层土沙降低敌人{0}%防御",
       "icon": "icon_b1013",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10733,
+      "buffEffectDes": 10766,
       "buffGroup": 1013,
       "overlayCount": 15,
       "effectValue": [
@@ -230,8 +230,8 @@
       "nameTest": "无敌",
       "decTest": "无敌，不受到任何伤害，不受控制",
       "icon": "icon_b1015",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10735,
+      "buffEffectDes": 10768,
       "buffGroup": 1015,
       "overlayCount": 1,
       "effectValue": [
@@ -250,8 +250,8 @@
       "nameTest": "冰魄牢域",
       "decTest": "乌龟的技能，神龟的所有主动伤害型技能命中目标后都会施加一层寒气，\n寒气每叠到{0}层时，消耗所有层寒气对敌人照成{0}秒的冰冻效果",
       "icon": "icon_b1016",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10736,
+      "buffEffectDes": 10769,
       "buffGroup": 1016,
       "overlayCount": 1,
       "effectValue": [
@@ -271,8 +271,8 @@
       "nameTest": "鼠疫",
       "decTest": "敌人受到每秒受到{0}*层数的伤害，持续期间攻击力降低{1}%*层数",
       "icon": "icon_b1017",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10737,
+      "buffEffectDes": 10770,
       "buffGroup": 1017,
       "overlayCount": 15,
       "effectValue": [
@@ -292,8 +292,8 @@
       "nameTest": "感电",
       "decTest": "麻痹敌人，敌人的身体受到麻痹，有{0}%*层数的概率是功法无法进入释放状态,没触发一次，消耗一半感电",
       "icon": "icon_b1018",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10738,
+      "buffEffectDes": 10771,
       "buffGroup": 1018,
       "overlayCount": 10,
       "effectValue": [
@@ -312,8 +312,8 @@
       "nameTest": "筋脉封锁金",
       "decTest": "封锁筋脉",
       "icon": "icon_b1019",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10739,
+      "buffEffectDes": 10772,
       "buffGroup": 1019,
       "overlayCount": 1,
       "effectValue": [
@@ -332,8 +332,8 @@
       "nameTest": "筋脉封锁木",
       "decTest": "封锁筋脉",
       "icon": "icon_b1020",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10740,
+      "buffEffectDes": 10773,
       "buffGroup": 1020,
       "overlayCount": 1,
       "effectValue": [
@@ -352,8 +352,8 @@
       "nameTest": "筋脉封锁水",
       "decTest": "封锁筋脉",
       "icon": "icon_b1021",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10741,
+      "buffEffectDes": 10774,
       "buffGroup": 1021,
       "overlayCount": 1,
       "effectValue": [
@@ -372,8 +372,8 @@
       "nameTest": "筋脉封锁火",
       "decTest": "封锁筋脉",
       "icon": "icon_b1022",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10742,
+      "buffEffectDes": 10775,
       "buffGroup": 1022,
       "overlayCount": 1,
       "effectValue": [
@@ -392,8 +392,8 @@
       "nameTest": "筋脉封锁土",
       "decTest": "封锁筋脉",
       "icon": "icon_b1023",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10743,
+      "buffEffectDes": 10776,
       "buffGroup": 1023,
       "overlayCount": 1,
       "effectValue": [
@@ -412,8 +412,8 @@
       "nameTest": "星辰印记",
       "decTest": "星辰道升级获得的效果，在结算时收到层数对应的伤害",
       "icon": "icon_b1024",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10744,
+      "buffEffectDes": 10777,
       "buffGroup": 1024,
       "overlayCount": 99,
       "effectValue": [
@@ -432,8 +432,8 @@
       "nameTest": "控制",
       "decTest": "不能释放功法，功法也不能充能完成",
       "icon": "icon_b1025",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10745,
+      "buffEffectDes": 10778,
       "buffGroup": 1025,
       "overlayCount": 99,
       "effectValue": [
@@ -452,8 +452,8 @@
       "nameTest": "大树隐身状态",
       "decTest": "大树隐身状态",
       "icon": "icon_b1026",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10746,
+      "buffEffectDes": 10779,
       "buffGroup": 1026,
       "overlayCount": 99,
       "effectValue": [
@@ -472,8 +472,8 @@
       "nameTest": "阴水",
       "decTest": "",
       "icon": "icon_b1027",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10747,
+      "buffEffectDes": 10780,
       "buffGroup": 1027,
       "overlayCount": 99,
       "effectValue": [
@@ -492,8 +492,8 @@
       "nameTest": "冰冻值",
       "decTest": "",
       "icon": "icon_b1028",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10748,
+      "buffEffectDes": 10781,
       "buffGroup": 1028,
       "overlayCount": 99,
       "effectValue": [
@@ -512,8 +512,8 @@
       "nameTest": "金伤势",
       "decTest": "影响金的灵根",
       "icon": "icon_b1029",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10749,
+      "buffEffectDes": 10782,
       "buffGroup": 1029,
       "overlayCount": 15,
       "effectValue": [
@@ -532,8 +532,8 @@
       "nameTest": "木伤势",
       "decTest": "影响木的灵根",
       "icon": "icon_b1030",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10750,
+      "buffEffectDes": 10783,
       "buffGroup": 1030,
       "overlayCount": 15,
       "effectValue": [
@@ -552,8 +552,8 @@
       "nameTest": "水伤势",
       "decTest": "影响水的灵根",
       "icon": "icon_b1031",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10751,
+      "buffEffectDes": 10784,
       "buffGroup": 1031,
       "overlayCount": 15,
       "effectValue": [
@@ -572,8 +572,8 @@
       "nameTest": "火伤势",
       "decTest": "影响火的灵根",
       "icon": "icon_b1032",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10752,
+      "buffEffectDes": 10785,
       "buffGroup": 1032,
       "overlayCount": 15,
       "effectValue": [
@@ -592,8 +592,8 @@
       "nameTest": "土伤势",
       "decTest": "影响土的灵根",
       "icon": "icon_b1033",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10753,
+      "buffEffectDes": 10786,
       "buffGroup": 1033,
       "overlayCount": 15,
       "effectValue": [

Assets/Res/Config/EventLinkConfig.json

@@ -4204,7 +4204,10 @@
       "EventConditionMessage": 5290,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 106,
+      "LanID": [
+        5311
+      ],
       "DialogueType": 0,
       "EventID": 10014,
       "step": 16,
@@ -4235,13 +4238,13 @@
     },
     {
       "ID": 1001501,
-      "conciseEventMessage": 5311,
+      "conciseEventMessage": 5312,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 106,
       "LanID": [
-        5312
+        5313
       ],
       "DialogueType": 0,
       "EventID": 10015,
@@ -4254,13 +4257,13 @@
     },
     {
       "ID": 1001502,
-      "conciseEventMessage": 5311,
+      "conciseEventMessage": 5312,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 106,
       "LanID": [
-        5313
+        5314
       ],
       "DialogueType": 0,
       "EventID": 10015,
@@ -4270,7 +4273,7 @@
         1001503
       ],
       "optionPara2": [
-        5314
+        5315
       ],
       "ResultType": 1,
       "ResultOptions": [
@@ -4279,13 +4282,13 @@
     },
     {
       "ID": 1001503,
-      "conciseEventMessage": 5311,
+      "conciseEventMessage": 5312,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 106,
       "LanID": [
-        5315
+        5316
       ],
       "DialogueType": 0,
       "EventID": 10015,
@@ -4298,13 +4301,13 @@
     },
     {
       "ID": 1001504,
-      "conciseEventMessage": 5311,
+      "conciseEventMessage": 5312,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 106,
       "LanID": [
-        5316
+        5317
       ],
       "DialogueType": 0,
       "EventID": 10015,
@@ -4317,13 +4320,13 @@
     },
     {
       "ID": 1001505,
-      "conciseEventMessage": 5311,
+      "conciseEventMessage": 5312,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 106,
       "LanID": [
-        5317
+        5318
       ],
       "DialogueType": 0,
       "EventID": 10015,
@@ -4340,13 +4343,13 @@
     },
     {
       "ID": 1001506,
-      "conciseEventMessage": 5311,
+      "conciseEventMessage": 5312,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 106,
       "LanID": [
-        5318
+        5319
       ],
       "DialogueType": 0,
       "EventID": 10015,
@@ -4359,13 +4362,13 @@
     },
     {
       "ID": 1001507,
-      "conciseEventMessage": 5311,
+      "conciseEventMessage": 5312,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 106,
       "LanID": [
-        5319
+        5320
       ],
       "DialogueType": 0,
       "EventID": 10015,
@@ -4375,7 +4378,7 @@
         1001508
       ],
       "optionPara2": [
-        5320
+        5321
       ],
       "ResultType": 1,
       "ResultOptions": [
@@ -4384,13 +4387,13 @@
     },
     {
       "ID": 1001508,
-      "conciseEventMessage": 5311,
+      "conciseEventMessage": 5312,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5321
+        5322
       ],
       "DialogueType": 2,
       "EventID": 10015,
@@ -4403,13 +4406,13 @@
     },
     {
       "ID": 1001601,
-      "conciseEventMessage": 5322,
+      "conciseEventMessage": 5323,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 106,
       "LanID": [
-        5323
+        5324
       ],
       "DialogueType": 0,
       "EventID": 10016,
@@ -4422,13 +4425,13 @@
     },
     {
       "ID": 1001602,
-      "conciseEventMessage": 5322,
+      "conciseEventMessage": 5323,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 106,
       "LanID": [
-        5324
+        5325
       ],
       "DialogueType": 0,
       "EventID": 10016,
@@ -4441,13 +4444,13 @@
     },
     {
       "ID": 1001603,
-      "conciseEventMessage": 5322,
+      "conciseEventMessage": 5323,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 106,
       "LanID": [
-        5325
+        5326
       ],
       "DialogueType": 0,
       "EventID": 10016,
@@ -4460,13 +4463,13 @@
     },
     {
       "ID": 1001604,
-      "conciseEventMessage": 5322,
+      "conciseEventMessage": 5323,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 100,
       "LanID": [
-        5326
+        5327
       ],
       "DialogueType": 0,
       "EventID": 10016,
@@ -4479,7 +4482,7 @@
     },
     {
       "ID": 1001605,
-      "conciseEventMessage": 5322,
+      "conciseEventMessage": 5323,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
@@ -4498,13 +4501,13 @@
     },
     {
       "ID": 1001606,
-      "conciseEventMessage": 5322,
+      "conciseEventMessage": 5323,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5327
+        5328
       ],
       "DialogueType": 2,
       "EventID": 10016,
@@ -4517,13 +4520,13 @@
     },
     {
       "ID": 1001607,
-      "conciseEventMessage": 5322,
+      "conciseEventMessage": 5323,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 106,
       "LanID": [
-        5328
+        5329
       ],
       "DialogueType": 0,
       "EventID": 10016,
@@ -4536,13 +4539,13 @@
     },
     {
       "ID": 1001608,
-      "conciseEventMessage": 5322,
+      "conciseEventMessage": 5323,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 100,
       "LanID": [
-        5329
+        5330
       ],
       "DialogueType": 0,
       "EventID": 10016,
@@ -4555,13 +4558,13 @@
     },
     {
       "ID": 1001609,
-      "conciseEventMessage": 5322,
+      "conciseEventMessage": 5323,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 100,
+      "NPCID": 0,
       "LanID": [
-        5330
+        5331
       ],
       "DialogueType": 0,
       "EventID": 10016,
@@ -4574,14 +4577,11 @@
     },
     {
       "ID": 1001610,
-      "conciseEventMessage": 5322,
+      "conciseEventMessage": 5323,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 0,
-      "LanID": [
-        5331
-      ],
       "DialogueType": 2,
       "EventID": 10016,
       "step": 10,

Assets/Res/Config/LanguageChineseConfig.json

@@ -18282,87 +18282,87 @@
     },
     {
       "ID": 5311,
-      "txt": "割草喝茶"
+      "txt": "你资历尚浅，还是历练历练再来找我吧。"
     },
     {
       "ID": 5312,
-      "txt": "（转身望向屋后的山坡）你来得也巧，我正想在开辟一块新药田。"
+      "txt": "割草喝茶"
     },
     {
       "ID": 5313,
-      "txt": "后山有一块不错的地，离我家有一些远，平时也懒得打理，正好你来了就去帮我开辟出来吧。"
+      "txt": "（转身望向屋后的山坡）你来得也巧，我正想在开辟一块新药田。"
     },
     {
       "ID": 5314,
-      "txt": "……前辈是让我干农活吗"
+      "txt": "后山有一块不错的地，离我家有一些远，平时也懒得打理，正好你来了就去帮我开辟出来吧。"
     },
     {
       "ID": 5315,
-      "txt": "（笑）哈哈，正是，帮我清理一下灵田，回来请你喝茶。"
+      "txt": "……前辈是让我干农活吗"
     },
     {
       "ID": 5316,
-      "txt": "对了，在哪些杂草中不也会生长着一些药效不错的药草，这些药草在杂草中没有更好的成长起来，如果发现了药草帮我收集一些药草的种子回来。"
+      "txt": "（笑）哈哈，正是，帮我清理一下灵田，回来请你喝茶。"
     },
     {
       "ID": 5317,
-      "txt": "在开辟的过程中也请小心一点，后山也经常有妖怪出没。"
+      "txt": "对了，在哪些杂草中不也会生长着一些药效不错的药草，这些药草在杂草中没有更好的成长起来，如果发现了药草帮我收集一些药草的种子回来。"
     },
     {
       "ID": 5318,
-      "txt": "（你回到屋前，满身草屑与泥土，许由在烧水，煮茶）"
+      "txt": "在开辟的过程中也请小心一点，后山也经常有妖怪出没。"
     },
     {
       "ID": 5319,
-      "txt": "小友动作还挺快。坐，喝口茶。"
+      "txt": "（你回到屋前，满身草屑与泥土，许由在烧水，煮茶）"
     },
     {
       "ID": 5320,
-      "txt": "多谢前辈。"
+      "txt": "小友动作还挺快。坐，喝口茶。"
     },
     {
       "ID": 5321,
-      "txt": "（你获得了永久属性提升）（此处需要进一步处理）"
+      "txt": "多谢前辈。"
     },
     {
       "ID": 5322,
-      "txt": "再来一杯"
+      "txt": "（你获得了永久属性提升）（此处需要进一步处理）"
     },
     {
       "ID": 5323,
-      "txt": "今天的风有点不对，开来昨日你在后山的动静不小呀，山那头怕是要来些不速之客。"
+      "txt": "再来一杯"
     },
     {
       "ID": 5324,
-      "txt": "你才帮我弄好灵草种子和灵田，别让妖兽给毁了。"
+      "txt": "今天的风有点不对，开来昨日你在后山的动静不小呀，山那头怕是要来些不速之客。"
     },
     {
       "ID": 5325,
-      "txt": "你去走一趟。"
+      "txt": "你才帮我弄好灵草种子和灵田，别让妖兽给毁了。"
     },
     {
       "ID": 5326,
-      "txt": "好的"
+      "txt": "你去走一趟。"
     },
     {
       "ID": 5327,
-      "txt": "（回到屋前，看到许由又在烧水，煮茶，和上次一样）"
+      "txt": "好的"
     },
     {
       "ID": 5328,
-      "txt": "来，喝茶。"
+      "txt": "（回到屋前，看到许由又在烧水，煮茶，和上次一样）"
     },
     {
       "ID": 5329,
-      "txt": "（心中默念...这个精英妖兽，可费我一些功夫，怎么又是茶？）"
+      "txt": "来，喝茶。"
     },
     {
       "ID": 5330,
-      "txt": "（你没说话，默默喝下）"
+      "txt": "（心中默念...这个精英妖兽，可费我一些功夫，怎么又是茶？）"
     },
     {
       "ID": 5331,
-      "txt": "（你获得了永久属性提升）（此处需要进一步处理）"
+      "txt": "（你没说话，默默喝下）你觉得心胸翻涌，看来得需要一定的境界才能压制住这股力量。"
     },
     {
       "ID": 5332,
@@ -18466,11 +18466,11 @@
     },
     {
       "ID": 5357,
-      "txt": "（转身，望向殿后灵山）我这里灵气充沛，古迹亦多，不妨在此逗留几日，四处看看。"
+      "txt": "（转身，望向殿后灵山）我这里灵气充沛，古迹亦多，不妨在此逗留几日，四处看看。等你境界足够，再踏上新的历练吧。"
     },
     {
       "ID": 5358,
-      "txt": "或许这也是冲虚真人引你来的真正用意。"
+      "txt": "看你获益良多，或许这是冲虚真人引你来的真正用意。"
     },
     {
       "ID": 5359,
@@ -18666,7 +18666,7 @@
     },
     {
       "ID": 5407,
-      "txt": "多谢前辈"
+      "txt": "多谢前辈。眼下我还得多历练历练，才能登上这座神山吧。"
     },
     {
       "ID": 5408,
@@ -18758,7 +18758,7 @@
     },
     {
       "ID": 5430,
-      "txt": "好的道友，那我这就去寻。"
+      "txt": "好的道友，那我这就去寻。不过想要打败飞天走地的神兽，需要再历练历练才行。"
     },
     {
       "ID": 5431,
@@ -18790,7 +18790,7 @@
     },
     {
       "ID": 5438,
-      "txt": "多谢前辈！  （得到樗木的树枝）"
+      "txt": "多谢前辈！  （得到樗木的树枝）接下来登山之前，还得再历练历练。"
     },
     {
       "ID": 5439,
@@ -18838,7 +18838,7 @@
     },
     {
       "ID": 5450,
-      "txt": "闲来无事，种种花草，研究研究阵法。\n如果道友有兴趣，可以随时交流。"
+      "txt": "闲来无事，种种花草，研究研究阵法，提升修仙境界。\n如果道友有兴趣，可以随时交流。"
     },
     {
       "ID": 5451,
@@ -19018,7 +19018,7 @@
     },
     {
       "ID": 5495,
-      "txt": "我的修仙之路，到底在何方啊？"
+      "txt": "我的修仙之路，到底在何方啊？还是先静下心来先历练一番再图后计。"
     },
     {
       "ID": 5496,
@@ -19126,7 +19126,7 @@
     },
     {
       "ID": 5522,
-      "txt": "此镜照心。击败它，便知一二。"
+      "txt": "此镜照心。去周围历练一番，击败它，便知一二。"
     },
     {
       "ID": 5523,
@@ -19158,7 +19158,7 @@
     },
     {
       "ID": 5530,
-      "txt": "多谢前辈指点！"
+      "txt": "多谢前辈指点！去北海深处之前，先得历练足够再上路吧。"
     },
     {
       "ID": 5531,
@@ -19230,7 +19230,7 @@
     },
     {
       "ID": 5548,
-      "txt": "前辈，一路顺风！"
+      "txt": "前辈，一路顺风！待我渡劫至炼虚，再图后计！"
     },
     {
       "ID": 5549,
@@ -39883,6 +39883,306 @@
     {
       "ID": 10711,
       "txt": "占位"
+    },
+    {
+      "ID": 10712,
+      "txt": "战斗中生命值为0，战斗结束"
+    },
+    {
+      "ID": 10713,
+      "txt": "影响功法和法宝的效果"
+    },
+    {
+      "ID": 10714,
+      "txt": "影响最终受到的伤害"
+    },
+    {
+      "ID": 10715,
+      "txt": "影响释放功法的频率"
+    },
+    {
+      "ID": 10716,
+      "txt": "提升金属性功法的效果，降低受到金属性功法的伤害"
+    },
+    {
+      "ID": 10717,
+      "txt": "提升木属性功法的效果，降低受到木属性功法的伤害"
+    },
+    {
+      "ID": 10718,
+      "txt": "提升水属性功法的效果，降低受到水属性功法的伤害"
+    },
+    {
+      "ID": 10719,
+      "txt": "提升火属性功法的效果，降低受到火属性功法的伤害"
+    },
+    {
+      "ID": 10720,
+      "txt": "提升土属性功法的效果，降低受到土属性功法的伤害"
+    },
+    {
+      "ID": 10721,
+      "txt": "寒气"
+    },
+    {
+      "ID": 10722,
+      "txt": "冻结"
+    },
+    {
+      "ID": 10723,
+      "txt": "毒"
+    },
+    {
+      "ID": 10724,
+      "txt": "0"
+    },
+    {
+      "ID": 10725,
+      "txt": "灼热"
+    },
+    {
+      "ID": 10726,
+      "txt": "昏厥"
+    },
+    {
+      "ID": 10727,
+      "txt": "剑意"
+    },
+    {
+      "ID": 10728,
+      "txt": "封禁"
+    },
+    {
+      "ID": 10729,
+      "txt": "五行混乱"
+    },
+    {
+      "ID": 10730,
+      "txt": "0"
+    },
+    {
+      "ID": 10731,
+      "txt": "流血"
+    },
+    {
+      "ID": 10732,
+      "txt": "放血"
+    },
+    {
+      "ID": 10733,
+      "txt": "土沙"
+    },
+    {
+      "ID": 10734,
+      "txt": "0"
+    },
+    {
+      "ID": 10735,
+      "txt": "无敌"
+    },
+    {
+      "ID": 10736,
+      "txt": "冰魄牢域"
+    },
+    {
+      "ID": 10737,
+      "txt": "鼠疫"
+    },
+    {
+      "ID": 10738,
+      "txt": "感电"
+    },
+    {
+      "ID": 10739,
+      "txt": "筋脉封锁金"
+    },
+    {
+      "ID": 10740,
+      "txt": "筋脉封锁木"
+    },
+    {
+      "ID": 10741,
+      "txt": "筋脉封锁水"
+    },
+    {
+      "ID": 10742,
+      "txt": "筋脉封锁火"
+    },
+    {
+      "ID": 10743,
+      "txt": "筋脉封锁土"
+    },
+    {
+      "ID": 10744,
+      "txt": "星辰印记"
+    },
+    {
+      "ID": 10745,
+      "txt": "控制"
+    },
+    {
+      "ID": 10746,
+      "txt": "大树隐身状态"
+    },
+    {
+      "ID": 10747,
+      "txt": "阴水"
+    },
+    {
+      "ID": 10748,
+      "txt": "冰冻值"
+    },
+    {
+      "ID": 10749,
+      "txt": "金伤势"
+    },
+    {
+      "ID": 10750,
+      "txt": "木伤势"
+    },
+    {
+      "ID": 10751,
+      "txt": "水伤势"
+    },
+    {
+      "ID": 10752,
+      "txt": "火伤势"
+    },
+    {
+      "ID": 10753,
+      "txt": "土伤势"
+    },
+    {
+      "ID": 10754,
+      "txt": "每到寒气对敌人的功法运转速度降低{0}%"
+    },
+    {
+      "ID": 10755,
+      "txt": "敌人不能做任何作用，功法将会被封住。"
+    },
+    {
+      "ID": 10756,
+      "txt": "每层毒对敌人每秒照成{0}%木属性伤害，{1}层毒时毒气会入侵五脏,敌人每使用一次功法对应功法的伤势增加1"
+    },
+    {
+      "ID": 10757,
+      "txt": "0"
+    },
+    {
+      "ID": 10758,
+      "txt": "对敌人照成{0}火属性灼烧伤害，满层时敌人会受到痛苦，敌人使用功法时自身受到当前生命{1}%伤害"
+    },
+    {
+      "ID": 10759,
+      "txt": "敌人眩晕状态不能做任何事"
+    },
+    {
+      "ID": 10760,
+      "txt": "剑祖的剑意标记"
+    },
+    {
+      "ID": 10761,
+      "txt": "法宝封禁不能充能，不能使用"
+    },
+    {
+      "ID": 10762,
+      "txt": "敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算"
+    },
+    {
+      "ID": 10763,
+      "txt": "0"
+    },
+    {
+      "ID": 10764,
+      "txt": "敌人持续流血{0}金属性伤害，满层后每隔{1}秒放血一次"
+    },
+    {
+      "ID": 10765,
+      "txt": "敌人受到一次大量{0}%金属性命值伤害，后续流血伤害提升{1}%"
+    },
+    {
+      "ID": 10766,
+      "txt": "每一层土沙降低敌人{0}%防御"
+    },
+    {
+      "ID": 10767,
+      "txt": "0"
+    },
+    {
+      "ID": 10768,
+      "txt": "无敌，不受到任何伤害，不受控制"
+    },
+    {
+      "ID": 10769,
+      "txt": "乌龟的技能，神龟的所有主动伤害型技能命中目标后都会施加一层寒气，\n寒气每叠到{0}层时，消耗所有层寒气对敌人照成{0}秒的冰冻效果"
+    },
+    {
+      "ID": 10770,
+      "txt": "敌人受到每秒受到{0}*层数的伤害，持续期间攻击力降低{1}%*层数"
+    },
+    {
+      "ID": 10771,
+      "txt": "麻痹敌人，敌人的身体受到麻痹，有{0}%*层数的概率是功法无法进入释放状态,没触发一次，消耗一半感电"
+    },
+    {
+      "ID": 10772,
+      "txt": "封锁筋脉"
+    },
+    {
+      "ID": 10773,
+      "txt": "封锁筋脉"
+    },
+    {
+      "ID": 10774,
+      "txt": "封锁筋脉"
+    },
+    {
+      "ID": 10775,
+      "txt": "封锁筋脉"
+    },
+    {
+      "ID": 10776,
+      "txt": "封锁筋脉"
+    },
+    {
+      "ID": 10777,
+      "txt": "星辰道升级获得的效果，在结算时收到层数对应的伤害"
+    },
+    {
+      "ID": 10778,
+      "txt": "不能释放功法，功法也不能充能完成"
+    },
+    {
+      "ID": 10779,
+      "txt": "大树隐身状态"
+    },
+    {
+      "ID": 10780,
+      "txt": "0"
+    },
+    {
+      "ID": 10781,
+      "txt": "0"
+    },
+    {
+      "ID": 10782,
+      "txt": "影响金的灵根"
+    },
+    {
+      "ID": 10783,
+      "txt": "影响木的灵根"
+    },
+    {
+      "ID": 10784,
+      "txt": "影响水的灵根"
+    },
+    {
+      "ID": 10785,
+      "txt": "影响火的灵根"
+    },
+    {
+      "ID": 10786,
+      "txt": "影响土的灵根"
     }
   ]
 }

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -1432,7 +1432,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5895335, y: 0.6792451, z: 0.63400584, w: 1}
+      - {x: 0.712264, y: 0.712264, z: 0.712264, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1463,7 +1463,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.601415, y: 0.72345334, z: 0.8018867, w: 1}
+      - {x: 0.5882353, y: 0.6784314, z: 0.63529414, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1494,7 +1494,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.7411765, y: 0.5921569, z: 0.8431373, w: 1}
+      - {x: 0.6, y: 0.72156864, z: 0.8, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1525,7 +1525,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.8726414, y: 0.7377412, z: 0.44866928, w: 1}
+      - {x: 0.7411765, y: 0.5921569, z: 0.84313726, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -2057,7 +2057,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5895335, g: 0.6792451, b: 0.63400584, a: 1}
+  m_Color: {r: 0.712264, g: 0.712264, b: 0.712264, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Scripts/GameData/ExcelConfig/TowerInfoConfig.cs

@@ -94,6 +94,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] rewardCount;
+#else
+		public int[] rewardCount{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///解锁值
 		/// </summary>

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615