军团活动：诸侯混战城池状态

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

@@ -76,7 +76,7 @@ export class CityActivityHandler {
         }
 
         const dbCities = await GuildActivityCityModel.getAllCities(serverId);
-        let cityStatus = pubGetCityStatus(guildCode, cityId, dicCity.preCity, dbCities);
+        let cityStatus = pubGetCityStatus(guildCode, cityId, dicCity, dbCities);
         if(cityStatus == CITY_STATUS.DECLARED) {
             obj.pushGuild(guildCode, serverId, cityId);
         }
@@ -185,7 +185,7 @@ export class CityActivityHandler {
         let guildScore = await getRankScore(getCityKeyName(REDIS_KEY.CITY_ACTIVITY, cityId), serverId, guildCode);
 
         const dbCities = await GuildActivityCityModel.getAllCities(serverId);
-        let cityStatus = pubGetCityStatus(guildCode, cityId, dicCity.preCity, dbCities);
+        let cityStatus = pubGetCityStatus(guildCode, cityId, dicCity, dbCities);
 
         // 前一天中位数战力
         let medianCe = await getMedianCe(serverId);

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

@@ -13,8 +13,8 @@ import { REDIS_KEY } from "../../../consts";
 import { addActive } from "../../../services/guildService";
 import { gameData } from "../../../pubUtils/data";
 import { getGuildChannelSid } from "../../../services/chatService";
-import { guildActivityStart, gateActivityEnd, cityActivityEnd } from "../../../services/timeTaskService";
 import { UserGuildModel } from "../../../db/UserGuild";
+import { GuildActivityCityModel } from "../../../db/GuildActivityCity";
 
 export default function (app: Application) {
     return new GateActivityHandler(app);
@@ -306,6 +306,25 @@ export class GateActivityHandler {
             return resResult(STATUS.GUILD_ACTIVITY_IS_OPEN)
         }
 
+        // !! 注意，这条函数会改变内存中的字典表，仅用于测试中使用
+        let now = new Date();
+        let guildServers = pinus.app.getServersByType('guild');
+        for(let server of guildServers) {
+            pinus.app.rpc.guild.guildActivityRemote.updateGuildActivityData.toServer(server.id, aid, true);
+        }
+
+        return resResult(STATUS.SUCCESS);
+    }
+
+    // ! 测试接口
+    async debugSetDay(msg: { week: number }, session: BackendSession) {
+        let guildServers = pinus.app.getServersByType('guild');
+        for(let server of guildServers) {
+            pinus.app.rpc.guild.guildActivityRemote.setDay.toServer(server.id, msg.week);
+        }
+        if(msg.week <= 2) {
+            await GuildActivityCityModel.deleteMany({});
+        }
         return resResult(STATUS.SUCCESS);
     }
 
@@ -319,6 +338,13 @@ export class GateActivityHandler {
         } else if (aid == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) {
             await pinus.app.rpc.systimer.systimerRemote.raceActivityEnd.toServer('systimer-server-1');
         }
+
+        // !! 注意，这条函数会改变内存中的字典表，仅用于测试中使用
+        let now = new Date();
+        let guildServers = pinus.app.getServersByType('guild');
+        for(let server of guildServers) {
+            pinus.app.rpc.guild.guildActivityRemote.updateGuildActivityData.toServer(server.id, aid, false);
+        }
         return resResult(STATUS.SUCCESS);
     }
 

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

@@ -70,7 +70,7 @@ export class RaceActivityHandler {
         }
 
 
-        let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, this.aid);
+        let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, this.aid, obj.getEvents(guildCode, 0));
         if(!guildActivityRec) return resResult(STATUS.INTERNAL_ERR);
 
         let { code: sourceCode } = guildActivityRec;
@@ -124,14 +124,24 @@ export class RaceActivityHandler {
     }
 
 
-    // 结束挑战
-    async useItem(msg: { id: number, toGuild: string }, session: BackendSession) {
+    // 使用道具
+    async useItem(msg: { id: number, count: number, toGuild: string }, session: BackendSession) {
         let roleId = session.get('roleId');
         let roleName = session.get('roleName');
         let guildCode = session.get('guildCode');
-        let serverId = session.get('serverId');
+        let sid = session.get('sid');
+        
+        let {id, count, toGuild} = msg;
+        let obj = getRaceActivityObj();
+        let event = await obj.useItem(roleId, sid, guildCode, toGuild, id, count);
+        if(!event) return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH);
 
-        return resResult(STATUS.SUCCESS);
+        await GuildActivityRecordModel.pushEvent(guildCode, event);
+
+        return resResult(STATUS.SUCCESS, {
+            timestamp: Date.now(),
+            event: obj.getEvents(guildCode, 0)
+        });
     }
 
     // 结束挑战