军团活动：粮草先行还缺event记录和权限限制

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

@@ -306,17 +306,6 @@ export class GateActivityHandler {
             return resResult(STATUS.GUILD_ACTIVITY_IS_OPEN)
         }
 
-        let map = new Map<number, string[]>();
-        let guilds = await GuildModel.findAllGuild('serverId code');
-        for(let { serverId, code } of guilds) {
-            if(map.has(serverId)) {
-                map.get(serverId).push(code);
-            } else {
-                map.set(serverId, [code]);
-            }
-        }
-        await delGuildActivityRank(aid, map);
-
         return resResult(STATUS.SUCCESS);
     }
 
@@ -327,10 +316,27 @@ export class GateActivityHandler {
             await pinus.app.rpc.systimer.systimerRemote.gateActivityEnd.toServer('systimer-server-1');
         } else if (aid == GUILD_ACTIVITY_TYPE.CITY_ACTIVITY) {
             await pinus.app.rpc.systimer.systimerRemote.cityActivityEnd.toServer('systimer-server-1');
+        } else if (aid == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) {
+            await pinus.app.rpc.systimer.systimerRemote.raceActivityEnd.toServer('systimer-server-1');
         }
         return resResult(STATUS.SUCCESS);
     }
 
+    async debugDelRedis(msg: { aid: number }, session: BackendSession) {
+        let { aid } = msg;
+
+        let map = new Map<number, string[]>();
+        let guilds = await GuildModel.findAllGuild('serverId code');
+        for(let { serverId, code } of guilds) {
+            if(map.has(serverId)) {
+                map.get(serverId).push(code);
+            } else {
+                map.set(serverId, [code]);
+            }
+        }
+        await delGuildActivityRank(aid, map);
+    }
+
     // ! 测试接口 将自己添加进活动roleId里
     async debugAddParticipants(msg: { aid: number }, session: BackendSession) {
         let roleId = session.get('roleId');

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

@@ -1,8 +1,12 @@
 import { Application, ChannelService, BackendSession } from "pinus";
-import { GUILD_ACTIVITY_TYPE, STATUS, GUILD_ACTIVITY_STATUS } from "../../../consts";
+import { GUILD_ACTIVITY_TYPE, STATUS, GUILD_ACTIVITY_STATUS, GUILD_POINT_WAYS, REDIS_KEY } from "../../../consts";
 import { resResult } from "../../../pubUtils/util";
 import { getGuildActivityStatus, getRaceActivityObj, getRaceActivityRank, getWoodenHorseList, calWoodenHorseAndSend } from "../../../services/guildActivityService";
 import { UserGuildModel } from "../../../db/UserGuild";
+import { GuildActivityRecordModel } from "../../../db/GuildActivityRec";
+import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
+import { addActive } from "../../../services/guildService";
+import { getMyUnionRank } from "../../../services/redisService";
 
 export default function (app: Application) {
     return new RaceActivityHandler(app);
@@ -52,6 +56,7 @@ export class RaceActivityHandler {
         const roleName = session.get('roleName');
         const serverId = session.get('serverId');
         const guildCode = session.get('guildCode');
+        const sid = session.get('sid');
         if(!guildCode) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
 
         let statusResult = getGuildActivityStatus(this.aid);
@@ -59,14 +64,26 @@ export class RaceActivityHandler {
 
         let obj = getRaceActivityObj();
 
+        let hasJoin = obj.hasJoin(guildCode, roleId);
+        if(hasJoin) {
+            return resResult(STATUS.RACE_HAS_JOIN);
+        }
+
+
+        let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, this.aid);
+        if(!guildActivityRec) return resResult(STATUS.INTERNAL_ERR);
+
+        let { code: sourceCode } = guildActivityRec;
+        let myGuildActivityRec = await UserGuildActivityRecModel.getRecord(roleId, roleName, guildCode, serverId, sourceCode, this.aid);
+
         let myGuild = await UserGuildModel.getMyGuild(roleId, 'job');
-        let woodenHorse = obj.joinWoodenHorse(guildCode, roleId, roleName, myGuild.job);
+        let woodenHorse = await obj.joinWoodenHorse(guildCode, roleId, roleName, serverId, sid, myGuild.job);
         if(!woodenHorse) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
 
         let events = obj.getEvents(guildCode, woodenHorse.distance);
-        let hasJoin = obj.hasJoin(guildCode, roleId);
 
         return resResult(STATUS.SUCCESS, {
+            code: myGuildActivityRec.code,
             ...statusResult,
             hasJoin,
             woodenHorse,
@@ -106,6 +123,46 @@ export class RaceActivityHandler {
         });
     }
 
+
+    // 结束挑战
+    async useItem(msg: { id: 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');
+
+        return resResult(STATUS.SUCCESS);
+    }
+
+    // 结束挑战
+    async battleEnd(msg: { code: string, isSuccess: boolean }, session: BackendSession) {
+        let roleId = session.get('roleId');
+        let roleName = session.get('roleName');
+        let guildCode = session.get('guildCode');
+        let serverId = session.get('serverId');
+
+        let { code, isSuccess } = msg;
+
+        let statusResult = getGuildActivityStatus(this.aid);
+        if(!statusResult) return resResult(STATUS.DIC_DATA_NOT_FOUND);
+
+        // 更新userGuildActivityRecord
+        let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, this.aid);
+        let myGuildActivityRec = await UserGuildActivityRecModel.updateInfo(code, { isSuccess, isCompleted: true });
+        if(!guildActivityRec || !myGuildActivityRec) return resResult(STATUS.INTERNAL_ERR);
+
+        // 发放活跃
+        await addActive(roleId, serverId, GUILD_POINT_WAYS.ACTIVITY);  //获得活跃值
+        // 返回当前军团总军功
+        let myGuildRank = await getMyUnionRank(REDIS_KEY.RACE_ACTIVITY, serverId, guildCode);
+
+        return resResult(STATUS.SUCCESS, {
+            timestamp: Date.now(),
+            woodenHorse: guildActivityRec.woodenHorse,
+            myGuildRank
+        })
+    }
+
     async test(msg: { serverId: number }, session: BackendSession) {
         let {serverId} = msg;
         await calWoodenHorseAndSend(serverId);

game-server/app/servers/guild/remote/guildActivityRemote.ts

@@ -1,5 +1,5 @@
 import { Application, ChannelService } from 'pinus';
-import { sendAllGuildRanks, sendGuildActEndMsg, calWoodenHorseAndSend } from '../../../services/guildActivityService';
+import { sendAllGuildRanks, sendGuildActEndMsg, calWoodenHorseAndSend, sendRaceStartMsg } from '../../../services/guildActivityService';
 
 export default function (app: Application) {
     return new GuildActivityRemote(app);
@@ -34,4 +34,11 @@ export class GuildActivityRemote {
     public async calWoodenHorseAndSend(serverId: number) {
         await calWoodenHorseAndSend(serverId);
     }
+
+    /**
+     * 发送粮草先行活动开始通知
+     */
+    async raceActivityStart(serverId: number) {
+        await sendRaceStartMsg(serverId);
+    }
 }