活动：招财进宝改为领取箱子

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

@@ -1,6 +1,6 @@
 import { Application, BackendSession, HandlerService } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
-import { ACTIVITY_RESOURCES_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, ITEM_CHANGE_REASON, STATUS } from '../../../consts';
+import { ACTIVITY_RESOURCES_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, DAILY_COIN_BOX_STATUS, ITEM_CHANGE_REASON, STATUS } from '../../../consts';
 import { getGoldObject, handleCost } from '../../../services/role/rewardService';
 import { getPlayerDailyCoinData, mergeData } from '../../../services/activity/dailyCoinService';
 import { ConsumeExchangeFormulaItem, CoinRewardFormulaItem } from '../../../domain/activityField/dailyCoinField';
@@ -91,13 +91,6 @@ export class DailyCoinHandler {
                 reward.count = reward.count * rate;
             }
             allReward = allReward.concat(baseRewardParamArr);
-            let extraIndex = playerData.isExtra(index);
-            if (extraIndex != -1) {//额外奖励
-                let extraRewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.extraReward);
-                let extraReward = extraRewardParamArr[extraIndex];
-                // console.log('额外奖励', JSON.stringify(extraReward))
-                allReward.push(extraReward);
-            }
         }
 
         let newConsume = mergeData(allConsume);
@@ -128,13 +121,47 @@ export class DailyCoinHandler {
         //免费期间
         let time = moment(new Date()).valueOf();
         let result = await addReward(roleId, roleName, sid, serverId, newReward, ITEM_CHANGE_REASON.DAILY_COIN_EXCHANGE);
-        await ActivityDailyCoinModel.addExchangeRecord(serverId, activityId, roleId, playerData.roundIndex, count, addCoin, `${count}&${consumeGold}&${addCoin}&${time}`);
+        let record = await ActivityDailyCoinModel.addExchangeRecord(serverId, activityId, roleId, playerData.roundIndex, count, addCoin, `${count}&${consumeGold}&${addCoin}&${time}`);
+        let extraReward = playerData.setAllBoxStatus(record);
 
         let exchangeCount = playerData.exchangeCount + count;
         return resResult(STATUS.SUCCESS, Object.assign(result, {
-            param: { activityId, count },
+            param: { activityId, count, extraReward },
             item: { exchangeCount, recordMsg: `${count}&${consumeGold}&${addCoin}&${time}`, rateArray },
         }));
     }
 
+
+    /**
+        * @description 领取宝箱
+        * @param {{ activityId: number, cellIndex:number}} msg
+        * @param {BackendSession} session
+        * @memberof DailyCoinHandler
+        */
+     async receiveExtraReward(msg: { activityId: number, cellIndex: number }, session: BackendSession) {
+        const { activityId, cellIndex } = msg;
+        const roleId = session.get('roleId');
+        const serverId = session.get('serverId');
+        const sid = session.get('sid');
+        const roleName = session.get('roleName');
+        
+
+        let playerData = await getPlayerDailyCoinData(activityId, serverId, roleId)
+        if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
+        let box = await playerData.findBoxByCellIndex(cellIndex);
+        if(!box) return resResult(STATUS.DAILY_COIN_BOX_NOT_FOUND);
+        if(box.status != DAILY_COIN_BOX_STATUS.CAN_OPEN) return resResult(STATUS.DAILY_COIN_BOX_CANNOT_RECEIVE);
+       
+        let rewardArray = stringToRewardParam(box.reward)
+        let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.ACT_DAILY_COIN_RECEIVE_BOX);
+
+        let record = await ActivityDailyCoinModel.receiveBox(serverId, activityId, roleId, playerData.roundIndex, cellIndex);
+        let item = playerData.setBoxStatus(cellIndex, record);
+
+        return resResult(STATUS.SUCCESS, Object.assign(result, {
+            item,
+            param: { activityId },
+        }));
+    }
+
 }

game-server/app/services/activity/dailyCoinService.ts

@@ -8,30 +8,6 @@ import { getRoleCreateTime, getServerCreateTime } from '../redisService';
 import { getActivitiesByType, getActivityById } from './activityService';
 
 
