军团活动：诸侯混战拍卖行

shared/pubUtils/data.ts

@@ -585,8 +585,8 @@ export function getTodayGuildActivity() {
  * @param aid 活动id
  * @param rank 排名
  */
-export function getGuildAuctionRewards(aid: number, rank: number) {
+export function getGuildAuctionRewards(aid: number, rank: number, cityId: number = 0) {
-    let ranksReward = gameData.guildAuction.get(aid) || [];
+    let ranksReward = gameData.guildAuction.get(`${aid}_${cityId}`) || [];
     let dic = ranksReward.find(cur => {
         return rank >= cur.min && (rank <= cur.max || cur.max == 0);
     });

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)||[];
+        let cityIds = parseNumberList(o.cityId);
-        rank.push(o);
+        if(cityIds.length <= 0) { // 诸侯混战以外的活动
-        dicGuildAuction.set(o.id, rank);
+            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;
 }

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"
     }
 ]