🐞 fix(军团活动): 已占领和宣战的城池想通时优先显示占领
This commit is contained in:
@@ -602,10 +602,10 @@ export function getCityStatus(guildCode: string, cityId: number, dic: DicCityAct
|
|||||||
|
|
||||||
let curCity = dbCities.find(cur => cur.cityId == cityId);
|
let curCity = dbCities.find(cur => cur.cityId == cityId);
|
||||||
if (curCity) {
|
if (curCity) {
|
||||||
if (curCity.guardGuildCode == guildCode) {
|
if (curCity.declareGuilds?.includes(guildCode)) {
|
||||||
status = CITY_STATUS.GUARD;
|
|
||||||
} else if (curCity.declareGuilds?.includes(guildCode)) {
|
|
||||||
status = CITY_STATUS.DECLARED;
|
status = CITY_STATUS.DECLARED;
|
||||||
|
} else if (curCity.guardGuildCode == guildCode) {
|
||||||
|
status = CITY_STATUS.GUARD;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// let hasGuard = false, hasDeclared = false;
|
// let hasGuard = false, hasDeclared = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user