From 8e026e8f440f3d46c6d20bd6bae6815c8150f44d Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Tue, 20 Jun 2023 17:22:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedcondi.json | 50 +- bin/json/game_dispatch_battle.json | 2 +- bin/json/game_dispatch_task.json | 146 +- bin/json/game_dreamlandtrigger.json | 10 +- bin/json/game_item.json | 184 +- bin/json/game_loading.json | 9 + bin/json/game_mainstage.json | 2020 ++++++++---------- bin/json/game_mainstartype.json | 2 +- bin/json/game_model.json | 78 +- bin/json/game_monsterformat.json | 948 ++++++-- bin/json/game_newsmithy.json | 408 +--- bin/json/game_ruledesc.json | 4 +- bin/json/game_skillatk.json | 10 +- bin/json/game_skillpassive.json | 8 +- bin/json/game_smithyidtool.json | 60 +- bin/json/game_smithytask.json | 173 +- bin/json/game_smithytool.json | 60 +- bin/json/game_vikingboss.json | 444 +--- bin/json/game_worldtask.json | 2 +- modules/viking/api_challengeover.go | 2 +- sys/configure/structs/Game.VikingBossData.go | 17 +- sys/wordfilter/core.go | 2 +- 22 files changed, 2173 insertions(+), 2466 deletions(-) diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 03e4ae41e..d4d51d201 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -178,7 +178,7 @@ "type": 8, "valid": 0, "NPC": 0, - "value": 1, + "value": 2, "filter": [], "filter2": [ "0", @@ -200,7 +200,7 @@ "type": 9, "valid": 0, "NPC": 0, - "value": 1, + "value": 3, "filter": [], "filter2": [ "0", @@ -16972,7 +16972,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_726", - "text": "击败恐惧灵" + "text": "击败豺狼小怪" }, "type": 70, "valid": 0, @@ -17136,7 +17136,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_733", - "text": "冒险关卡【1-1】-【1-3】" + "text": "冒险关卡【1-3】" }, "type": 61, "valid": 1, @@ -17184,7 +17184,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_735", - "text": "冒险关卡【1-4】-【1-7】" + "text": "冒险关卡【1-7】" }, "type": 61, "valid": 1, @@ -17259,7 +17259,7 @@ }, "type": 169, "valid": 0, - "NPC": 0, + "NPC": -102, "value": 1, "filter": [ 1 @@ -17283,7 +17283,7 @@ }, "type": 43, "valid": 0, - "NPC": 0, + "NPC": -102, "value": 3, "filter": [ 3 @@ -17519,7 +17519,7 @@ }, "type": 41, "valid": 0, - "NPC": 0, + "NPC": -102, "value": 6, "filter": [ 3 @@ -17543,7 +17543,7 @@ }, "type": 43, "valid": 0, - "NPC": 0, + "NPC": -102, "value": 3, "filter": [ 6 @@ -17563,7 +17563,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_751", - "text": "通关冒险关卡【2-1】-【2-8】" + "text": "通关冒险关卡【2-8】" }, "type": 61, "valid": 0, @@ -17712,7 +17712,7 @@ }, "type": 43, "valid": 0, - "NPC": 0, + "NPC": -102, "value": 6, "filter": [ 6 @@ -17732,7 +17732,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_758", - "text": "通关冒险关卡【3-1】-【3-4】" + "text": "通关冒险关卡【3-4】" }, "type": 61, "valid": 0, @@ -17785,7 +17785,7 @@ }, "type": 43, "valid": 0, - "NPC": 0, + "NPC": -102, "value": 8, "filter": [ 3 @@ -17809,7 +17809,7 @@ }, "type": 169, "valid": 0, - "NPC": 0, + "NPC": -102, "value": 1, "filter": [ 10 @@ -17829,7 +17829,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_762", - "text": "通关冒险关卡【3-5】-【3-8】" + "text": "通关冒险关卡【3-8】" }, "type": 61, "valid": 0, @@ -17952,7 +17952,7 @@ }, "type": 43, "valid": 0, - "NPC": 0, + "NPC": -102, "value": 9, "filter": [ 6 @@ -17996,7 +17996,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_769", - "text": "通关冒险关卡【4-1】-【4-8】" + "text": "通关冒险关卡【4-8】" }, "type": 61, "valid": 0, @@ -18767,7 +18767,7 @@ "key": "buried_buried_condi_tasktxt_801", "text": "守护者回响解锁次数10次" }, - "type": 173, + "type": 199, "valid": 0, "NPC": 10754, "value": 10, @@ -18789,7 +18789,7 @@ "key": "buried_buried_condi_tasktxt_802", "text": "守护者回响解锁次数15次" }, - "type": 173, + "type": 199, "valid": 0, "NPC": 10764, "value": 15, @@ -18904,12 +18904,12 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_807", - "text": "守护者回响解锁解锁30次" + "text": "守护者回响解锁解锁20次" }, - "type": 173, + "type": 199, "valid": 0, "NPC": 10814, - "value": 30, + "value": 20, "filter": [], "filter2": [ "0", @@ -19095,12 +19095,12 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_815", - "text": "守护者回响解锁50次" + "text": "守护者回响解锁25次" }, - "type": 173, + "type": 199, "valid": 0, "NPC": 10894, - "value": 50, + "value": 25, "filter": [], "filter2": [ "0", diff --git a/bin/json/game_dispatch_battle.json b/bin/json/game_dispatch_battle.json index 791a7654a..ab732b938 100644 --- a/bin/json/game_dispatch_battle.json +++ b/bin/json/game_dispatch_battle.json @@ -60,7 +60,7 @@ "text": "有人前来闹事，快去解决掉他" }, "BattleReadyID": 100, - "monsterformat_id": 101052, + "monsterformat_id": 101051, "EventList": [], "award": [ { diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index 53429a17e..7e6586928 100644 --- a/bin/json/game_dispatch_task.json +++ b/bin/json/game_dispatch_task.json @@ -8,7 +8,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 177, + "tasktime": 61, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_1", "text": "这是属于阿宝的专属委托" @@ -56,7 +56,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 166, + "tasktime": 137, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_2", "text": "这是属于波比的专属委托" @@ -104,7 +104,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 81, + "tasktime": 166, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_3", "text": "这是属于悍娇虎的专属委托" @@ -152,7 +152,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 78, + "tasktime": 85, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_4", "text": "这是属于师父的专属委托" @@ -200,7 +200,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 179, + "tasktime": 118, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_5", "text": "这是属于阿宝的专属委托" @@ -248,7 +248,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 179, + "tasktime": 114, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_6", "text": "这是属于波比的专属委托" @@ -296,7 +296,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 115, + "tasktime": 72, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_7", "text": "这是属于悍娇虎的专属委托" @@ -344,7 +344,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 98, + "tasktime": 61, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_8", "text": "这是属于师父的专属委托" @@ -392,7 +392,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 139, + "tasktime": 103, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_9", "text": "这是属于阿宝的专属委托" @@ -440,7 +440,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 139, + "tasktime": 145, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_10", "text": "这是属于波比的专属委托" @@ -488,7 +488,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 107, + "tasktime": 178, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_11", "text": "这是属于悍娇虎的专属委托" @@ -536,7 +536,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 176, + "tasktime": 75, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_12", "text": "这是属于师父的专属委托" @@ -584,7 +584,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 134, + "tasktime": 172, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_13", "text": "这是属于阿宝的专属委托" @@ -632,7 +632,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 74, + "tasktime": 76, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_14", "text": "这是属于波比的专属委托" @@ -680,7 +680,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 112, + "tasktime": 146, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_15", "text": "这是属于悍娇虎的专属委托" @@ -728,7 +728,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 74, + "tasktime": 72, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_16", "text": "这是属于师父的专属委托" @@ -776,7 +776,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 152, + "tasktime": 118, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_17", "text": "这是属于阿宝的专属委托" @@ -824,7 +824,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 163, + "tasktime": 104, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_18", "text": "这是属于波比的专属委托" @@ -872,7 +872,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 134, + "tasktime": 60, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_19", "text": "这是属于悍娇虎的专属委托" @@ -920,7 +920,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 93, + "tasktime": 113, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_20", "text": "这是属于师父的专属委托" @@ -968,7 +968,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 115, + "tasktime": 136, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_21", "text": "这是属于阿宝的专属委托" @@ -1016,7 +1016,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 176, + "tasktime": 67, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_22", "text": "这是属于波比的专属委托" @@ -1064,7 +1064,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 125, + "tasktime": 179, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_23", "text": "这是属于悍娇虎的专属委托" @@ -1112,7 +1112,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 158, + "tasktime": 72, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_24", "text": "这是属于师父的专属委托" @@ -1160,7 +1160,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 176, + "tasktime": 71, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_25", "text": "这是属于阿宝的专属委托" @@ -1208,7 +1208,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 91, + "tasktime": 105, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_26", "text": "这是属于波比的专属委托" @@ -1256,7 +1256,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 165, + "tasktime": 174, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_27", "text": "这是属于悍娇虎的专属委托" @@ -1304,7 +1304,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 163, + "tasktime": 132, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_28", "text": "这是属于师父的专属委托" @@ -1352,7 +1352,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 166, + "tasktime": 102, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_29", "text": "这是属于阿宝的专属委托" @@ -1400,7 +1400,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 124, + "tasktime": 176, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_30", "text": "这是属于波比的专属委托" @@ -1448,7 +1448,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 136, + "tasktime": 122, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_31", "text": "这是属于悍娇虎的专属委托" @@ -1496,7 +1496,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 107, + "tasktime": 127, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_32", "text": "这是属于师父的专属委托" @@ -1544,7 +1544,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 133, + "tasktime": 102, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_33", "text": "这是属于阿宝的专属委托" @@ -1592,7 +1592,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 128, + "tasktime": 130, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_34", "text": "这是属于波比的专属委托" @@ -1640,7 +1640,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 153, + "tasktime": 83, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_35", "text": "这是属于悍娇虎的专属委托" @@ -1688,7 +1688,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 179, + "tasktime": 173, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_36", "text": "这是属于师父的专属委托" @@ -1736,7 +1736,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 86, + "tasktime": 177, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_37", "text": "这是属于阿宝的专属委托" @@ -1784,7 +1784,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 173, + "tasktime": 171, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_38", "text": "这是属于波比的专属委托" @@ -1832,7 +1832,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 63, + "tasktime": 94, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_39", "text": "这是属于悍娇虎的专属委托" @@ -1880,7 +1880,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 124, + "tasktime": 78, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_40", "text": "这是属于师父的专属委托" @@ -1928,7 +1928,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 148, + "tasktime": 171, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_41", "text": "这是属于阿宝的专属委托" @@ -1976,7 +1976,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 153, + "tasktime": 173, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_42", "text": "这是属于波比的专属委托" @@ -2024,7 +2024,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 180, + "tasktime": 168, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_43", "text": "这是属于悍娇虎的专属委托" @@ -2072,7 +2072,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 152, + "tasktime": 168, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_44", "text": "这是属于师父的专属委托" @@ -2120,7 +2120,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 64, + "tasktime": 165, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_45", "text": "这是属于阿宝的专属委托" @@ -2168,7 +2168,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 125, + "tasktime": 135, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_46", "text": "这是属于波比的专属委托" @@ -2216,7 +2216,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 172, + "tasktime": 123, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_47", "text": "这是属于悍娇虎的专属委托" @@ -2264,7 +2264,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 174, + "tasktime": 114, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_48", "text": "这是属于师父的专属委托" @@ -2312,7 +2312,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 117, + "tasktime": 141, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_49", "text": "这是属于阿宝的专属委托" @@ -2360,7 +2360,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 98, + "tasktime": 113, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_50", "text": "这是属于波比的专属委托" @@ -2408,7 +2408,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 143, + "tasktime": 135, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_51", "text": "这是属于悍娇虎的专属委托" @@ -2456,7 +2456,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 79, + "tasktime": 85, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_52", "text": "这是属于师父的专属委托" @@ -2504,7 +2504,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 122, + "tasktime": 176, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_53", "text": "这是属于阿宝的专属委托" @@ -2552,7 +2552,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 70, + "tasktime": 150, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_54", "text": "这是属于波比的专属委托" @@ -2600,7 +2600,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 154, + "tasktime": 178, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_55", "text": "这是属于悍娇虎的专属委托" @@ -2648,7 +2648,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 132, + "tasktime": 140, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_56", "text": "这是属于师父的专属委托" @@ -2696,7 +2696,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 106, + "tasktime": 65, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_57", "text": "这是属于阿宝的专属委托" @@ -2744,7 +2744,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 82, + "tasktime": 112, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_58", "text": "这是属于波比的专属委托" @@ -2792,7 +2792,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 92, + "tasktime": 74, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_59", "text": "这是属于悍娇虎的专属委托" @@ -2840,7 +2840,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 75, + "tasktime": 120, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_60", "text": "这是属于师父的专属委托" @@ -2888,7 +2888,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 165, + "tasktime": 131, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_61", "text": "这是属于阿宝的专属委托" @@ -2936,7 +2936,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 132, + "tasktime": 152, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_62", "text": "这是属于波比的专属委托" @@ -2984,7 +2984,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 80, + "tasktime": 121, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_63", "text": "这是属于悍娇虎的专属委托" @@ -3032,7 +3032,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 122, + "tasktime": 173, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_64", "text": "这是属于师父的专属委托" @@ -3080,7 +3080,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 123, + "tasktime": 130, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_65", "text": "这是属于阿宝的专属委托" @@ -3128,7 +3128,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 162, + "tasktime": 92, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_66", "text": "这是属于波比的专属委托" @@ -3176,7 +3176,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 61, + "tasktime": 168, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_67", "text": "这是属于悍娇虎的专属委托" @@ -3224,7 +3224,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 154, + "tasktime": 93, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_68", "text": "这是属于师父的专属委托" @@ -3272,7 +3272,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 146, + "tasktime": 156, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_69", "text": "这是属于阿宝的专属委托" @@ -3320,7 +3320,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 156, + "tasktime": 166, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_70", "text": "这是属于波比的专属委托" @@ -3416,7 +3416,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 88, + "tasktime": 136, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_72", "text": "这是属于师父的专属委托" @@ -3464,7 +3464,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 109, + "tasktime": 164, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_73", "text": "这是属于阿宝的专属委托" @@ -3512,7 +3512,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 109, + "tasktime": 147, "tasktxt": { "key": "pandamas_pandamas_dispatch_tasktxt_74", "text": "这是属于波比的专属委托" diff --git a/bin/json/game_dreamlandtrigger.json b/bin/json/game_dreamlandtrigger.json index 40ae01665..2631a2283 100644 --- a/bin/json/game_dreamlandtrigger.json +++ b/bin/json/game_dreamlandtrigger.json @@ -2,26 +2,26 @@ { "id": 1, "dreamland_pro": 1000, - "open": true + "open": false }, { "id": 2, "dreamland_pro": 1000, - "open": true + "open": false }, { "id": 3, "dreamland_pro": 1000, - "open": true + "open": false }, { "id": 4, "dreamland_pro": 1000, - "open": true + "open": false }, { "id": 5, "dreamland_pro": 1000, - "open": true + "open": false } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 2f9354842..29e0440ba 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -289,7 +289,7 @@ "img": "item_10000008", "intr": { "key": "item_item_intr_8", - "text": "守护者初级护身符" + "text": "用于提升稀有守护者技能等级的道具" }, "sale": [ { @@ -328,7 +328,7 @@ "img": "item_10000009", "intr": { "key": "item_item_intr_9", - "text": "守护者中级护身符" + "text": "用于提升完美守护者技能等级的道具" }, "sale": [ { @@ -367,7 +367,7 @@ "img": "item_10000010", "intr": { "key": "item_item_intr_10", - "text": "守护者高级护身符" + "text": "用于提升史诗守护者技能等级的道具" }, "sale": [ { @@ -418,7 +418,7 @@ "img": "item_10000011", "intr": { "key": "item_item_intr_11", - "text": "初级荣耀徽章" + "text": "用于提升三星守护者星级的道具" }, "sale": [ { @@ -481,7 +481,7 @@ "img": "item_10000012", "intr": { "key": "item_item_intr_12", - "text": "中级荣耀徽章" + "text": "用于提升四星守护者星级的道具" }, "sale": [ { @@ -532,7 +532,7 @@ "img": "item_10000013", "intr": { "key": "item_item_intr_13", - "text": "高级荣耀徽章" + "text": "用于提升五星守护者星级的道具" }, "sale": [ { @@ -2772,7 +2772,7 @@ "img": "xxtx_js_13001", "intr": { "key": "item_item_intr_85", - "text": "闪闪守护之心" + "text": "闪闪守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -2811,7 +2811,7 @@ "img": "xxtx_js_13002", "intr": { "key": "item_item_intr_86", - "text": "食人鱼先生守护之心" + "text": "食人鱼先生守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -2850,7 +2850,7 @@ "img": "xxtx_js_13003", "intr": { "key": "item_item_intr_87", - "text": "啊啊守护之心" + "text": "啊啊守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -2889,7 +2889,7 @@ "img": "xxtx_js_13004", "intr": { "key": "item_item_intr_88", - "text": "法夸德勋爵守护之心" + "text": "法夸德勋爵守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -2928,7 +2928,7 @@ "img": "xxtx_js_13005", "intr": { "key": "item_item_intr_89", - "text": "大大守护之心" + "text": "大大守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -2967,7 +2967,7 @@ "img": "xxtx_js_14001", "intr": { "key": "item_item_intr_90", - "text": "史图依克守护之心" + "text": "史图依克守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3006,7 +3006,7 @@ "img": "xxtx_js_14002", "intr": { "key": "item_item_intr_91", - "text": "大龙守护之心" + "text": "大龙守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3045,7 +3045,7 @@ "img": "xxtx_js_14003", "intr": { "key": "item_item_intr_92", - "text": "亚丝翠守护之心" + "text": "亚丝翠守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3084,7 +3084,7 @@ "img": "xxtx_js_14004", "intr": { "key": "item_item_intr_93", - "text": "克莱尔·努涅斯守护之心" + "text": "克莱尔·努涅斯守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3123,7 +3123,7 @@ "img": "xxtx_js_14005", "intr": { "key": "item_item_intr_94", - "text": "鹤大师守护之心" + "text": "鹤大师守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3162,7 +3162,7 @@ "img": "xxtx_js_14006", "intr": { "key": "item_item_intr_95", - "text": "布兰奇守护之心" + "text": "布兰奇守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3201,7 +3201,7 @@ "img": "xxtx_js_14007", "intr": { "key": "item_item_intr_96", - "text": "格里斯特王子守护之心" + "text": "格里斯特王子守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3240,7 +3240,7 @@ "img": "xxtx_js_15001", "intr": { "key": "item_item_intr_97", - "text": "吉姆·莱克守护之心" + "text": "吉姆·莱克守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3279,7 +3279,7 @@ "img": "xxtx_js_15002", "intr": { "key": "item_item_intr_98", - "text": "船长守护之心" + "text": "船长守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3318,7 +3318,7 @@ "img": "xxtx_js_15003", "intr": { "key": "item_item_intr_99", - "text": "希沙窦斯守护之心" + "text": "希沙窦斯守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3357,7 +3357,7 @@ "img": "xxtx_js_15004", "intr": { "key": "item_item_intr_100", - "text": "小欧守护之心" + "text": "小欧守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3396,7 +3396,7 @@ "img": "xxtx_js_15005", "intr": { "key": "item_item_intr_101", - "text": "亚力克斯守护之心" + "text": "亚力克斯守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3435,7 +3435,7 @@ "img": "xxtx_js_23001", "intr": { "key": "item_item_intr_102", - "text": "斯梅克船长守护之心" + "text": "斯梅克船长守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3474,7 +3474,7 @@ "img": "xxtx_js_23002", "intr": { "key": "item_item_intr_103", - "text": "警卫队长守护之心" + "text": "警卫队长守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3513,7 +3513,7 @@ "img": "xxtx_js_23003", "intr": { "key": "item_item_intr_104", - "text": "黛塔黛恩守护之心" + "text": "黛塔黛恩守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3552,7 +3552,7 @@ "img": "xxtx_js_23004", "intr": { "key": "item_item_intr_105", - "text": "吉姆·普雷斯科特守护之心" + "text": "吉姆·普雷斯科特守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3591,7 +3591,7 @@ "img": "xxtx_js_24001", "intr": { "key": "item_item_intr_106", - "text": "警长守护之心" + "text": "警长守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3630,7 +3630,7 @@ "img": "xxtx_js_24002", "intr": { "key": "item_item_intr_107", - "text": "牙仙守护之心" + "text": "牙仙守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3669,7 +3669,7 @@ "img": "xxtx_js_24003", "intr": { "key": "item_item_intr_108", - "text": "睡神沙人守护之心" + "text": "睡神沙人守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3708,7 +3708,7 @@ "img": "xxtx_js_24004", "intr": { "key": "item_item_intr_109", - "text": "邦尼兔守护之心" + "text": "邦尼兔守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3747,7 +3747,7 @@ "img": "xxtx_js_24005", "intr": { "key": "item_item_intr_110", - "text": "金猴守护之心" + "text": "金猴守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3786,7 +3786,7 @@ "img": "xxtx_js_24006", "intr": { "key": "item_item_intr_111", - "text": "凯尔守护之心" + "text": "凯尔守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3825,7 +3825,7 @@ "img": "xxtx_js_24007", "intr": { "key": "item_item_intr_112", - "text": "小钱守护之心" + "text": "小钱守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3864,7 +3864,7 @@ "img": "xxtx_js_24008", "intr": { "key": "item_item_intr_113", - "text": "暴芙那特守护之心" + "text": "暴芙那特守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3903,7 +3903,7 @@ "img": "xxtx_js_24009", "intr": { "key": "item_item_intr_114", - "text": "云朵先生守护之心" + "text": "云朵先生守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3942,7 +3942,7 @@ "img": "xxtx_js_25001", "intr": { "key": "item_item_intr_115", - "text": "阿宝守护之心" + "text": "阿宝守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -3981,7 +3981,7 @@ "img": "xxtx_js_25002", "intr": { "key": "item_item_intr_116", - "text": "沃尔夫先生守护之心" + "text": "沃尔夫先生守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4020,7 +4020,7 @@ "img": "xxtx_js_25003", "intr": { "key": "item_item_intr_117", - "text": "羊仙姑守护之心" + "text": "羊仙姑守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4059,7 +4059,7 @@ "img": "xxtx_js_25004", "intr": { "key": "item_item_intr_118", - "text": "波比守护之心" + "text": "波比守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4098,7 +4098,7 @@ "img": "xxtx_js_33001", "intr": { "key": "item_item_intr_119", - "text": "巫嘎守护之心" + "text": "巫嘎守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4137,7 +4137,7 @@ "img": "xxtx_js_33002", "intr": { "key": "item_item_intr_120", - "text": "坦克守护之心" + "text": "坦克守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4176,7 +4176,7 @@ "img": "xxtx_js_33003", "intr": { "key": "item_item_intr_121", - "text": "胡德先生守护之心" + "text": "胡德先生守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4215,7 +4215,7 @@ "img": "xxtx_js_33004", "intr": { "key": "item_item_intr_122", - "text": "普鲁格兰杰守护之心" + "text": "普鲁格兰杰守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4254,7 +4254,7 @@ "img": "xxtx_js_33005", "intr": { "key": "item_item_intr_123", - "text": "鼻涕粗守护之心" + "text": "鼻涕粗守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4293,7 +4293,7 @@ "img": "xxtx_js_33006", "intr": { "key": "item_item_intr_124", - "text": "珍妮丝·邓普顿守护之心" + "text": "珍妮丝·邓普顿守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4332,7 +4332,7 @@ "img": "xxtx_js_34001", "intr": { "key": "item_item_intr_125", - "text": "贫嘴驴守护之心" + "text": "贫嘴驴守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4371,7 +4371,7 @@ "img": "xxtx_js_34002", "intr": { "key": "item_item_intr_126", - "text": "蒂姆·邓普顿守护之心" + "text": "蒂姆·邓普顿守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4410,7 +4410,7 @@ "img": "xxtx_js_34003", "intr": { "key": "item_item_intr_127", - "text": "圣诞老人守护之心" + "text": "圣诞老人守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4449,7 +4449,7 @@ "img": "xxtx_js_34004", "intr": { "key": "item_item_intr_128", - "text": "瓜哥守护之心" + "text": "瓜哥守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4488,7 +4488,7 @@ "img": "xxtx_js_34005", "intr": { "key": "item_item_intr_129", - "text": "沃尔特·史翠克勒守护之心" + "text": "沃尔特·史翠克勒守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4527,7 +4527,7 @@ "img": "xxtx_js_34006", "intr": { "key": "item_item_intr_130", - "text": "冰霜杰克守护之心" + "text": "冰霜杰克守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4566,7 +4566,7 @@ "img": "xxtx_js_34007", "intr": { "key": "item_item_intr_131", - "text": "菲奥娜守护之心" + "text": "菲奥娜守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4605,7 +4605,7 @@ "img": "xxtx_js_34008", "intr": { "key": "item_item_intr_132", - "text": "悍夫那特守护之心" + "text": "悍夫那特守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4644,7 +4644,7 @@ "img": "xxtx_js_35001", "intr": { "key": "item_item_intr_133", - "text": "师父守护之心" + "text": "师父守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4683,7 +4683,7 @@ "img": "xxtx_js_35002", "intr": { "key": "item_item_intr_134", - "text": "希卡普守护之心" + "text": "希卡普守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4722,7 +4722,7 @@ "img": "xxtx_js_35003", "intr": { "key": "item_item_intr_135", - "text": "漆黑守护之心" + "text": "漆黑守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4761,7 +4761,7 @@ "img": "xxtx_js_35004", "intr": { "key": "item_item_intr_136", - "text": "黛安·福克斯顿守护之心" + "text": "黛安·福克斯顿守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4800,7 +4800,7 @@ "img": "xxtx_js_35005", "intr": { "key": "item_item_intr_137", - "text": "幸运·普雷斯科特守护之心" + "text": "幸运·普雷斯科特守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4839,7 +4839,7 @@ "img": "xxtx_js_35006", "intr": { "key": "item_item_intr_138", - "text": "平先生守护之心" + "text": "平先生守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4878,7 +4878,7 @@ "img": "xxtx_js_43001", "intr": { "key": "item_item_intr_139", - "text": "阿比盖尔·斯通守护之心" + "text": "阿比盖尔·斯通守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4917,7 +4917,7 @@ "img": "xxtx_js_43002", "intr": { "key": "item_item_intr_140", - "text": "果酱教授守护之心" + "text": "果酱教授守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4956,7 +4956,7 @@ "img": "xxtx_js_43003", "intr": { "key": "item_item_intr_141", - "text": "史蒂夫·帕丘克守护之心" + "text": "史蒂夫·帕丘克守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -4995,7 +4995,7 @@ "img": "xxtx_js_43004", "intr": { "key": "item_item_intr_142", - "text": "姜饼人守护之心" + "text": "姜饼人守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5034,7 +5034,7 @@ "img": "xxtx_js_43005", "intr": { "key": "item_item_intr_143", - "text": "瓦希尔指挥官守护之心" + "text": "瓦希尔指挥官守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5073,7 +5073,7 @@ "img": "xxtx_js_43006", "intr": { "key": "item_item_intr_144", - "text": "布里奇特守护之心" + "text": "布里奇特守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5112,7 +5112,7 @@ "img": "xxtx_js_43007", "intr": { "key": "item_item_intr_145", - "text": "戈伯守护之心" + "text": "戈伯守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5151,7 +5151,7 @@ "img": "xxtx_js_44001", "intr": { "key": "item_item_intr_146", - "text": "美肚鲨守护之心" + "text": "美肚鲨守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5190,7 +5190,7 @@ "img": "xxtx_js_44002", "intr": { "key": "item_item_intr_147", - "text": "蛇先生守护之心" + "text": "蛇先生守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5229,7 +5229,7 @@ "img": "xxtx_js_44003", "intr": { "key": "item_item_intr_148", - "text": "匹诺曹守护之心" + "text": "匹诺曹守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5268,7 +5268,7 @@ "img": "xxtx_js_44004", "intr": { "key": "item_item_intr_149", - "text": "骇客蛛守护之心" + "text": "骇客蛛守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5307,7 +5307,7 @@ "img": "xxtx_js_44005", "intr": { "key": "item_item_intr_150", - "text": "小伊守护之心" + "text": "小伊守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5346,7 +5346,7 @@ "img": "xxtx_js_44006", "intr": { "key": "item_item_intr_151", - "text": "悍娇虎守护之心" + "text": "悍娇虎守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5385,7 +5385,7 @@ "img": "xxtx_js_45001", "intr": { "key": "item_item_intr_152", - "text": "乌龟大师守护之心" + "text": "乌龟大师守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5424,7 +5424,7 @@ "img": "xxtx_js_45002", "intr": { "key": "item_item_intr_153", - "text": "梅林守护之心" + "text": "梅林守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5463,7 +5463,7 @@ "img": "xxtx_js_45003", "intr": { "key": "item_item_intr_154", - "text": "盖守护之心" + "text": "盖守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5502,7 +5502,7 @@ "img": "xxtx_js_45004", "intr": { "key": "item_item_intr_155", - "text": "穿靴子的猫守护之心" + "text": "穿靴子的猫守护之心，可用于守护者觉醒与技能提升" }, "sale": [ { @@ -5607,7 +5607,7 @@ "img": "item_13000003", "intr": { "key": "item_item_intr_158", - "text": "打造时添加熔岩石，不增加熔炉CD" + "text": "打造时添加熔岩石，不消耗熔炉温度" }, "sale": [] }, @@ -5640,7 +5640,7 @@ "img": "item_13000004", "intr": { "key": "item_item_intr_159", - "text": "清除熔炉的CD" + "text": "提升熔炉温度" }, "sale": [] }, @@ -7111,7 +7111,7 @@ "img": "item_14020009", "intr": { "key": "item_item_intr_202", - "text": "往猪肚中塞入苹果，再将一整只猪放在炉子上烤制而成，皮酥肉嫩，宴席之王。" + "text": "先往猪肚中塞入苹果，再将一整只猪放在炉子上烤制而成，皮酥肉嫩，宴席之王。" }, "sale": [ { @@ -8402,7 +8402,7 @@ "img": "item_15000101", "intr": { "key": "item_item_intr_243", - "text": "热火之灵" + "text": "狩猎头目的初级掉落物，可用于守护者共鸣" }, "sale": [ { @@ -8453,7 +8453,7 @@ "img": "item_15000102", "intr": { "key": "item_item_intr_244", - "text": "水滴之灵" + "text": "狩猎头目的初级掉落物，可用于守护者共鸣" }, "sale": [ { @@ -8504,7 +8504,7 @@ "img": "item_15000103", "intr": { "key": "item_item_intr_245", - "text": "古木之灵" + "text": "狩猎头目的初级掉落物，可用于守护者共鸣" }, "sale": [ { @@ -8555,7 +8555,7 @@ "img": "item_15000104", "intr": { "key": "item_item_intr_246", - "text": "微光之灵" + "text": "狩猎头目的初级掉落物，可用于守护者共鸣" }, "sale": [ { @@ -8618,7 +8618,7 @@ "img": "item_15000201", "intr": { "key": "item_item_intr_247", - "text": "烈焰之魄" + "text": "狩猎头目的中级掉落物，可用于守护者共鸣" }, "sale": [ { @@ -8681,7 +8681,7 @@ "img": "item_15000202", "intr": { "key": "item_item_intr_248", - "text": "波浪之魄" + "text": "狩猎头目的中级掉落物，可用于守护者共鸣" }, "sale": [ { @@ -8744,7 +8744,7 @@ "img": "item_15000203", "intr": { "key": "item_item_intr_249", - "text": "荆棘之魄" + "text": "狩猎头目的中级掉落物，可用于守护者共鸣" }, "sale": [ { @@ -8807,7 +8807,7 @@ "img": "item_15000204", "intr": { "key": "item_item_intr_250", - "text": "曙光之魄" + "text": "狩猎头目的中级掉落物，可用于守护者共鸣" }, "sale": [ { @@ -8858,7 +8858,7 @@ "img": "item_15000301", "intr": { "key": "item_item_intr_251", - "text": "燃爆之魂" + "text": "狩猎头目的高级掉落物，可用于守护者共鸣" }, "sale": [ { @@ -8909,7 +8909,7 @@ "img": "item_15000302", "intr": { "key": "item_item_intr_252", - "text": "浪花之魂" + "text": "狩猎头目的高级掉落物，可用于守护者共鸣" }, "sale": [ { @@ -8960,7 +8960,7 @@ "img": "item_15000303", "intr": { "key": "item_item_intr_253", - "text": "回春之魂" + "text": "狩猎头目的高级掉落物，可用于守护者共鸣" }, "sale": [ { @@ -9011,7 +9011,7 @@ "img": "item_15000304", "intr": { "key": "item_item_intr_254", - "text": "耀光之魂" + "text": "狩猎头目的高级掉落物，可用于守护者共鸣" }, "sale": [ { diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index c3b550700..9e5f019fc 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -142,5 +142,14 @@ "key": "loading_Sheet1_prompt_16", "text": "打败森林泰坦就能获得打造辅助套装的材料。" } + }, + { + "id": 1017, + "scene": "GameFightScene", + "image": "ld_mh_bg_zd", + "prompt": { + "key": "loading_Sheet1_prompt_17", + "text": "打败森林泰坦就能获得打造辅助套装的材料。" + } } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index b3a99c58c..f14b2af9d 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -65,7 +65,7 @@ "FormatList": [ 101011 ], - "captainId": 440052, + "captainId": 450035, "star": [ 1, 1, @@ -153,7 +153,7 @@ "FormatList": [ 101021 ], - "captainId": 510043, + "captainId": 530025, "star": [ 1, 1, @@ -241,7 +241,7 @@ "FormatList": [ 101031 ], - "captainId": 510053, + "captainId": 530025, "star": [ 1, 1, @@ -329,7 +329,7 @@ "FormatList": [ 101041 ], - "captainId": 530013, + "captainId": 130025, "star": [ 1, 1, @@ -417,7 +417,7 @@ "FormatList": [ 101051 ], - "captainId": 440052, + "captainId": 530025, "star": [ 1, 1, @@ -503,9 +503,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 101051 + 101061 ], - "captainId": 550025, + "captainId": 450035, "star": [ 1, 1, @@ -591,9 +591,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 102011 + 101071 ], - "captainId": 250013, + "captainId": 450035, "star": [ 1, 1, @@ -677,11 +677,11 @@ "n": 26930 } ], - "BattleReadyID": 118, + "BattleReadyID": 122, "FormatList": [ - 102021 + 101081 ], - "captainId": 510053, + "captainId": 550025, "star": [ 1, 1, @@ -767,9 +767,9 @@ ], "BattleReadyID": 119, "FormatList": [ - 102031 + 102011 ], - "captainId": 240025, + "captainId": 530025, "star": [ 1, 1, @@ -855,9 +855,9 @@ ], "BattleReadyID": 119, "FormatList": [ - 102041 + 102021 ], - "captainId": 510043, + "captainId": 440065, "star": [ 1, 1, @@ -943,9 +943,9 @@ ], "BattleReadyID": 119, "FormatList": [ - 102051 + 102031 ], - "captainId": 440063, + "captainId": 510055, "star": [ 1, 1, @@ -1031,9 +1031,9 @@ ], "BattleReadyID": 119, "FormatList": [ - 102061 + 102041 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -1119,9 +1119,9 @@ ], "BattleReadyID": 119, "FormatList": [ - 103011 + 102051 ], - "captainId": 440052, + "captainId": 530025, "star": [ 1, 1, @@ -1207,9 +1207,9 @@ ], "BattleReadyID": 119, "FormatList": [ - 103021 + 102061 ], - "captainId": 510023, + "captainId": 530035, "star": [ 1, 1, @@ -1295,9 +1295,9 @@ ], "BattleReadyID": 119, "FormatList": [ - 103031 + 102071 ], - "captainId": 510053, + "captainId": 240045, "star": [ 1, 1, @@ -1383,9 +1383,9 @@ ], "BattleReadyID": 119, "FormatList": [ - 103041 + 102081 ], - "captainId": 530013, + "captainId": 240045, "star": [ 1, 1, @@ -1471,9 +1471,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 103051 + 103011 ], - "captainId": 440052, + "captainId": 430025, "star": [ 1, 1, @@ -1559,9 +1559,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 103061 + 103021 ], - "captainId": 550025, + "captainId": 430035, "star": [ 1, 1, @@ -1647,9 +1647,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104011 + 103031 ], - "captainId": 250013, + "captainId": 340055, "star": [ 1, 1, @@ -1735,9 +1735,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104021 + 103041 ], - "captainId": 510053, + "captainId": 240015, "star": [ 1, 1, @@ -1823,9 +1823,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104031 + 103051 ], - "captainId": 240025, + "captainId": 340055, "star": [ 1, 1, @@ -1911,9 +1911,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104041 + 103061 ], - "captainId": 510033, + "captainId": 240045, "star": [ 1, 1, @@ -1999,9 +1999,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051 + 103071 ], - "captainId": 440063, + "captainId": 430025, "star": [ 1, 1, @@ -2087,9 +2087,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051 + 103081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -2175,9 +2175,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051 + 104011 ], - "captainId": 350013, + "captainId": 330035, "star": [ 1, 1, @@ -2263,9 +2263,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051 + 104021 ], - "captainId": 350013, + "captainId": 140035, "star": [ 1, 1, @@ -2351,9 +2351,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051 + 104031 ], - "captainId": 350013, + "captainId": 340065, "star": [ 1, 1, @@ -2439,9 +2439,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051 + 104041 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -2529,7 +2529,7 @@ "FormatList": [ 104051 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -2615,9 +2615,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051 + 104061 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -2703,9 +2703,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051 + 104071 ], - "captainId": 350013, + "captainId": 340075, "star": [ 1, 1, @@ -2789,11 +2789,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051 + 104081 ], - "captainId": 350013, + "captainId": 130045, "star": [ 1, 1, @@ -2879,10 +2879,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 105011 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -2968,10 +2967,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 105021 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -3057,10 +3055,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 105031 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -3146,10 +3143,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 105041 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -3235,10 +3231,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 105051 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -3324,10 +3319,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 105061 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -3413,10 +3407,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 105071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -3502,10 +3495,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 105081 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -3591,10 +3583,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 106011 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -3680,10 +3671,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 106021 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -3769,10 +3759,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 106031 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -3858,10 +3847,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 106041 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -3947,10 +3935,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 106051 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -4036,10 +4023,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 106061 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -4125,10 +4111,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 106071 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -4212,12 +4197,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 106081 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -4303,10 +4287,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 107011 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -4392,10 +4375,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 107021 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -4481,10 +4463,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 107031 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -4570,10 +4551,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 107041 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -4659,10 +4639,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 107051 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -4748,10 +4727,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 107061 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -4837,10 +4815,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 107071 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -4926,10 +4903,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 107081 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -5015,10 +4991,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 108011 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -5104,10 +5079,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 108021 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -5193,10 +5167,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 108031 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -5282,10 +5255,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 108041 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -5371,10 +5343,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 108051 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -5460,10 +5431,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 108061 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -5549,10 +5519,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 108071 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -5636,12 +5605,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 108081 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -5727,10 +5695,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 109011 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -5816,10 +5783,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 109021 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -5905,10 +5871,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 109031 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -5994,10 +5959,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 109041 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -6083,10 +6047,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 109051 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -6172,10 +6135,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 109061 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -6261,10 +6223,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 109071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -6350,10 +6311,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 109081 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -6439,10 +6399,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 110011 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -6528,10 +6487,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 110021 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -6617,10 +6575,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 110031 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -6706,10 +6663,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 110041 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -6795,10 +6751,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 110051 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -6884,10 +6839,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 110061 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -6973,10 +6927,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 110071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -7060,12 +7013,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 110081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -7151,10 +7103,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 111011 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -7240,10 +7191,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 111021 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -7329,10 +7279,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 111031 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -7418,10 +7367,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 111041 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -7507,10 +7455,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 111051 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -7596,10 +7543,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 111061 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -7685,10 +7631,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 111071 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -7774,10 +7719,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 111081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -7863,10 +7807,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 112011 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -7952,10 +7895,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 112021 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -8041,10 +7983,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 112031 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -8130,10 +8071,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 112041 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -8219,10 +8159,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 112051 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -8308,10 +8247,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 112061 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -8397,10 +8335,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 112071 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -8484,12 +8421,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 112081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -8575,10 +8511,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 121011 ], - "captainId": 350013, + "captainId": 450035, "star": [ 1, 1, @@ -8664,10 +8599,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 121021 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -8753,10 +8687,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 121031 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -8842,10 +8775,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 121041 ], - "captainId": 350013, + "captainId": 130025, "star": [ 1, 1, @@ -8931,10 +8863,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 121051 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -9020,10 +8951,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 121061 ], - "captainId": 350013, + "captainId": 450035, "star": [ 1, 1, @@ -9109,10 +9039,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 121071 ], - "captainId": 350013, + "captainId": 450035, "star": [ 1, 1, @@ -9196,12 +9125,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 122, "FormatList": [ - 104051, - 104052 + 121081 ], - "captainId": 350013, + "captainId": 550025, "star": [ 1, 1, @@ -9285,12 +9213,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 122011 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -9374,12 +9301,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 122021 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -9463,12 +9389,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 122031 ], - "captainId": 350013, + "captainId": 510055, "star": [ 1, 1, @@ -9552,12 +9477,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 122041 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -9641,12 +9565,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 122051 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -9730,12 +9653,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 122061 ], - "captainId": 350013, + "captainId": 530035, "star": [ 1, 1, @@ -9819,12 +9741,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 122071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -9908,12 +9829,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 122081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -9997,12 +9917,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 123011 ], - "captainId": 350013, + "captainId": 430025, "star": [ 1, 1, @@ -10086,12 +10005,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 123021 ], - "captainId": 350013, + "captainId": 430035, "star": [ 1, 1, @@ -10175,12 +10093,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 123031 ], - "captainId": 350013, + "captainId": 340055, "star": [ 1, 1, @@ -10264,12 +10181,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 123041 ], - "captainId": 350013, + "captainId": 240015, "star": [ 1, 1, @@ -10353,12 +10269,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 123051 ], - "captainId": 350013, + "captainId": 340055, "star": [ 1, 1, @@ -10442,12 +10357,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 123061 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -10531,12 +10445,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 123071 ], - "captainId": 350013, + "captainId": 430025, "star": [ 1, 1, @@ -10620,12 +10533,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 123081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -10711,10 +10623,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 124011 ], - "captainId": 350013, + "captainId": 330035, "star": [ 1, 1, @@ -10800,10 +10711,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 124021 ], - "captainId": 350013, + "captainId": 140035, "star": [ 1, 1, @@ -10889,10 +10799,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 124031 ], - "captainId": 350013, + "captainId": 340065, "star": [ 1, 1, @@ -10978,10 +10887,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 124041 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -11067,10 +10975,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 124051 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -11156,10 +11063,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 124061 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -11245,10 +11151,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 124071 ], - "captainId": 350013, + "captainId": 340075, "star": [ 1, 1, @@ -11332,12 +11237,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 124081 ], - "captainId": 350013, + "captainId": 130045, "star": [ 1, 1, @@ -11423,10 +11327,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 125011 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -11512,10 +11415,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 125021 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -11601,10 +11503,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 125031 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -11690,10 +11591,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 125041 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -11779,10 +11679,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 125051 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -11868,10 +11767,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 125061 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -11957,10 +11855,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 125071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -12046,10 +11943,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 125081 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -12135,10 +12031,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 126011 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -12224,10 +12119,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 126021 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -12313,10 +12207,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 126031 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -12402,10 +12295,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 126041 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -12491,10 +12383,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 126051 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -12580,10 +12471,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 126061 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -12669,10 +12559,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 126071 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -12756,12 +12645,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 126081 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -12847,10 +12735,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 127011 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -12936,10 +12823,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 127021 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -13025,10 +12911,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 127031 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -13114,10 +12999,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 127041 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -13203,10 +13087,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 127051 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -13292,10 +13175,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 127061 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -13381,10 +13263,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 127071 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -13470,10 +13351,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 127081 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -13559,10 +13439,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 128011 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -13648,10 +13527,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 128021 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -13737,10 +13615,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 128031 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -13826,10 +13703,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 128041 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -13915,10 +13791,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 128051 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -14004,10 +13879,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 128061 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -14093,10 +13967,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 128071 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -14180,12 +14053,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 128081 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -14271,10 +14143,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 129011 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -14360,10 +14231,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 129021 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -14449,10 +14319,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 129031 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -14538,10 +14407,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 129041 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -14627,10 +14495,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 129051 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -14716,10 +14583,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 129061 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -14805,10 +14671,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 129071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -14894,10 +14759,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 129081 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -14983,10 +14847,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 130011 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -15072,10 +14935,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 130021 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -15161,10 +15023,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 130031 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -15250,10 +15111,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 130041 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -15339,10 +15199,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 130051 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -15428,10 +15287,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 130061 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -15517,10 +15375,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 130071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -15604,12 +15461,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 130081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -15695,10 +15551,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 131011 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -15784,10 +15639,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 131021 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -15873,10 +15727,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 131031 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -15962,10 +15815,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 131041 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -16051,10 +15903,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 131051 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -16140,10 +15991,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 131061 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -16229,10 +16079,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 131071 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -16318,10 +16167,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 131081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -16407,10 +16255,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 132011 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -16496,10 +16343,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 132021 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -16585,10 +16431,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 132031 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -16674,10 +16519,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 132041 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -16763,10 +16607,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 132051 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -16852,10 +16695,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 132061 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -16941,10 +16783,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 132071 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -17028,12 +16869,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 132081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -17119,10 +16959,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 141011 ], - "captainId": 350013, + "captainId": 450035, "star": [ 1, 1, @@ -17208,10 +17047,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 141021 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -17297,10 +17135,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 141031 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -17386,10 +17223,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 141041 ], - "captainId": 350013, + "captainId": 130025, "star": [ 1, 1, @@ -17475,10 +17311,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 141051 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -17564,10 +17399,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 141061 ], - "captainId": 350013, + "captainId": 450035, "star": [ 1, 1, @@ -17653,10 +17487,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 141071 ], - "captainId": 350013, + "captainId": 450035, "star": [ 1, 1, @@ -17740,12 +17573,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 122, "FormatList": [ - 104051, - 104052 + 141081 ], - "captainId": 350013, + "captainId": 550025, "star": [ 1, 1, @@ -17829,12 +17661,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 142011 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -17918,12 +17749,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 142021 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -18007,12 +17837,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 142031 ], - "captainId": 350013, + "captainId": 510055, "star": [ 1, 1, @@ -18096,12 +17925,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 142041 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -18185,12 +18013,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 142051 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -18274,12 +18101,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 142061 ], - "captainId": 350013, + "captainId": 530035, "star": [ 1, 1, @@ -18363,12 +18189,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 142071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -18452,12 +18277,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 142081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -18541,12 +18365,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 143011 ], - "captainId": 350013, + "captainId": 430025, "star": [ 1, 1, @@ -18630,12 +18453,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 143021 ], - "captainId": 350013, + "captainId": 430035, "star": [ 1, 1, @@ -18719,12 +18541,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 143031 ], - "captainId": 350013, + "captainId": 340055, "star": [ 1, 1, @@ -18808,12 +18629,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 143041 ], - "captainId": 350013, + "captainId": 240015, "star": [ 1, 1, @@ -18897,12 +18717,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 143051 ], - "captainId": 350013, + "captainId": 340055, "star": [ 1, 1, @@ -18986,12 +18805,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 143061 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -19075,12 +18893,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 143071 ], - "captainId": 350013, + "captainId": 430025, "star": [ 1, 1, @@ -19164,12 +18981,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 143081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -19255,10 +19071,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 144011 ], - "captainId": 350013, + "captainId": 330035, "star": [ 1, 1, @@ -19344,10 +19159,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 144021 ], - "captainId": 350013, + "captainId": 140035, "star": [ 1, 1, @@ -19433,10 +19247,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 144031 ], - "captainId": 350013, + "captainId": 340065, "star": [ 1, 1, @@ -19522,10 +19335,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 144041 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -19611,10 +19423,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 144051 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -19700,10 +19511,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 144061 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -19789,10 +19599,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 144071 ], - "captainId": 350013, + "captainId": 340075, "star": [ 1, 1, @@ -19876,12 +19685,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 144081 ], - "captainId": 350013, + "captainId": 130045, "star": [ 1, 1, @@ -19967,10 +19775,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 145011 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -20056,10 +19863,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 145021 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -20145,10 +19951,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 145031 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -20234,10 +20039,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 145041 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -20323,10 +20127,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 145051 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -20412,10 +20215,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 145061 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -20501,10 +20303,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 145071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -20590,10 +20391,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 145081 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -20679,10 +20479,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 146011 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -20768,10 +20567,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 146021 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -20857,10 +20655,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 146031 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -20946,10 +20743,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 146041 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -21035,10 +20831,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 146051 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -21124,10 +20919,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 146061 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -21213,10 +21007,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 146071 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -21300,12 +21093,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 146081 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -21391,10 +21183,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 147011 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -21480,10 +21271,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 147021 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -21569,10 +21359,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 147031 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -21658,10 +21447,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 147041 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -21747,10 +21535,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 147051 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -21836,10 +21623,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 147061 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -21925,10 +21711,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 147071 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -22014,10 +21799,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 147081 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -22103,10 +21887,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 148011 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -22192,10 +21975,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 148021 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -22281,10 +22063,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 148031 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -22370,10 +22151,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 148041 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -22459,10 +22239,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 148051 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -22548,10 +22327,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 148061 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -22637,10 +22415,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 148071 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -22724,12 +22501,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 148081 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -22815,10 +22591,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 149011 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -22904,10 +22679,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 149021 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -22993,10 +22767,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 149031 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -23082,10 +22855,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 149041 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -23171,10 +22943,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 149051 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -23260,10 +23031,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 149061 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -23349,10 +23119,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 149071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -23438,10 +23207,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 149081 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -23527,10 +23295,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 150011 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -23616,10 +23383,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 150021 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -23705,10 +23471,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 150031 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -23794,10 +23559,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 150041 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -23883,10 +23647,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 150051 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -23972,10 +23735,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 150061 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -24061,10 +23823,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 150071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -24148,12 +23909,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 150081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -24239,10 +23999,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 151011 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -24328,10 +24087,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 151021 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -24417,10 +24175,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 151031 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -24506,10 +24263,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 151041 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -24595,10 +24351,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 151051 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -24684,10 +24439,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 151061 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -24773,10 +24527,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 151071 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -24862,10 +24615,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 151081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -24951,10 +24703,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 152011 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -25040,10 +24791,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 152021 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -25129,10 +24879,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 152031 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -25218,10 +24967,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 152041 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -25307,10 +25055,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 152051 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -25396,10 +25143,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 152061 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -25485,10 +25231,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 152071 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -25572,12 +25317,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 152081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -25663,10 +25407,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 161011 ], - "captainId": 350013, + "captainId": 450035, "star": [ 1, 1, @@ -25752,10 +25495,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 161021 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -25841,10 +25583,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 161031 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -25930,10 +25671,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 161041 ], - "captainId": 350013, + "captainId": 130025, "star": [ 1, 1, @@ -26019,10 +25759,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 161051 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -26108,10 +25847,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 161061 ], - "captainId": 350013, + "captainId": 450035, "star": [ 1, 1, @@ -26197,10 +25935,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 161071 ], - "captainId": 350013, + "captainId": 450035, "star": [ 1, 1, @@ -26284,12 +26021,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 122, "FormatList": [ - 104051, - 104052 + 161081 ], - "captainId": 350013, + "captainId": 550025, "star": [ 1, 1, @@ -26373,12 +26109,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 162011 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -26462,12 +26197,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 162021 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -26551,12 +26285,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 162031 ], - "captainId": 350013, + "captainId": 510055, "star": [ 1, 1, @@ -26640,12 +26373,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 162041 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -26729,12 +26461,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 162051 ], - "captainId": 350013, + "captainId": 530025, "star": [ 1, 1, @@ -26818,12 +26549,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 162061 ], - "captainId": 350013, + "captainId": 530035, "star": [ 1, 1, @@ -26907,12 +26637,11 @@ "n": 220415 } ], - "BattleReadyID": 116, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 162071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -26996,12 +26725,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 119, "FormatList": [ - 104051, - 104052 + 162081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -27085,12 +26813,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 163011 ], - "captainId": 350013, + "captainId": 430025, "star": [ 1, 1, @@ -27174,12 +26901,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 163021 ], - "captainId": 350013, + "captainId": 430035, "star": [ 1, 1, @@ -27263,12 +26989,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 163031 ], - "captainId": 350013, + "captainId": 340055, "star": [ 1, 1, @@ -27352,12 +27077,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 163041 ], - "captainId": 350013, + "captainId": 240015, "star": [ 1, 1, @@ -27441,12 +27165,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 163051 ], - "captainId": 350013, + "captainId": 340055, "star": [ 1, 1, @@ -27530,12 +27253,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 163061 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -27619,12 +27341,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 163071 ], - "captainId": 350013, + "captainId": 430025, "star": [ 1, 1, @@ -27708,12 +27429,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 163081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -27799,10 +27519,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 164011 ], - "captainId": 350013, + "captainId": 330035, "star": [ 1, 1, @@ -27888,10 +27607,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 164021 ], - "captainId": 350013, + "captainId": 140035, "star": [ 1, 1, @@ -27977,10 +27695,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 164031 ], - "captainId": 350013, + "captainId": 340065, "star": [ 1, 1, @@ -28066,10 +27783,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 164041 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -28155,10 +27871,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 164051 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -28244,10 +27959,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 164061 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -28333,10 +28047,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 164071 ], - "captainId": 350013, + "captainId": 340075, "star": [ 1, 1, @@ -28420,12 +28133,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 164081 ], - "captainId": 350013, + "captainId": 130045, "star": [ 1, 1, @@ -28511,10 +28223,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 165011 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -28600,10 +28311,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 165021 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -28689,10 +28399,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 165031 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -28778,10 +28487,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 165041 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -28867,10 +28575,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 165051 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -28956,10 +28663,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 165061 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -29045,10 +28751,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 165071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -29134,10 +28839,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 165081 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -29223,10 +28927,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 166011 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -29312,10 +29015,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 166021 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -29401,10 +29103,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 166031 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -29490,10 +29191,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 166041 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -29579,10 +29279,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 166051 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -29668,10 +29367,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 166061 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -29757,10 +29455,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 166071 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -29844,12 +29541,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 166081 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -29935,10 +29631,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 167011 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -30024,10 +29719,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 167021 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -30113,10 +29807,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 167031 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -30202,10 +29895,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 167041 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -30291,10 +29983,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 167051 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -30380,10 +30071,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 167061 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -30469,10 +30159,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 167071 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -30558,10 +30247,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 167081 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -30647,10 +30335,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 168011 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -30736,10 +30423,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 168021 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -30825,10 +30511,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 168031 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -30914,10 +30599,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 168041 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -31003,10 +30687,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 168051 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -31092,10 +30775,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 168061 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -31181,10 +30863,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 168071 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -31268,12 +30949,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 168081 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -31359,10 +31039,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 169011 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -31448,10 +31127,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 169021 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -31537,10 +31215,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 169031 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -31626,10 +31303,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 169041 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -31715,10 +31391,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 169051 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -31804,10 +31479,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 169061 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -31893,10 +31567,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 169071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -31982,10 +31655,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 169081 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -32071,10 +31743,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 170011 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -32160,10 +31831,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 170021 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -32249,10 +31919,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 170031 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -32338,10 +32007,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 170041 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -32427,10 +32095,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 170051 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -32516,10 +32183,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 170061 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -32605,10 +32271,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 170071 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -32692,12 +32357,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 170081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -32783,10 +32447,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 171011 ], - "captainId": 350013, + "captainId": 140055, "star": [ 1, 1, @@ -32872,10 +32535,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 171021 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -32961,10 +32623,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 171031 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -33050,10 +32711,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 171041 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -33139,10 +32799,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 171051 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -33228,10 +32887,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 171061 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -33317,10 +32975,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 171071 ], - "captainId": 350013, + "captainId": 240025, "star": [ 1, 1, @@ -33406,10 +33063,9 @@ ], "BattleReadyID": 118, "FormatList": [ - 104051, - 104052 + 171081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, @@ -33495,10 +33151,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 172011 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -33584,10 +33239,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 172021 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -33673,10 +33327,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 172031 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -33762,10 +33415,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 172041 ], - "captainId": 350013, + "captainId": 150035, "star": [ 1, 1, @@ -33851,10 +33503,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 172051 ], - "captainId": 350013, + "captainId": 450015, "star": [ 1, 1, @@ -33940,10 +33591,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 172061 ], - "captainId": 350013, + "captainId": 350015, "star": [ 1, 1, @@ -34029,10 +33679,9 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 172071 ], - "captainId": 350013, + "captainId": 440065, "star": [ 1, 1, @@ -34116,12 +33765,11 @@ "n": 220415 } ], - "BattleReadyID": 118, + "BattleReadyID": 116, "FormatList": [ - 104051, - 104052 + 172081 ], - "captainId": 350013, + "captainId": 240045, "star": [ 1, 1, diff --git a/bin/json/game_mainstartype.json b/bin/json/game_mainstartype.json index 00a90c72e..f8542a855 100644 --- a/bin/json/game_mainstartype.json +++ b/bin/json/game_mainstartype.json @@ -10,7 +10,7 @@ "id": 2, "starName": { "key": "mainchapter_main_startype_starName_2", - "text": "死亡人数不超过{0}人" + "text": "被击败人数不超过{0}人" } }, { diff --git a/bin/json/game_model.json b/bin/json/game_model.json index 56be2d310..b9ac79a85 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -4271,9 +4271,9 @@ }, { "id": "51016", - "preson": "51016", - "presonshow": "51016_exhibition", - "presonstory": "51016", + "preson": "51015", + "presonshow": "51015_exhibition", + "presonstory": "51015", "presondraw": "", "height": 1, "weight": 1, @@ -4306,9 +4306,9 @@ }, { "id": "51017", - "preson": "51004", - "presonshow": "51004_exhibition", - "presonstory": "51004", + "preson": "51015", + "presonshow": "51015_exhibition", + "presonstory": "51015", "presondraw": "", "height": 1, "weight": 1, @@ -4341,9 +4341,9 @@ }, { "id": "51018", - "preson": "51004", - "presonshow": "51004_exhibition", - "presonstory": "51004", + "preson": "51015", + "presonshow": "51015_exhibition", + "presonstory": "51015", "presondraw": "", "height": 1, "weight": 1, @@ -4376,9 +4376,9 @@ }, { "id": "51019", - "preson": "51004", - "presonshow": "51004_exhibition", - "presonstory": "51004", + "preson": "51015", + "presonshow": "51015_exhibition", + "presonstory": "51015", "presondraw": "", "height": 1, "weight": 1, @@ -4411,9 +4411,9 @@ }, { "id": "51020", - "preson": "51004", - "presonshow": "51004_exhibition", - "presonstory": "51004", + "preson": "51015", + "presonshow": "51015_exhibition", + "presonstory": "51015", "presondraw": "", "height": 1, "weight": 1, @@ -4446,9 +4446,9 @@ }, { "id": "51021", - "preson": "51004", - "presonshow": "51004_exhibition", - "presonstory": "51004", + "preson": "51015", + "presonshow": "51015_exhibition", + "presonstory": "51015", "presondraw": "", "height": 1, "weight": 1, @@ -4481,9 +4481,9 @@ }, { "id": "51022", - "preson": "51004", - "presonshow": "51004_exhibition", - "presonstory": "51004", + "preson": "51015", + "presonshow": "51015_exhibition", + "presonstory": "51015", "presondraw": "", "height": 1, "weight": 1, @@ -4516,9 +4516,9 @@ }, { "id": "51023", - "preson": "51004", - "presonshow": "51004_exhibition", - "presonstory": "51004", + "preson": "51015", + "presonshow": "51015_exhibition", + "presonstory": "51015", "presondraw": "", "height": 1, "weight": 1, @@ -4551,9 +4551,9 @@ }, { "id": "51024", - "preson": "51004", - "presonshow": "51004_exhibition", - "presonstory": "51004", + "preson": "51015", + "presonshow": "51015_exhibition", + "presonstory": "51015", "presondraw": "", "height": 1, "weight": 1, @@ -4586,9 +4586,9 @@ }, { "id": "51025", - "preson": "51004", - "presonshow": "51004_exhibition", - "presonstory": "51004", + "preson": "51015", + "presonshow": "51015_exhibition", + "presonstory": "51015", "presondraw": "", "height": 1, "weight": 1, @@ -4621,9 +4621,9 @@ }, { "id": "51026", - "preson": "51004", - "presonshow": "51004_exhibition", - "presonstory": "51004", + "preson": "51015", + "presonshow": "51015_exhibition", + "presonstory": "51015", "presondraw": "", "height": 1, "weight": 1, @@ -4656,9 +4656,9 @@ }, { "id": "51027", - "preson": "51004", - "presonshow": "51004_exhibition", - "presonstory": "51004", + "preson": "51015", + "presonshow": "51015_exhibition", + "presonstory": "51015", "presondraw": "", "height": 1, "weight": 1, @@ -4691,9 +4691,9 @@ }, { "id": "51028", - "preson": "51004", - "presonshow": "51004_exhibition", - "presonstory": "51004", + "preson": "51015", + "presonshow": "51015_exhibition", + "presonstory": "51015", "presondraw": "", "height": 1, "weight": 1, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 64e1e4305..71d8a5375 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -1505,7 +1505,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 94005, + "heroid": 44005, "star": 3, "equip": [], "newskill": [], @@ -1525,7 +1525,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 83002, + "heroid": 33002, "star": 3, "equip": [], "newskill": [], @@ -1825,7 +1825,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 83002, + "heroid": 33002, "star": 3, "equip": [], "newskill": [], @@ -2163,8 +2163,8 @@ "Id": 101081, "pos": 4, "captainId": 1, - "IsBoss": 0, - "bossHpCnt": 0, + "IsBoss": 1, + "bossHpCnt": 1, "heroid": 55002, "star": 3, "equip": [], @@ -30305,7 +30305,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 94005, + "heroid": 44005, "star": 3, "equip": [], "newskill": [], @@ -30325,7 +30325,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 83002, + "heroid": 33002, "star": 3, "equip": [], "newskill": [], @@ -30625,7 +30625,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 83002, + "heroid": 33002, "star": 3, "equip": [], "newskill": [], @@ -59105,7 +59105,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 94005, + "heroid": 44005, "star": 3, "equip": [], "newskill": [], @@ -59125,7 +59125,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 83002, + "heroid": 33002, "star": 3, "equip": [], "newskill": [], @@ -59425,7 +59425,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 83002, + "heroid": 33002, "star": 3, "equip": [], "newskill": [], @@ -87905,7 +87905,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 94005, + "heroid": 44005, "star": 3, "equip": [], "newskill": [], @@ -87925,7 +87925,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 83002, + "heroid": 33002, "star": 3, "equip": [], "newskill": [], @@ -88225,7 +88225,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 83002, + "heroid": 33002, "star": 3, "equip": [], "newskill": [], @@ -115665,7 +115665,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55002, + "heroid": 55005, "star": 3, "equip": [], "newskill": [], @@ -115965,7 +115965,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55002, + "heroid": 55005, "star": 3, "equip": [], "newskill": [], @@ -116265,7 +116265,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55002, + "heroid": 55005, "star": 3, "equip": [], "newskill": [], @@ -116565,7 +116565,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55002, + "heroid": 55005, "star": 4, "equip": [], "newskill": [], @@ -116865,7 +116865,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55002, + "heroid": 55005, "star": 5, "equip": [], "newskill": [], @@ -117165,7 +117165,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55002, + "heroid": 55005, "star": 5, "equip": [], "newskill": [], @@ -117465,7 +117465,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55002, + "heroid": 55005, "star": 5, "equip": [], "newskill": [], @@ -117765,7 +117765,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55002, + "heroid": 55005, "star": 5, "equip": [], "newskill": [], @@ -118065,7 +118065,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55002, + "heroid": 55005, "star": 6, "equip": [], "newskill": [], @@ -118365,7 +118365,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55002, + "heroid": 55005, "star": 6, "equip": [], "newskill": [], @@ -124400,7 +124400,7 @@ "modelsize": 1 }, { - "Id": 306011, + "Id": 306001, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -124420,7 +124420,7 @@ "modelsize": 1 }, { - "Id": 306011, + "Id": 306001, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -124440,7 +124440,7 @@ "modelsize": 1 }, { - "Id": 306011, + "Id": 306001, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -124460,7 +124460,7 @@ "modelsize": 1 }, { - "Id": 306011, + "Id": 306001, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -124480,7 +124480,7 @@ "modelsize": 1 }, { - "Id": 306011, + "Id": 306001, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -124500,7 +124500,7 @@ "modelsize": 1 }, { - "Id": 306012, + "Id": 306002, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -124520,7 +124520,7 @@ "modelsize": 1 }, { - "Id": 306012, + "Id": 306002, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -124540,7 +124540,7 @@ "modelsize": 1 }, { - "Id": 306012, + "Id": 306002, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -124560,7 +124560,7 @@ "modelsize": 1 }, { - "Id": 306012, + "Id": 306002, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -124580,7 +124580,7 @@ "modelsize": 1 }, { - "Id": 306012, + "Id": 306002, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -124600,7 +124600,7 @@ "modelsize": 1 }, { - "Id": 306013, + "Id": 306003, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -124620,7 +124620,7 @@ "modelsize": 1 }, { - "Id": 306013, + "Id": 306003, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -124640,7 +124640,7 @@ "modelsize": 1 }, { - "Id": 306013, + "Id": 306003, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -124660,7 +124660,7 @@ "modelsize": 1 }, { - "Id": 306013, + "Id": 306003, "pos": 4, "captainId": 1, "IsBoss": 1, @@ -124680,7 +124680,7 @@ "modelsize": 1 }, { - "Id": 306013, + "Id": 306003, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -124700,7 +124700,7 @@ "modelsize": 1 }, { - "Id": 306014, + "Id": 306004, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -124720,7 +124720,7 @@ "modelsize": 1 }, { - "Id": 306014, + "Id": 306004, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -124740,7 +124740,7 @@ "modelsize": 1 }, { - "Id": 306014, + "Id": 306004, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -124760,7 +124760,7 @@ "modelsize": 1 }, { - "Id": 306014, + "Id": 306004, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -124780,7 +124780,7 @@ "modelsize": 1 }, { - "Id": 306014, + "Id": 306004, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -124800,7 +124800,7 @@ "modelsize": 1 }, { - "Id": 306015, + "Id": 306005, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -124820,7 +124820,7 @@ "modelsize": 1 }, { - "Id": 306015, + "Id": 306005, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -124840,7 +124840,7 @@ "modelsize": 1 }, { - "Id": 306015, + "Id": 306005, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -124860,7 +124860,7 @@ "modelsize": 1 }, { - "Id": 306015, + "Id": 306005, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -124880,7 +124880,7 @@ "modelsize": 1 }, { - "Id": 306015, + "Id": 306005, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -124900,7 +124900,7 @@ "modelsize": 1 }, { - "Id": 306016, + "Id": 306006, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -124920,7 +124920,7 @@ "modelsize": 1 }, { - "Id": 306016, + "Id": 306006, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -124940,7 +124940,7 @@ "modelsize": 1 }, { - "Id": 306016, + "Id": 306006, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -124960,7 +124960,7 @@ "modelsize": 1 }, { - "Id": 306016, + "Id": 306006, "pos": 4, "captainId": 1, "IsBoss": 1, @@ -124980,7 +124980,7 @@ "modelsize": 1 }, { - "Id": 306016, + "Id": 306006, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -125000,7 +125000,7 @@ "modelsize": 1 }, { - "Id": 306017, + "Id": 306007, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -125020,7 +125020,7 @@ "modelsize": 1 }, { - "Id": 306017, + "Id": 306007, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -125040,7 +125040,7 @@ "modelsize": 1 }, { - "Id": 306017, + "Id": 306007, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -125060,7 +125060,7 @@ "modelsize": 1 }, { - "Id": 306017, + "Id": 306007, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -125080,7 +125080,7 @@ "modelsize": 1 }, { - "Id": 306017, + "Id": 306007, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -125100,7 +125100,7 @@ "modelsize": 1 }, { - "Id": 306018, + "Id": 306008, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -125120,7 +125120,7 @@ "modelsize": 1 }, { - "Id": 306018, + "Id": 306008, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -125140,7 +125140,7 @@ "modelsize": 1 }, { - "Id": 306018, + "Id": 306008, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -125160,7 +125160,7 @@ "modelsize": 1 }, { - "Id": 306018, + "Id": 306008, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -125180,7 +125180,7 @@ "modelsize": 1 }, { - "Id": 306018, + "Id": 306008, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -125200,7 +125200,7 @@ "modelsize": 1 }, { - "Id": 306019, + "Id": 306009, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -125220,7 +125220,7 @@ "modelsize": 1 }, { - "Id": 306019, + "Id": 306009, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -125240,7 +125240,7 @@ "modelsize": 1 }, { - "Id": 306019, + "Id": 306009, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -125260,7 +125260,7 @@ "modelsize": 1 }, { - "Id": 306019, + "Id": 306009, "pos": 4, "captainId": 1, "IsBoss": 1, @@ -125280,7 +125280,7 @@ "modelsize": 1 }, { - "Id": 306019, + "Id": 306009, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -125300,7 +125300,7 @@ "modelsize": 1 }, { - "Id": 306020, + "Id": 306010, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -125320,7 +125320,7 @@ "modelsize": 1 }, { - "Id": 306020, + "Id": 306010, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -125340,7 +125340,7 @@ "modelsize": 1 }, { - "Id": 306020, + "Id": 306010, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -125360,7 +125360,7 @@ "modelsize": 1 }, { - "Id": 306020, + "Id": 306010, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -125380,7 +125380,7 @@ "modelsize": 1 }, { - "Id": 306020, + "Id": 306010, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -125400,7 +125400,7 @@ "modelsize": 1 }, { - "Id": 306021, + "Id": 306011, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -125420,7 +125420,7 @@ "modelsize": 1 }, { - "Id": 306021, + "Id": 306011, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -125440,7 +125440,7 @@ "modelsize": 1 }, { - "Id": 306021, + "Id": 306011, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -125460,7 +125460,7 @@ "modelsize": 1 }, { - "Id": 306021, + "Id": 306011, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -125480,7 +125480,7 @@ "modelsize": 1 }, { - "Id": 306021, + "Id": 306011, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -125500,7 +125500,7 @@ "modelsize": 1 }, { - "Id": 306022, + "Id": 306012, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -125520,7 +125520,7 @@ "modelsize": 1 }, { - "Id": 306022, + "Id": 306012, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -125540,7 +125540,7 @@ "modelsize": 1 }, { - "Id": 306022, + "Id": 306012, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -125560,7 +125560,7 @@ "modelsize": 1 }, { - "Id": 306022, + "Id": 306012, "pos": 4, "captainId": 1, "IsBoss": 1, @@ -125580,7 +125580,7 @@ "modelsize": 1 }, { - "Id": 306022, + "Id": 306012, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -125600,7 +125600,7 @@ "modelsize": 1 }, { - "Id": 306023, + "Id": 306013, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -125620,7 +125620,7 @@ "modelsize": 1 }, { - "Id": 306023, + "Id": 306013, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -125640,7 +125640,7 @@ "modelsize": 1 }, { - "Id": 306023, + "Id": 306013, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -125660,7 +125660,7 @@ "modelsize": 1 }, { - "Id": 306023, + "Id": 306013, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -125680,7 +125680,7 @@ "modelsize": 1 }, { - "Id": 306023, + "Id": 306013, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -125700,7 +125700,7 @@ "modelsize": 1 }, { - "Id": 306024, + "Id": 306014, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -125720,7 +125720,7 @@ "modelsize": 1 }, { - "Id": 306024, + "Id": 306014, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -125740,7 +125740,7 @@ "modelsize": 1 }, { - "Id": 306024, + "Id": 306014, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -125760,7 +125760,7 @@ "modelsize": 1 }, { - "Id": 306024, + "Id": 306014, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -125780,7 +125780,7 @@ "modelsize": 1 }, { - "Id": 306024, + "Id": 306014, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -125800,7 +125800,7 @@ "modelsize": 1 }, { - "Id": 306025, + "Id": 306015, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -125820,7 +125820,7 @@ "modelsize": 1 }, { - "Id": 306025, + "Id": 306015, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -125840,7 +125840,7 @@ "modelsize": 1 }, { - "Id": 306025, + "Id": 306015, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -125860,7 +125860,7 @@ "modelsize": 1 }, { - "Id": 306025, + "Id": 306015, "pos": 4, "captainId": 1, "IsBoss": 1, @@ -125880,7 +125880,7 @@ "modelsize": 1 }, { - "Id": 306025, + "Id": 306015, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -125900,7 +125900,7 @@ "modelsize": 1 }, { - "Id": 306026, + "Id": 306016, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -125920,7 +125920,7 @@ "modelsize": 1 }, { - "Id": 306026, + "Id": 306016, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -125940,7 +125940,7 @@ "modelsize": 1 }, { - "Id": 306026, + "Id": 306016, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -125960,7 +125960,7 @@ "modelsize": 1 }, { - "Id": 306026, + "Id": 306016, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -125980,7 +125980,7 @@ "modelsize": 1 }, { - "Id": 306026, + "Id": 306016, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -126000,7 +126000,7 @@ "modelsize": 1 }, { - "Id": 306027, + "Id": 306017, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -126020,7 +126020,7 @@ "modelsize": 1 }, { - "Id": 306027, + "Id": 306017, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -126040,7 +126040,7 @@ "modelsize": 1 }, { - "Id": 306027, + "Id": 306017, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -126060,7 +126060,7 @@ "modelsize": 1 }, { - "Id": 306027, + "Id": 306017, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -126080,7 +126080,7 @@ "modelsize": 1 }, { - "Id": 306027, + "Id": 306017, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -126100,7 +126100,7 @@ "modelsize": 1 }, { - "Id": 306028, + "Id": 306018, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -126120,7 +126120,7 @@ "modelsize": 1 }, { - "Id": 306028, + "Id": 306018, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -126140,7 +126140,7 @@ "modelsize": 1 }, { - "Id": 306028, + "Id": 306018, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -126160,7 +126160,7 @@ "modelsize": 1 }, { - "Id": 306028, + "Id": 306018, "pos": 4, "captainId": 1, "IsBoss": 1, @@ -126180,7 +126180,7 @@ "modelsize": 1 }, { - "Id": 306028, + "Id": 306018, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -126200,7 +126200,7 @@ "modelsize": 1 }, { - "Id": 306029, + "Id": 306019, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -126220,7 +126220,7 @@ "modelsize": 1 }, { - "Id": 306029, + "Id": 306019, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -126240,7 +126240,7 @@ "modelsize": 1 }, { - "Id": 306029, + "Id": 306019, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -126260,7 +126260,7 @@ "modelsize": 1 }, { - "Id": 306029, + "Id": 306019, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -126280,7 +126280,7 @@ "modelsize": 1 }, { - "Id": 306029, + "Id": 306019, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -126300,7 +126300,7 @@ "modelsize": 1 }, { - "Id": 306030, + "Id": 306020, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -126320,7 +126320,7 @@ "modelsize": 1 }, { - "Id": 306030, + "Id": 306020, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -126340,7 +126340,7 @@ "modelsize": 1 }, { - "Id": 306030, + "Id": 306020, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -126360,7 +126360,7 @@ "modelsize": 1 }, { - "Id": 306030, + "Id": 306020, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -126380,7 +126380,7 @@ "modelsize": 1 }, { - "Id": 306030, + "Id": 306020, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -126400,7 +126400,7 @@ "modelsize": 1 }, { - "Id": 306031, + "Id": 306021, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -126420,7 +126420,7 @@ "modelsize": 1 }, { - "Id": 306031, + "Id": 306021, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -126440,7 +126440,7 @@ "modelsize": 1 }, { - "Id": 306031, + "Id": 306021, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -126460,7 +126460,7 @@ "modelsize": 1 }, { - "Id": 306031, + "Id": 306021, "pos": 4, "captainId": 1, "IsBoss": 1, @@ -126480,7 +126480,7 @@ "modelsize": 1 }, { - "Id": 306031, + "Id": 306021, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -126500,7 +126500,7 @@ "modelsize": 1 }, { - "Id": 306032, + "Id": 306022, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -126520,7 +126520,7 @@ "modelsize": 1 }, { - "Id": 306032, + "Id": 306022, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -126540,7 +126540,7 @@ "modelsize": 1 }, { - "Id": 306032, + "Id": 306022, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -126560,7 +126560,7 @@ "modelsize": 1 }, { - "Id": 306032, + "Id": 306022, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -126580,7 +126580,7 @@ "modelsize": 1 }, { - "Id": 306032, + "Id": 306022, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -126600,7 +126600,7 @@ "modelsize": 1 }, { - "Id": 306033, + "Id": 306023, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -126620,7 +126620,7 @@ "modelsize": 1 }, { - "Id": 306033, + "Id": 306023, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -126640,7 +126640,7 @@ "modelsize": 1 }, { - "Id": 306033, + "Id": 306023, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -126660,7 +126660,7 @@ "modelsize": 1 }, { - "Id": 306033, + "Id": 306023, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -126680,7 +126680,7 @@ "modelsize": 1 }, { - "Id": 306033, + "Id": 306023, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -126700,7 +126700,7 @@ "modelsize": 1 }, { - "Id": 306034, + "Id": 306024, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -126720,7 +126720,7 @@ "modelsize": 1 }, { - "Id": 306034, + "Id": 306024, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -126740,7 +126740,7 @@ "modelsize": 1 }, { - "Id": 306034, + "Id": 306024, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -126760,7 +126760,7 @@ "modelsize": 1 }, { - "Id": 306034, + "Id": 306024, "pos": 4, "captainId": 1, "IsBoss": 1, @@ -126780,7 +126780,7 @@ "modelsize": 1 }, { - "Id": 306034, + "Id": 306024, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -126800,7 +126800,7 @@ "modelsize": 1 }, { - "Id": 306035, + "Id": 306025, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -126820,7 +126820,7 @@ "modelsize": 1 }, { - "Id": 306035, + "Id": 306025, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -126840,7 +126840,7 @@ "modelsize": 1 }, { - "Id": 306035, + "Id": 306025, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -126860,7 +126860,7 @@ "modelsize": 1 }, { - "Id": 306035, + "Id": 306025, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -126880,7 +126880,7 @@ "modelsize": 1 }, { - "Id": 306035, + "Id": 306025, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -126900,7 +126900,7 @@ "modelsize": 1 }, { - "Id": 306036, + "Id": 306026, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -126920,7 +126920,7 @@ "modelsize": 1 }, { - "Id": 306036, + "Id": 306026, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -126940,7 +126940,7 @@ "modelsize": 1 }, { - "Id": 306036, + "Id": 306026, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -126960,7 +126960,7 @@ "modelsize": 1 }, { - "Id": 306036, + "Id": 306026, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -126980,7 +126980,7 @@ "modelsize": 1 }, { - "Id": 306036, + "Id": 306026, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -127000,7 +127000,7 @@ "modelsize": 1 }, { - "Id": 306037, + "Id": 306027, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -127020,7 +127020,7 @@ "modelsize": 1 }, { - "Id": 306037, + "Id": 306027, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -127040,7 +127040,7 @@ "modelsize": 1 }, { - "Id": 306037, + "Id": 306027, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -127060,7 +127060,7 @@ "modelsize": 1 }, { - "Id": 306037, + "Id": 306027, "pos": 4, "captainId": 1, "IsBoss": 1, @@ -127080,7 +127080,7 @@ "modelsize": 1 }, { - "Id": 306037, + "Id": 306027, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -127100,7 +127100,7 @@ "modelsize": 1 }, { - "Id": 306038, + "Id": 306028, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -127120,7 +127120,7 @@ "modelsize": 1 }, { - "Id": 306038, + "Id": 306028, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -127140,7 +127140,7 @@ "modelsize": 1 }, { - "Id": 306038, + "Id": 306028, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -127160,7 +127160,7 @@ "modelsize": 1 }, { - "Id": 306038, + "Id": 306028, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -127180,7 +127180,7 @@ "modelsize": 1 }, { - "Id": 306038, + "Id": 306028, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -127200,7 +127200,7 @@ "modelsize": 1 }, { - "Id": 306039, + "Id": 306029, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -127220,7 +127220,7 @@ "modelsize": 1 }, { - "Id": 306039, + "Id": 306029, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -127240,7 +127240,7 @@ "modelsize": 1 }, { - "Id": 306039, + "Id": 306029, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -127260,7 +127260,7 @@ "modelsize": 1 }, { - "Id": 306039, + "Id": 306029, "pos": 4, "captainId": 1, "IsBoss": 0, @@ -127280,7 +127280,7 @@ "modelsize": 1 }, { - "Id": 306039, + "Id": 306029, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -127300,7 +127300,7 @@ "modelsize": 1 }, { - "Id": 306040, + "Id": 306030, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -127320,7 +127320,7 @@ "modelsize": 1 }, { - "Id": 306040, + "Id": 306030, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -127340,7 +127340,7 @@ "modelsize": 1 }, { - "Id": 306040, + "Id": 306030, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -127360,7 +127360,7 @@ "modelsize": 1 }, { - "Id": 306040, + "Id": 306030, "pos": 4, "captainId": 1, "IsBoss": 1, @@ -127380,7 +127380,7 @@ "modelsize": 1 }, { - "Id": 306040, + "Id": 306030, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -127399,6 +127399,606 @@ "speed": 124, "modelsize": 1 }, + { + "Id": 306031, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306031, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306031, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306031, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 53001, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306031, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306032, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51005, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306032, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51005, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306032, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306032, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 53002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306032, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306033, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51010, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306033, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51010, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306033, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51011, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 122, + "modelsize": 1 + }, + { + "Id": 306033, + "pos": 4, + "captainId": 1, + "IsBoss": 1, + "bossHpCnt": 4, + "heroid": 53003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 1.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 114, + "modelsize": 1 + }, + { + "Id": 306033, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51011, + "star": 5, + "equip": [], + "newskill": [], + "lv": 55, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 124, + "modelsize": 1 + }, + { + "Id": 306034, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306034, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306034, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306034, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 53001, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306034, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306035, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51005, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306035, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51005, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306035, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306035, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 53002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306035, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306036, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51010, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306036, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51010, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 306036, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51011, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 122, + "modelsize": 1 + }, + { + "Id": 306036, + "pos": 4, + "captainId": 1, + "IsBoss": 1, + "bossHpCnt": 4, + "heroid": 53003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 1.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 114, + "modelsize": 1 + }, + { + "Id": 306036, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51011, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.8, + "atkpro": 0.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 124, + "modelsize": 1 + }, { "Id": 401001, "pos": 1, diff --git a/bin/json/game_newsmithy.json b/bin/json/game_newsmithy.json index 85c3ae785..b18b29709 100644 --- a/bin/json/game_newsmithy.json +++ b/bin/json/game_newsmithy.json @@ -23,27 +23,9 @@ } ], "temperature_cos": 30, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 1 - } - ], - "customized_cos1": [ - { - "a": "item", - "t": "13000002", - "n": 10 - } - ], - "customized_cos2": [ - { - "a": "item", - "t": "13000002", - "n": 40 - } - ], + "refine_cos": [], + "customized_cos1": [], + "customized_cos2": [], "customized_lv": [ 1, 2 @@ -79,27 +61,9 @@ } ], "temperature_cos": 30, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 1 - } - ], - "customized_cos1": [ - { - "a": "item", - "t": "13000002", - "n": 10 - } - ], - "customized_cos2": [ - { - "a": "item", - "t": "13000002", - "n": 40 - } - ], + "refine_cos": [], + "customized_cos1": [], + "customized_cos2": [], "customized_lv": [ 1, 2, @@ -136,27 +100,9 @@ } ], "temperature_cos": 30, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 1 - } - ], - "customized_cos1": [ - { - "a": "item", - "t": "13000002", - "n": 10 - } - ], - "customized_cos2": [ - { - "a": "item", - "t": "13000002", - "n": 40 - } - ], + "refine_cos": [], + "customized_cos1": [], + "customized_cos2": [], "customized_lv": [ 2, 3 @@ -192,13 +138,7 @@ } ], "temperature_cos": 40, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 2 - } - ], + "refine_cos": [], "customized_cos1": [ { "a": "item", @@ -210,7 +150,7 @@ { "a": "item", "t": "13000002", - "n": 40 + "n": 10 } ], "customized_lv": [ @@ -249,13 +189,7 @@ } ], "temperature_cos": 40, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 2 - } - ], + "refine_cos": [], "customized_cos1": [ { "a": "item", @@ -267,7 +201,7 @@ { "a": "item", "t": "13000002", - "n": 40 + "n": 10 } ], "customized_lv": [ @@ -305,25 +239,19 @@ } ], "temperature_cos": 50, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 3 - } - ], + "refine_cos": [], "customized_cos1": [ { "a": "item", - "t": "13000002", + "t": "13000005", "n": 10 } ], "customized_cos2": [ { "a": "item", - "t": "13000002", - "n": 40 + "t": "13000005", + "n": 20 } ], "customized_lv": [ @@ -362,25 +290,19 @@ } ], "temperature_cos": 50, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 3 - } - ], + "refine_cos": [], "customized_cos1": [ { "a": "item", - "t": "13000002", + "t": "13000005", "n": 10 } ], "customized_cos2": [ { "a": "item", - "t": "13000002", - "n": 40 + "t": "13000005", + "n": 20 } ], "customized_lv": [ @@ -422,21 +344,21 @@ { "a": "item", "t": "13000001", - "n": 4 + "n": 1 } ], "customized_cos1": [ { "a": "item", - "t": "13000002", + "t": "13000006", "n": 10 } ], "customized_cos2": [ { "a": "item", - "t": "13000002", - "n": 40 + "t": "13000006", + "n": 25 } ], "customized_lv": [ @@ -479,21 +401,21 @@ { "a": "item", "t": "13000001", - "n": 4 + "n": 1 } ], "customized_cos1": [ { "a": "item", - "t": "13000002", + "t": "13000006", "n": 10 } ], "customized_cos2": [ { "a": "item", - "t": "13000002", - "n": 40 + "t": "13000006", + "n": 30 } ], "customized_lv": [ @@ -531,27 +453,9 @@ } ], "temperature_cos": 30, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 1 - } - ], - "customized_cos1": [ - { - "a": "item", - "t": "13000002", - "n": 10 - } - ], - "customized_cos2": [ - { - "a": "item", - "t": "13000002", - "n": 40 - } - ], + "refine_cos": [], + "customized_cos1": [], + "customized_cos2": [], "customized_lv": [ 1, 2 @@ -587,27 +491,9 @@ } ], "temperature_cos": 30, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 1 - } - ], - "customized_cos1": [ - { - "a": "item", - "t": "13000002", - "n": 10 - } - ], - "customized_cos2": [ - { - "a": "item", - "t": "13000002", - "n": 40 - } - ], + "refine_cos": [], + "customized_cos1": [], + "customized_cos2": [], "customized_lv": [ 1, 2, @@ -644,27 +530,9 @@ } ], "temperature_cos": 30, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 1 - } - ], - "customized_cos1": [ - { - "a": "item", - "t": "13000002", - "n": 10 - } - ], - "customized_cos2": [ - { - "a": "item", - "t": "13000002", - "n": 40 - } - ], + "refine_cos": [], + "customized_cos1": [], + "customized_cos2": [], "customized_lv": [ 2, 3 @@ -700,13 +568,7 @@ } ], "temperature_cos": 40, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 2 - } - ], + "refine_cos": [], "customized_cos1": [ { "a": "item", @@ -718,7 +580,7 @@ { "a": "item", "t": "13000002", - "n": 40 + "n": 10 } ], "customized_lv": [ @@ -757,13 +619,7 @@ } ], "temperature_cos": 40, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 2 - } - ], + "refine_cos": [], "customized_cos1": [ { "a": "item", @@ -775,7 +631,7 @@ { "a": "item", "t": "13000002", - "n": 40 + "n": 10 } ], "customized_lv": [ @@ -813,25 +669,19 @@ } ], "temperature_cos": 50, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 3 - } - ], + "refine_cos": [], "customized_cos1": [ { "a": "item", - "t": "13000002", + "t": "13000005", "n": 10 } ], "customized_cos2": [ { "a": "item", - "t": "13000002", - "n": 40 + "t": "13000005", + "n": 20 } ], "customized_lv": [ @@ -870,25 +720,19 @@ } ], "temperature_cos": 50, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 3 - } - ], + "refine_cos": [], "customized_cos1": [ { "a": "item", - "t": "13000002", + "t": "13000005", "n": 10 } ], "customized_cos2": [ { "a": "item", - "t": "13000002", - "n": 40 + "t": "13000005", + "n": 20 } ], "customized_lv": [ @@ -930,21 +774,21 @@ { "a": "item", "t": "13000001", - "n": 4 + "n": 1 } ], "customized_cos1": [ { "a": "item", - "t": "13000002", + "t": "13000006", "n": 10 } ], "customized_cos2": [ { "a": "item", - "t": "13000002", - "n": 40 + "t": "13000006", + "n": 25 } ], "customized_lv": [ @@ -987,21 +831,21 @@ { "a": "item", "t": "13000001", - "n": 4 + "n": 1 } ], "customized_cos1": [ { "a": "item", - "t": "13000002", + "t": "13000006", "n": 10 } ], "customized_cos2": [ { "a": "item", - "t": "13000002", - "n": 40 + "t": "13000006", + "n": 30 } ], "customized_lv": [ @@ -1039,27 +883,9 @@ } ], "temperature_cos": 30, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 1 - } - ], - "customized_cos1": [ - { - "a": "item", - "t": "13000002", - "n": 10 - } - ], - "customized_cos2": [ - { - "a": "item", - "t": "13000002", - "n": 40 - } - ], + "refine_cos": [], + "customized_cos1": [], + "customized_cos2": [], "customized_lv": [ 1, 2 @@ -1095,27 +921,9 @@ } ], "temperature_cos": 30, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 1 - } - ], - "customized_cos1": [ - { - "a": "item", - "t": "13000002", - "n": 10 - } - ], - "customized_cos2": [ - { - "a": "item", - "t": "13000002", - "n": 40 - } - ], + "refine_cos": [], + "customized_cos1": [], + "customized_cos2": [], "customized_lv": [ 1, 2, @@ -1152,27 +960,9 @@ } ], "temperature_cos": 30, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 1 - } - ], - "customized_cos1": [ - { - "a": "item", - "t": "13000002", - "n": 10 - } - ], - "customized_cos2": [ - { - "a": "item", - "t": "13000002", - "n": 40 - } - ], + "refine_cos": [], + "customized_cos1": [], + "customized_cos2": [], "customized_lv": [ 2, 3 @@ -1208,13 +998,7 @@ } ], "temperature_cos": 40, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 2 - } - ], + "refine_cos": [], "customized_cos1": [ { "a": "item", @@ -1226,7 +1010,7 @@ { "a": "item", "t": "13000002", - "n": 40 + "n": 10 } ], "customized_lv": [ @@ -1265,13 +1049,7 @@ } ], "temperature_cos": 40, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 2 - } - ], + "refine_cos": [], "customized_cos1": [ { "a": "item", @@ -1283,7 +1061,7 @@ { "a": "item", "t": "13000002", - "n": 40 + "n": 10 } ], "customized_lv": [ @@ -1321,25 +1099,19 @@ } ], "temperature_cos": 50, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 3 - } - ], + "refine_cos": [], "customized_cos1": [ { "a": "item", - "t": "13000002", + "t": "13000005", "n": 10 } ], "customized_cos2": [ { "a": "item", - "t": "13000002", - "n": 40 + "t": "13000005", + "n": 20 } ], "customized_lv": [ @@ -1378,25 +1150,19 @@ } ], "temperature_cos": 50, - "refine_cos": [ - { - "a": "item", - "t": "13000001", - "n": 3 - } - ], + "refine_cos": [], "customized_cos1": [ { "a": "item", - "t": "13000002", + "t": "13000005", "n": 10 } ], "customized_cos2": [ { "a": "item", - "t": "13000002", - "n": 40 + "t": "13000005", + "n": 20 } ], "customized_lv": [ @@ -1438,21 +1204,21 @@ { "a": "item", "t": "13000001", - "n": 4 + "n": 1 } ], "customized_cos1": [ { "a": "item", - "t": "13000002", + "t": "13000006", "n": 10 } ], "customized_cos2": [ { "a": "item", - "t": "13000002", - "n": 40 + "t": "13000006", + "n": 25 } ], "customized_lv": [ @@ -1495,21 +1261,21 @@ { "a": "item", "t": "13000001", - "n": 4 + "n": 1 } ], "customized_cos1": [ { "a": "item", - "t": "13000002", + "t": "13000006", "n": 10 } ], "customized_cos2": [ { "a": "item", - "t": "13000002", - "n": 40 + "t": "13000006", + "n": 30 } ], "customized_lv": [ diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json index 80b9f8b75..f14033520 100644 --- a/bin/json/game_ruledesc.json +++ b/bin/json/game_ruledesc.json @@ -190,11 +190,11 @@ "id": 10018, "title": { "key": "ruledesc_ruledesc_title_18", - "text": "招募说明" + "text": "招募概率公示" }, "content": { "key": "ruledesc_ruledesc_content_18", - "text": "这里可以使用时空石招募新的守护者们（时空石可以用200钻石购买一个）" + "text": "这里可以使用圣桃枝招募新的守护者们\n（圣桃枝可以用200钻石购买一个）\n招募概率公示：史诗守护者获得概率：1.2%\n 完美守护者获得概率：10.8%\n 稀有守护者获得概率：88%" } }, { diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index aaa4014bd..e2c043bf2 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -1613,7 +1613,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134006011_1", - "text": "[color=#37d8a9]速度提升[/color]20%" + "text": "己方速度提升25%" }, "buffid": [], "map": "" @@ -4917,7 +4917,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_144006011_1", - "text": "生命值增加30%" + "text": "己方生命值增加30%" }, "buffid": [], "map": "" @@ -6617,7 +6617,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124002011_1", - "text": "友方效果[color=#c84a32]命中提升[/color]30%" + "text": "己方效果命中提升30%" }, "buffid": [], "map": "" @@ -8881,7 +8881,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113003011_1", - "text": "己方提升20%速度" + "text": "己方速度提升25%" }, "buffid": [], "map": "" @@ -22432,7 +22432,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_100002001_1", - "text": "[color=#37d8a9]免疫[/color] 控制" + "text": "免疫控制" }, "buffid": [], "map": "" diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 419212661..237a8b937 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -501,7 +501,7 @@ "Id": 424002211, "When": 16, "FromCheck": "Target=3", - "TargetCheck": "Hasbuff=390001211", + "TargetCheck": "Target=2,HasBuff=390001211", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -516,7 +516,7 @@ { "Id": 424002212, "When": 16, - "FromCheck": "Hasbuff=390001211", + "FromCheck": "HasBuff=390001211", "TargetCheck": "Target=3", "MainSkillCheck": "", "AfterSkillCheck": "", @@ -1652,7 +1652,7 @@ "AfterSkillCheck": "", "BuffCheck": "", "AddCon": [ - "Hasbuff=390001415" + "HasBuff=390001415" ], "PasPr": 1000, "Type": "CallSkillPas", @@ -1859,7 +1859,7 @@ "Id": 424007213, "When": 16, "FromCheck": "Target=3", - "TargetCheck": "Hasbuff=SPDUP", + "TargetCheck": "HasBuff=SPDUP", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", diff --git a/bin/json/game_smithyidtool.json b/bin/json/game_smithyidtool.json index 19a88ded1..0ca596053 100644 --- a/bin/json/game_smithyidtool.json +++ b/bin/json/game_smithyidtool.json @@ -13,7 +13,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_1", - "text": "销售精英lv.{0}" + "text": "销售精英等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_1", @@ -36,7 +36,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_2", - "text": "销售精英lv.{0}" + "text": "销售精英等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_2", @@ -59,7 +59,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_3", - "text": "销售精英lv.{0}" + "text": "销售精英等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_3", @@ -82,7 +82,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_4", - "text": "销售精英lv.{0}" + "text": "销售精英等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_4", @@ -105,7 +105,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_5", - "text": "销售精英lv.{0}" + "text": "销售精英等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_5", @@ -122,7 +122,7 @@ "up_material": [], "name_text": { "key": "newsmithy_tool_name_text_6", - "text": "销售精英lv.{0}" + "text": "销售精英等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_6", @@ -145,7 +145,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_7", - "text": "节能环保lv.{0}" + "text": "节能环保等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_7", @@ -168,7 +168,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_8", - "text": "节能环保lv.{0}" + "text": "节能环保等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_8", @@ -191,7 +191,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_9", - "text": "节能环保lv.{0}" + "text": "节能环保等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_9", @@ -214,7 +214,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_10", - "text": "节能环保lv.{0}" + "text": "节能环保等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_10", @@ -237,7 +237,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_11", - "text": "节能环保lv.{0}" + "text": "节能环保等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_11", @@ -254,7 +254,7 @@ "up_material": [], "name_text": { "key": "newsmithy_tool_name_text_12", - "text": "节能环保lv.{0}" + "text": "节能环保等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_12", @@ -277,7 +277,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_13", - "text": "推广引流lv.{0}" + "text": "推广引流等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_13", @@ -300,7 +300,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_14", - "text": "推广引流lv.{0}" + "text": "推广引流等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_14", @@ -317,7 +317,7 @@ "up_material": [], "name_text": { "key": "newsmithy_tool_name_text_15", - "text": "推广引流lv.{0}" + "text": "推广引流等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_15", @@ -340,7 +340,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_16", - "text": "倾销货物lv.{0}" + "text": "倾销货物等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_16", @@ -363,7 +363,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_17", - "text": "倾销货物lv.{0}" + "text": "倾销货物等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_17", @@ -386,7 +386,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_18", - "text": "倾销货物lv.{0}" + "text": "倾销货物等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_18", @@ -403,7 +403,7 @@ "up_material": [], "name_text": { "key": "newsmithy_tool_name_text_19", - "text": "倾销货物lv.{0}" + "text": "倾销货物等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_19", @@ -426,7 +426,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_20", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_20", @@ -449,7 +449,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_21", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_21", @@ -472,7 +472,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_22", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_22", @@ -495,7 +495,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_23", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_23", @@ -518,7 +518,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_24", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_24", @@ -541,7 +541,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_25", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_25", @@ -564,7 +564,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_26", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_26", @@ -587,7 +587,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_27", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_27", @@ -610,7 +610,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_28", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_28", @@ -633,7 +633,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_29", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_29", @@ -650,7 +650,7 @@ "up_material": [], "name_text": { "key": "newsmithy_tool_name_text_30", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_30", diff --git a/bin/json/game_smithytask.json b/bin/json/game_smithytask.json index 6f56ab16d..ab7bdef89 100644 --- a/bin/json/game_smithytask.json +++ b/bin/json/game_smithytask.json @@ -4,9 +4,9 @@ "id_list": 1, "task_display": { "key": "newsmithy_task_task_display_1", - "text": "进行1次普通招募" + "text": "日常登录1次" }, - "type_id": 2018001, + "type_id": 107, "reword": [ { "a": "attr", @@ -25,9 +25,9 @@ "id_list": 2, "task_display": { "key": "newsmithy_task_task_display_2", - "text": "为任意守护者提升1次等级" + "text": "累计登录2天" }, - "type_id": 2024001, + "type_id": 108, "reword": [ { "a": "attr", @@ -42,13 +42,13 @@ ] }, { - "key": 10004, - "id_list": 4, + "key": 10003, + "id_list": 3, "task_display": { "key": "newsmithy_task_task_display_3", - "text": "强化任意装备成功1次" + "text": "连续登录3天" }, - "type_id": 2047001, + "type_id": 109, "reword": [ { "a": "attr", @@ -63,13 +63,13 @@ ] }, { - "key": 10006, - "id_list": 6, + "key": 10004, + "id_list": 4, "task_display": { "key": "newsmithy_task_task_display_4", - "text": "在商店购买任意1件商品" + "text": "拥有2个好友" }, - "type_id": 2064001, + "type_id": 110, "reword": [ { "a": "attr", @@ -84,13 +84,13 @@ ] }, { - "key": 10007, - "id_list": 7, + "key": 10005, + "id_list": 5, "task_display": { "key": "newsmithy_task_task_display_5", - "text": "使用好友助战守护者战斗1次" + "text": "赠送1次友情点" }, - "type_id": 2012001, + "type_id": 111, "reword": [ { "a": "attr", @@ -105,13 +105,13 @@ ] }, { - "key": 10008, - "id_list": 8, + "key": 10006, + "id_list": 6, "task_display": { "key": "newsmithy_task_task_display_6", - "text": "进行竞技场挑战1次" + "text": "使用好友助战1次" }, - "type_id": 2130001, + "type_id": 112, "reword": [ { "a": "attr", @@ -126,13 +126,13 @@ ] }, { - "key": 10009, - "id_list": 9, + "key": 10007, + "id_list": 7, "task_display": { "key": "newsmithy_task_task_display_7", - "text": "进行10次普通招募" + "text": "更换2次助战守护者" }, - "type_id": 3018001, + "type_id": 113, "reword": [ { "a": "attr", @@ -147,13 +147,13 @@ ] }, { - "key": 10010, - "id_list": 10, + "key": 10008, + "id_list": 8, "task_display": { "key": "newsmithy_task_task_display_8", - "text": "为任意守护者提升10次等级" + "text": "进行1次普通招募" }, - "type_id": 3024001, + "type_id": 114, "reword": [ { "a": "attr", @@ -163,18 +163,18 @@ { "a": "attr", "t": "diamond", - "n": 10 + "n": 11 } ] }, { - "key": 10011, - "id_list": 12, + "key": 10009, + "id_list": 9, "task_display": { "key": "newsmithy_task_task_display_9", - "text": "强化任意装备成功6次" + "text": "进行10次阵营招募" }, - "type_id": 3047001, + "type_id": 115, "reword": [ { "a": "attr", @@ -184,112 +184,7 @@ { "a": "attr", "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 10012, - "id_list": 14, - "task_display": { - "key": "newsmithy_task_task_display_10", - "text": "在商店购买任意7件商品" - }, - "type_id": 3064001, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 19 - }, - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 10013, - "id_list": 15, - "task_display": { - "key": "newsmithy_task_task_display_11", - "text": "使用好友助战守护者战斗7次" - }, - "type_id": 3012001, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 20 - }, - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 10014, - "id_list": 17, - "task_display": { - "key": "newsmithy_task_task_display_12", - "text": "刷新商店10次" - }, - "type_id": 3105001, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 21 - }, - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 10015, - "id_list": 18, - "task_display": { - "key": "newsmithy_task_task_display_13", - "text": "消费1000颗钻石" - }, - "type_id": 3104001, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 22 - }, - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ] - }, - { - "key": 10016, - "id_list": 19, - "task_display": { - "key": "newsmithy_task_task_display_14", - "text": "进行30场竞技场挑战" - }, - "type_id": 3130001, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 23 - }, - { - "a": "attr", - "t": "diamond", - "n": 10 + "n": 12 } ] } diff --git a/bin/json/game_smithytool.json b/bin/json/game_smithytool.json index 19a88ded1..0ca596053 100644 --- a/bin/json/game_smithytool.json +++ b/bin/json/game_smithytool.json @@ -13,7 +13,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_1", - "text": "销售精英lv.{0}" + "text": "销售精英等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_1", @@ -36,7 +36,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_2", - "text": "销售精英lv.{0}" + "text": "销售精英等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_2", @@ -59,7 +59,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_3", - "text": "销售精英lv.{0}" + "text": "销售精英等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_3", @@ -82,7 +82,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_4", - "text": "销售精英lv.{0}" + "text": "销售精英等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_4", @@ -105,7 +105,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_5", - "text": "销售精英lv.{0}" + "text": "销售精英等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_5", @@ -122,7 +122,7 @@ "up_material": [], "name_text": { "key": "newsmithy_tool_name_text_6", - "text": "销售精英lv.{0}" + "text": "销售精英等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_6", @@ -145,7 +145,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_7", - "text": "节能环保lv.{0}" + "text": "节能环保等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_7", @@ -168,7 +168,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_8", - "text": "节能环保lv.{0}" + "text": "节能环保等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_8", @@ -191,7 +191,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_9", - "text": "节能环保lv.{0}" + "text": "节能环保等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_9", @@ -214,7 +214,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_10", - "text": "节能环保lv.{0}" + "text": "节能环保等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_10", @@ -237,7 +237,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_11", - "text": "节能环保lv.{0}" + "text": "节能环保等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_11", @@ -254,7 +254,7 @@ "up_material": [], "name_text": { "key": "newsmithy_tool_name_text_12", - "text": "节能环保lv.{0}" + "text": "节能环保等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_12", @@ -277,7 +277,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_13", - "text": "推广引流lv.{0}" + "text": "推广引流等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_13", @@ -300,7 +300,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_14", - "text": "推广引流lv.{0}" + "text": "推广引流等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_14", @@ -317,7 +317,7 @@ "up_material": [], "name_text": { "key": "newsmithy_tool_name_text_15", - "text": "推广引流lv.{0}" + "text": "推广引流等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_15", @@ -340,7 +340,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_16", - "text": "倾销货物lv.{0}" + "text": "倾销货物等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_16", @@ -363,7 +363,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_17", - "text": "倾销货物lv.{0}" + "text": "倾销货物等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_17", @@ -386,7 +386,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_18", - "text": "倾销货物lv.{0}" + "text": "倾销货物等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_18", @@ -403,7 +403,7 @@ "up_material": [], "name_text": { "key": "newsmithy_tool_name_text_19", - "text": "倾销货物lv.{0}" + "text": "倾销货物等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_19", @@ -426,7 +426,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_20", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_20", @@ -449,7 +449,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_21", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_21", @@ -472,7 +472,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_22", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_22", @@ -495,7 +495,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_23", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_23", @@ -518,7 +518,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_24", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_24", @@ -541,7 +541,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_25", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_25", @@ -564,7 +564,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_26", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_26", @@ -587,7 +587,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_27", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_27", @@ -610,7 +610,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_28", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_28", @@ -633,7 +633,7 @@ ], "name_text": { "key": "newsmithy_tool_name_text_29", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_29", @@ -650,7 +650,7 @@ "up_material": [], "name_text": { "key": "newsmithy_tool_name_text_30", - "text": "制造大师lv.{0}" + "text": "制造大师等级.{0}" }, "content_text": { "key": "newsmithy_tool_content_text_30", diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json index cfa8e2c11..49e6c1aad 100644 --- a/bin/json/game_vikingboss.json +++ b/bin/json/game_vikingboss.json @@ -57,11 +57,7 @@ ], "drop": 1004, "heroexp": 100, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -141,11 +137,7 @@ ], "drop": 1005, "heroexp": 101, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -225,11 +217,7 @@ ], "drop": 1006, "heroexp": 102, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -309,11 +297,7 @@ ], "drop": 1007, "heroexp": 100, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -393,11 +377,7 @@ ], "drop": 1008, "heroexp": 101, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -477,11 +457,7 @@ ], "drop": 1009, "heroexp": 102, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -561,11 +537,7 @@ ], "drop": 1010, "heroexp": 103, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -645,11 +617,7 @@ ], "drop": 1011, "heroexp": 104, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -729,11 +697,7 @@ ], "drop": 1012, "heroexp": 105, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -813,11 +777,7 @@ ], "drop": 1013, "heroexp": 106, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -897,11 +857,7 @@ ], "drop": 1014, "heroexp": 107, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -981,11 +937,7 @@ ], "drop": 1015, "heroexp": 108, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1065,11 +1017,7 @@ ], "drop": 1016, "heroexp": 109, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1149,11 +1097,7 @@ ], "drop": 1017, "heroexp": 110, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1233,11 +1177,7 @@ ], "drop": 1018, "heroexp": 111, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1317,11 +1257,7 @@ ], "drop": 1019, "heroexp": 112, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1401,11 +1337,7 @@ ], "drop": 1020, "heroexp": 113, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1485,11 +1417,7 @@ ], "drop": 1021, "heroexp": 114, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1569,11 +1497,7 @@ ], "drop": 1022, "heroexp": 115, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1653,11 +1577,7 @@ ], "drop": 1023, "heroexp": 116, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1737,11 +1657,7 @@ ], "drop": 1024, "heroexp": 117, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -1821,11 +1737,7 @@ ], "drop": 1025, "heroexp": 118, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -1905,11 +1817,7 @@ ], "drop": 1026, "heroexp": 119, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -1989,11 +1897,7 @@ ], "drop": 1027, "heroexp": 120, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2073,11 +1977,7 @@ ], "drop": 1028, "heroexp": 121, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2157,11 +2057,7 @@ ], "drop": 1029, "heroexp": 122, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2241,11 +2137,7 @@ ], "drop": 1030, "heroexp": 123, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2325,11 +2217,7 @@ ], "drop": 1004, "heroexp": 124, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2409,11 +2297,7 @@ ], "drop": 1005, "heroexp": 125, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2493,11 +2377,7 @@ ], "drop": 1006, "heroexp": 126, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2577,11 +2457,7 @@ ], "drop": 1007, "heroexp": 127, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -2661,11 +2537,7 @@ ], "drop": 1008, "heroexp": 128, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -2745,11 +2617,7 @@ ], "drop": 1003, "heroexp": 129, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -2829,11 +2697,7 @@ ], "drop": 1004, "heroexp": 130, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -2913,11 +2777,7 @@ ], "drop": 1005, "heroexp": 131, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -2997,11 +2857,7 @@ ], "drop": 1006, "heroexp": 132, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3081,11 +2937,7 @@ ], "drop": 1007, "heroexp": 133, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3165,11 +3017,7 @@ ], "drop": 1008, "heroexp": 134, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3249,11 +3097,7 @@ ], "drop": 1009, "heroexp": 135, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3333,11 +3177,7 @@ ], "drop": 1010, "heroexp": 136, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3417,11 +3257,7 @@ ], "drop": 1001, "heroexp": 137, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3501,11 +3337,7 @@ ], "drop": 1002, "heroexp": 138, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3585,11 +3417,7 @@ ], "drop": 1003, "heroexp": 139, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3669,11 +3497,7 @@ ], "drop": 1004, "heroexp": 140, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3753,11 +3577,7 @@ ], "drop": 1005, "heroexp": 141, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3837,11 +3657,7 @@ ], "drop": 1006, "heroexp": 142, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -3921,11 +3737,7 @@ ], "drop": 1007, "heroexp": 143, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -4005,11 +3817,7 @@ ], "drop": 1008, "heroexp": 144, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -4089,11 +3897,7 @@ ], "drop": 1009, "heroexp": 145, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -4173,11 +3977,7 @@ ], "drop": 1010, "heroexp": 146, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -4208,7 +4008,7 @@ "text": "阿宝" }, "difficulty": 1, - "BattleReadyID": 121, + "BattleReadyID": 117, "captionrecommend": [ 25001, 25004, @@ -4242,16 +4042,14 @@ ], "drop": 30010, "heroexp": 5000, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, "boss": [ - 302073 + 306001, + 306002, + 306003 ], "ps_consume": [ { @@ -4277,7 +4075,7 @@ "text": "阿宝" }, "difficulty": 2, - "BattleReadyID": 121, + "BattleReadyID": 117, "captionrecommend": [ 25001, 25004, @@ -4311,16 +4109,14 @@ ], "drop": 30020, "heroexp": 6050, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, "boss": [ - 302076 + 306004, + 306005, + 306006 ], "ps_consume": [ { @@ -4346,7 +4142,7 @@ "text": "阿宝" }, "difficulty": 3, - "BattleReadyID": 121, + "BattleReadyID": 117, "captionrecommend": [ 25001, 25004, @@ -4380,16 +4176,14 @@ ], "drop": 30030, "heroexp": 7200, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, "boss": [ - 302079 + 306007, + 306008, + 306009 ], "ps_consume": [ { @@ -4415,7 +4209,7 @@ "text": "阿宝" }, "difficulty": 4, - "BattleReadyID": 121, + "BattleReadyID": 117, "captionrecommend": [ 25001, 25004, @@ -4449,16 +4243,14 @@ ], "drop": 30040, "heroexp": 8450, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, "boss": [ - 302082 + 306010, + 306011, + 306012 ], "ps_consume": [ { @@ -4484,7 +4276,7 @@ "text": "阿宝" }, "difficulty": 5, - "BattleReadyID": 121, + "BattleReadyID": 117, "captionrecommend": [ 25001, 25004, @@ -4518,16 +4310,14 @@ ], "drop": 30050, "heroexp": 9800, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, "boss": [ - 302085 + 306013, + 306014, + 306015 ], "ps_consume": [ { @@ -4553,7 +4343,7 @@ "text": "阿宝" }, "difficulty": 6, - "BattleReadyID": 121, + "BattleReadyID": 117, "captionrecommend": [ 25001, 25004, @@ -4587,16 +4377,14 @@ ], "drop": 30060, "heroexp": 11250, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, "boss": [ - 302088 + 306016, + 306017, + 306018 ], "ps_consume": [ { @@ -4622,7 +4410,7 @@ "text": "阿宝" }, "difficulty": 7, - "BattleReadyID": 121, + "BattleReadyID": 117, "captionrecommend": [ 25001, 25004, @@ -4656,16 +4444,14 @@ ], "drop": 30070, "heroexp": 12800, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, "boss": [ - 302091 + 306019, + 306020, + 306021 ], "ps_consume": [ { @@ -4691,7 +4477,7 @@ "text": "阿宝" }, "difficulty": 8, - "BattleReadyID": 121, + "BattleReadyID": 117, "captionrecommend": [ 25001, 25004, @@ -4725,16 +4511,14 @@ ], "drop": 30080, "heroexp": 14450, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, "boss": [ - 302094 + 306022, + 306023, + 306024 ], "ps_consume": [ { @@ -4760,7 +4544,7 @@ "text": "阿宝" }, "difficulty": 9, - "BattleReadyID": 121, + "BattleReadyID": 117, "captionrecommend": [ 25001, 25004, @@ -4799,16 +4583,14 @@ ], "drop": 30090, "heroexp": 16200, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, "boss": [ - 302097 + 306025, + 306026, + 306027 ], "ps_consume": [ { @@ -4834,7 +4616,7 @@ "text": "阿宝" }, "difficulty": 10, - "BattleReadyID": 121, + "BattleReadyID": 117, "captionrecommend": [ 25001, 25004, @@ -4873,16 +4655,14 @@ ], "drop": 30100, "heroexp": 19000, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, "boss": [ - 302100 + 306028, + 306029, + 306030 ], "ps_consume": [ { @@ -4908,7 +4688,7 @@ "text": "阿宝" }, "difficulty": 11, - "BattleReadyID": 121, + "BattleReadyID": 117, "captionrecommend": [ 25001, 25004, @@ -4947,16 +4727,14 @@ ], "drop": 30110, "heroexp": 22000, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, "boss": [ - 302103 + 306031, + 306032, + 306033 ], "ps_consume": [ { @@ -4982,7 +4760,7 @@ "text": "阿宝" }, "difficulty": 12, - "BattleReadyID": 121, + "BattleReadyID": 117, "captionrecommend": [ 25001, 25004, @@ -5021,16 +4799,14 @@ ], "drop": 30120, "heroexp": 25000, - "manexp": { - "a": "attr", - "t": "exp", - "n": 1000 - }, + "manexp": [], "scene": "", "bossmodel": 11009, "boss_skill": 25001, "boss": [ - 302106 + 306034, + 306035, + 306036 ], "ps_consume": [ { diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 04d876e30..8adb00d82 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -234,7 +234,7 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_7", - "text": "击败恐惧灵" + "text": "击败豺狼小怪" }, "npc": 10050, "completetask": [ diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 8638ea5bd..990237ae1 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -139,7 +139,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal res = append(res, v) } } - res = append(res, vikingCfg.Manexp) //给玩家加经验 + res = append(res, vikingCfg.Manexp...) //给玩家加经验 if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil { return } diff --git a/sys/configure/structs/Game.VikingBossData.go b/sys/configure/structs/Game.VikingBossData.go index 4a3969670..d5addc5be 100644 --- a/sys/configure/structs/Game.VikingBossData.go +++ b/sys/configure/structs/Game.VikingBossData.go @@ -22,7 +22,7 @@ type GameVikingBossData struct { Dropshow []*Gameatn Drop int32 Heroexp int32 - Manexp *Gameatn + Manexp []*Gameatn Scene string Bossmodel int32 BossSkill int32 @@ -88,7 +88,20 @@ func (_v *GameVikingBossData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) } - { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["manexp"].(map[string]interface{}); !_ok_ { err = errors.New("manexp error"); return }; if _v.Manexp, err = DeserializeGameatn(_x_); err != nil { return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["manexp"].([]interface{}); !_ok_ { err = errors.New("manexp error"); return } + + _v.Manexp = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Manexp = append(_v.Manexp, _list_v_) + } + } + { var _ok_ bool; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossmodel"].(float64); !_ok_ { err = errors.New("bossmodel error"); return }; _v.Bossmodel = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_skill"].(float64); !_ok_ { err = errors.New("boss_skill error"); return }; _v.BossSkill = int32(_tempNum_) } diff --git a/sys/wordfilter/core.go b/sys/wordfilter/core.go index a7c843b21..fb1a472e9 100644 --- a/sys/wordfilter/core.go +++ b/sys/wordfilter/core.go @@ -23,7 +23,7 @@ type ( Filter(text string) string ///和谐敏感词 Replace(text string, repl rune) string - ///检测敏感词 + ///字符串是否包含铭感词 FindIn(text string) (bool, string) ///找到所有匹配词 FindAll(text string) []string