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

2021-03-30 10:59:53 +08:00
parent 85f886c3c8
commit ba5e139bee
3 changed files with 19 additions and 14 deletions
@@ -476,15 +476,17 @@ export async function cityActivitySettleReward(cityId: number, serverId: number)
 */
 async function autoDeclare(serverId: number) {
    let allCities = await GuildActivityCityModel.getAllCities(serverId);
-    for(let { cityId, guardGuildCode } of allCities) {
+    let guardList = new Array<{ cityId: number, guardGuildCode: string }>();
+    for (let { cityId, guardGuildCode } of allCities) {
+        guardList.push({ cityId, guardGuildCode });
+        await GuildActivityCityModel.guard(serverId, cityId, "", "");
+    }
+    for (let { cityId, guardGuildCode } of guardList) {
        let dicCity = gameData.cityActivity.get(cityId);
-        if(guardGuildCode && dicCity.nextCity) {
+        if (guardGuildCode && dicCity.nextCity) {
            await GuildActivityCityModel.declare(serverId, dicCity.nextCity, guardGuildCode);
        }
    }
-    for(let { cityId } of allCities) {
-        await GuildActivityCityModel.guard(serverId, cityId, "", "");
-    }
 }

 /**