Merge branch 'master' of https://gitlab.trgame.cn/zyztech/zyz_server

shared/resource/jsons/dic_email_content.json

@@ -208,5 +208,12 @@
         "sendName": "&",
         "content": "很抱歉，您的军团已被解散，振作起来寻找新的军团加入吧",
         "time": 720
+    },
+    {
+        "id": 30,
+        "title": "&",
+        "sendName": "&",
+        "content": "您在昨日的名将擂台中获得了第%d名，排名奖励已发送至您的邮箱，请查收",
+        "time": 720
     }
 ]

shared/resource/jsons/dic_zyz_achievement.json

@@ -2094,5 +2094,181 @@
         "condition": 1,
         "taskReward": "40005&4000",
         "point": 30
+    },
+    {
+        "id": 132,
+        "achieveTaskId": 134,
+        "tab": 2,
+        "tabName": "游历",
+        "subTab": 16,
+        "subTabName": "羁绊",
+        "taskType": 124,
+        "taskParam": "5&",
+        "achieveType": 57,
+        "achieveTaskName": "亲密无间·壹",
+        "taskInfo": "单个最高等级的羁绊达5级",
+        "condition": 5,
+        "taskReward": "11014&1",
+        "point": 5
+    },
+    {
+        "id": 133,
+        "achieveTaskId": 135,
+        "tab": 2,
+        "tabName": "游历",
+        "subTab": 16,
+        "subTabName": "羁绊",
+        "taskType": 124,
+        "taskParam": "10&",
+        "achieveType": 57,
+        "achieveTaskName": "亲密无间·贰",
+        "taskInfo": "单个最高等级的羁绊达10级",
+        "condition": 10,
+        "taskReward": "11014&2",
+        "point": 10
+    },
+    {
+        "id": 134,
+        "achieveTaskId": 136,
+        "tab": 2,
+        "tabName": "游历",
+        "subTab": 16,
+        "subTabName": "羁绊",
+        "taskType": 124,
+        "taskParam": "12&",
+        "achieveType": 57,
+        "achieveTaskName": "亲密无间·叁",
+        "taskInfo": "单个最高等级的羁绊达12级",
+        "condition": 12,
+        "taskReward": "11014&5",
+        "point": 15
+    },
+    {
+        "id": 135,
+        "achieveTaskId": 137,
+        "tab": 2,
+        "tabName": "游历",
+        "subTab": 16,
+        "subTabName": "羁绊",
+        "taskType": 125,
+        "taskParam": "15&",
+        "achieveType": 58,
+        "achieveTaskName": "同生共死·壹",
+        "taskInfo": "单个3条羁绊共提升15级",
+        "condition": 15,
+        "taskReward": "11014&10",
+        "point": 20
+    },
+    {
+        "id": 136,
+        "achieveTaskId": 138,
+        "tab": 2,
+        "tabName": "游历",
+        "subTab": 16,
+        "subTabName": "羁绊",
+        "taskType": 125,
+        "taskParam": "36&",
+        "achieveType": 58,
+        "achieveTaskName": "同生共死·贰",
+        "taskInfo": "单个3条羁绊共提升36级",
+        "condition": 36,
+        "taskReward": "11014&5",
+        "point": 15
+    },
+    {
+        "id": 137,
+        "achieveTaskId": 139,
+        "tab": 8,
+        "tabName": "试炼",
+        "subTab": 17,
+        "subTabName": "攻擂",
+        "taskType": 121,
+        "taskParam": "10&",
+        "achieveType": 59,
+        "achieveTaskName": "死战·壹",
+        "taskInfo": "名将擂台挑战10次",
+        "condition": 10,
+        "taskReward": "40007&50",
+        "point": 30
+    },
+    {
+        "id": 138,
+        "achieveTaskId": 140,
+        "tab": 8,
+        "tabName": "试炼",
+        "subTab": 17,
+        "subTabName": "攻擂",
+        "taskType": 121,
+        "taskParam": "50&",
+        "achieveType": 59,
+        "achieveTaskName": "死战·贰",
+        "taskInfo": "名将擂台挑战50次",
+        "condition": 50,
+        "taskReward": "40007&100",
+        "point": 5
+    },
+    {
+        "id": 139,
+        "achieveTaskId": 141,
+        "tab": 8,
+        "tabName": "试炼",
+        "subTab": 17,
+        "subTabName": "攻擂",
+        "taskType": 122,
+        "taskParam": "10&",
+        "achieveType": 60,
+        "achieveTaskName": "胜利者·壹",
+        "taskInfo": "名将擂台胜利10次",
+        "condition": 10,
+        "taskReward": "40007&150",
+        "point": 10
+    },
+    {
+        "id": 140,
+        "achieveTaskId": 142,
+        "tab": 8,
+        "tabName": "试炼",
+        "subTab": 17,
+        "subTabName": "攻擂",
+        "taskType": 122,
+        "taskParam": "50&",
+        "achieveType": 60,
+        "achieveTaskName": "胜利者·贰",
+        "taskInfo": "名将擂台胜利50次",
+        "condition": 50,
+        "taskReward": "40007&200",
+        "point": 10
+    },
+    {
+        "id": 141,
+        "achieveTaskId": 143,
+        "tab": 8,
+        "tabName": "试炼",
+        "subTab": 17,
+        "subTabName": "攻擂",
+        "taskType": 123,
+        "taskParam": "100&1",
+        "achieveType": 61,
+        "achieveTaskName": "不屈不挠·壹",
+        "taskInfo": "名将擂台排名进入前100名",
+        "condition": 1,
+        "taskReward": "17054&100",
+        "point": 10
+    },
+    {
+        "id": 142,
+        "achieveTaskId": 144,
+        "tab": 8,
+        "tabName": "试炼",
+        "subTab": 17,
+        "subTabName": "攻擂",
+        "taskType": 123,
+        "taskParam": "50&1",
+        "achieveType": 61,
+        "achieveTaskName": "不屈不挠·贰",
+        "taskInfo": "名将擂台排名进入前50名",
+        "condition": 1,
+        "taskReward": "17054&100",
+        "point": 10
     }
 ]

shared/resource/jsons/dic_zyz_chat_system.json

@@ -4,7 +4,7 @@
         "name": "ROLE_SEND_TEXT",
         "mean": "玩家发送消息",
         "type": "2&3&4&5",
-        "template": "<color=#301B0C>%d</color>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>%d</outline></color>",
         "worldchat": "<outline color=#1c1613 width=1>%d</outline>",
         "comments": "%d：玩家发送的消息内容"
     },
@@ -13,7 +13,7 @@
         "name": "PRIVATE_SEND_GIFT",
         "mean": "发送礼物",
         "type": "5&",
-        "template": "<color=#301B0C>我挥了挥小手，给你送了</color><color=#fc879b>%d</color><color=#a49a48>，你一定要喜欢哦！</color>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>我挥了挥小手，给你送了</outline></color><color=#fc879b><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，你一定要喜欢哦！</outline></color>",
         "worldchat": "<outline color=#1c1613 width=1><color=#301B0C>我挥了挥小手，给你送了</color><color=#fc879b>%d</color><color=#a49a48>，你一定要喜欢哦！</color></outline>",
         "comments": "1:%d(赠送的道具)"
     },
