From 06a0c38fbdb8a039c1dd06c03db6f3b76511814c Mon Sep 17 00:00:00 2001 From: mamengke01 <794347210@qq.com> Date: Mon, 11 Jan 2021 15:47:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/db/Mail.ts | 3 +- shared/db/PvpDefense.ts | 1 + shared/resource/jsons/dic_goods.json | 276 +++++++++--------- shared/resource/jsons/dic_pvp_rankReward.json | 14 +- shared/resource/jsons/dic_zyz_gk_pvp.json | 15 +- shared/resource/jsons/dic_zyz_gk_tower.json | 8 +- 6 files changed, 162 insertions(+), 155 deletions(-) diff --git a/shared/db/Mail.ts b/shared/db/Mail.ts index 419d5f363..bd371c73c 100644 --- a/shared/db/Mail.ts +++ b/shared/db/Mail.ts @@ -25,7 +25,8 @@ export default class Mail extends BaseModel { sendName: string; public static async addMails( mails: Array) { - await MailModel.insertMany(mails); + let mailInfos:Array = await MailModel.insertMany(mails); + return mailInfos; } public static async addMail(params:{ goods: Array, sendName: string, mailId: number, sendTime?: number}) { diff --git a/shared/db/PvpDefense.ts b/shared/db/PvpDefense.ts index 6cd54b6ac..2adb45724 100644 --- a/shared/db/PvpDefense.ts +++ b/shared/db/PvpDefense.ts @@ -23,6 +23,7 @@ interface pvpUpdateInter { isFirstEntry?:boolean; receivedBox?: Array; seasonEndTime?:number; + isDefaultHero?:boolean; } export class Heroes { diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json index d70b029e0..97a479ab6 100755 --- a/shared/resource/jsons/dic_goods.json +++ b/shared/resource/jsons/dic_goods.json @@ -75584,7 +75584,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&25", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -75621,7 +75621,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&26", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -75658,7 +75658,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&27", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -75695,7 +75695,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&28", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -75732,7 +75732,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&29", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -75769,7 +75769,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&30", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -75806,7 +75806,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&125", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -75843,7 +75843,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&126", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -75880,7 +75880,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&127", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -75917,7 +75917,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&128", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -75954,7 +75954,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&129", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -75991,7 +75991,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&130", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76028,7 +76028,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&225", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76065,7 +76065,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&226", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76102,7 +76102,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&227", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76139,7 +76139,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&228", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76176,7 +76176,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&229", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76213,7 +76213,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&230", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76250,7 +76250,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&325", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76287,7 +76287,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&326", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76324,7 +76324,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&327", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76361,7 +76361,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&328", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76398,7 +76398,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&329", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76435,7 +76435,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&330", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76472,7 +76472,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&425", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76509,7 +76509,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&426", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76546,7 +76546,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&427", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76583,7 +76583,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&428", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76620,7 +76620,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&429", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76657,7 +76657,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&430", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76694,7 +76694,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&525", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76731,7 +76731,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&526", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76768,7 +76768,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&527", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76805,7 +76805,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&528", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76842,7 +76842,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&529", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76879,7 +76879,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&530", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76916,7 +76916,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&625", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76953,7 +76953,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&626", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -76990,7 +76990,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&627", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77027,7 +77027,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&628", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77064,7 +77064,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&629", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77101,7 +77101,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&630", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77138,7 +77138,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&725", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77175,7 +77175,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&726", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77212,7 +77212,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&727", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77249,7 +77249,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&728", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77286,7 +77286,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&729", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77323,7 +77323,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&730", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77360,7 +77360,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2025", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77397,7 +77397,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2026", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77434,7 +77434,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2027", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77471,7 +77471,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2028", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77508,7 +77508,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2029", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77545,7 +77545,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2030", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77582,7 +77582,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2125", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77619,7 +77619,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2126", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77656,7 +77656,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2127", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77693,7 +77693,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2128", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77730,7 +77730,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2129", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77767,7 +77767,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2130", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77804,7 +77804,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2225", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77841,7 +77841,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2226", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77878,7 +77878,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2227", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77915,7 +77915,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2228", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77952,7 +77952,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2229", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -77989,7 +77989,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&2230", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78026,7 +78026,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3025", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78063,7 +78063,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3026", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78100,7 +78100,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3027", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78137,7 +78137,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3028", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78174,7 +78174,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3029", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78211,7 +78211,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3030", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78248,7 +78248,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3125", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78285,7 +78285,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3126", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78322,7 +78322,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3127", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78359,7 +78359,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3128", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78396,7 +78396,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3129", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78433,7 +78433,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3130", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78470,7 +78470,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3225", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78507,7 +78507,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3226", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78544,7 +78544,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3227", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78581,7 +78581,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3228", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78618,7 +78618,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3229", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78655,7 +78655,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&3230", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78692,7 +78692,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4025", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78729,7 +78729,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4026", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78766,7 +78766,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4027", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78803,7 +78803,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4028", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78840,7 +78840,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4029", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78877,7 +78877,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4030", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78914,7 +78914,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4125", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78951,7 +78951,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4126", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -78988,7 +78988,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4127", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79025,7 +79025,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4128", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79062,7 +79062,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4129", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79099,7 +79099,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4130", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79136,7 +79136,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4225", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79173,7 +79173,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4226", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79210,7 +79210,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4227", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79247,7 +79247,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4228", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79284,7 +79284,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4229", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79321,7 +79321,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&4230", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79358,7 +79358,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5025", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79395,7 +79395,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5026", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79432,7 +79432,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5027", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79469,7 +79469,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5028", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79506,7 +79506,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5029", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79543,7 +79543,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5030", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79580,7 +79580,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5125", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79617,7 +79617,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5126", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79654,7 +79654,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5127", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79691,7 +79691,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5128", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79728,7 +79728,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5129", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79765,7 +79765,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5130", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79802,7 +79802,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5225", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79839,7 +79839,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5226", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79876,7 +79876,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5227", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79913,7 +79913,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5228", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79950,7 +79950,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5229", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -79987,7 +79987,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&5230", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80024,7 +80024,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6025", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80061,7 +80061,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6026", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80098,7 +80098,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6027", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80135,7 +80135,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6028", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80172,7 +80172,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6029", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80209,7 +80209,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6030", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80246,7 +80246,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6125", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80283,7 +80283,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6126", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80320,7 +80320,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6127", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80357,7 +80357,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6128", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80394,7 +80394,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6129", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80431,7 +80431,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6130", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80468,7 +80468,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6225", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80505,7 +80505,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6226", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80542,7 +80542,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6227", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80579,7 +80579,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6228", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80616,7 +80616,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6229", "suitId_1": 0, "getWays": "1&0", "value": 0, @@ -80653,7 +80653,7 @@ "mdef_up": 0, "agi_up": 0, "luk_up": 0, - "specialAttr": "&", + "specialAttr": "2&6230", "suitId_1": 0, "getWays": "1&0", "value": 0, diff --git a/shared/resource/jsons/dic_pvp_rankReward.json b/shared/resource/jsons/dic_pvp_rankReward.json index a6d21ece5..05591f8fc 100755 --- a/shared/resource/jsons/dic_pvp_rankReward.json +++ b/shared/resource/jsons/dic_pvp_rankReward.json @@ -3,43 +3,43 @@ "id": 1, "min": 0, "max": 1, - "reward": "41003&1|60059&5|60049&5|60039&5|60062&5|1006&100|21043&100|17001&20|11004&50|13030&6|40004&1200" + "reward": "41003&1|60059&5|60049&5|60039&5|60029&5|21006&100|21043&100|17001&20|11004&50|60060&8|40004&1200" }, { "id": 2, "min": 2, "max": 3, - "reward": "41003&1|21006&100|17001&15|11004&50|13030&6|40004&1200" + "reward": "41003&1|21006&100|17001&15|11004&50|60060&6|40004&1200" }, { "id": 3, "min": 4, "max": 10, - "reward": "41003&1|21044&100|17001&12|11004&50|13030&6|40004&1000" + "reward": "41003&1|21044&100|17001&12|11004&50|60060&6|40004&1000" }, { "id": 4, "min": 11, "max": 50, - "reward": "41003&1|21042&60|17001&10|11004&50|13030&6|40004&800" + "reward": "41003&1|21042&60|17001&10|11004&50|60060&6|40004&800" }, { "id": 5, "min": 51, "max": 100, - "reward": "41003&1|21005&50|17001&8|11004&50|13030&6|40004&600" + "reward": "41003&1|21005&50|17001&8|11004&50|60060&6|40004&600" }, { "id": 6, "min": 101, "max": 500, - "reward": "21009&20|17001&6|11004&50|13030&4|40004&400" + "reward": "21009&20|17001&6|11004&50|60060&4|40004&400" }, { "id": 7, "min": 501, "max": 999, - "reward": "17001&4|11003&50|13030&2|40004&200" + "reward": "17001&4|11003&50|60060&2|40004&200" }, { "id": 8, diff --git a/shared/resource/jsons/dic_zyz_gk_pvp.json b/shared/resource/jsons/dic_zyz_gk_pvp.json index 0c8b215e5..e47297c7a 100755 --- a/shared/resource/jsons/dic_zyz_gk_pvp.json +++ b/shared/resource/jsons/dic_zyz_gk_pvp.json @@ -6,7 +6,8 @@ "warType": 9, "gk_name": "地图1", "victoryInfoInUI": "5回合内杀死2个敌军", - "victoryCondition ": "111&5&2&" + "victoryCondition ": "111&5&2&", + "turnLimted": 10 }, { "war_id": 4502, @@ -15,7 +16,8 @@ "warType": 9, "gk_name": "地图2", "victoryInfoInUI": "我军死亡武将不超过2人", - "victoryCondition ": "102&2&" + "victoryCondition ": "102&2&", + "turnLimted": 10 }, { "war_id": 4503, @@ -24,7 +26,8 @@ "warType": 9, "gk_name": "地图3", "victoryInfoInUI": "我军全员生存", - "victoryCondition ": "102&0&" + "victoryCondition ": "102&0&", + "turnLimted": 10 }, { "war_id": 4504, @@ -33,7 +36,8 @@ "warType": 9, "gk_name": "地图4", "victoryInfoInUI": "8回合内获得胜利", - "victoryCondition ": "106&8&" + "victoryCondition ": "106&8&", + "turnLimted": 10 }, { "war_id": 4505, @@ -42,6 +46,7 @@ "warType": 9, "gk_name": "地图5", "victoryInfoInUI": "同一名武将击杀3名敌军", - "victoryCondition ": "400&3&" + "victoryCondition ": "400&3&", + "turnLimted": 10 } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_zyz_gk_tower.json b/shared/resource/jsons/dic_zyz_gk_tower.json index ada092c5c..1b69166b5 100755 --- a/shared/resource/jsons/dic_zyz_gk_tower.json +++ b/shared/resource/jsons/dic_zyz_gk_tower.json @@ -133,7 +133,7 @@ "loseInfoInUI": "我方全部阵亡", "starInfoInUI": "无", "cost": 15, - "heroInUI": "1&1004|1&1001|1&1006|1&344|1&1004", + "heroInUI": "1&1004|1&1001|1&312|1&1001|1&1004", "recommendedPower": 10005, "previousGk": 10004 }, @@ -179,7 +179,7 @@ "loseInfoInUI": "我方全部阵亡", "starInfoInUI": "无", "cost": 15, - "heroInUI": "1&1004|1&344|1&314|1&1001|1&1004", + "heroInUI": "1&1004|1&1001|1&312|1&1001|1&1004", "recommendedPower": 10007, "previousGk": 10007 }, @@ -248,7 +248,7 @@ "loseInfoInUI": "我方全部阵亡", "starInfoInUI": "无", "cost": 15, - "heroInUI": "1&312|1&344|1&314|1&315|1&311", + "heroInUI": "1&1004|1&1001|1&312|1&1001|1&1004", "recommendedPower": 10010, "previousGk": 10010 }, @@ -294,7 +294,7 @@ "loseInfoInUI": "我方全部阵亡", "starInfoInUI": "无", "cost": 15, - "heroInUI": "1&312|1&344|1&314|1&315|1&309", + "heroInUI": "1&1004|1&1001|1&312|1&1001|1&1004", "recommendedPower": 10012, "previousGk": 10010 }