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-31 14:49:28 +08:00
parent 45126d296f
commit 758587ef29
3 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { STATUS, SIGNIN_VIP_OPEN_LIMIT, ACTIVITY_TYPE, SERVER_OPEN_TIME, SIGNIN_OPEN, SIGNIN_CLOSE } from '../../../consts';
import { canBuyVip, getPlayerSignInData, signInActivity } from '../../../services/signInService';
import { addItems, createHeroes, handleCost } from '../../../services/rewardService';
import { STATUS, ACTIVITY_TYPE, SERVER_OPEN_TIME, } from '../../../consts';
import { canBuyVip, getPlayerSignInData } from '../../../services/signInService';
import { handleCost } from '../../../services/rewardService';
import { SignInItem } from '../../../domain/activityField/signInField';
import { ActivitySignInModel } from '../../../db/ActivitySignIn';
import moment = require('moment');
@@ -33,12 +33,11 @@ export class SignInHandler {
const serverId = session.get('serverId');
let todayIndex = moment(new Date()).date();
if (todayIndex < SIGNIN_OPEN || todayIndex > SIGNIN_CLOSE) {//未开启
return resResult(STATUS.ACTIVITY_CLOSED);
}
let playerData = await getPlayerSignInData(activityId, serverId, roleId)
if (todayIndex < playerData.startDate || todayIndex > playerData.endDate) {//未开启
return resResult(STATUS.ACTIVITY_CLOSED);
}
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
return resResult(STATUS.SUCCESS, playerData);
@@ -58,22 +57,15 @@ export class SignInHandler {
const roleName = session.get('roleName');
const funcs: number[] = session.get('funcs');
let playerData = await getPlayerSignInData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let todayIndex = moment(new Date()).date();
if (todayIndex < SIGNIN_OPEN || todayIndex > SIGNIN_CLOSE) {//未开启
if (todayIndex < playerData.startDate || todayIndex > playerData.endDate) {//未开启
return resResult(STATUS.ACTIVITY_CLOSED);
}
let openTime = SERVER_OPEN_TIME;
// let activityData = await signInActivity(serverId, roleId);
// if (!activityData) {//未配置活动数据
// return resResult(STATUS.ACTIVITY_MISSING);
// }
// if (activityData.activityId != activityId) {
// 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);

22
game-server/app/services/signInService.ts
View File

@@ -1,5 +1,5 @@
import moment = require('moment');
import { ACTIVITY_TYPE, SERVER_OPEN_TIME, SIGNIN_CLOSE, SIGNIN_OPEN, SIGNIN_VIP_OPEN_LIMIT, STATUS } from '../consts';
import { ACTIVITY_TYPE, SERVER_OPEN_TIME, SIGNIN_VIP_OPEN_LIMIT, STATUS } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivitySignInModel, ActivitySignInModelType } from '../db/ActivitySignIn';
import { ServerlistModel } from '../db/Serverlist';
@@ -15,11 +15,6 @@ import { SignInData, SignInItem } from '../domain/activityField/signInField';
*
*/
export async function signInActivity(serverId: number, roleId: string) {
let todayIndex = moment(new Date()).date();
if (todayIndex < SIGNIN_OPEN || todayIndex > SIGNIN_CLOSE) {//未开启
return null;
}
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.SIGN_IN, new Date());
if (activityArray.length == 0) {
@@ -27,6 +22,10 @@ export async function signInActivity(serverId: number, roleId: string) {
}
let activityData = activityArray[0];
let playerData = new SignInData(activityData);
let todayIndex = moment(new Date()).date();
if (todayIndex < playerData.startDate || todayIndex > playerData.endDate) {//未开启
return null;
}
let playerRecords: ActivitySignInModelType = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex);
playerData.setPlayerRecords(playerRecords);
return playerData;
@@ -42,11 +41,6 @@ export async function signInActivity(serverId: number, roleId: string) {
*
*/
export async function signInVIPActivity(serverId: number, roleId: string) {
let todayIndex = moment(new Date()).date();
if (todayIndex < SIGNIN_OPEN || todayIndex > SIGNIN_CLOSE) {//未开启
return null;
}
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.SIGN_IN_VIP, new Date());
if (activityArray.length == 0) {
@@ -54,6 +48,12 @@ export async function signInVIPActivity(serverId: number, roleId: string) {
}
let activityData = activityArray[0];
let playerData = new SignInData(activityData);
let todayIndex = moment(new Date()).date();
if (todayIndex < playerData.startDate || todayIndex > playerData.endDate) {//未开启
return null;
}
let playerRecords: ActivitySignInModelType = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex);
playerData.setPlayerRecords(playerRecords);
return playerData;

15
shared/domain/activityField/signInField.ts
View File

@@ -32,6 +32,8 @@ export class SignInData extends ActivityBase {
productID: string = '';//商品ID
consume: string = ''//补签消耗
isVip: boolean = false;//是否购买了当前的vip活动
startDate: number = 1;//月卡开启
endDate: number = 30;//月卡关闭
//第几天的签到奖励
public findDayItem(dayIndex: number) {
@@ -56,16 +58,19 @@ export class SignInData extends ActivityBase {
}
public initData(data: string) {
let date = new Date();
this.beginTime = moment(date.setDate(SIGNIN_OPEN)).startOf('day').valueOf();
this.endTime = moment(date.setDate(SIGNIN_CLOSE)).endOf('day').valueOf();
let dataObj = JSON.parse(data);
this.startDate = dataObj.startDate ? dataObj.startDate : SIGNIN_OPEN;
this.endDate = dataObj.endDate ? dataObj.endDate : SIGNIN_CLOSE;
let date = new Date();
this.beginTime = moment(date.setDate(this.startDate)).startOf('day').valueOf();
this.endTime = moment(date.setDate(this.endDate)).endOf('day').valueOf();
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() - SIGNIN_OPEN + 1;
this.todayIndex = moment(Date.now()).date() - this.startDate + 1;
let arr = dataObj.data
for (let obj of arr) {