@@ -22,7 +22,7 @@
         "name": "TEAM_ROLE",
         "mean": "玩家发送组队消息",
         "type": "5&",
-        "template": "<color=#301B0C>%d</color>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>%d</outline></color>",
         "worldchat": "<outline color=#1c1613 width=1><color=#301B0C>%d</color></outline>",
         "comments": "1:%d(发出组队邀请的玩家名)；2:%d(跳转链接)"
     },
@@ -31,7 +31,7 @@
         "name": "HERO_QUALITY_UP",
         "mean": "武将升品",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>将</color><outline color=#ad5712 width=1>%d</outline><color=#301B0C>升品至</color><outline color=#ad5712 width=1>%d</outline>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>将</outline></color><outline color=#1c613 width=1>%d</outline><color=#ffffff><outline color=#1c613 width=1>升品至</outline></color><outline color=#ad5712 width=1>%d</outline>",
         "worldchat": "<outline color=#1c1613 width=1><color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#a49a48>将</color>%d<color=#a49a48>升品至</color>%d</outline>",
         "comments": "1:%d(玩家名)；2:%d(武将名)；3.%d(武将品质)"
     },
@@ -40,7 +40,7 @@
         "name": "COMPOSE_ORANGE_HERO",
         "mean": "玩家获得传奇武将（橙）",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>时来运转，获得传奇武将</color><outline color=#ad5712 width=1>%d</outline>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>时来运转，获得传奇武将</outline></color><outline color=#ad5712 width=1>%d</outline>",
         "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#E6CB68>%d</color>时来运转，获得传奇武将%d</outline>",
         "comments": "1:%d(玩家名)；2:%d(武将名)"
     },
@@ -49,7 +49,7 @@
         "name": "HERO_STAR_MAX",
         "mean": "武将满星",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>将</color><outline color=#ad5712 width=1><color=#ffd800>%d</color></outline><color=#301B0C>培养至</color><outline color=#bd1616 width=1><color=#ff8080>彩星满星</color></outline>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>将</color><outline color=#ad5712 width=1><color=#ffd800>%d</color></outline><color=#ffffff><outline color=#1c613 width=1>培养至</outline></color><outline color=#bd1616 width=1><color=#ff8080>彩星满星</color></outline>",
         "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color><color=#a49a48>将</color><color=#f03420>%d</color>培养至彩星满星</outline>",
         "comments": "1:%d(玩家名)；2:%d(武将名)"
     },
@@ -58,7 +58,7 @@
         "name": "GUILD_NOTICE",
         "mean": "军团修改公告",
         "type": "3&",
-        "template": "<color=#5885BC>公告：%d</color>",
+        "template": "<color=#5885BC><outline color=#1c613 width=1>公告：</outline></color><outline color=#1c613 width=1>%d</outline>",
         "worldchat": "<color=#301B0C>公告：%d</color>",
         "comments": "%d：玩家发送的消息内容"
     },
@@ -67,7 +67,7 @@
         "name": "GUILD_STRUCTURE_LV_UP",
         "mean": "军团升级建筑",
         "type": "3&",
-        "template": "<color=#301B0C>恭喜主公，军团</color><color=#d9973a>%d</color><color=#301B0C>已升至</color><color=#907ffb>%d</color><color=#301B0C>级</color>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜主公，军团</outline></color><color=#d9973a><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>已升至</outline></color><color=#907ffb><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>级</outline></color>",
         "worldchat": "<outline color=#1c1613 width=1>恭喜各位小将军，军团<outline color=#5a5cc width=1><color=#53e1fb>%d</color></outline>已升至<color=#907ffb>%d</color>级</outline>",
         "comments": "1:%d(军团名)；2:%d(军团升级后的等级数)"
     },
@@ -76,7 +76,7 @@
         "name": "GUILD_TRAIN_SUC",
         "mean": "军团练兵场压制成功",
         "type": "3&",
-        "template": "<color=#301B0C>军团据点</color><outline color=#ad5712 width=1>%d</outline><color=#301B0C>被成功压制，对应宝藏已开启，请各位成员前往领取宝藏</color>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>军团据点</outline></color><outline color=#ad5712 width=1>%d</outline><color=#ffffff><outline color=#1c613 width=1>被成功压制，对应宝藏已开启，请各位成员前往领取宝藏</outline></color>",
         "worldchat": "<outline color=#1c1613 width=1><color=#301B0C>军团据点</color>%d<color=#a49a48>被成功压制，对应宝藏已开启，请各位成员前往领取宝藏</color></outline>",
         "comments": "1:%d(武将名)"
     },
@@ -85,7 +85,7 @@
         "name": "GUILD_BOSS_SUC",
         "mean": "军团BOSS胜利",
         "type": "3&",
-        "template": "<color=#301B0C>恭喜主公，军团BOSS</color><color=#f019fd>%d</color><color=#301B0C>被成功压制，拍卖行即将开启</color>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜主公，军团BOSS</outline></color><color=#f019fd><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>被成功压制，拍卖行即将开启</outline></color>",
         "worldchat": "<outline color=#1c1613 width=1>恭喜各位小将军，军团BOSS<color=#f019fd>%d</color>被成功压制，拍卖行即将开启</outline>",
         "comments": "1:%d(BOSS名)"
     },
@@ -94,8 +94,8 @@
         "name": "EQUIP_REFINE_SUC",
         "mean": "玩家首次精炼成功",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>，成功将</color><on click=%d>%d</on><color=#301B0C>进行精炼</color>",
-        "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color>，成功将<on click=%d>%d</on>进行精炼</outline>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，成功将</outline></color><color=%d><outline color=%d width=1><on click=%d>%d</on></outline></color><color=#ffffff><outline color=#1c613 width=1>进行精炼</outline></color>",
+        "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color>，成成功将</outline></color><color=%d><outline color=%d width=1><on click=%d>%d</on></outline></color><color=#ffffff><outline color=#1c613 width=1>进行精炼</outline>",
         "comments": "1:%d(玩家名)；2:%d(装备名)"
     },
     {
@@ -103,7 +103,7 @@
         "name": "EQUIP_COMPOSE_SUIT",
         "mean": "装备合成套装",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>，合成套装装备</color>%d",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，合成套装装备</outline></color><outline color=#1c613 width=1>%d</outline>",
         "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color>，合成套装装备%d</outline>",
         "comments": "1:%d(玩家名)；2:%d(装备名)"
     },
@@ -112,7 +112,7 @@
         "name": "EQUIP_COMPOSE_ORANGE",
         "mean": "装备合成出橙色品质及其以上装备",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>，获得</color>%d",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，获得</outline></color><outline color=#1c613 width=1>%d</outline>",
         "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color>，获得%d</outline>",
         "comments": "1:%d(玩家名)；2:%d(装备名)"
     },
