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

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;
     }