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

活动：修改获取活动逻辑，从serverlist上剥离

Browse Source
This commit is contained in:
luying
2022-04-07 11:38:33 +08:00
parent 0d7b435f1f
commit 765aff9cf0
31 changed files with 148 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/activity/signInService.ts
+4 -8
View File
@@ -6,7 +6,7 @@ import { RoleModel } from '../../db/Role';
import { ServerlistModel } from '../../db/Serverlist';
import { SignInData } from '../../domain/activityField/signInField';
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
import { getActivityById } from './activityService';
import { getActivitiesByType, getActivityById } from './activityService';
/**
* 获取活动数据
@@ -18,8 +18,7 @@ import { getActivityById } from './activityService';
*
*/
export async function signInActivity(serverId: number, roleId: string) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.SIGN_IN, new Date());
let activityArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.SIGN_IN);
if (activityArray.length == 0) {
return null;
}
@@ -46,8 +45,7 @@ export async function signInActivity(serverId: number, roleId: string) {
*
*/
export async function signInVIPActivity(serverId: number, roleId: string) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.SIGN_IN_VIP, new Date());
let activityArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.SIGN_IN_VIP);
if (activityArray.length == 0) {
return null;
}
@@ -76,9 +74,7 @@ export async function signInVIPActivity(serverId: number, roleId: string) {
*
*/
export async function newPlayerSignInActivity(serverId: number, roleId: string) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN, new Date());
let activityArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN);
if (activityArray.length == 0) {
return null;
}