@@ -121,7 +121,7 @@
         "name": "JEWEL_COMPOSE",
         "mean": "宝石合成7阶及其以上",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>，合成出%d",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，合成出</outline></color><outline color=#1c613 width=1>%d</outline>",
         "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color>，合成出%d</outline>",
         "comments": "1:%d(玩家名)；2:%d(宝石阶数)；3.%d(宝石名)"
     },
@@ -130,7 +130,7 @@
         "name": "ORANGE_BLUEPRT_COMPOSE",
         "mean": "合成橙色及其以上藏宝图",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>，合成</color>%d",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，合成</outline></color><outline color=#1c613 width=1>%d</outline>",
         "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color>，合成</color>%d</outline>",
         "comments": "1:%d(玩家名)；2:%d(藏宝图名)"
     },
@@ -139,7 +139,7 @@
         "name": "TOWER_SUC",
         "mean": "镇念塔100层后每通关50层",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>，镇念塔通关</color><color=#e5955a>%d</color><color=#301B0C>层</color>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，镇念塔通关</outline></color><color=#e5955a><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>层</outline></color>",
         "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color>，镇念塔通关<color=#e5955a>%d</color>层</outline>",
         "comments": "1:%d(玩家名)；2:%d(镇念塔层数)"
     },
@@ -148,7 +148,7 @@
         "name": "MYSTERY_FIRST_SUC",
         "mean": "秘境首通",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>，在秘境中成功压制通关</color><color=#e5955a>%d</color>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，在秘境中成功压制通关</outline></color><color=#e5955a><outline color=#1c613 width=1>%d</outline></color>",
         "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color>，在秘境中成功压制通关<color=#e5955a>%d</color></outline>",
         "comments": "1:%d(玩家名)；2:%d(关卡名)"
     },
@@ -157,7 +157,7 @@
         "name": "VESTIGE_FIRST_SUC",
         "mean": "遗迹首通",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>，在遗迹中成功压制通关</color><color=#e5955a>%d</color>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，在遗迹中成功压制通关</outline></color><color=#e5955a><outline color=#1c613 width=1>%d</outline></color>",
         "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color>，在遗迹中成功压制通关<color=#e5955a>%d</color></outline>",
         "comments": "1:%d(玩家名)；2:%d(关卡名)"
     },
@@ -166,7 +166,7 @@
         "name": "TEAM_INVITE",
         "mean": "组队一键邀请",
         "type": "2&3",
-        "template": "<color=#c08834>%d</color><color=#301B0C>发起组队邀请，诚邀各路侠士加入</color><color=#301B0C> %d</color><color=#301B0C>寻宝队伍，</color><color=#2f9b00><on click=%d>[加入]</on></color>",
+        "template": "<color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>发起组队邀请，诚邀各路侠士加入</outline></color><color=#ffffff><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>寻宝队伍，</outline></color><color=#2f9b00><on click=%d>[加入]</on></color>",
         "worldchat": "<outline color=#1c1613 width=1><color=#c08834>%d</color>发起组队邀请，诚邀各路侠士加入<color=#a49a48> %d寻宝队伍，</color><color=#2f9b00><on click=%d>[加入]</on></color></outline>",
         "comments": "1:%d(发出组队邀请的玩家名)；2:%d(藏宝图对应的关卡名); 3:%d(跳转链接)"
     },
@@ -175,7 +175,7 @@
         "name": "HERO_WAKEUP",
         "mean": "武将觉醒",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>，成功将</color><outline color=#ad5712 width=1><color=#ffd800>%d</color></outline><color=#301B0C>觉醒</color>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，成功将</outline></color><outline color=#ad5712 width=1><color=#ffd800>%d</color></outline><color=#ffffff><outline color=#1c613 width=1>觉醒</outline></color>",
         "worldchat": "<outline color=#1c1613 width=1><color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>，成功将</color><color=#f03420>%d</color><color=#301B0C>觉醒</color>",
         "comments": "1:%d(玩家名)；2:%d(武将名)"
     },
@@ -184,7 +184,7 @@
         "name": "EQUIP_REFRESH_BEST",
         "mean": "装备洗炼出特殊属性",
         "type": "1&",
-        "template": "<color=#c08834>%d</color><color=#c08834>锲而不舍，将</color>%d<color=#c08834>洗炼出极品属性</color>",
+        "template": "<color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=##ffffff><outline color=#1c613 width=1>锲而不舍，将</outline></color><outline color=#1c613 width=1>%d</outline><color=#c08834><color=##ffffff><outline color=#1c613 width=1>洗炼出极品属性</outline></color>",
         "worldchat": "<outline color=#1c1613 width=1><color=#c08834>%d</color>锲而不舍，将%d洗炼出极品属性</outline>",
         "comments": "1:%d(玩家名)；2:%d(装备名)"
     },
@@ -193,7 +193,7 @@
         "name": "ACQUIRE_RARE_GOODS",
         "mean": "掉落其他稀有道具",
         "type": "1&",
-        "template": "<color=#c08834>%d</color><color=#c08834>福星高照，获得稀有物资</color>%d",
+        "template": "<color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>福星高照，获得稀有物资</outline></color><outline color=#1c613 width=1>%d</outline>",
         "worldchat": "<outline color=#1c1613 width=1><color=#c08834>%d</color>福星高照，获得稀有物资%d</outline>",
         "comments": "1:%d(玩家名)；2:%d(物品名)"
     },
@@ -202,7 +202,7 @@
         "name": "GROUP_SEND_GIFT",
         "mean": "发送礼物",
         "type": "1&",
-        "template": "<color=#c08834>%d</color><color=#301B0C>赠送给</color><color=#c08834>%d</color><outline color=#5a5ccc width=1><color=#f09fed>%d</color></outline>",
+        "template": "<color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>赠送给</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><outline color=#5a5ccc width=1><color=#f09fed>%d</color></outline>",
         "worldchat": "<outline color=#1c1613 width=1><color=#c08834>%d</color>赠送给<color=#c08834>%d</color><color=#5a5ccc>%d</color></outline>",
         "comments": "1:%d(赠送的玩家名)；2:%d(赠送的玩家名)；3.%d(赠送的道具)"
     },
@@ -211,7 +211,7 @@
         "name": "SEND_MARQUEE",
         "mean": "跑马灯内容",
         "type": "1&",
-        "template": "%d",
+        "template": "<outline color=#1c613 width=1>%d</outline>",
         "worldchat": "%d",
         "comments": "&"
     },
@@ -220,7 +220,7 @@
         "name": "GUILD_RECURIT",
         "mean": "军团招募",
         "type": "2&",
-        "template": "<color=#53e1fb>%d</color><color=#301B0C>正在招兵买马：</color><color=#c08834>%d</color><color=#2f9b00><on click=%d>[前往]</on></color>",
+        "template": "<color=#53e1fb><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>正在招兵买马：</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#2f9b00><on click=%d>[前往]</on></color>",
         "worldchat": "<outline color=#1c1613 width=1><color=#53e1fb>%d</color>正在招兵买马：%d<color=#2f9b00><on click=%d>[前往]</on></color></outline>",
         "comments": "1:%d(军团名)；2:%d(军团招募内容)"
     },
