✨ feat(军团活动): 诸侯混战已占领的城池不能宣战
This commit is contained in:
@@ -133,10 +133,7 @@ export class CityActivityHandler {
|
|||||||
let declareIndex = getDeclareIndex();
|
let declareIndex = getDeclareIndex();
|
||||||
let checkResult = await GuildActivityCityDeclareModel.checkDeclartion(serverId, guildCode, declareIndex);
|
let checkResult = await GuildActivityCityDeclareModel.checkDeclartion(serverId, guildCode, declareIndex);
|
||||||
if (!!checkResult) return resResult(STATUS.HAS_DECLARED);
|
if (!!checkResult) return resResult(STATUS.HAS_DECLARED);
|
||||||
let curCity = await GuildActivityCityModel.getCity(serverId, cityId, declareIndex);
|
await GuildActivityCityModel.getCity(serverId, cityId, declareIndex);
|
||||||
if (curCity && curCity.guardGuildCode) {
|
|
||||||
return resResult(STATUS.CITY_IS_GUARD);
|
|
||||||
}
|
|
||||||
|
|
||||||
let declareResult = await declareCity(serverId, roleId, guildCode, cityId, false, declareIndex);
|
let declareResult = await declareCity(serverId, roleId, guildCode, cityId, false, declareIndex);
|
||||||
if(!declareResult) return resResult(STATUS.HAS_DECLARED);
|
if(!declareResult) return resResult(STATUS.HAS_DECLARED);
|
||||||
|
|||||||
Reference in New Issue
Block a user