军团活动：修复没有拍卖行bug

game-server/app/servers/gm/handler/gmHandler.ts

@@ -56,7 +56,7 @@ export class GmHandler {
         return await this.sendMail(gmmail, isPass, uid);
     }
 
-    async sendSserverMailTxt(msg: { id: string, isPass: boolean }, session: BackendSession) {
+    async sendServerMailTxt(msg: { id: string, isPass: boolean }, session: BackendSession) {
         const uid: number = session.get('uid')
         let { id, isPass } = msg;
         let gmmail = await GMMailModel.getGmMailByIdAndType(id, GM_MAIL_TYPE.SERVER, false);

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

@@ -1,5 +1,5 @@
 import { Application, BackendSession, ChannelService, pinus, HandlerService, } from "pinus";
-import { getMedianCe, getGuildActivityStatus, getRecordScore, getGateActivityObj, sendSingleGateActEndMsg, participants, getGateActivityRank, getCityActivityObj } from "../../../services/guildActivityService";
+import { getMedianCe, getGuildActivityStatus, getRecordScore, getGateActivityObj, participants, getGateActivityRank, getCityActivityObj } from "../../../services/guildActivityService";
 import { resResult } from "../../../pubUtils/util";
 import { STATUS, GUILD_ACTIVITY_TYPE, GUILD_POINT_WAYS, ENEMIES_TYPE, GET_POINT_WAYS, TASK_TYPE } from "../../../consts";
 import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
@@ -177,10 +177,10 @@ export class GateActivityHandler {
         // if(!statusResult.isOpen) return resResult(STATUS.GUILD_ACTIVITY_NOT_OPEN);
 
         gateHp = obj.getGateHpAndInc(guildCode, -1 * damage);
-        if (gateHp <= 0) {
-            // 推送 停止活动并结算奖励
-            await sendSingleGateActEndMsg(guildCode, serverId);
-        }
+        // if (gateHp <= 0) {
+        //     // 推送 停止活动并结算奖励
+        //     await sendSingleGateActEndMsg(guildCode, serverId);
+        // }
         // 推送 城门血量
         let chatSid = await getGuildChannelSid(guildCode);
         pinus.app.rpc.chat.guildRemote.pushGateHp.toServer(chatSid, guildCode, gateHp);

game-server/app/services/guildActivityService.ts

@@ -301,8 +301,11 @@ export async function sendGuildActEndMsg(aid: number) {
 
     if (aid == GUILD_ACTIVITY_TYPE.GATE_ACTIVITY) {
         let obj = getGateActivityObj();
+        console.log('******** gateActivity', obj);
         let guilds = obj.getGuilds();
+        console.log('******** guilds', guilds);
         for (let [serverId, guildCodes] of guilds) {
+            console.log('***** serverId', serverId, 'guildCodes', guildCodes);
             for (let guildCode of guildCodes) {
                 await gateActivitySettleReward(guildCode, serverId);
             }
@@ -342,11 +345,11 @@ export async function sendEndMsgToAll() {
  * 单个军团城门血条破了之后给他发奖励
  * @param guildCode 军团code
  */
-export async function sendSingleGateActEndMsg(guildCode: string, serverId: number) {
-    let chatSid = await getGuildChannelSid(guildCode);
-    pinus.app.rpc.chat.guildRemote.sendGuildActivityEnd.toServer(chatSid, guildCode);
-    await gateActivitySettleReward(guildCode, serverId);
-}
+// export async function sendSingleGateActEndMsg(guildCode: string, serverId: number) {
+//     let chatSid = await getGuildChannelSid(guildCode);
+//     pinus.app.rpc.chat.guildRemote.sendGuildActivityEnd.toServer(chatSid, guildCode);
+//     await gateActivitySettleReward(guildCode, serverId);
+// }
 
 
 /**
@@ -381,14 +384,18 @@ export async function sendSingleRaceActEndMsg(guildCode: string, woodenHorse: Wo
  * @param serverId 服务器id
  */
 export async function gateActivitySettleReward(guildCode: string, serverId: number) {
+    console.log('gateActivitySettleReward', guildCode, serverId);
     let obj = getGateActivityObj();
     let { gateHp, members } = obj.getObj(guildCode, serverId);
+    console.log('***** gateHp', gateHp, 'members', members);
 
     let r = new Rank(REDIS_KEY.GATE_ACTIVITY, { serverId }, true);
     let rank = await r.getMyRank({ guildCode });
     let guildScore = await r.getMyScore({ guildCode });
+    console.log('****** ranks', rank, 'guildScore', guildScore);
 
     let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, rank);
+    console.log('***** rewards', JSON.stringify(rewards));
 
     let rec = await GuildActivityRecordModel.updateInfo(guildCode, GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, {
         isSuccess: gateHp > 0,
@@ -415,7 +422,7 @@ export async function gateActivitySettleReward(guildCode: string, serverId: numb
     // 加入拍卖行
     await genAuction(guildCode, AUCTION_SOURCE.GATE, rec.code, serverId, rewards);
 
-    obj.delGuildRecord(guildCode, serverId);
+    // obj.delGuildRecord(guildCode, serverId);
 }
 
 async function updateUserRecAndSendHonour(honour: number, myScore: number, rank: number, roleId: string, members: Member[]) {

game-server/app/services/timeTaskService.ts

@@ -211,14 +211,6 @@ export async function guildActivitySchedule() {
     if (guildActStartJobId) {
         guildActStartJobId.cancel();
     }
-    if (guildActSecondsJobId) {
-        guildActSecondsJobId.cancel();
-        guildActSecondsJobId = undefined;
-    }
-    if (guildActEndJobId) {
-        guildActEndJobId.cancel();
-        guildActEndJobId = undefined;
-    }
 
     let dicGuildActivity = getTodayGuildActivity();
     await delGuildActivityRank(dicGuildActivity.id);
@@ -240,6 +232,15 @@ export async function guildActivityStart(dicGuildActivity?: DicGuildActivity) {
 
     console.log('********', dicGuildActivity.id, Date.now() + dicGuildActivity.duringTime * 1000)
     let servers = await getAllServers(); // 玩家serverId列表
+    console.log('****** guildActSecondsJobId', guildActSecondsJobId)
+    if (guildActSecondsJobId) {
+        guildActSecondsJobId.cancel();
+        guildActSecondsJobId = undefined;
+    }
+    if (guildActEndJobId) {
+        guildActEndJobId.cancel();
+        guildActEndJobId = undefined;
+    }
     if (dicGuildActivity.id == GUILD_ACTIVITY_TYPE.GATE_ACTIVITY) {
         guildActSecondsJobId = scheduleJob('guildActivitySeconds', '*/10 * * * * *', gateActivitySeconds);
         // 结束时间