@@ -229,8 +229,8 @@
         "name": "EQUIP_STAR_UP",
         "mean": "装备升至12星",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>，成功将</color><on click=%d>%d</on><color=#301B0C>升至满星</color>",
-        "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color>，成功将<on click=%d>%d</on>升至满星</outline>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，成功将</outline></color><color=%d><outline color=%d width=1><on click=%d>%d</on></outline></color><color=#ffffff><outline color=#1c613 width=1>升至满星</outline></color>",
+        "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color>，成功将</outline></color><color=%d><outline color=%d width=1><on click=%d>%d</on></outline></color><color=#ffffff><outline color=#1c613 width=1>升至满星</outline></color>",
         "comments": "1:%d(玩家名)；2:%d(装备名)"
     },
     {
@@ -238,8 +238,17 @@
         "name": "EQUIP_QUALITY_UP",
         "mean": "装备升至金色",
         "type": "1&",
-        "template": "<color=#301B0C>恭喜</color><color=#c08834>%d</color><color=#301B0C>，成功将</color><on click=%d>%d</on><color=#301B0C>升至最高品质</color>",
-        "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color>，成功将<on click=%d>%d</on>升至最高品质</outline>",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，成功将</outline></color><color=%d><outline color=%d width=1><on click=%d>%d</on></outline></color><color=#ffffff><outline color=#1c613 width=1>升至最高品质</outline></color>",
+        "worldchat": "<outline color=#1c1613 width=1>恭喜<color=#c08834>%d</color>，成功将</outline></color><color=%d><outline color=%d width=1><on click=%d>%d</on></outline></color><color=#ffffff><outline color=#1c613 width=1>升至最高品质</outline></color>",
         "comments": "1:%d(玩家名)；2:%d(装备名)"
+    },
+    {
+        "id": 27,
+        "name": "LADDER_FIRST_CHANGE",
+        "mean": "名将擂台第一名换人",
+        "type": "1&",
+        "template": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，在名将擂台中攻擂成功，登顶第一</outline></color>",
+        "worldchat": "<color=#ffffff><outline color=#1c613 width=1>恭喜</outline></color><color=#c08834><outline color=#1c613 width=1>%d</outline></color><color=#ffffff><outline color=#1c613 width=1>，在名将擂台中攻擂成功，登顶第一</outline></color>",
+        "comments": "1:%d(玩家名)"
     }
 ]

shared/resource/jsons/dic_zyz_jewel.json

@@ -8,7 +8,8 @@
         "lv": 1,
         "quality": 1,
         "effectCount": 2,
-        "randomEffect": "90101&90401&90601&90801&90901&91201&91301",
+        "randomEffect": "90401&90601&90801&90901&91201&91301",
+        "rareEffect": "90110&",
         "mapGoodId": 33001,
         "quenchConsume": "17057&1",
         "successConsume": "17057&100",
@@ -24,7 +25,8 @@
         "lv": 2,
         "quality": 1,
         "effectCount": 2,
-        "randomEffect": "90102&90402&90602&90802&90902&91202&91302",
+        "randomEffect": "90402&90602&90802&90902&91202&91302",
+        "rareEffect": "90111&",
         "mapGoodId": 33002,
         "quenchConsume": "17057&2",
         "successConsume": "17057&100",
@@ -40,7 +42,8 @@
         "lv": 3,
         "quality": 2,
         "effectCount": 2,
-        "randomEffect": "90103&90403&90603&90803&90903&91203&91303",
+        "randomEffect": "90403&90603&90803&90903&91203&91303",
+        "rareEffect": "90112&",
         "mapGoodId": 33003,
         "quenchConsume": "17057&4",
         "successConsume": "17057&100",
@@ -56,7 +59,8 @@
         "lv": 4,
         "quality": 2,
         "effectCount": 2,
-        "randomEffect": "90104&90404&90604&90804&90904&91204&91304",
+        "randomEffect": "90404&90604&90804&90904&91204&91304",
+        "rareEffect": "90113&",
         "mapGoodId": 33004,
         "quenchConsume": "17057&6",
         "successConsume": "17057&100",
@@ -72,7 +76,8 @@
         "lv": 5,
         "quality": 3,
         "effectCount": 3,
-        "randomEffect": "90105&90405&90605&90805&90905&91205&91305",
+        "randomEffect": "90405&90605&90805&90905&91205&91305",
+        "rareEffect": "90114&",
         "mapGoodId": 33005,
         "quenchConsume": "17057&8",
         "successConsume": "17057&100",
@@ -88,7 +93,8 @@
         "lv": 6,
         "quality": 3,
         "effectCount": 3,
-        "randomEffect": "90106&90406&90606&90806&90906&91206&91306",
+        "randomEffect": "90406&90606&90806&90906&91206&91306",
+        "rareEffect": "90115&",
         "mapGoodId": 33006,
         "quenchConsume": "17057&12",
         "successConsume": "17057&100",
@@ -104,7 +110,8 @@
         "lv": 7,
         "quality": 4,
         "effectCount": 4,
-        "randomEffect": "90107&90407&90607&90807&90907&91207&91307",
+        "randomEffect": "90407&90607&90807&90907&91207&91307",
+        "rareEffect": "90116&",
         "mapGoodId": 33007,
         "quenchConsume": "17057&16",
         "successConsume": "17057&100",
@@ -120,7 +127,8 @@
         "lv": 8,
         "quality": 4,
         "effectCount": 4,
-        "randomEffect": "90108&90408&90608&90808&90908&91208&91308",
+        "randomEffect": "90408&90608&90808&90908&91208&91308",
+        "rareEffect": "90117&",
         "mapGoodId": 33008,
         "quenchConsume": "17057&24",
         "successConsume": "17057&100",
@@ -136,7 +144,8 @@
         "lv": 9,
         "quality": 5,
         "effectCount": 4,
-        "randomEffect": "90109&90409&90609&90809&90909&91209&91309",
+        "randomEffect": "90409&90609&90809&90909&91209&91309",
+        "rareEffect": "90118&",
         "mapGoodId": 0,
         "quenchConsume": "17057&36",
         "successConsume": "17057&100",
@@ -152,7 +161,8 @@
         "lv": 1,
         "quality": 1,
         "effectCount": 2,
-        "randomEffect": "90201&90401&90601&90801&90901&91001&91101",
+        "randomEffect": "90401&90601&90801&90901&91001&91101",
+        "rareEffect": "90210&",
         "mapGoodId": 33010,
         "quenchConsume": "17057&1",
         "successConsume": "17057&100",
@@ -168,7 +178,8 @@
         "lv": 2,
         "quality": 1,
         "effectCount": 2,
-        "randomEffect": "90202&90402&90602&90802&90902&91002&91102",
+        "randomEffect": "90402&90602&90802&90902&91002&91102",
+        "rareEffect": "90211&",
         "mapGoodId": 33011,
         "quenchConsume": "17057&2",
         "successConsume": "17057&100",
@@ -184,7 +195,8 @@
         "lv": 3,
         "quality": 2,
         "effectCount": 2,
