军团活动：修复粮草先行重启问题，诸侯混战宣战问题

shared/consts/constModules/sysConst.ts

@@ -554,6 +554,7 @@ export const FILENAME = {
     DIC_LADDER_RANKREWARD: 'dic_zyz_ladder_rankReward',
     DIC_GK_LADDER: 'dic_zyz_gk_ladder',
     DIC_LADDER_MATCH: 'dic_zyz_ladderMatch',
+    DIC_GK_BRANCH_ELITE: 'dic_zyz_gk_branchElite',
 }
 
 export const WAR_RELATE_TABLES = [
@@ -576,6 +577,7 @@ export const WAR_RELATE_TABLES = [
     FILENAME.DIC_GK_ARMY_TRAIN,
     FILENAME.DIC_GK_ARMY_BOSS,
     FILENAME.DIC_GK_LADDER,
+    FILENAME.DIC_GK_BRANCH_ELITE,
 ]
 
 // 装备栏强化类型

shared/db/GuildActivityCityDeclare.ts

@@ -1,7 +1,7 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 
-@index({ serverId: 1, cityId: 1, createdAt: 1   })
+@index({ serverId: 1, guildCode: 1, status: 1, declareIndex: 1  })
 export default class GuildActivityCityDeclare extends BaseModel {
 
     @prop({ required: true })
@@ -30,7 +30,7 @@ export default class GuildActivityCityDeclare extends BaseModel {
 
     // 宣战
     public static async declareIfNot(serverId: number, guildCode: string, cityId: number, roleId: string, declareTime: number, isAutoDeclare: boolean, declareIndex: number) {
-        let rec: GuildActivityCityDeclareType = await GuildActivityCityDeclareModel.findOneAndUpdate({ serverId, guildCode, cityId, status: 1, declareIndex }, { $setOnInsert: { declareMember: roleId, declareTime, isAutoDeclare } }, { new: true, upsert: true }).lean();
+        let rec: GuildActivityCityDeclareType = await GuildActivityCityDeclareModel.findOneAndUpdate({ serverId, guildCode, status: 1, declareIndex }, { $setOnInsert: { declareMember: roleId, declareTime, isAutoDeclare, cityId } }, { new: true, upsert: true }).lean();
         return rec;
     }
 

shared/db/ServerRecords.ts

@@ -77,6 +77,11 @@ export default class ServerRecord extends BaseModel {
     return rec;
   }
 
+  public static async findTomorrowData(serverId: number) {
+    let tomorrow = getZeroPoint() + 86400;
+    let rec: ServerRecordType = await ServerRecordModel.findOne({ serverId, today: tomorrow }).lean();
+    return rec;
+  }
 }
 
 export const ServerRecordModel = getModelForClass(ServerRecord);

shared/domain/battleField/guildActivity.ts

@@ -55,6 +55,10 @@ export class WoodenHorseMember {
     setReceived(hasReceiveInitItems: boolean) {
         this.hasReceiveInitItems = hasReceiveInitItems;
     }
+
+    updateSid(sid: string) {
+        this.sid = sid;
+    }
 }
 
 // 木牛流马
@@ -267,6 +271,13 @@ export class WoodenHorse {
         }
     }
 
+    public updateMemberSid(roleId: string, sid: string) {
+        let index = this.members.findIndex(cur => cur.roleId == roleId);
+        if(index != -1) {
+            this.members[index].updateSid(sid);
+        }
+    }
+
     public setRemainItem(id: number, remain: number, max: number) {
         this.remainItems.set(id, { total: remain, max });
     }