🐞 fix(军团活动): 已占领和宣战的城池想通时优先显示占领

2023-04-12 10:59:48 +08:00
parent 05d8576dd4
commit a376e8cf81
1 changed files with 3 additions and 3 deletions
--- a/game-server/app/services/guildActivity/guildActivityService.ts
+++ b/game-server/app/services/guildActivity/guildActivityService.ts
@@ -602,10 +602,10 @@ export function getCityStatus(guildCode: string, cityId: number, dic: DicCityAct

    let curCity = dbCities.find(cur => cur.cityId == cityId);
    if (curCity) {
-        if (curCity.guardGuildCode == guildCode) {
-            status = CITY_STATUS.GUARD;
-        } else if (curCity.declareGuilds?.includes(guildCode)) {
+        if (curCity.declareGuilds?.includes(guildCode)) {
            status = CITY_STATUS.DECLARED;
+        } else if (curCity.guardGuildCode == guildCode) {
+            status = CITY_STATUS.GUARD;
        }
    }
    // let hasGuard = false, hasDeclared = false;