From dc77aac59b5619e0d1c75ddb276606653f5324cd Mon Sep 17 00:00:00 2001 From: luying Date: Thu, 28 Jul 2022 14:31:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E5=AE=9D=EF=BC=9A=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=E8=AF=BB=E8=A1=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/pubUtils/dictionary/DicWar.ts | 3 +- .../resource/jsons/dic_zyz_gk_treasure.json | 128 +++++++++--------- 2 files changed, 65 insertions(+), 66 deletions(-) diff --git a/shared/pubUtils/dictionary/DicWar.ts b/shared/pubUtils/dictionary/DicWar.ts index a00fcf30c..83361895e 100644 --- a/shared/pubUtils/dictionary/DicWar.ts +++ b/shared/pubUtils/dictionary/DicWar.ts @@ -112,14 +112,13 @@ export function loadWar() { o.winReward = parseTrainReward(o.winReward); o.failReward = parseTrainReward(o.failReward); } else if (o.warType == WAR_TYPE.COM_BATTLE) { - console.log('####', o) let reward = { captainReward: o.fixReward, teammateReward: parseGoodStr(o.teammateReward), captainTimeReward: parseGoodStr(o.time_captain_normalReward), teammateTimeReward: parseGoodStr(o.time_normalReward), captainTimeGuildReward: parseComBattleTimeReward(o.time_captain_guildReward), - teammateTimeGuildReward: parseComBattleTimeReward(o.time_captain_guildReward), + teammateTimeGuildReward: parseComBattleTimeReward(o.time_guildReward), } dicComBattleReward.set(o.war_id, reward); } diff --git a/shared/resource/jsons/dic_zyz_gk_treasure.json b/shared/resource/jsons/dic_zyz_gk_treasure.json index a24a411c2..d785067a0 100644 --- a/shared/resource/jsons/dic_zyz_gk_treasure.json +++ b/shared/resource/jsons/dic_zyz_gk_treasure.json @@ -8,9 +8,9 @@ "script_id": "&", "fixReward": "80001&1", "teammateReward": "40002&40", - "time_captain_normalReward": "40002&50", + "time_captain_normalReward": "40002&125", "time_normalReward": "40002&50", - "time_captain_guildReward": "40002&60|40002&70", + "time_captain_guildReward": "40002&150|40002&160", "time_guildReward": "40002&60|40002&70", "warType": 7, "gk_name": "天晶·破(1品)&藏宝图", @@ -40,9 +40,9 @@ "script_id": "&", "fixReward": "80002&1", "teammateReward": "40002&100", - "time_captain_normalReward": "40002&125", + "time_captain_normalReward": "40002&250", "time_normalReward": "40002&125", - "time_captain_guildReward": "40002&150|40002&160", + "time_captain_guildReward": "40002&300|40002&320", "time_guildReward": "40002&150|40002&160", "warType": 7, "gk_name": "天晶·破(2品)&藏宝图", @@ -72,9 +72,9 @@ "script_id": "&", "fixReward": "80003&1", "teammateReward": "40002&200", - "time_captain_normalReward": "40002&250", + "time_captain_normalReward": "40002&375", "time_normalReward": "40002&250", - "time_captain_guildReward": "40002&300|40002&320", + "time_captain_guildReward": "40002&450|40002&500", "time_guildReward": "40002&300|40002&320", "warType": 7, "gk_name": "天晶·破(3品)&藏宝图", @@ -104,9 +104,9 @@ "script_id": "&", "fixReward": "80004&1", "teammateReward": "40002&300", - "time_captain_normalReward": "40002&375", + "time_captain_normalReward": "40002&600", "time_normalReward": "40002&375", - "time_captain_guildReward": "40002&450|40002&500", + "time_captain_guildReward": "40002&750|40002&800", "time_guildReward": "40002&450|40002&500", "warType": 7, "gk_name": "天晶·破(4品)&藏宝图", @@ -136,9 +136,9 @@ "script_id": "&", "fixReward": "80005&1", "teammateReward": "40002&500", - "time_captain_normalReward": "40002&600", + "time_captain_normalReward": "40002&825", "time_normalReward": "40002&600", - "time_captain_guildReward": "40002&750|40002&800", + "time_captain_guildReward": "40002&1050|40002&1200", "time_guildReward": "40002&750|40002&800", "warType": 7, "gk_name": "天晶·破(5品)&藏宝图", @@ -168,9 +168,9 @@ "script_id": "&", "fixReward": "80006&1", "teammateReward": "40002&700", - "time_captain_normalReward": "40002&825", + "time_captain_normalReward": "40002&1150", "time_normalReward": "40002&825", - "time_captain_guildReward": "40002&1050|40002&1200", + "time_captain_guildReward": "40002&1500|40002&1700", "time_guildReward": "40002&1050|40002&1200", "warType": 7, "gk_name": "天晶·破(6品)&藏宝图", @@ -200,9 +200,9 @@ "script_id": "&", "fixReward": "80007&1", "teammateReward": "40002&1000", - "time_captain_normalReward": "40002&1150", + "time_captain_normalReward": "40002&1700", "time_normalReward": "40002&1150", - "time_captain_guildReward": "40002&1500|40002&1700", + "time_captain_guildReward": "40002&2250|40002&2500", "time_guildReward": "40002&1500|40002&1700", "warType": 7, "gk_name": "天晶·破(7品)&藏宝图", @@ -232,9 +232,9 @@ "script_id": "&", "fixReward": "80008&1", "teammateReward": "40002&1500", - "time_captain_normalReward": "40002&1700", + "time_captain_normalReward": "40002&2000", "time_normalReward": "40002&1700", - "time_captain_guildReward": "40002&2250|40002&2500", + "time_captain_guildReward": "40002&2800|40002&3000", "time_guildReward": "40002&2250|40002&2500", "warType": 7, "gk_name": "天晶·破(8品)&藏宝图", @@ -264,9 +264,9 @@ "script_id": "&", "fixReward": "80011&1", "teammateReward": "40002&40", - "time_captain_normalReward": "40002&50", + "time_captain_normalReward": "40002&125", "time_normalReward": "40002&50", - "time_captain_guildReward": "40002&60|40002&70", + "time_captain_guildReward": "40002&150|40002&160", "time_guildReward": "40002&60|40002&70", "warType": 7, "gk_name": "天晶·护(1品)&藏宝图", @@ -296,9 +296,9 @@ "script_id": "&", "fixReward": "80012&1", "teammateReward": "40002&100", - "time_captain_normalReward": "40002&125", + "time_captain_normalReward": "40002&250", "time_normalReward": "40002&125", - "time_captain_guildReward": "40002&150|40002&160", + "time_captain_guildReward": "40002&300|40002&320", "time_guildReward": "40002&150|40002&160", "warType": 7, "gk_name": "天晶·护(2品)&藏宝图", @@ -328,9 +328,9 @@ "script_id": "&", "fixReward": "80013&1", "teammateReward": "40002&200", - "time_captain_normalReward": "40002&250", + "time_captain_normalReward": "40002&375", "time_normalReward": "40002&250", - "time_captain_guildReward": "40002&300|40002&320", + "time_captain_guildReward": "40002&450|40002&500", "time_guildReward": "40002&300|40002&320", "warType": 7, "gk_name": "天晶·护(3品)&藏宝图", @@ -360,9 +360,9 @@ "script_id": "&", "fixReward": "80014&1", "teammateReward": "40002&300", - "time_captain_normalReward": "40002&375", + "time_captain_normalReward": "40002&600", "time_normalReward": "40002&375", - "time_captain_guildReward": "40002&450|40002&500", + "time_captain_guildReward": "40002&750|40002&800", "time_guildReward": "40002&450|40002&500", "warType": 7, "gk_name": "天晶·护(4品)&藏宝图", @@ -392,9 +392,9 @@ "script_id": "&", "fixReward": "80015&1", "teammateReward": "40002&500", - "time_captain_normalReward": "40002&600", + "time_captain_normalReward": "40002&825", "time_normalReward": "40002&600", - "time_captain_guildReward": "40002&750|40002&800", + "time_captain_guildReward": "40002&1050|40002&1200", "time_guildReward": "40002&750|40002&800", "warType": 7, "gk_name": "天晶·护(5品)&藏宝图", @@ -424,9 +424,9 @@ "script_id": "&", "fixReward": "80016&1", "teammateReward": "40002&700", - "time_captain_normalReward": "40002&825", + "time_captain_normalReward": "40002&1150", "time_normalReward": "40002&825", - "time_captain_guildReward": "40002&1050|40002&1200", + "time_captain_guildReward": "40002&1500|40002&1700", "time_guildReward": "40002&1050|40002&1200", "warType": 7, "gk_name": "天晶·护(6品)&藏宝图", @@ -456,9 +456,9 @@ "script_id": "&", "fixReward": "80017&1", "teammateReward": "40002&1000", - "time_captain_normalReward": "40002&1150", + "time_captain_normalReward": "40002&1700", "time_normalReward": "40002&1150", - "time_captain_guildReward": "40002&1500|40002&1700", + "time_captain_guildReward": "40002&2250|40002&2500", "time_guildReward": "40002&1500|40002&1700", "warType": 7, "gk_name": "天晶·护(7品)&藏宝图", @@ -488,9 +488,9 @@ "script_id": "&", "fixReward": "80018&1", "teammateReward": "40002&1500", - "time_captain_normalReward": "40002&1700", + "time_captain_normalReward": "40002&2000", "time_normalReward": "40002&1700", - "time_captain_guildReward": "40002&2250|40002&2500", + "time_captain_guildReward": "40002&2800|40002&3000", "time_guildReward": "40002&2250|40002&2500", "warType": 7, "gk_name": "天晶·护(8品)&藏宝图", @@ -520,9 +520,9 @@ "script_id": "&", "fixReward": "80021&1", "teammateReward": "40002&40", - "time_captain_normalReward": "40002&50", + "time_captain_normalReward": "40002&125", "time_normalReward": "40002&50", - "time_captain_guildReward": "40002&60|40002&70", + "time_captain_guildReward": "40002&150|40002&160", "time_guildReward": "40002&60|40002&70", "warType": 7, "gk_name": "天晶·御(1品)&藏宝图", @@ -552,9 +552,9 @@ "script_id": "&", "fixReward": "80022&1", "teammateReward": "40002&100", - "time_captain_normalReward": "40002&125", + "time_captain_normalReward": "40002&250", "time_normalReward": "40002&125", - "time_captain_guildReward": "40002&150|40002&160", + "time_captain_guildReward": "40002&300|40002&320", "time_guildReward": "40002&150|40002&160", "warType": 7, "gk_name": "天晶·御(2品)&藏宝图", @@ -584,9 +584,9 @@ "script_id": "&", "fixReward": "80023&1", "teammateReward": "40002&200", - "time_captain_normalReward": "40002&250", + "time_captain_normalReward": "40002&375", "time_normalReward": "40002&250", - "time_captain_guildReward": "40002&300|40002&320", + "time_captain_guildReward": "40002&450|40002&500", "time_guildReward": "40002&300|40002&320", "warType": 7, "gk_name": "天晶·御(3品)&藏宝图", @@ -616,9 +616,9 @@ "script_id": "&", "fixReward": "80024&1", "teammateReward": "40002&300", - "time_captain_normalReward": "40002&375", + "time_captain_normalReward": "40002&600", "time_normalReward": "40002&375", - "time_captain_guildReward": "40002&450|40002&500", + "time_captain_guildReward": "40002&750|40002&800", "time_guildReward": "40002&450|40002&500", "warType": 7, "gk_name": "天晶·御(4品)&藏宝图", @@ -648,9 +648,9 @@ "script_id": "&", "fixReward": "80025&1", "teammateReward": "40002&500", - "time_captain_normalReward": "40002&600", + "time_captain_normalReward": "40002&825", "time_normalReward": "40002&600", - "time_captain_guildReward": "40002&750|40002&800", + "time_captain_guildReward": "40002&1050|40002&1200", "time_guildReward": "40002&750|40002&800", "warType": 7, "gk_name": "天晶·御(5品)&藏宝图", @@ -680,9 +680,9 @@ "script_id": "&", "fixReward": "80026&1", "teammateReward": "40002&700", - "time_captain_normalReward": "40002&825", + "time_captain_normalReward": "40002&1150", "time_normalReward": "40002&825", - "time_captain_guildReward": "40002&1050|40002&1200", + "time_captain_guildReward": "40002&1500|40002&1700", "time_guildReward": "40002&1050|40002&1200", "warType": 7, "gk_name": "天晶·御(6品)&藏宝图", @@ -712,9 +712,9 @@ "script_id": "&", "fixReward": "80027&1", "teammateReward": "40002&1000", - "time_captain_normalReward": "40002&1150", + "time_captain_normalReward": "40002&1700", "time_normalReward": "40002&1150", - "time_captain_guildReward": "40002&1500|40002&1700", + "time_captain_guildReward": "40002&2250|40002&2500", "time_guildReward": "40002&1500|40002&1700", "warType": 7, "gk_name": "天晶·御(7品)&藏宝图", @@ -744,9 +744,9 @@ "script_id": "&", "fixReward": "80028&1", "teammateReward": "40002&1500", - "time_captain_normalReward": "40002&1700", + "time_captain_normalReward": "40002&2000", "time_normalReward": "40002&1700", - "time_captain_guildReward": "40002&2250|40002&2500", + "time_captain_guildReward": "40002&2800|40002&3000", "time_guildReward": "40002&2250|40002&2500", "warType": 7, "gk_name": "天晶·御(8品)&藏宝图", @@ -776,9 +776,9 @@ "script_id": "&", "fixReward": "80031&1", "teammateReward": "40002&40", - "time_captain_normalReward": "40002&50", + "time_captain_normalReward": "40002&125", "time_normalReward": "40002&50", - "time_captain_guildReward": "40002&60|40002&70", + "time_captain_guildReward": "40002&150|40002&160", "time_guildReward": "40002&60|40002&70", "warType": 7, "gk_name": "天晶·命(1品)&藏宝图", @@ -808,9 +808,9 @@ "script_id": "&", "fixReward": "80032&1", "teammateReward": "40002&100", - "time_captain_normalReward": "40002&125", + "time_captain_normalReward": "40002&250", "time_normalReward": "40002&125", - "time_captain_guildReward": "40002&150|40002&160", + "time_captain_guildReward": "40002&300|40002&320", "time_guildReward": "40002&150|40002&160", "warType": 7, "gk_name": "天晶·命(2品)&藏宝图", @@ -840,9 +840,9 @@ "script_id": "&", "fixReward": "80033&1", "teammateReward": "40002&200", - "time_captain_normalReward": "40002&250", + "time_captain_normalReward": "40002&375", "time_normalReward": "40002&250", - "time_captain_guildReward": "40002&300|40002&320", + "time_captain_guildReward": "40002&450|40002&500", "time_guildReward": "40002&300|40002&320", "warType": 7, "gk_name": "天晶·命(3品)&藏宝图", @@ -872,9 +872,9 @@ "script_id": "&", "fixReward": "80034&1", "teammateReward": "40002&300", - "time_captain_normalReward": "40002&375", + "time_captain_normalReward": "40002&600", "time_normalReward": "40002&375", - "time_captain_guildReward": "40002&450|40002&500", + "time_captain_guildReward": "40002&750|40002&800", "time_guildReward": "40002&450|40002&500", "warType": 7, "gk_name": "天晶·命(4品)&藏宝图", @@ -904,9 +904,9 @@ "script_id": "&", "fixReward": "80035&1", "teammateReward": "40002&500", - "time_captain_normalReward": "40002&600", + "time_captain_normalReward": "40002&825", "time_normalReward": "40002&600", - "time_captain_guildReward": "40002&750|40002&800", + "time_captain_guildReward": "40002&1050|40002&1200", "time_guildReward": "40002&750|40002&800", "warType": 7, "gk_name": "天晶·命(5品)&藏宝图", @@ -936,9 +936,9 @@ "script_id": "&", "fixReward": "80036&1", "teammateReward": "40002&700", - "time_captain_normalReward": "40002&825", + "time_captain_normalReward": "40002&1150", "time_normalReward": "40002&825", - "time_captain_guildReward": "40002&1050|40002&1200", + "time_captain_guildReward": "40002&1500|40002&1700", "time_guildReward": "40002&1050|40002&1200", "warType": 7, "gk_name": "天晶·命(6品)&藏宝图", @@ -968,9 +968,9 @@ "script_id": "&", "fixReward": "80037&1", "teammateReward": "40002&1000", - "time_captain_normalReward": "40002&1150", + "time_captain_normalReward": "40002&1700", "time_normalReward": "40002&1150", - "time_captain_guildReward": "40002&1500|40002&1700", + "time_captain_guildReward": "40002&2250|40002&2500", "time_guildReward": "40002&1500|40002&1700", "warType": 7, "gk_name": "天晶·命(7品)&藏宝图", @@ -1000,9 +1000,9 @@ "script_id": "&", "fixReward": "80038&1", "teammateReward": "40002&1500", - "time_captain_normalReward": "40002&1700", + "time_captain_normalReward": "40002&2000", "time_normalReward": "40002&1700", - "time_captain_guildReward": "40002&2250|40002&2500", + "time_captain_guildReward": "40002&2800|40002&3000", "time_guildReward": "40002&2250|40002&2500", "warType": 7, "gk_name": "天晶·命(8品)&藏宝图",