-/**
-   * 获取活动数据
-   *
-   * @param {number} serverId 区Id
-   * @param {number} activityId 活动Id
-   * @param {string} roleId 角色Id
-   *
-   */
-export async function dailyCoinActivity(serverId: number, roleId: string) {
-    let activityDataArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.DAILY_COIN);
-    if (activityDataArray.length === 0) {
-        return null;
-    }
-    let activityData: ActivityModelType = activityDataArray[0];
-    let createTime = await getRoleCreateTime(roleId);
-    let serverTime = await getServerCreateTime(serverId);
-    let playerData = new DailyCoinData(activityData, createTime, serverTime);
-
-    let playerRecord: ActivityDailyCoinModelType = await ActivityDailyCoinModel.findData(serverId, activityData.activityId, roleId, playerData.roundIndex);
-    playerData.setPlayerRecords(playerRecord);
-    return playerData;
-}
-
-
 /**
    * 玩家玩家活动数据
    *

game-server/app/services/activity/treasureHuntService.ts

@@ -28,8 +28,6 @@ export async function getPlayerTreasureHuntDataShow(activityId: number, serverId
    */
 export async function getPlayerTreasureHuntData(activityId: number, serverId: number, roleId: string, dataType: TREASURE_HUNT_DATA_TYPE = TREASURE_HUNT_DATA_TYPE.ALL) {
     let activityData = await getActivityById(activityId);
-    console.log('#####', activityId, activityData)
-
     let createTime = await getRoleCreateTime(roleId);
     let serverTime = await getServerCreateTime(serverId);
     let playerData = new TreasureHuntData(activityData, createTime, serverTime);

shared/consts/constModules/activityConst.ts

@@ -210,3 +210,9 @@ export enum TREASURE_HUNT_DATA_TYPE {
     CHALLENGE = 4,
     TREASURE_SHOP = 5,
 }
+
+export enum DAILY_COIN_BOX_STATUS {
+    CAN_NOT_OPEN = 0,  // 不可打开
+    CAN_OPEN = 1,      // 可以打开
+    RECEIVED = 2,      // 已领取
+}

shared/consts/constModules/sysConst.ts

@@ -1017,6 +1017,7 @@ export enum ITEM_CHANGE_REASON {
     JEWEL_INHERIT = 146,                     // 天晶继承
     RESET_TALENT = 147,                      // 洗点
     RECEIVE_TOWER_BOX = 148,                 // 领取镇念塔节点奖励 
+    ACT_DAILY_COIN_RECEIVE_BOX = 149,        // 招财进宝领取宝箱 
 }
 
 export enum TA_EVENT {

shared/consts/statusCode.ts

@@ -471,7 +471,9 @@ export const STATUS = {
     SHOP_CLOSED: { code: 50034, simStr: '停业' },
     ACTIVITY_RECHARGE_ITEM_NOT_ENOUGH: { code: 50035, simStr: '商品不足' },
     ACTIVITY_ITEM_CANNOT_RECEIVE: { code: 50036, simStr: '无可领取物品' },
-    ACTIVITY_POP_UP_MUST_BUY: { code: 50013, simStr: '该礼包必须购买' },
+    ACTIVITY_POP_UP_MUST_BUY: { code: 50037, simStr: '该礼包必须购买' },
+    DAILY_COIN_BOX_NOT_FOUND: { code: 50038, simStr: '未找到该宝箱' },
+    DAILY_COIN_BOX_CANNOT_RECEIVE: {code: 50013, simStr: '该宝箱不可领取' },
     // GM后台相关状态 60000 - 69999
     GM_ERR_PASSWORD: { code: 60001, simStr: '账号或密码错误' },
     GM_MISS_API: { code: 60002, simStr: '未找到该接口' },

shared/db/ActivityDailyCoin.ts

@@ -24,6 +24,8 @@ export default class Activity_Daily_Coin extends BaseModel {
 
     @prop({ required: true })
     roundIndex: number;			    // 周期数
+    @prop({ required: true, type: Number })
+    receivedBox: number[];			    // 周期数
 
 
     //兑换记录
@@ -33,6 +35,13 @@ export default class Activity_Daily_Coin extends BaseModel {
         return result;
     }
 
+    // 领取宝箱
+    public static async receiveBox(serverId: number, activityId: number, roleId: string, roundIndex: number, cellIndex: number) {
+        let result = await ActivityDailyCoinModel.findOneAndUpdate({ serverId, activityId, roleId, roundIndex },
+            { $push: { receivedBox: cellIndex } }, { upsert: true, new: true }).lean(true)
+        return result;
+    }
+    
     //根据活动时间查询活动数据
     public static async findData(serverId: number, activityId: number, roleId: string, roundIndex: number) {
         let result: ActivityDailyCoinModelType = await ActivityDailyCoinModel.findOne({

shared/domain/activityField/dailyCoinField.ts

@@ -1,19 +1,33 @@
-import { random } from 'underscore';
+import { pick, random } from 'underscore';
+import { DAILY_COIN_BOX_STATUS } from '../../consts';
 import { ActivityModelType } from '../../db/Activity';
 import { ActivityDailyCoinModelType } from '../../db/ActivityDailyCoin';
 import { splitString } from '../../pubUtils/util';
 import { ActivityBase } from './activityField';
 
-export class CoinRewardFormulaItem {
+interface ConsumeExchangeFormulaInDb {
-    levelMin: number;
+    key: number;
-    levelMax: number;
+    countMin: number;         // 兑换次数下限
-    rewardFormula: string;
+    countMax: number;         // 兑换次数上限
+    consumeFormula: string;
+}
 
-    constructor(data: any) {
+interface CoinRewardFormulaInDb {
-        this.levelMin = data.levelMin;
+    key: number;
-        this.levelMax = data.levelMax;
+    levelMin: number;          // 玩家等级下限
-        this.rewardFormula = data.rewardFormula;
+    levelMax: number;          // 玩家等级上限
-    }
+    rewardFormula: string;
+}
+
+interface DailyCoinDataInDb {
+    countMax: number;           // 每日上限
+    freeCount: number;          // 每日免费次数
+    extraRewardCount: string;   // 可额外获得道具奖励的第X次
+    extraReward: string;        // 额外获得的道具奖励
+    double: number;             // 2倍暴击触发的概率
+    fiveTimes: number;          // 5倍暴击触发的概率
+    consumeExchangeFormula: ConsumeExchangeFormulaInDb[]; // 消耗的元宝
+    coinRewardFormula: CoinRewardFormulaInDb[];       // 获得的硬币
 }
 
 // 每次配置数据
@@ -22,7 +36,7 @@ export class ConsumeExchangeFormulaItem {
     countMax: number;
     consumeFormula: string;
 
-    constructor(data: any) {
+    constructor(data: ConsumeExchangeFormulaInDb) {
         this.countMin = data.countMin;
         this.countMax = data.countMax;
         this.consumeFormula = data.consumeFormula;
@@ -30,20 +44,50 @@ export class ConsumeExchangeFormulaItem {
 }
 
 
+export class CoinRewardFormulaItem {
+    levelMin: number;
+    levelMax: number;
+    rewardFormula: string;
+
+    constructor(data: CoinRewardFormulaInDb) {
+        this.levelMin = data.levelMin;
+        this.levelMax = data.levelMax;
+        this.rewardFormula = data.rewardFormula;
+    }
+}
+
+export class ExtraRewardItem {
+    cellIndex: number;
+    exchangeCount: number;
+    reward: string;
+    status: number = DAILY_COIN_BOX_STATUS.CAN_NOT_OPEN;
+
+    constructor(cellIndex: number, exchangeCount: string, reward: string) {
+        this.cellIndex = cellIndex;
+        this.exchangeCount = parseInt(exchangeCount);
+        this.reward = reward;
+    }
+
+    setRecord(count: number, receivedBox: number[]) {
+        this.status = DAILY_COIN_BOX_STATUS.CAN_NOT_OPEN;
+        if(count >= this.exchangeCount) this.status = DAILY_COIN_BOX_STATUS.CAN_OPEN;
+        if(receivedBox.indexOf(this.cellIndex) != -1) this.status = DAILY_COIN_BOX_STATUS.RECEIVED;
+    }
+}
+
 // 每日兑换铜币活动数据
 export class DailyCoinData extends ActivityBase {
-    countMax: number = 0;//每日上限
+    countMax: number = 0;           // 每日上限
-    freeCount: number = 0;//每日免费次数
+    freeCount: number = 0;          // 每日免费次数
-    extraRewardCount: string = '';//可额外获得道具奖励的第X次
+    double: number = 0;             // 2倍暴击触发的概率
-    extraReward: string = '';//额外获得的道具奖励
+    fiveTimes: number = 0;          // 5倍暴击触发的概率
-    double: number = 0;//2倍暴击触发的概率
-    fiveTimes: number = 0;//5倍暴击触发的概率
     consumeExchangeFormulaItem: ConsumeExchangeFormulaItem[] = [];
     coinRewardFormulaItem: CoinRewardFormulaItem[] = [];
+    extraReward: ExtraRewardItem[] = [];
 
-    exchangeCount: number = 0;//已经兑换次数
+    exchangeCount: number = 0;     // 已经兑换次数
-    coinCount: number = 0;//已经兑换获得铜币数量
+    coinCount: number = 0;         // 已经兑换获得铜币数量
-    recordMsg: string[] = [];//历史记录
+    recordMsg: string[] = [];      // 历史记录
 
     public getRate() {
         let ran = (random(99) + 1) * 0.01;//[1,100]
@@ -58,10 +102,9 @@ export class DailyCoinData extends ActivityBase {
         return 1;
     }
 
-    public isExtra(index: number) {
+    // public isExtra(index: number) {
-        let arr = splitString(this.extraRewardCount, '&');
+    //     return arr.indexOf(index);
-        return arr.indexOf(index);
+    // }
-    }
 
     public findConsumeExchangeFormulaItem(index: number) {
         let itemIndex = this.consumeExchangeFormulaItem.findIndex(obj => { return obj.countMin <= index && obj.countMax >= index });
@@ -75,20 +118,38 @@ export class DailyCoinData extends ActivityBase {
 
     //解析玩家领取记录
     public setPlayerRecords(data: ActivityDailyCoinModelType) {
-        this.exchangeCount = data && data.exchangeCount ? data.exchangeCount : 0;
+        if(!data) return;
-        this.coinCount = data && data.coinCount ? data.coinCount : 0;
+        this.exchangeCount = data.exchangeCount||0;
-        this.recordMsg = data && data.recordMsg ? data.recordMsg : [];
+        this.coinCount = data.coinCount || 0;
+        this.recordMsg = data.recordMsg || [];
+        this.setAllBoxStatus(data);
+    }
+
+    public findBoxByCellIndex(cellIndex: number) {
+        return this.extraReward.find(cur => cur.cellIndex == cellIndex);
+    }
+
+    public setAllBoxStatus(data: ActivityDailyCoinModelType) {
+        for(let box of this.extraReward) {
+            box.setRecord(this.exchangeCount, data.receivedBox||[]);
+        }
+        return this.extraReward;
+    }
+
+    public setBoxStatus(cellIndex: number, data: ActivityDailyCoinModelType) {
+        let item = this.extraReward.find(cur => cur.cellIndex == cellIndex);
+        if(!item) return null;
+        item.setRecord(data.exchangeCount, data.receivedBox||[]);
+        return item
     }
 
     public initData(data: string) {
         this.exchangeCount = 0;
         this.coinCount = 0;
 
-        let dataObj = JSON.parse(data);
+        let dataObj: DailyCoinDataInDb = JSON.parse(data);
         this.countMax = dataObj.countMax;
         this.freeCount = dataObj.freeCount;
-        this.extraRewardCount = dataObj.extraRewardCount;
-        this.extraReward = dataObj.extraReward;
         this.double = dataObj.double;
         this.fiveTimes = dataObj.fiveTimes;
 
@@ -98,16 +159,11 @@ export class DailyCoinData extends ActivityBase {
         for (let obj of dataObj.coinRewardFormula) {
             this.coinRewardFormulaItem.push(new CoinRewardFormulaItem(obj))
         }
-        // let curDate = moment(new Date());
+        let counts = splitString(dataObj.extraRewardCount, '&');
-        // if (curDate.hour() < REFRESH_TIME) {
+        let extraReward = dataObj.extraReward.split('|');
-        //     this.beginTime = curDate.startOf('d').add(-1, 'd').add(REFRESH_TIME, 'h').valueOf();
+        for(let i = 0; i < counts.length; i++) {
-        //     this.endTime = moment(this.beginTime).add(1, 'd').valueOf();
+            this.extraReward.push(new ExtraRewardItem(i + 1, counts[i], extraReward[i]||''));
-        // } else {
+        }
-        //     this.beginTime = curDate.startOf('d').add(REFRESH_TIME, 'h').valueOf();
-        //     this.endTime = moment(this.beginTime).add(1, 'd').valueOf()
-        // }
-        // console.log('ddddddddddddbbbbbbb')
-
     }
 
     constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {