军团活动：修复城池时间状态

game-server/app/servers/guild/handler/cityActivityHandler.ts

@@ -8,7 +8,7 @@ import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
 import { leaveCityChannel, addRoleToCityChannel, getCityChannelSid } from "../../../services/chatService";
 import { UserGuildModel } from "../../../db/UserGuild";
 import { GuildActivityRecordModel } from "../../../db/GuildActivityRec";
-import { nowSeconds, getBeforeMinuteSeconds } from "../../../pubUtils/timeUtil";
+import { nowSeconds, getBeforeSeconds } from "../../../pubUtils/timeUtil";
 import { getGoldObject } from "../../../pubUtils/itemUtils";
 import { GUILDACTIVITY } from "../../../pubUtils/dicParam";
 import { handleCost } from "../../../services/rewardService";
@@ -279,7 +279,7 @@ export class CityActivityHandler {
         if(!dicCity) return resResult(STATUS.DIC_DATA_NOT_FOUND);
 
         // 更新userGuildActivityRecord
-        let challengeTime = getBeforeMinuteSeconds(-1 * GUILDACTIVITY.CITYACTIVITY_CD_COST); 
+        let challengeTime = getBeforeSeconds(-1 * GUILDACTIVITY.CITYACTIVITY_CHALLENGE_CD); 
         let myGuildActivityRec = await UserGuildActivityRecModel.updateInfo(code, { isSuccess, isCompleted: true, cityId, challengeTime });
         if(!myGuildActivityRec) return resResult(STATUS.INTERNAL_ERR);
 

game-server/app/services/guildActivityService.ts

@@ -546,6 +546,8 @@ export function getCityStatus(guildCode: string, cityId: number, dic: DicCityAct
     let startDay = openDay[curIndex - 1]||0;
     let endDay = openDay[openDay.length - 1]||0;
     if(d >= startDay && d <= endDay) status = CITY_STATUS.CAN_DECLARE;
+    if(d == startDay && activityStatus.status != GUILD_ACTIVITY_STATUS.END) status = CITY_STATUS.NOT_OPEN;
+    if(d == endDay && activityStatus.status == GUILD_ACTIVITY_STATUS.END) status = CITY_STATUS.NOT_OPEN;
 
     let curCity = dbCities.find(cur => cur.cityId == cityId);
     if(curCity) {