xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
qiaoxin
2021-05-24 15:17:18 +08:00
parent e91650f11c
commit 4fd14a2075
4 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
game-server/app/servers/activity/handler/sevenDaysHandler.ts
View File

@@ -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,
}));
}

55
game-server/app/servers/activity/handler/signInHandler.ts
View File

@@ -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);
}
await ActivitySignInModel.addSignInRecord(activityId, roleId, roundIndex, dayIndex);
let reward = signinItemData.goodReward();
let goods = await addItems(roleId, roleName, sid, reward);
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);
if (isDelay) {
let consume = stringToConsumeParam(playerData.consume)
let consumeResult = await handleCost(roleId, sid, consume);
if (!consumeResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
}
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 },
}));
}
}