From eff6e5f738e9578aa9bd8299e7686d982cdf6de8 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Tue, 2 Nov 2021 16:09:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9B=E5=9B=A2=E6=B4=BB=E5=8A=A8=EF=BC=9A?=
 =?UTF-8?q?=E8=AF=B8=E4=BE=AF=E6=B7=B7=E6=88=98=E6=8B=8D=E5=8D=96=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/pubUtils/data.ts                       |  4 +-
 shared/pubUtils/dictionary/DicGuildAuction.ts | 18 +++--
 .../resource/jsons/dic_zyz_guildAuction.json  | 75 ++++++++++++++++---
 3 files changed, 81 insertions(+), 16 deletions(-)

diff --git a/shared/pubUtils/data.ts b/shared/pubUtils/data.ts
index 7b8db4ea6..a80677dde 100644
--- a/shared/pubUtils/data.ts
+++ b/shared/pubUtils/data.ts
@@ -585,8 +585,8 @@ export function getTodayGuildActivity() {
  * @param aid 活动id
  * @param rank 排名
  */
-export function getGuildAuctionRewards(aid: number, rank: number) {
-    let ranksReward = gameData.guildAuction.get(aid) || [];
+export function getGuildAuctionRewards(aid: number, rank: number, cityId: number = 0) {
+    let ranksReward = gameData.guildAuction.get(`${aid}_${cityId}`) || [];
     let dic = ranksReward.find(cur => {
         return rank >= cur.min && (rank <= cur.max || cur.max == 0);
     });
diff --git a/shared/pubUtils/dictionary/DicGuildAuction.ts b/shared/pubUtils/dictionary/DicGuildAuction.ts
index cea3c8949..12cc0351c 100644
--- a/shared/pubUtils/dictionary/DicGuildAuction.ts
+++ b/shared/pubUtils/dictionary/DicGuildAuction.ts
@@ -1,5 +1,5 @@
 // 公会权限
-import { readFileAndParse } from '../util'
+import { parseNumberList, readFileAndParse } from '../util'
 import { FILENAME } from '../../consts'
 
 export interface DicGuildAuction {
@@ -12,18 +12,26 @@ export interface DicGuildAuction {
     readonly max: number;
     // 奖励
     readonly rewards: number;
+    // 城池
+    readonly cityId: number;
 }
 
-export const dicGuildAuction = new Map<number, DicGuildAuction[]>();
+export const dicGuildAuction = new Map<string, DicGuildAuction[]>();
 export function loadGuildAuction() {
     dicGuildAuction.clear();
     
     let arr = readFileAndParse(FILENAME.DIC_GUILD_AUCTION);
 
     arr.forEach(o => {
-        let rank = dicGuildAuction.get(o.id)||[];
-        rank.push(o);
-        dicGuildAuction.set(o.id, rank);
+        let cityIds = parseNumberList(o.cityId);
+        if(cityIds.length <= 0) { // 诸侯混战以外的活动
+            cityIds = [0];
+        }
+        for(let cityId of cityIds) {
+            let rank = dicGuildAuction.get(`${o.id}_${cityId}`)||[];
+            rank.push(o);
+            dicGuildAuction.set(`${o.id}_${cityId}`, rank);
+        }
     });
     arr = undefined;
 }
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_zyz_guildAuction.json b/shared/resource/jsons/dic_zyz_guildAuction.json
index ede8111ff..5deea69e5 100644
--- a/shared/resource/jsons/dic_zyz_guildAuction.json
+++ b/shared/resource/jsons/dic_zyz_guildAuction.json
@@ -4,62 +4,119 @@
         "name": "蛮夷入侵",
         "min": 1,
         "max": 1,
-        "rewards": 4
+        "rewards": 4,
+        "cityId": "0&"
     },
     {
         "id": 1,
         "name": "蛮夷入侵",
         "min": 2,
         "max": 10,
-        "rewards": 5
+        "rewards": 5,
+        "cityId": "0&"
     },
     {
         "id": 1,
         "name": "蛮夷入侵",
         "min": 11,
         "max": 0,
-        "rewards": 6
+        "rewards": 6,
+        "cityId": "0&"
     },
     {
         "id": 2,
         "name": "诸侯混战",
         "min": 1,
         "max": 1,
-        "rewards": 7
+        "rewards": 7,
+        "cityId": "10&"
     },
     {
         "id": 2,
         "name": "诸侯混战",
         "min": 2,
         "max": 10,
-        "rewards": 8
+        "rewards": 8,
+        "cityId": "10&"
     },
     {
         "id": 2,
         "name": "诸侯混战",
         "min": 11,
         "max": 0,
-        "rewards": 9
+        "rewards": 9,
+        "cityId": "10&"
     },
     {
         "id": 3,
         "name": "粮草先行",
         "min": 1,
         "max": 1,
-        "rewards": 10
+        "rewards": 10,
+        "cityId": "0&"
     },
     {
         "id": 3,
         "name": "粮草先行",
         "min": 2,
         "max": 10,
-        "rewards": 11
+        "rewards": 11,
+        "cityId": "0&"
     },
     {
         "id": 3,
         "name": "粮草先行",
         "min": 11,
         "max": 0,
-        "rewards": 12
+        "rewards": 12,
+        "cityId": "0&"
+    },
+    {
+        "id": 2,
+        "name": "诸侯混战",
+        "min": 1,
+        "max": 1,
+        "rewards": 7,
+        "cityId": "7&8&9"
+    },
+    {
+        "id": 2,
+        "name": "诸侯混战",
+        "min": 2,
+        "max": 10,
+        "rewards": 8,
+        "cityId": "7&8&9"
+    },
+    {
+        "id": 2,
+        "name": "诸侯混战",
+        "min": 11,
+        "max": 0,
+        "rewards": 9,
+        "cityId": "7&8&9"
+    },
+    {
+        "id": 2,
+        "name": "诸侯混战",
+        "min": 1,
+        "max": 1,
+        "rewards": 7,
+        "cityId": "1&2&3&4&5&6"
+    },
+    {
+        "id": 2,
+        "name": "诸侯混战",
+        "min": 2,
+        "max": 10,
+        "rewards": 8,
+        "cityId": "1&2&3&4&5&6"
+    },
+    {
+        "id": 2,
+        "name": "诸侯混战",
+        "min": 11,
+        "max": 0,
+        "rewards": 9,
+        "cityId": "1&2&3&4&5&6"
     }
 ]
\ No newline at end of file