xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/ce'

Browse Source
This commit is contained in:
luying
2022-03-30 21:19:32 +08:00
parent cf1eac550a b4ac87d8f5
commit af8cb4ec94
54 changed files with 16380 additions and 2502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
shared/resource/jsons/dic_zyz_equip.json
View File

@@ -5,8 +5,6 @@
"jobClass": 1,
"eplaceId": 1,
"suitId": 1,
"attribute": "2&10",
"attributeUp": "2&10",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -16,8 +14,6 @@
"jobClass": 1,
"eplaceId": 2,
"suitId": 1,
"attribute": "4&20",
"attributeUp": "4&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -27,8 +23,6 @@
"jobClass": 1,
"eplaceId": 3,
"suitId": 1,
"attribute": "5&20",
"attributeUp": "5&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -38,8 +32,6 @@
"jobClass": 1,
"eplaceId": 4,
"suitId": 1,
"attribute": "1&50",
"attributeUp": "1&50",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -49,8 +41,6 @@
"jobClass": 2,
"eplaceId": 1,
"suitId": 2,
"attribute": "2&10",
"attributeUp": "2&10",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -60,8 +50,6 @@
"jobClass": 2,
"eplaceId": 2,
"suitId": 2,
"attribute": "4&20",
"attributeUp": "4&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -71,8 +59,6 @@
"jobClass": 2,
"eplaceId": 3,
"suitId": 2,
"attribute": "5&20",
"attributeUp": "5&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -82,8 +68,6 @@
"jobClass": 2,
"eplaceId": 4,
"suitId": 2,
"attribute": "1&50",
"attributeUp": "1&50",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -93,8 +77,6 @@
"jobClass": 3,
"eplaceId": 1,
"suitId": 3,
"attribute": "2&10",
"attributeUp": "2&10",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -104,8 +86,6 @@
"jobClass": 3,
"eplaceId": 2,
"suitId": 3,
"attribute": "4&20",
"attributeUp": "4&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -115,8 +95,6 @@
"jobClass": 3,
"eplaceId": 3,
"suitId": 3,
"attribute": "5&20",
"attributeUp": "5&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -126,8 +104,6 @@
"jobClass": 3,
"eplaceId": 4,
"suitId": 3,
"attribute": "1&50",
"attributeUp": "1&50",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -137,8 +113,6 @@
"jobClass": 4,
"eplaceId": 1,
"suitId": 4,
"attribute": "2&10",
"attributeUp": "2&10",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -148,8 +122,6 @@
"jobClass": 4,
"eplaceId": 2,
"suitId": 4,
"attribute": "4&20",
"attributeUp": "4&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -159,8 +131,6 @@
"jobClass": 4,
"eplaceId": 3,
"suitId": 4,
"attribute": "5&20",
"attributeUp": "5&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -170,8 +140,6 @@
"jobClass": 4,
"eplaceId": 4,
"suitId": 4,
"attribute": "1&50",
"attributeUp": "1&50",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -181,8 +149,6 @@
"jobClass": 5,
"eplaceId": 1,
"suitId": 5,
"attribute": "2&10",
"attributeUp": "2&10",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -192,8 +158,6 @@
"jobClass": 5,
"eplaceId": 2,
"suitId": 5,
"attribute": "4&20",
"attributeUp": "4&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -203,8 +167,6 @@
"jobClass": 5,
"eplaceId": 3,
"suitId": 5,
"attribute": "5&20",
"attributeUp": "5&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -214,8 +176,6 @@
"jobClass": 5,
"eplaceId": 4,
"suitId": 5,
"attribute": "1&50",
"attributeUp": "1&50",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -225,8 +185,6 @@
"jobClass": 6,
"eplaceId": 1,
"suitId": 6,
"attribute": "2&10",
"attributeUp": "2&10",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -236,8 +194,6 @@
"jobClass": 6,
"eplaceId": 2,
"suitId": 6,
"attribute": "4&20",
"attributeUp": "4&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -247,8 +203,6 @@
"jobClass": 6,
"eplaceId": 3,
"suitId": 6,
"attribute": "5&20",
"attributeUp": "5&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -258,8 +212,6 @@
"jobClass": 6,
"eplaceId": 4,
"suitId": 6,
"attribute": "1&50",
"attributeUp": "1&50",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -269,8 +221,6 @@
"jobClass": 7,
"eplaceId": 1,
"suitId": 7,
"attribute": "2&10",
"attributeUp": "2&10",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -280,8 +230,6 @@
"jobClass": 7,
"eplaceId": 2,
"suitId": 7,
"attribute": "4&20",
"attributeUp": "4&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -291,8 +239,6 @@
"jobClass": 7,
"eplaceId": 3,
"suitId": 7,
"attribute": "5&20",
"attributeUp": "5&20",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
},
@@ -302,8 +248,6 @@
"jobClass": 7,
"eplaceId": 4,
"suitId": 7,
"attribute": "1&50",
"attributeUp": "1&50",
"composeMaterial": "50001&2",
"imageId": "qingtongjian&bintiejian&wenshijian&jinggangjian&songwenjian"
}

