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

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;