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

活动：签到

Browse Source
This commit is contained in:
luying
2022-05-21 02:03:17 +08:00
parent e3b9d0d5c2
commit 69d41b830a
5 changed files with 52 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,22 +61,15 @@ export class SignInHandler {
let playerData = await getPlayerSignInData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let curDate = moment(new Date()).valueOf();
if (curDate < playerData.beginTime || curDate > playerData.endTime) {//未开启
if (!playerData.canShow()) {//未开启
return resResult(STATUS.ACTIVITY_CLOSED);
}
let openTime = SERVER_OPEN_TIME;
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;
//高级签到开启条件
@@ -104,7 +97,7 @@ export class SignInHandler {
if (!consumeResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
}
await ActivitySignInModel.addSignInRecord(activityId, roleId, roundIndex, [dayIndex]);
await ActivitySignInModel.addSignInRecord(activityId, roleId, roundIndex, dayIndex);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(signinItemData.reward);
let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr, ITEM_CHANGE_REASON.SIGNIN)

59
game-server/app/services/activity/signInService.ts
View File

@@ -64,50 +64,6 @@ export async function signInVIPActivity(serverId: number, roleId: string) {
return playerData;
}
/**
* 获取活动数据
*
* @param {number} type 新手签到
* @param {number} serverId 区Id
* @param {number} activityId 活动Id
* @param {string} roleId 角色Id
*
*/
export async function newPlayerSignInActivity(serverId: number, roleId: string) {
let activityArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN);
if (activityArray.length == 0) {
return null;
}
let activityData = activityArray[0];
let createTime = await getRoleCreateTime(roleId);
let serverTime = await getServerCreateTime(serverId);
let playerData = new SignInData(activityData, createTime, serverTime);
let betinTime = null;
let endTime = null
let curDate = moment(createTime * 1000);
if (curDate.hour() < REFRESH_TIME) {
betinTime = moment(createTime * 1000).startOf('d').add(-1, 'd').add(REFRESH_TIME, 'h').toDate();
endTime = moment(betinTime).add(playerData.days, 'd').toDate()
} else {
betinTime = moment(createTime * 1000).startOf('d').add(REFRESH_TIME, 'h').toDate();
endTime = moment(betinTime).add(playerData.days, 'd').toDate()
}
if (curDate > endTime) {
return null;
}
playerData.setNewPlayerDate(betinTime, endTime);
let curDateStamp = moment(new Date()).valueOf();
if (curDateStamp < playerData.beginTime || curDateStamp > playerData.endTime) {//未开启
return null;
}
let playerRecords: ActivitySignInModelType = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex);
playerData.setPlayerRecords(playerRecords);
return playerData;
}
/**
* 玩家活动数据
*
@@ -126,22 +82,11 @@ export async function getPlayerSignInData(activityId: number, serverId: number,
let serverTime = await getServerCreateTime(serverId);
let playerData = new SignInData(activityData, createTime, serverTime);
console.log('##### getPlayerSignInData',activityId, roleId, playerData.roundIndex, playerData)
let playerRecords: ActivitySignInModelType = await ActivitySignInModel.findData(activityId, roleId, playerData.roundIndex);
console.log('##### getPlayerSignInData playerData', playerRecords, !!playerRecords)
playerData.setPlayerRecords(playerRecords);
if (playerData.type === ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN) {
let betinTime = null;
let endTime = null
let curDate = moment(createTime * 1000);
if (curDate.hour() < REFRESH_TIME) {
betinTime = moment(createTime * 1000).startOf('d').add(-1, 'd').add(REFRESH_TIME, 'h').toDate();
endTime = moment(betinTime).add(playerData.days, 'd').toDate()
} else {
betinTime = moment(createTime * 1000).startOf('d').add(REFRESH_TIME, 'h').toDate();
endTime = moment(betinTime).add(playerData.days, 'd').toDate()
}
playerData.setNewPlayerDate(betinTime, endTime)
}
return playerData;
}