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;