-        "randomEffect": "90203&90403&90603&90803&90903&91003&91103",
+        "randomEffect": "90403&90603&90803&90903&91003&91103",
+        "rareEffect": "90212&",
         "mapGoodId": 33012,
         "quenchConsume": "17057&4",
         "successConsume": "17057&100",
@@ -200,7 +212,8 @@
         "lv": 4,
         "quality": 2,
         "effectCount": 2,
-        "randomEffect": "90204&90404&90604&90804&90904&91004&91104",
+        "randomEffect": "90404&90604&90804&90904&91004&91104",
+        "rareEffect": "90213&",
         "mapGoodId": 33013,
         "quenchConsume": "17057&6",
         "successConsume": "17057&100",
@@ -216,7 +229,8 @@
         "lv": 5,
         "quality": 3,
         "effectCount": 3,
-        "randomEffect": "90205&90405&90605&90805&90905&91005&91105",
+        "randomEffect": "90405&90605&90805&90905&91005&91105",
+        "rareEffect": "90214&",
         "mapGoodId": 33014,
         "quenchConsume": "17057&8",
         "successConsume": "17057&100",
@@ -232,7 +246,8 @@
         "lv": 6,
         "quality": 3,
         "effectCount": 3,
-        "randomEffect": "90206&90406&90606&90806&90906&91006&91106",
+        "randomEffect": "90406&90606&90806&90906&91006&91106",
+        "rareEffect": "90215&",
         "mapGoodId": 33015,
         "quenchConsume": "17057&12",
         "successConsume": "17057&100",
@@ -248,7 +263,8 @@
         "lv": 7,
         "quality": 4,
         "effectCount": 4,
-        "randomEffect": "90207&90407&90607&90807&90907&91007&91107",
+        "randomEffect": "90407&90607&90807&90907&91007&91107",
+        "rareEffect": "90216&",
         "mapGoodId": 33016,
         "quenchConsume": "17057&16",
         "successConsume": "17057&100",
@@ -264,7 +280,8 @@
         "lv": 8,
         "quality": 4,
         "effectCount": 4,
-        "randomEffect": "90208&90408&90608&90808&90908&91008&91108",
+        "randomEffect": "90408&90608&90808&90908&91008&91108",
+        "rareEffect": "90217&",
         "mapGoodId": 33017,
         "quenchConsume": "17057&24",
         "successConsume": "17057&100",
@@ -280,7 +297,8 @@
         "lv": 9,
         "quality": 5,
         "effectCount": 4,
-        "randomEffect": "90209&90409&90609&90809&90909&91009&91109",
+        "randomEffect": "90409&90609&90809&90909&91009&91109",
+        "rareEffect": "90218&",
         "mapGoodId": 0,
         "quenchConsume": "17057&36",
         "successConsume": "17057&100",
@@ -296,7 +314,8 @@
         "lv": 1,
         "quality": 1,
         "effectCount": 2,
-        "randomEffect": "90301&90501&90701&90801&90901&91001&91101",
+        "randomEffect": "90501&90701&90801&90901&91001&91101",
+        "rareEffect": "90310&",
         "mapGoodId": 33019,
         "quenchConsume": "17057&1",
         "successConsume": "17057&100",
@@ -312,7 +331,8 @@
         "lv": 2,
         "quality": 1,
         "effectCount": 2,
-        "randomEffect": "90302&90502&90702&90802&90902&91002&91102",
+        "randomEffect": "90502&90702&90802&90902&91002&91102",
+        "rareEffect": "90311&",
         "mapGoodId": 33020,
         "quenchConsume": "17057&2",
         "successConsume": "17057&100",
@@ -328,7 +348,8 @@
         "lv": 3,
         "quality": 2,
         "effectCount": 2,
-        "randomEffect": "90303&90503&90703&90803&90903&91003&91103",
+        "randomEffect": "90503&90703&90803&90903&91003&91103",
+        "rareEffect": "90312&",
         "mapGoodId": 33021,
         "quenchConsume": "17057&4",
         "successConsume": "17057&100",
@@ -344,7 +365,8 @@
         "lv": 4,
         "quality": 2,
         "effectCount": 2,
-        "randomEffect": "90304&90504&90704&90804&90904&91004&91104",
+        "randomEffect": "90504&90704&90804&90904&91004&91104",
+        "rareEffect": "90313&",
         "mapGoodId": 33022,
         "quenchConsume": "17057&6",
         "successConsume": "17057&100",
@@ -360,7 +382,8 @@
         "lv": 5,
         "quality": 3,
         "effectCount": 3,
-        "randomEffect": "90305&90505&90705&90805&90905&91005&91105",
+        "randomEffect": "90505&90705&90805&90905&91005&91105",
+        "rareEffect": "90314&",
         "mapGoodId": 33023,
         "quenchConsume": "17057&8",
         "successConsume": "17057&100",
@@ -376,7 +399,8 @@
         "lv": 6,
         "quality": 3,
         "effectCount": 3,
-        "randomEffect": "90306&90506&90706&90806&90906&91006&91106",
+        "randomEffect": "90506&90706&90806&90906&91006&91106",
+        "rareEffect": "90315&",
         "mapGoodId": 33024,
         "quenchConsume": "17057&12",
         "successConsume": "17057&100",
@@ -392,7 +416,8 @@
         "lv": 7,
         "quality": 4,
         "effectCount": 4,
-        "randomEffect": "90307&90507&90707&90807&90907&91007&91107",
+        "randomEffect": "90507&90707&90807&90907&91007&91107",
+        "rareEffect": "90316&",
         "mapGoodId": 33025,
         "quenchConsume": "17057&16",
         "successConsume": "17057&100",
@@ -408,7 +433,8 @@
         "lv": 8,
         "quality": 4,
         "effectCount": 4,
-        "randomEffect": "90308&90508&90708&90808&90908&91008&91108",
+        "randomEffect": "90508&90708&90808&90908&91008&91108",
+        "rareEffect": "90317&",
         "mapGoodId": 33026,
         "quenchConsume": "17057&24",
         "successConsume": "17057&100",
@@ -424,7 +450,8 @@
         "lv": 9,
         "quality": 5,
         "effectCount": 4,
-        "randomEffect": "90309&90509&90709&90809&90909&91009&91109",
+        "randomEffect": "90509&90709&90809&90909&91009&91109",
+        "rareEffect": "90318&",
         "mapGoodId": 0,
         "quenchConsume": "17057&36",
         "successConsume": "17057&100",
@@ -440,7 +467,8 @@
         "lv": 1,
         "quality": 1,
         "effectCount": 2,
-        "randomEffect": "90001&90501&90701&90801&90901&91001&91101",
+        "randomEffect": "90501&90701&90801&90901&91001&91101",
+        "rareEffect": "90010&",
         "mapGoodId": 33028,
         "quenchConsume": "17057&1",
         "successConsume": "17057&100",
@@ -456,7 +484,8 @@
         "lv": 2,
         "quality": 1,
         "effectCount": 2,
