活动：战令

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

@@ -69,7 +69,6 @@ export class RechargeMoneyHandler {
         item.setHasGet(true);
 
         return resResult(STATUS.SUCCESS, {
-            goods,
             param: { activityId },
             item: item
         });

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

@@ -0,0 +1,88 @@
+import { Application, BackendSession, HandlerService, } from 'pinus';
+import { resResult } from '../../../pubUtils/util';
+import { ITEM_CHANGE_REASON, STATUS, } from '../../../consts';
+import { getTaskPassData, getTaskPassDataShow } from '../../../services/activity/taskPassService';
+import { ActivityTaskPassModel, ReceivedReward } from '../../../db/ActivityTaskPass';
+import { RewardParam } from '../../../domain/activityField/rewardField';
+import { nowSeconds } from '../../../pubUtils/timeUtil';
+import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
+import { ItemInter } from '../../../pubUtils/interface';
+import { isNumber, pick } from 'underscore';
+import { handleCost } from '../../../services/rewardService';
+
+export default function (app: Application) {
+    new HandlerService(app, {});
+    return new TaskPassHandler(app);
+}
+
+export class TaskPassHandler {
+    constructor(private app: Application) {
+    }
+
+    /************************战令系统****************************/
+    // 获得战令活动数据
+    public async getTaskPassData(msg: { activityId: number }, session: BackendSession) {
+        const { activityId } = msg;
+        const roleId = session.get('roleId');
+        const serverId = session.get('serverId');
+
+        let playerData = await getTaskPassDataShow(activityId, serverId, roleId)
+        if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
+
+        return resResult(STATUS.SUCCESS, { playerData });
+    }
+
+    // （一键）领取
+    public async receiveItems(msg: { activityId: number, pageIndex: number, lv: number }, session: BackendSession) {
+
+        const { activityId, pageIndex, lv = 0 } = msg;
+        const roleId = session.get('roleId');
+        const roleName = session.get('roleName');
+        const sid = session.get('sid');
+        const serverId = session.get('serverId');
+
+        let playerData = await getTaskPassData(activityId, serverId, roleId)
+        if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
+
+        let items = playerData.receiveItems(pageIndex, lv);
+        if(!items) return resResult(STATUS.ACTIVITY_ITEM_CANNOT_RECEIVE);
+
+        let records: ReceivedReward[] = [], rewards: RewardParam[] = [];
+        for(let item of items) {
+            records.push({ pageIndex, lv: item.lv, receiveTime: nowSeconds() });
+            rewards.push(...stringToRewardParam(item.reward));
+        }
+        await ActivityTaskPassModel.receiveItems(serverId, activityId, roleId, playerData.roundIndex, records);
+        let result = await addReward(roleId, roleName, sid, serverId, rewards, ITEM_CHANGE_REASON.ACT_DAILY_GK_BATTLE_END);
+
+        return resResult(STATUS.SUCCESS, { items, ...result });
+    }
+
+    // 加速
+    public async speedUp(msg: { activityId: number, count: number }, session: BackendSession) {
+
+        const { activityId, count } = msg;
+        const roleId = session.get('roleId');
+        const roleName = session.get('roleName');
+        const sid = session.get('sid');
+        const serverId = session.get('serverId');
+        if(count == 0 || !isNumber(count)) return resResult(STATUS.WRONG_PARMS);
+
+        let playerData = await getTaskPassData(activityId, serverId, roleId)
+        if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
+
+        let cost: ItemInter[] = [];
+        let consumeArr = stringToConsumeParam(playerData.spdUp.cost);
+        for(let consume of consumeArr) {
+            cost.push({ ...consume, count: consume.count * count });
+        }
+        let consumeResult = await handleCost(roleId, sid, consumeArr, ITEM_CHANGE_REASON.ACT_DAILY_GK_BATTLE_END);
+        if(!consumeResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
+
+        let addPoint = playerData.spdUp.point * count;
+        await ActivityTaskPassModel.addPoint(serverId, activityId, roleId, playerData.roundIndex, addPoint, count);
+        let result = playerData.addPoint(addPoint, count);
+
+        return resResult(STATUS.SUCCESS, result);
+    }
+}

game-server/app/servers/chat/remote/guildRemote.ts

@@ -42,7 +42,7 @@ export class GuildRemote {
     private GUILD_RACE_UPDATE = 'onRaceHorseUpdate';   /// 更新木牛流马
     private GUILD_RACE_JOIN = 'onRaceHorseJoin'
     private GUILD_RACE_EVENT = 'onRaceEventUpdate';   /// 更新木牛流马
-    private GUILD_POP_UP_ACTIVITY = 'onActivityUpdate';   /// 向军团成员发送弹窗礼包
+    private GUILD_POP_UP_ACTIVITY = 'onActivityTaskUpdate';   /// 向军团成员发送弹窗礼包
     private GUILD_TRAIN_RESET = 'onGuildTainReset'; // 试炼场重置
     private GUILD_BOSS_ENCOURAGE = 'onGuildBossEncourage'; // 鼓舞
     private AUCTION_UPDATE = 'onAuctionUpdate';       // 拍卖行更新

game-server/app/servers/role/handler/taskHandler.ts

@@ -1,6 +1,6 @@
 import { Application, BackendSession, pinus, HandlerService, } from "pinus";
 import { resResult, parseGoodStr, getRandSingleEelm } from "../../../pubUtils/util";
-import { STATUS, TASK_FUN_TYPE, SHOP_REFRESH_TYPE, KING_EXP_RATIO_TYPE, DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON } from "../../../consts";
+import { STATUS, TASK_FUN_TYPE, SHOP_REFRESH_TYPE, KING_EXP_RATIO_TYPE, DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON, ACTIVITY_TYPE } from "../../../consts";
 import { gameData } from "../../../pubUtils/data";
 import { UserTaskRecModel } from "../../../db/UserTaskRec";
 import { addItems } from "../../../services/rewardService";
@@ -9,12 +9,12 @@ import { nowSeconds, getZeroPointD } from "../../../pubUtils/timeUtil";
 import { DicDailyTask, DicAchievement, DicMainTask } from "../../../pubUtils/dictionary/DicTask";
 import { getMainTask, refDailyTaskBox, removeHistoryTask, getCurTask, checkTask, getPvpTask } from "../../../services/taskService";
 import { TASK } from "../../../pubUtils/dicParam";
-import { newHeroGiftPoint } from "../../../services/activity/newHeroGiftsService";
 import { ActivityTaskPointModel, ActivityTaskPointModelType } from "../../../db/ActivityTaskPoint";
 import { ItemInter, RewardInter } from "../../../pubUtils/interface";
 import { RoleModel } from "../../../db/Role";
 import { roleLevelup } from "../../../services/normalBattleService";
 import _ = require("underscore");
+import { addActvityTaskPoint } from "../../../services/activity/activityService";
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -79,12 +79,8 @@ export class ShopHandler {
         }
 
         //任务完成后关联活动的积分
-        let activityTaskPoint: ActivityTaskPointModelType[] = await ActivityTaskPointModel.findData(type, id);
-        for (let obj of activityTaskPoint) {
-            await newHeroGiftPoint(serverId, obj.activityId, roleId, obj.point);
-            let uids = [{ uid: roleId, sid }];
-            this.app.get('channelService').pushMessageByUids('addPoint', resResult(STATUS.SUCCESS, { activityId: obj.activityId, addPoint: point }), uids);
-        }
+
+        await addActvityTaskPoint(type, id, session );
 
         let goods = await addItems(roleId, roleName, sid, taskReward, ITEM_CHANGE_REASON.TASK_REWARD);
         if (expItem && expItem.count > 0) {