活动：糜家商店挑战统计

game-server/app/servers/activity/handler/selfServiceShopHandler.ts

@@ -1,5 +1,5 @@
 import { Application, BackendSession } from 'pinus';
-import { deltaDays, resResult } from '../../../pubUtils/util';
+import { decodeArrayListStr, deltaDays, resResult, splitString } from '../../../pubUtils/util';
 import { STATUS, ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE } from '../../../consts';
 import { SelfServiceShopData, SelfServiceShopItem, SelfServiceShopItemInfo } from '../../../domain/activityField/selfServiceShopField';
 import { addItems, handleCost } from '../../../services/rewardService';
@@ -8,8 +8,9 @@ import { ActivitySelfServiceModel, ActivitySelfServiceModelType } from '../../..
 import { ActivitySelfServiceGoodsModel, ActivitySelfServiceGoodsModelType } from '../../../db/ActivitySelfServiceGoods';
 import moment = require('moment');
 import Activity, { ActivityModel, ActivityModelType } from '../../../db/Activity';
-import { addSelfServiceShopGiftReward, getActivityData, getPlayerActivityData } from '../../../services/selfServiceShopActivityService';
+import { addSelfServiceShopGiftReward, getSelfServiceShopActivityData, getPlayerActivityData } from '../../../services/selfServiceShopActivityService';
 import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/giftPackageService';
+import { random } from 'underscore';
 
 export default function (app: Application) {
     return new SelfServiceShopHandler(app);
@@ -32,7 +33,7 @@ export class SelfServiceShopHandler {
         const roleId = session.get('roleId');
         const serverId = session.get('serverId');
 
-        let playerData = await getActivityData(serverId, roleId)
+        let playerData = await getSelfServiceShopActivityData(serverId, roleId)
         if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
         let playerGoods = await ActivitySelfServiceGoodsModel.findData(playerData.activityId, roleId, playerData.roundIndex, true);
         return resResult(STATUS.SUCCESS, { playerData, playerGoods });
@@ -131,4 +132,32 @@ export class SelfServiceShopHandler {
 
         return resResult(STATUS.SUCCESS, Object.assign(result, { unitBuyCount: buyCount + 1 }));
     }
+
+    /**
+       * @description 获取关卡id
+       * @param {{ activityId: number}} msg
+       * @param {BackendSession} session
+       * @memberof SelfServiceShopHandler
+       */
+    async getWarId(msg: { activityId: number, }, session: BackendSession) {
+        const { activityId, } = msg;
+        const roleId = session.get('roleId');
+        const serverId = session.get('serverId');
+        const sid = session.get('sid');
+        const roleName = session.get('roleName');
+        const funcs: number[] = session.get('funcs');
+
+        let playerData = await getPlayerActivityData(activityId, serverId, roleId)
+        if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
+
+        if (playerData.challengeCount >= playerData.count) {
+            return resResult(STATUS.ACTIVITY_MAX_COUNT);
+        }
+
+        let warIdArray = splitString(playerData.warid, '&')
+        let index = random(warIdArray.length - 1);
+        let warId = warIdArray[index];
+
+        return resResult(STATUS.SUCCESS, { warId });
+    }
 }

game-server/app/servers/battle/handler/guildTrainHandler.ts

@@ -145,8 +145,7 @@ export class GuildTrainHandler {
      * @param session 
      */
     async trainBattleEnd(msg: { battleCode: string, isSuccess: boolean }, session: BackendSession) {
-        const { battleCode, } = msg;
-        let isSuccess = true;
+        const { battleCode, isSuccess } = msg;
         const roleId: string = session.get('roleId');
         const serverId: number = parseInt(session.get('serverId'));
         const roleName: string = session.get('roleName');

game-server/app/servers/battle/handler/normalBattleHandler.ts

@@ -20,6 +20,8 @@ import { pushMysteryFirstMsg, pushTowerMsg, pushVestigeFirstMsg } from '../../..
 import { nowSeconds } from '../../../pubUtils/timeUtil';
 import { Rank } from '../../../services/rankService';
 import { checkTaskWithWar, checkTaskInBattleEnd, checkActivityTask } from '../../../services/taskService';
+import { ActivitySelfServiceModel } from '../../../db/ActivitySelfService';
+import { getSelfServiceShopActivityData } from '../../../services/selfServiceShopActivityService';
 
 export default function (app: Application) {
     return new NormalBattleHandler(app);
@@ -161,7 +163,7 @@ export class NormalBattleHandler {
         let dungeonNum = {};
 
         if (warInfo.warType == WAR_TYPE.DAILY) {
-            let checkResult = await checkDailyAndIncrease(roleId, [{id: battleId, star, warType: warInfo.warType}, ...warStar], battleId, 1, false);
+            let checkResult = await checkDailyAndIncrease(roleId, [{ id: battleId, star, warType: warInfo.warType }, ...warStar], battleId, 1, false);
             if (checkResult.status == -1) {
                 return checkResult.resResult;
             }
@@ -205,6 +207,12 @@ export class NormalBattleHandler {
                 await r.setRankWithRoleInfo(roleId, role.mainEliteWarId, role.mainEliteUpdatedAt, role);
                 await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.BATTLE_MAIN_ELITE, 1, { mainEliteWarId: battleId })
             }
+        } else if (warInfo.warType == WAR_TYPE.ACT_SELF_SHOP) {
+            //糜家商队挑战成功后记录挑战次数
+            if (isSuccess) {
+                let playerData = await getSelfServiceShopActivityData(serverId, roleId)
+                await ActivitySelfServiceModel.addChallengeRecord(serverId, playerData.activityId, roleId, playerData.roundIndex, 1, new Date())
+            }
         }
 
         if (isSuccess) { // 挑战胜利