14142
shared/resource/jsons/dic_zyz_equipStrengthAttr.json Normal file
View File

File diff suppressed because it is too large Load Diff

54
shared/resource/jsons/dic_zyz_gk_branch.json
View File

@@ -15,8 +15,8 @@
"turnLimted": 20,
"forcedCharactor": "&",
"fobiddenCharactor": "&",
"victoryInfoInUI": "1.消灭所有敌军\r\n2.死亡的村民数量≤2\r\n3.剩下的村民都到达洞口",
"loseInfoInUI": "1.我方全部阵亡\r\n2.死亡的村民数量≥3\r\n3.20回合内未能胜利",
"victoryInfoInUI": "1.消灭所有敌军\n2.死亡的村民数量≤2\n3.剩下的村民都到达洞口",
"loseInfoInUI": "1.我方全部阵亡\n2.死亡的村民数量≥3\n3.20回合内未能胜利",
"starInfoInUI": "1.在20回合内获得胜利",
"cost": 10,
"iconInMap": "spine&qingnian",
@@ -30,7 +30,7 @@
"needPrepare": 1,
"spineInBigMap": "&",
"HeroNum": "6&6",
"gkInfo": " 循着不详的气息，赵云一行人来到了一座神秘的小村庄。老人们说，他们是为了躲避连年战乱才来此地。\r\n 想不到即使是在这里，也藏着不为人知的阴谋……\r\n 这些阴兵，究竟由谁招来？山林里还有恶兽蠢蠢欲动……\r\n",
"gkInfo": " 循着不详的气息，赵云一行人来到了一座神秘的小村庄。老人们说，他们是为了躲避连年战乱才来此地。\n 想不到即使是在这里，也藏着不为人知的阴谋……\n 这些阴兵，究竟由谁招来？山林里还有恶兽蠢蠢欲动……\n",
"HeroNum_1": "1&6",
"progress": "1&0|2&0",
"progressDesc": "已逃走的百姓数量&被击杀的百姓数量",
@@ -52,8 +52,8 @@
"turnLimted": 20,
"forcedCharactor": "&",
"fobiddenCharactor": "&",
"victoryInfoInUI": "1.消灭所有敌军\r\n2.解救所有被绑架的村民\r\n",
"loseInfoInUI": "1.我方全部阵亡\r\n2.20回合内未能胜利",
"victoryInfoInUI": "1.消灭所有敌军\n2.解救所有被绑架的村民\n",
"loseInfoInUI": "1.我方全部阵亡\n2.20回合内未能胜利",
"starInfoInUI": "1.在20回合内获得胜利",
"cost": 10,
"iconInMap": "spine&yinbingdao&1",
@@ -67,7 +67,7 @@
"needPrepare": 1,
"spineInBigMap": "&",
"HeroNum": "6&6",
"gkInfo": " 赵云一行人刚将村中的百姓带入山洞避难，一位急急忙忙寻找妻子的青年便找上门来。\r\n 洞内仍有不少以往百姓为了躲避战乱设下的陷阱，可务必要当心！\r\n 也许在这昏暗的洞穴里，点燃火炬一路小心前行，才是上策。",
"gkInfo": " 赵云一行人刚将村中的百姓带入山洞避难，一位急急忙忙寻找妻子的青年便找上门来。\n 洞内仍有不少以往百姓为了躲避战乱设下的陷阱，可务必要当心！\n 也许在这昏暗的洞穴里，点燃火炬一路小心前行，才是上策。",
"HeroNum_1": "1&6",
"progress": "1&0|6&0",
"progressDesc": "已解救的百姓数量&待解救的百姓数量",
@@ -104,7 +104,7 @@
"needPrepare": 1,
"spineInBigMap": "&",
"HeroNum": "6&6",
"gkInfo": " 诡异的阴兵，神秘的阴珠，残忍的血法……从巨鹿废墟到山林小村，一个巨大的阴谋似乎一直笼罩在冀州的上空。\r\n 现在赵云一行人终于来到了最后的祭坛，即将揭开这一切的始作俑者……",
"gkInfo": " 诡异的阴兵，神秘的阴珠，残忍的血法……从巨鹿废墟到山林小村，一个巨大的阴谋似乎一直笼罩在冀州的上空。\n 现在赵云一行人终于来到了最后的祭坛，即将揭开这一切的始作俑者……",
"HeroNum_1": "1&6",
"progress": "&",
"progressDesc": "&",
@@ -128,7 +128,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "\r\n1.在20回合内获得胜利",
"starInfoInUI": "\n1.在20回合内获得胜利",
"cost": 10,
"iconInMap": "spine&qingnian",
"iconName": "井底世界",
@@ -141,7 +141,7 @@
"needPrepare": 1,
"spineInBigMap": "&",
"HeroNum": "6&6",
"gkInfo": " 在枯井的周围，一群宫女装扮的幽鬼盘亘。\r\n 原来，这些是洛阳被焚毁时，惨死于皇宫中的宫女，因为长久以来的怨气而化为幽鬼，她们憎恨一切活着的人类。\r\n 小心！她们来了！",
"gkInfo": " 在枯井的周围，一群宫女装扮的幽鬼盘亘。\n 原来，这些是洛阳被焚毁时，惨死于皇宫中的宫女，因为长久以来的怨气而化为幽鬼，她们憎恨一切活着的人类。\n 小心！她们来了！",
"HeroNum_1": "1&6",
"progress": "&",
"progressDesc": "&",
@@ -178,7 +178,7 @@
"needPrepare": 1,
"spineInBigMap": "&",
"HeroNum": "6&6",
"gkInfo": " 枯井的尽头是一条大门，出于好奇，赵云一行人穿越幽暗的隧道，来到大门前。\r\n 吱呀——推开大门，原来这里是一片墓室。\r\n 在昏黄的烛火中，他们看到了一群没有意识的侍卫，还有一个没有头颅的巨大身影……",
"gkInfo": " 枯井的尽头是一条大门，出于好奇，赵云一行人穿越幽暗的隧道，来到大门前。\n 吱呀——推开大门，原来这里是一片墓室。\n 在昏黄的烛火中，他们看到了一群没有意识的侍卫，还有一个没有头颅的巨大身影……",
"HeroNum_1": "1&6",
"progress": "&",
"progressDesc": "&",
@@ -202,7 +202,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在30回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在30回合内获得胜利",
"cost": 30,
"iconInMap": "spine&zhangjiao",
"iconName": "何后废陵",
@@ -215,7 +215,7 @@
"needPrepare": 1,
"spineInBigMap": "&",
"HeroNum": "6&6",
"gkInfo": " 何太后身材窈窕，风流妩媚，进宫之后更是凭借自身的心计一步步征服了汉灵帝的心。然其天性善妒，刘协出生后，感到自身地位动摇的何太后用鸩酒毒杀了王美人。\r\n 天道有轮回，外戚与宦官相争，何进身死，董卓进京，何太后也被逼饮下毒酒。\r\n 陵墓尽头，彼岸花开，何太后已超脱生死，可千万别停留在这里！",
"gkInfo": " 何太后身材窈窕，风流妩媚，进宫之后更是凭借自身的心计一步步征服了汉灵帝的心。然其天性善妒，刘协出生后，感到自身地位动摇的何太后用鸩酒毒杀了王美人。\n 天道有轮回，外戚与宦官相争，何进身死，董卓进京，何太后也被逼饮下毒酒。\n 陵墓尽头，彼岸花开，何太后已超脱生死，可千万别停留在这里！",
"HeroNum_1": "1&6",
"progress": "&",
"progressDesc": "&",
@@ -239,7 +239,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 10,
"iconInMap": "spine&guanhai",
"iconName": 0,
@@ -276,7 +276,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 10,
"iconInMap": "spine&caosong",
"iconName": 0,
@@ -313,7 +313,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 30,
"iconInMap": "spine&zhangrang",
"iconName": 0,
@@ -350,7 +350,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 10,
"iconInMap": "spine&qingnian",
"iconName": 0,
@@ -387,7 +387,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 10,
"iconInMap": "spine&yinbingdao",
"iconName": 0,
@@ -424,7 +424,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 30,
"iconInMap": "spine&zhangjiao",
"iconName": 0,
@@ -461,7 +461,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 10,
"iconInMap": "spine&qingnian",
"iconName": 0,
@@ -498,7 +498,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 10,
"iconInMap": "spine&yinbingdao",
"iconName": 0,
@@ -535,7 +535,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 30,
"iconInMap": "spine&zhangjiao",
"iconName": 0,
@@ -572,7 +572,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 10,
"iconInMap": "spine&wangcan",
"iconName": 0,
@@ -609,7 +609,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 10,
"iconInMap": "spine&yanshi",
"iconName": 0,
@@ -646,7 +646,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 30,
"iconInMap": "spine&sengren",
"iconName": 0,
@@ -683,7 +683,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 10,
"iconInMap": "spine&qingnian",
"iconName": "武陵顽猴",
@@ -720,7 +720,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 10,
"iconInMap": "spine&yinbingdao",
"iconName": "桃源疫民",
@@ -757,7 +757,7 @@
"fobiddenCharactor": "&",
"victoryInfoInUI": "消灭所有敌军",
"loseInfoInUI": "我方全部阵亡",
"starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
"starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
"cost": 30,
"iconInMap": "spine&zhangjiao",
"iconName": "西夷疫魔",