-        "randomEffect": "90002&90502&90702&90802&90902&91002&91102",
+        "randomEffect": "90502&90702&90802&90902&91002&91102",
+        "rareEffect": "90011&",
         "mapGoodId": 33029,
         "quenchConsume": "17057&2",
         "successConsume": "17057&100",
@@ -472,7 +501,8 @@
         "lv": 3,
         "quality": 2,
         "effectCount": 2,
-        "randomEffect": "90003&90503&90703&90803&90903&91003&91103",
+        "randomEffect": "90503&90703&90803&90903&91003&91103",
+        "rareEffect": "90012&",
         "mapGoodId": 33030,
         "quenchConsume": "17057&4",
         "successConsume": "17057&100",
@@ -488,7 +518,8 @@
         "lv": 4,
         "quality": 2,
         "effectCount": 2,
-        "randomEffect": "90004&90504&90704&90804&90904&91004&91104",
+        "randomEffect": "90504&90704&90804&90904&91004&91104",
+        "rareEffect": "90013&",
         "mapGoodId": 33031,
         "quenchConsume": "17057&6",
         "successConsume": "17057&100",
@@ -504,7 +535,8 @@
         "lv": 5,
         "quality": 3,
         "effectCount": 3,
-        "randomEffect": "90005&90505&90705&90805&90905&91005&91105",
+        "randomEffect": "90505&90705&90805&90905&91005&91105",
+        "rareEffect": "90014&",
         "mapGoodId": 33032,
         "quenchConsume": "17057&8",
         "successConsume": "17057&100",
@@ -520,7 +552,8 @@
         "lv": 6,
         "quality": 3,
         "effectCount": 3,
-        "randomEffect": "90006&90506&90706&90806&90906&91006&91106",
+        "randomEffect": "90506&90706&90806&90906&91006&91106",
+        "rareEffect": "90015&",
         "mapGoodId": 33033,
         "quenchConsume": "17057&12",
         "successConsume": "17057&100",
@@ -536,7 +569,8 @@
         "lv": 7,
         "quality": 4,
         "effectCount": 4,
-        "randomEffect": "90007&90507&90707&90807&90907&91007&91107",
+        "randomEffect": "90507&90707&90807&90907&91007&91107",
+        "rareEffect": "90016&",
         "mapGoodId": 33034,
         "quenchConsume": "17057&16",
         "successConsume": "17057&100",
@@ -552,7 +586,8 @@
         "lv": 8,
         "quality": 4,
         "effectCount": 4,
-        "randomEffect": "90008&90508&90708&90808&90908&91008&91108",
+        "randomEffect": "90508&90708&90808&90908&91008&91108",
+        "rareEffect": "90017&",
         "mapGoodId": 33035,
         "quenchConsume": "17057&24",
         "successConsume": "17057&100",
@@ -568,7 +603,8 @@
         "lv": 9,
         "quality": 5,
         "effectCount": 4,
-        "randomEffect": "90009&90509&90709&90809&90909&91009&91109",
+        "randomEffect": "90509&90709&90809&90909&91009&91109",
+        "rareEffect": "90018&",
         "mapGoodId": 0,
         "quenchConsume": "17057&36",
         "successConsume": "17057&100",

shared/resource/jsons/dic_zyz_ladderMatch.json

@@ -0,0 +1,112 @@
+[
+    {
+        "id": 1,
+        "rankMin": 0,
+        "rankMax": 1,
+        "rangeBeforeMax": 0,
+        "rangeAfterMax": 0,
+        "rangeBeforeNum": 0,
+        "rangeAfterNum": 0,
+        "interval": "0&0",
+        "topChallenge": 1
+    },
+    {
+        "id": 2,
+        "rankMin": 1,
+        "rankMax": 10,
+        "rangeBeforeMax": 0,
+        "rangeAfterMax": 1,
+        "rangeBeforeNum": 0,
+        "rangeAfterNum": 1,
+        "interval": "0&0",
+        "topChallenge": 1
+    },
+    {
+        "id": 3,
+        "rankMin": 10,
+        "rankMax": 20,
+        "rangeBeforeMax": 5,
+        "rangeAfterMax": 1,
+        "rangeBeforeNum": 3,
+        "rangeAfterNum": 1,
+        "interval": "0&5",
+        "topChallenge": 1
+    },
+    {
+        "id": 4,
+        "rankMin": 20,
+        "rankMax": 50,
+        "rangeBeforeMax": 10,
+        "rangeAfterMax": 1,
+        "rangeBeforeNum": 5,
+        "rangeAfterNum": 1,
+        "interval": "0&5",
+        "topChallenge": 0
+    },
+    {
+        "id": 5,
+        "rankMin": 50,
+        "rankMax": 100,
+        "rangeBeforeMax": 30,
+        "rangeAfterMax": 5,
+        "rangeBeforeNum": 5,
+        "rangeAfterNum": 1,
+        "interval": "3&6",
+        "topChallenge": 0
+    },
+    {
+        "id": 6,
+        "rankMin": 100,
+        "rankMax": 200,
+        "rangeBeforeMax": 50,
+        "rangeAfterMax": 10,
+        "rangeBeforeNum": 5,
+        "rangeAfterNum": 1,
+        "interval": "5&10",
+        "topChallenge": 0
+    },
+    {
+        "id": 7,
+        "rankMin": 200,
+        "rankMax": 500,
+        "rangeBeforeMax": 100,
+        "rangeAfterMax": 50,
+        "rangeBeforeNum": 5,
+        "rangeAfterNum": 1,
+        "interval": "10&20",
+        "topChallenge": 0
+    },
+    {
+        "id": 8,
+        "rankMin": 500,
+        "rankMax": 1000,
+        "rangeBeforeMax": 200,
+        "rangeAfterMax": 100,
+        "rangeBeforeNum": 5,
+        "rangeAfterNum": 1,
+        "interval": "20&40",
+        "topChallenge": 0
+    },
+    {
+        "id": 9,
+        "rankMin": 1000,
+        "rankMax": 2000,
+        "rangeBeforeMax": 300,
+        "rangeAfterMax": 100,
+        "rangeBeforeNum": 5,
+        "rangeAfterNum": 1,
+        "interval": "30&60",
+        "topChallenge": 0
+    },
+    {
+        "id": 10,
+        "rankMin": 2000,
+        "rankMax": -1,
+        "rangeBeforeMax": 500,
+        "rangeAfterMax": 100,
+        "rangeBeforeNum": 5,
+        "rangeAfterNum": 1,
+        "interval": "50&100",
+        "topChallenge": 0
+    }
+]

shared/resource/jsons/dic_zyz_ladder_rankReward.json

