军团活动：添加诸侯奖励结算

shared/domain/battleField/guildActivity.ts

@@ -50,7 +50,10 @@ export class GateActivityObject {
     public pushMembers(guildCode: string, serverId: number, roleId: string, job: number) {
 
         if(this.members.has(guildCode)) {
-            this.members.get(guildCode).push({ roleId, job });
+            let members = this.members.get(guildCode);
+            if(members.findIndex(cur => cur.roleId == roleId) == -1) {
+                members.push({ roleId, job });
+            }
         } else {
             let arr = new Array<string>();
             arr.push(roleId);
@@ -101,6 +104,14 @@ export class CityActivityObject {
         return `${serverId}_${cityId}`;
     }
 
+    private decodeKey(key: string) {
+        let arr = key.split('_');
+        return {
+            serverId: parseInt(arr[0]),
+            cityId: parseInt(arr[1])
+        }
+    }
+
     public getObj( serverId: number, cityId: number, guildCode: string) {
         let key = this.getKey(serverId, cityId);
         return {
@@ -111,6 +122,27 @@ export class CityActivityObject {
         }
     }
 
+    public getAllCities() {
+        
+        let allCities = new Array<{ serverId: number, cityId: number, guildCodes: string[]}>();
+        let serverlists = new Array<number>();
+        for(let [key, guildCodes] of this.cities) {
+            let { serverId, cityId } = this.decodeKey(key);
+            allCities.push({ serverId, cityId, guildCodes });
+            if(!serverlists.includes(serverId)) serverlists.push(serverId);
+        }
+        return {cities: allCities, serverlists};
+    }
+
+    public getGuildsInCity(serverId: number, cityId: number) {
+        let key = this.getKey(serverId, cityId);
+        return this.cities.get(key)||[];
+    }
+
+    public getMembersOfGuild(guildCode: string) {
+        return this.members.get(guildCode)||[];
+    }
+
     public getGateHpAndInc(serverId: number, cityId: number, maxHp: number, inc: number = 0) {
         let key = this.getKey(serverId, cityId);
         let gateHp = this.gateHp.get(key);
@@ -137,7 +169,10 @@ export class CityActivityObject {
     public pushMembers(guildCode: string, roleId: string, job: number) {
 
         if(this.members.has(guildCode)) {
-            this.members.get(guildCode).push({ roleId, job });
+            let members = this.members.get(guildCode);
+            if(members.findIndex(cur => cur.roleId == roleId) == -1) {
+                members.push({ roleId, job });
+            }
         } else {
             let arr = new Array<string>();
             arr.push(roleId);