军团活动：诸侯混战自动宣战

shared/db/GuildActivityCity.ts

@@ -35,19 +35,17 @@ export default class GuildActivityCity extends BaseModel {
         return rec;
     }
 
+    public static async findMinDeclareCountCity(serverId: number, cityIds: number[]) {
+        let rec: GuildActivityCityType[] = await GuildActivityCityModel.find({ serverId, cityId: { $in: cityIds }, status: 1 }).sort({ declareCount: 1 }).lean();
+        return rec;
+    }
+
     public static async getCity(serverId: number, cityId: number) {
         let rec: GuildActivityCityType = await GuildActivityCityModel.findOne({ serverId, cityId, status: 1}).lean();
         
         return rec;
     }
 
-    // 检查是否宣战过
-    public static async checkDeclartion(serverId: number, guildCode: string) {
-        let rec: GuildActivityCityType = await GuildActivityCityModel.findOne(
-            { serverId, status: 1, declareGuilds: { $in: [guildCode]}}).lean();
-
-        return rec;
-    }
 
     // 宣言
     public static async declare(serverId: number, cityId: number, guildCode: string) {
@@ -60,18 +58,11 @@ export default class GuildActivityCity extends BaseModel {
     }
 
     // 占领
-    public static async guard(serverId: number, cityId: number, nextCityId: number, guildCode: string, guildName: string) {
+    public static async guard(serverId: number, cityId: number, guildCode: string, guildName: string) {
         let rec: GuildActivityCityType = await GuildActivityCityModel.findOneAndUpdate(
             { serverId, cityId, status: 1 }, 
             { $set: { guardGuildCode: guildCode, guardGuildName: guildName, guardTime: new Date()} }, 
             { new: true }).lean();
-            
-        if(nextCityId) {
-            await GuildActivityCityModel.findOneAndUpdate(
-                { serverId, cityId: nextCityId, status: 2 }, 
-                { $push: { declareGuilds: guildCode }, $inc: {declareCount: 1 } }, 
-                {new: true, upsert: true}).lean();
-        }
         return rec;
     }
 

shared/db/GuildActivityCityDeclare.ts

@@ -0,0 +1,53 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+
+@index({ serverId: 1, cityId: 1, createdAt: 1   })
+export default class GuildActivityCityDeclare extends BaseModel {
+
+    @prop({ required: true })
+    serverId: number;       // 分服
+    
+    @prop({ required: true })
+    cityId: number;       // 城池id
+
+    @prop({ required: true })
+    guildCode: string;       // 宣战的公会的code
+
+    @prop({ required: true })
+    declareTime: number;       // 宣战时间（当前）
+
+    @prop({ required: true })
+    declareMember: string;       // 触发宣战的人
+
+    @prop({ required: true })
+    isAutoDeclare: boolean;       // 是否是自动宣战
+
+    @prop({ required: true })
+    status: number;       // 状态 1-当前 0-失效，当活动结束时定时任务设为0
+
+    // 宣战
+    public static async declareIfNot(serverId: number, guildCode: string, cityId: number, roleId: string, declareTime: number, isAutoDeclare: boolean) {
+        let rec: GuildActivityCityDeclareType = await GuildActivityCityDeclareModel.findOneAndUpdate({ serverId, guildCode, status: 1 }, { $setOnInsert: { cityId, declareMember: roleId, declareTime, isAutoDeclare } }, { new: true, upsert: true }).lean();
+        return rec;
+    }
+
+    // 检查是否宣战过
+    public static async checkDeclartion(serverId: number, guildCode: string) {
+        let rec = await GuildActivityCityDeclareModel.exists({ serverId, status: 1, guildCode});
+        return rec;
+    }
+
+    // 清空今天的宣战
+    public static async clearDeclare(serverId?: number) {
+        if(serverId) {
+            await GuildActivityCityDeclareModel.updateMany({ serverId, status: 1}, { status: 0 });
+        } else {
+            await GuildActivityCityDeclareModel.updateMany({ status: 1}, { status: 0 });
+        }
+    }
+}
+
+export const GuildActivityCityDeclareModel = getModelForClass(GuildActivityCityDeclare);
+
+export interface GuildActivityCityDeclareType extends Pick<DocumentType<GuildActivityCityDeclare>, keyof GuildActivityCityDeclare> { };
+export type GuildActivityCityDeclareUpdateParam = Partial<GuildActivityCityDeclareType>; // 将所有字段变成可选项

shared/pubUtils/data.ts

@@ -52,7 +52,7 @@ import { dicGuildActivity, DicGuildActivity, loadGuildActivity } from './diction
 import { dicGateActivityPoint, loadGateActivityPoint } from './dictionary/DicGateActivityPoint';
 import { dicGuildAuction, loadGuildAuction } from './dictionary/DicGuildAuction';
 import { getCurDay } from "./timeUtil";
-import { dicCityActivity, loadCityActivity } from "./dictionary/DicCityActivity";
+import { dicCityActivity, dicJuniorCities, loadCityActivity } from "./dictionary/DicCityActivity";
 import { dicChatAccuse, loadChatAccuse } from "./dictionary/DicChatAccuse";
 import { dicCityActivityReward, loadCityActivityReward } from "./dictionary/DicCityActivityReward";
 import { dicRaceActivity, dicRaceTypes, loadRaceActivity } from './dictionary/DicRaceActivity';
@@ -189,6 +189,7 @@ export const gameData = {
     gateActivityPoint: dicGateActivityPoint,
     guildAuction: dicGuildAuction,
     cityActivity: dicCityActivity,
+    juniorCities: dicJuniorCities,
     chatAccuse: dicChatAccuse,
     cityActivityReward: dicCityActivityReward,
     raceActivityEvents: dicRaceActivity,

shared/pubUtils/dictionary/DicCityActivity.ts

@@ -26,8 +26,10 @@ export interface DicCityActivity {
     readonly atkTemplate: number;
 }
 
+export const dicJuniorCities: number[] = [];
 export const dicCityActivity = new Map<number, DicCityActivity>();
 export function loadCityActivity() {
+    dicJuniorCities.splice(0, dicJuniorCities.length);
     dicCityActivity.clear();
     let arr = readFileAndParse(FILENAME.DIC_CITY_ACTIVITY);
 
@@ -35,6 +37,7 @@ export function loadCityActivity() {
         o.preCity = parseNumberList(o.preCity);
         o.week = parseNumberList(o.week);
         dicCityActivity.set( o.id, o );
+        if(o.type == 1) dicJuniorCities.push(o.id);
     });
     arr = undefined;
 }