@@ -0,0 +1,56 @@
+[
+    {
+        "id": 1,
+        "rankMin": 0,
+        "rankMax": 1,
+        "reward": "31002&900|31001&5000"
+    },
+    {
+        "id": 2,
+        "rankMin": 1,
+        "rankMax": 10,
+        "reward": "31002&800|31001&4000"
+    },
+    {
+        "id": 3,
+        "rankMin": 10,
+        "rankMax": 50,
+        "reward": "31002&700|31001&3000"
+    },
+    {
+        "id": 4,
+        "rankMin": 50,
+        "rankMax": 100,
+        "reward": "31002&600|31001&2000"
+    },
+    {
+        "id": 5,
+        "rankMin": 100,
+        "rankMax": 200,
+        "reward": "31002&500|31001&2000"
+    },
+    {
+        "id": 6,
+        "rankMin": 200,
+        "rankMax": 500,
+        "reward": "31002&400|31001&2000"
+    },
+    {
+        "id": 7,
+        "rankMin": 500,
+        "rankMax": 1000,
+        "reward": "31002&300|31001&2000"
+    },
+    {
+        "id": 8,
+        "rankMin": 1000,
+        "rankMax": 2000,
+        "reward": "31002&200|31001&2000"
+    },
+    {
+        "id": 9,
+        "rankMin": 2000,
+        "rankMax": 3000,
+        "reward": "31002&100|31001&1000"
+    }
+]

shared/resource/jsons/dic_zyz_rankingType.json

@@ -43,7 +43,7 @@
     },
     {
         "id": 7,
-        "name": "主线推进 ",
+        "name": "主线推进",
         "group": 2,
         "groupName": "玩法",
         "general": 0
@@ -61,5 +61,12 @@
         "group": 2,
         "groupName": "玩法",
         "general": 0
+    },
+    {
+        "id": 10,
+        "name": "名将擂台",
+        "group": 2,
+        "groupName": "玩法",
+        "general": 0
     }
 ]

shared/resource/jsons/dic_zyz_taskType.json

@@ -386,7 +386,7 @@
         "param": "count&point&",
         "string": "领取次数&宝箱的积分&",
         "content": "point：领取宝箱消耗的点数",
-        "condition": "count",
+        "condition": "warcount",
         "sumType": 2
     },
     {
@@ -1005,8 +1005,58 @@
         "info": "军团元宝捐献x次",
         "param": "count&",
         "string": "捐献次数&",
-        "content": "捐献",
+        "content": "只算有元宝的捐献",
         "condition": "count",
         "sumType": 2
+    },
+    {
+        "id": 121,
+        "name": "名将擂台",
+        "info": "名将擂台挑战X次",
+        "param": "count&",
+        "string": "挑战次数&",
+        "content": "含扫荡（扣挑战次数就算）",
+        "condition": "count",
+        "sumType": 2
+    },
+    {
+        "id": 122,
+        "name": "名将擂台",
+        "info": "名将擂台胜利X次",
+        "param": "count&",
+        "string": "胜利次数&",
+        "content": "含扫荡",
+        "condition": "count",
+        "sumType": 2
+    },
+    {
+        "id": 123,
+        "name": "名将擂台",
+        "info": "名将擂台排名进入前X名",
+        "param": "rank&count&",
+        "string": "名次&条件",
+        "content": 0,
+        "condition": "count",
+        "sumType": 1
+    },
+    {
+        "id": 124,
+        "name": "武将",
+        "info": "单个武将其中最高等级的羁绊达X级",
+        "param": "level&",
+        "string": "等级&",
+        "content": 0,
+        "condition": "level&",
+        "sumType": 1
+    },
+    {
+        "id": 125,
+        "name": "武将",
+        "info": "单个武将3条羁绊总共提升X级",
+        "param": "level&",
+        "string": "等级&",
+        "content": 0,
+        "condition": "level&",
+        "sumType": 1
     }
 ]

shared/resource/warJsons/4601.json

@@ -0,0 +1,278 @@
+[
+    {
+        "warId": 4601,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
+        "dirction": 1,
+        "x": 6,
+        "y": 7,
+        "var": 501,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4601,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 1,
+        "dirction": 1,
+        "x": 6,
+        "y": 6,
+        "var": 502,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4601,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 2,
+        "dirction": 1,
+        "x": 5,
+        "y": 8,
+        "var": 503,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4601,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 3,
+        "dirction": 1,
+        "x": 5,
+        "y": 5,
+        "var": 504,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4601,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 4,
+        "dirction": 1,
+        "x": 4,
+        "y": 8,
+        "var": 505,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4601,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 4,
+        "y": 5,
+        "var": 506,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4601,
+        "actorName": "典韦",
+        "actorId": 307,
+        "dataId": 2001,
+        "relation": 2,
+        "outIndex": 0,
+        "dirction": 0,
+        "x": 11,
+        "y": 7,
+        "var": 2001,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4601,
+        "actorName": "文丑",
+        "actorId": 355,
+        "dataId": 2002,
+        "relation": 2,
+        "outIndex": 1,
+        "dirction": 0,
+        "x": 11,
+        "y": 6,
+        "var": 2002,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4601,
+        "actorName": "颜良",
+        "actorId": 354,
+        "dataId": 2003,
+        "relation": 2,
+        "outIndex": 2,
+        "dirction": 0,
+        "x": 12,
+        "y": 8,
+        "var": 2003,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4601,
+        "actorName": "孙乾",
+        "actorId": 331,
+        "dataId": 2004,
+        "relation": 2,
+        "outIndex": 3,
+        "dirction": 0,
+        "x": 12,
+        "y": 5,
+        "var": 2004,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4601,
+        "actorName": "蔡琰",
+        "actorId": 313,
+        "dataId": 2005,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 0,
+        "x": 13,
+        "y": 8,
+        "var": 2005,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4601,
+        "actorName": "麹义",
+        "actorId": 350,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 0,
+        "x": 13,
+        "y": 5,
+        "var": 2006,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    }
+]

shared/resource/warJsons/4602.json

@@ -0,0 +1,278 @@
+[
+    {
+        "warId": 4602,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
+        "dirction": 1,
+        "x": 6,
+        "y": 7,
+        "var": 501,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4602,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 1,
+        "dirction": 1,
+        "x": 6,
+        "y": 6,
+        "var": 502,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4602,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 2,
+        "dirction": 1,
+        "x": 5,
+        "y": 8,
+        "var": 503,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4602,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 3,
+        "dirction": 1,
+        "x": 5,
+        "y": 5,
+        "var": 504,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4602,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 4,
+        "dirction": 1,
+        "x": 4,
+        "y": 8,
+        "var": 505,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4602,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 4,
+        "y": 5,
+        "var": 506,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4602,
+        "actorName": "潘璋",
+        "actorId": 360,
+        "dataId": 2001,
+        "relation": 2,
+        "outIndex": 0,
+        "dirction": 0,
+        "x": 11,
+        "y": 7,
+        "var": 2001,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4602,
+        "actorName": "乐进",
+        "actorId": 316,
+        "dataId": 2002,
+        "relation": 2,
+        "outIndex": 1,
+        "dirction": 0,
+        "x": 11,
+        "y": 6,
+        "var": 2002,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4602,
+        "actorName": "凌统",
+        "actorId": 361,
+        "dataId": 2003,
+        "relation": 2,
+        "outIndex": 2,
+        "dirction": 0,
+        "x": 12,
+        "y": 8,
+        "var": 2003,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4602,
+        "actorName": "郭嘉",
+        "actorId": 305,
+        "dataId": 2004,
+        "relation": 2,
+        "outIndex": 3,
+        "dirction": 0,
+        "x": 12,
+        "y": 5,
+        "var": 2004,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4602,
+        "actorName": "孙权",
+        "actorId": 336,
+        "dataId": 2005,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 0,
+        "x": 13,
+        "y": 8,
+        "var": 2005,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4602,
+        "actorName": "李典",
+        "actorId": 312,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 0,
+        "x": 13,
+        "y": 5,
+        "var": 2006,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    }
+]

