活动：签到添加补签的规则

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

@@ -79,7 +79,7 @@ export class SevenDaysHandler {
         growthItemData.addPointCount = growthItemData.point;
         playerData.totalPoint += growthItemData.point;
         return resResult(STATUS.SUCCESS, Object.assign(result, {
-            param: msg,
+            param: { activityId, dayIndex, cellIndex, type },
             item: growthItemData,
             totalPoint: playerData.totalPoint
         }));
@@ -125,7 +125,7 @@ export class SevenDaysHandler {
         dayItemData.getPointReward = true;
         playerData.totalConsumePoint += dayItemData.consumePoint;
         return resResult(STATUS.SUCCESS, Object.assign(result, {
-            param: msg,
+            param: { activityId, dayIndex },
             item: dayItemData,
             totalPoint: playerData.totalPoint
         }));
@@ -186,7 +186,7 @@ export class SevenDaysHandler {
 
         dailyItemData.receiveRewardCount = 1;
         return resResult(STATUS.SUCCESS, Object.assign(result, {
-            param: msg,
+            param: { activityId, dayIndex, cellIndex, type },
             item: dailyItemData,
         }));
     }
@@ -258,7 +258,7 @@ export class SevenDaysHandler {
 
         dailyItemData.buyCount += 1;
         return resResult(STATUS.SUCCESS, Object.assign(result, {
-            param: msg,
+            param: { activityId, dayIndex, cellIndex },
             item: dailyItemData,
         }));
     }

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

@@ -7,6 +7,8 @@ import { SignInItem } from '../../../domain/activityField/signInField';
 import { ActivitySignInModel } from '../../../db/ActivitySignIn';
 import moment = require('moment');
 import { RoleModel } from '../../../db/Role';
+import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/giftPackageService';
+import { RewardParam } from '../../../domain/activityField/rewardField';
 
 
 export default function (app: Application) {
@@ -30,17 +32,11 @@ export class SignInHandler {
         const roleId = session.get('roleId');
         const serverId = session.get('serverId');
 
-        let todayIndex = moment(Date.now()).date();
+        let todayIndex = moment(new Date()).date();
         if (todayIndex < 5 || todayIndex > 24) {//未开启
             return resResult(STATUS.ACTIVITY_CLOSED);
         }
 
-        // let activityData = await signInActivity(ACTIVITY_TYPE.SIGN_IN, serverId, roleId);
-        // if (!activityData) {//未配置活动数据
-        //     return resResult(STATUS.ACTIVITY_MISSING);
-        // }
-
-        // let activityId = activityData.activityId;//活动ID
         let playerData = await getPlayerSignInData(activityId, serverId, roleId)
 
         if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
@@ -62,19 +58,12 @@ export class SignInHandler {
         const roleName = session.get('roleName');
         const funcs: number[] = session.get('funcs');
 
-        let todayIndex = moment(Date.now()).date();
+        let todayIndex = moment(new Date()).date();
         if (todayIndex < 5 || todayIndex > 24) {//未开启
             return resResult(STATUS.ACTIVITY_CLOSED);
         }
-        if (dayIndex > todayIndex) {
-            return resResult(STATUS.ACTIVITY_DAY_INDEX_OVER);
-        }
-        let openTime = SERVER_OPEN_TIME;
-        //开服第一个月可以签到之前未领取的奖励，下个月只能签到当天奖励
-        if (moment().diff(moment(openTime).startOf('months'), 'months') != 0 && (dayIndex != todayIndex)) {
-            return resResult(STATUS.ACTIVITY_SIGNIN_EXPIRE);
-        }
 
+        let openTime = SERVER_OPEN_TIME;
         let activityData = await signInActivity(ACTIVITY_TYPE.SIGN_IN, serverId, roleId);
         if (!activityData) {//未配置活动数据
             return resResult(STATUS.ACTIVITY_MISSING);
@@ -83,11 +72,18 @@ export class SignInHandler {
             return resResult(STATUS.ACTIVITY_EXPIRE);
         }
 
-
-
         let playerData = await getPlayerSignInData(activityId, serverId, roleId)
         if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
 
+        if (dayIndex > playerData.todayIndex) {
+            return resResult(STATUS.ACTIVITY_DAY_INDEX_OVER);
+        }
+        //开服第一个月可以签到之前未领取的奖励，下个月只能签到当天奖励，补签
+        let isDelay = false;//补签
+        if (moment().diff(moment(openTime).startOf('months'), 'months') != 0 && (dayIndex != playerData.todayIndex)) {
+            isDelay = true;
+        }
+
         let roundIndex = playerData.roundIndex;
 
         //高级签到开启条件
@@ -109,19 +105,20 @@ export class SignInHandler {
         if (!signinItemData.canReceive()) {//已经领取过
             return resResult(STATUS.ACTIVITY_REWARDED);
         }
-
+        if (isDelay) {
-        await ActivitySignInModel.addSignInRecord(activityId, roleId, roundIndex, dayIndex);
+            let consume = stringToConsumeParam(playerData.consume)
-        let reward = signinItemData.goodReward();
+            let consumeResult = await handleCost(roleId, sid, consume);
-        let goods = await addItems(roleId, roleName, sid, reward);
+            if (!consumeResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
-        let heroReward = signinItemData.heroReward();
-        let addHeros = [];
-        if (heroReward.length > 0) {
-            let heroResult = await createHeroes(roleId, roleName, sid, serverId, funcs, heroReward);
-            goods = goods.concat(heroResult.goods)
-            addHeros = addHeros.concat(heroResult.heroes);
         }
 
-        return resResult(STATUS.SUCCESS, { goods, addHeros });
+        await ActivitySignInModel.addSignInRecord(activityId, roleId, roundIndex, dayIndex);
+
+        let rewardParamArr: Array<RewardParam> = stringToRewardParam(signinItemData.reward);
+        let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
+
+        return resResult(STATUS.SUCCESS, Object.assign(result, {
+            param: { activityId, dayIndex },
+        }));
     }
 
 }

game-server/app/services/giftPackageService.ts

@@ -4,7 +4,7 @@ import { addItems, createHeroes } from './rewardService';
 import { RewardParam } from '../domain/activityField/rewardField';
 import { CreateHeroParam } from '../domain/roleField/hero';
 import { DicGiftPackage } from '../pubUtils/dictionary/DicGiftPackage';
-import { RewardInter } from '../pubUtils/interface';
+import { ItemInter, RewardInter } from '../pubUtils/interface';
 import { decodeArrayListStr } from '../pubUtils/util';
 
 
@@ -116,7 +116,7 @@ function randomSelectedData(count: number) {
     return arr;
 }
 
-//数据格式转换'类型&id&数量|类型&id&数量|' ->> Array<RewardParam>
+//数据格式转换'类型&id&数量|类型&id&数量|' ->> Array<RewardParam> 活动奖励
 export function stringToRewardParam(rewardStr: string): Array<RewardParam> {
     let result = new Array<{ type: number, id: number, count: number }>();
     if (!rewardStr) return result;
@@ -129,3 +129,17 @@ export function stringToRewardParam(rewardStr: string): Array<RewardParam> {
     }
     return result
 }
+
+//数据格式转换'类型&id&数量|类型&id&数量|' ->> Array<ItemInter> 资源消耗
+export function stringToConsumeParam(rewardStr: string): Array<ItemInter> {
+    let result = new Array<{ type: number, id: number, count: number }>();
+    if (!rewardStr) return result;
+    let decodeArr = decodeArrayListStr(rewardStr);
+    for (let [type, id, count] of decodeArr) {
+        if (isNaN(parseInt(type)) || isNaN(parseInt(id)) || isNaN(parseInt(count))) {
+            throw new Error('data table format wrong');
+        }
+        result.push({ type: parseInt(type), id: parseInt(id), count: parseInt(count) });
+    }
+    return result
+}

shared/domain/activityField/signInField.ts

@@ -46,13 +46,13 @@ export class SignInItem {
 }
 
 
-// 成长活动数据
+// 签到活动数据
 export class SignInData extends ActivityBase {
     list: Array<SignInItem> = [];
     roundIndex: number = 0;//活动周期
-    todayIndex: number = 0;//本月第几天
     price: number = 0;//vip价格，普通签到为0
     productID: string = '';//商品ID
+    consume: string = ''//补签消耗
     isVip: boolean = false;//是否购买了当前的vip活动
 
     //第几天的签到奖励
@@ -75,11 +75,16 @@ export class SignInData extends ActivityBase {
     }
 
     public initData(data: string) {
+        let date = new Date();
+        this.beginTime = moment(date.setDate(5)).startOf('day').valueOf();
+        this.endTime = moment(date.setDate(25)).endOf('day').valueOf();
+
         let dataObj = JSON.parse(data);
         this.price = dataObj.price;
         this.productID = dataObj.productID;
+        this.consume = dataObj.consume;
         this.roundIndex = moment().diff(moment(this.beginTime).startOf('months'), 'months') + 1;
-        this.todayIndex = moment(Date.now()).date();
+        this.todayIndex = moment(Date.now()).date() - 4;
 
         let arr = dataObj.data
         for (let obj of arr) {