From a376e8cf81bf35ba0170c1a0fa7fc72b7733d7da Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Wed, 12 Apr 2023 10:59:48 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E5=86=9B=E5=9B=A2=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8):=20=E5=B7=B2=E5=8D=A0=E9=A2=86=E5=92=8C=E5=AE=A3?=
 =?UTF-8?q?=E6=88=98=E7=9A=84=E5=9F=8E=E6=B1=A0=E6=83=B3=E9=80=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E6=98=BE=E7=A4=BA=E5=8D=A0=E9=A2=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/services/guildActivity/guildActivityService.ts      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/game-server/app/services/guildActivity/guildActivityService.ts b/game-server/app/services/guildActivity/guildActivityService.ts
index 30e6dd2b5..790212b47 100644
--- 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;