shared/resource/warJsons/4603.json

@@ -0,0 +1,278 @@
+[
+    {
+        "warId": 4603,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
+        "dirction": 1,
+        "x": 6,
+        "y": 7,
+        "var": 501,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4603,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 1,
+        "dirction": 1,
+        "x": 6,
+        "y": 6,
+        "var": 502,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4603,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 2,
+        "dirction": 1,
+        "x": 5,
+        "y": 8,
+        "var": 503,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4603,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 3,
+        "dirction": 1,
+        "x": 5,
+        "y": 5,
+        "var": 504,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4603,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 4,
+        "dirction": 1,
+        "x": 4,
+        "y": 8,
+        "var": 505,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4603,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 4,
+        "y": 5,
+        "var": 506,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4603,
+        "actorName": "典韦",
+        "actorId": 307,
+        "dataId": 2001,
+        "relation": 2,
+        "outIndex": 0,
+        "dirction": 0,
+        "x": 11,
+        "y": 7,
+        "var": 2001,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4603,
+        "actorName": "文丑",
+        "actorId": 355,
+        "dataId": 2002,
+        "relation": 2,
+        "outIndex": 1,
+        "dirction": 0,
+        "x": 11,
+        "y": 6,
+        "var": 2002,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4603,
+        "actorName": "颜良",
+        "actorId": 354,
+        "dataId": 2003,
+        "relation": 2,
+        "outIndex": 2,
+        "dirction": 0,
+        "x": 12,
+        "y": 8,
+        "var": 2003,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4603,
+        "actorName": "郭嘉",
+        "actorId": 305,
+        "dataId": 2004,
+        "relation": 2,
+        "outIndex": 3,
+        "dirction": 0,
+        "x": 12,
+        "y": 5,
+        "var": 2004,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4603,
+        "actorName": "孙权",
+        "actorId": 333,
+        "dataId": 2005,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 0,
+        "x": 13,
+        "y": 8,
+        "var": 2005,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4603,
+        "actorName": "太史慈",
+        "actorId": 335,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 0,
+        "x": 13,
+        "y": 5,
+        "var": 2006,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    }
+]

shared/resource/warJsons/4604.json

@@ -0,0 +1,278 @@
+[
+    {
+        "warId": 4604,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
+        "dirction": 1,
+        "x": 6,
+        "y": 7,
+        "var": 501,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4604,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 1,
+        "dirction": 1,
+        "x": 6,
+        "y": 6,
+        "var": 502,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4604,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 2,
+        "dirction": 1,
+        "x": 5,
+        "y": 8,
+        "var": 503,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4604,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 3,
+        "dirction": 1,
+        "x": 5,
+        "y": 5,
+        "var": 504,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4604,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 4,
+        "dirction": 1,
+        "x": 4,
+        "y": 8,
+        "var": 505,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4604,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 4,
+        "y": 5,
+        "var": 506,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4604,
+        "actorName": "庞舞",
+        "actorId": 352,
+        "dataId": 2001,
+        "relation": 2,
+        "outIndex": 0,
+        "dirction": 0,
+        "x": 11,
+        "y": 7,
+        "var": 2001,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4604,
+        "actorName": "文丑",
+        "actorId": 354,
+        "dataId": 2002,
+        "relation": 2,
+        "outIndex": 1,
+        "dirction": 0,
+        "x": 11,
+        "y": 6,
+        "var": 2002,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4604,
+        "actorName": "颜良",
+        "actorId": 355,
+        "dataId": 2003,
+        "relation": 2,
+        "outIndex": 2,
+        "dirction": 0,
+        "x": 12,
+        "y": 8,
+        "var": 2003,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4604,
+        "actorName": "郭嘉",
+        "actorId": 305,
+        "dataId": 2004,
+        "relation": 2,
+        "outIndex": 3,
+        "dirction": 0,
+        "x": 12,
+        "y": 5,
+        "var": 2004,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4604,
+        "actorName": "华佗",
+        "actorId": 346,
+        "dataId": 2005,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 0,
+        "x": 13,
+        "y": 8,
+        "var": 2005,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4604,
+        "actorName": "王平",
+        "actorId": 330,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 0,
+        "x": 13,
+        "y": 5,
+        "var": 2006,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    }
+]

shared/resource/warJsons/4605.json

@@ -0,0 +1,278 @@
+[
+    {
+        "warId": 4605,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
+        "dirction": 1,
+        "x": 6,
+        "y": 7,
+        "var": 501,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4605,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 1,
+        "dirction": 1,
+        "x": 6,
+        "y": 6,
+        "var": 502,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4605,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 2,
+        "dirction": 1,
+        "x": 5,
+        "y": 8,
+        "var": 503,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4605,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 3,
+        "dirction": 1,
+        "x": 5,
+        "y": 5,
+        "var": 504,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4605,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 4,
+        "dirction": 1,
+        "x": 4,
+        "y": 8,
+        "var": 505,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4605,
+        "actorName": "我军",
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 4,
+        "y": 5,
+        "var": 506,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4605,
+        "actorName": "黄盖",
+        "actorId": 362,
+        "dataId": 2001,
+        "relation": 2,
+        "outIndex": 0,
+        "dirction": 0,
+        "x": 11,
+        "y": 7,
+        "var": 2001,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4605,
+        "actorName": "周泰",
+        "actorId": 332,
+        "dataId": 2002,
+        "relation": 2,
+        "outIndex": 1,
+        "dirction": 0,
+        "x": 11,
+        "y": 6,
+        "var": 2002,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4605,
+        "actorName": "马云禄",
+        "actorId": 327,
+        "dataId": 2003,
+        "relation": 2,
+        "outIndex": 2,
+        "dirction": 0,
+        "x": 12,
+        "y": 8,
+        "var": 2003,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4605,
+        "actorName": "孙乾",
+        "actorId": 331,
+        "dataId": 2004,
+        "relation": 2,
+        "outIndex": 3,
+        "dirction": 0,
+        "x": 12,
+        "y": 5,
+        "var": 2004,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4605,
+        "actorName": "小乔",
+        "actorId": 340,
+        "dataId": 2005,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 0,
+        "x": 13,
+        "y": 8,
+        "var": 2005,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    },
+    {
+        "warId": 4605,
+        "actorName": "麹义",
+        "actorId": 350,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 0,
+        "x": 13,
+        "y": 5,
+        "var": 2006,
+        "lv": 1,
+        "hide": 0,
+        "initial_ai": 1,
+        "bossid": 0,
+        "attribute": "&",
+        "skill": "&",
+        "seid": "&",
+        "star": 0,
+        "quality": 0,
+        "jobLv": 0,
+        "spine": 0
+    }
+]