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/treasureHuntService.ts
+3 -5
View File
@@ -12,7 +12,7 @@ import { deltaDays } from '../../pubUtils/util';
import { addReward, stringToRewardParam } from './giftPackageService';
import { RewardParam } from '../../domain/activityField/rewardField';
import { RoleModel } from '../../db/Role';
import { getActivityById } from './activityService';
import { getActivitiesByType, getActivityById } from './activityService';
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
/**
@@ -225,11 +225,10 @@ export async function getTreasureHuntData(serverId: number, roleId: string) {
}
async function getNewActivityData(serverId: number, roleId: string) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let huntActivityId: number = 0; // 寻宝骑兵-活动Id
let huntEndTime: Date = null; // 寻宝骑兵-结束时间
let huntRoundIndex: number = 0; // 寻宝骑兵-周期数
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, ACTIVITY_TYPE.TREASURE_HUNT, 1)//activityId从小到大排序
let activityArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.TREASURE_HUNT);
let treasureHuntDataArray: TreasureHuntData[] = [];
let createTime = await getRoleCreateTime(roleId);
let serverTime = await getServerCreateTime(serverId);
@@ -259,11 +258,10 @@ async function getNewActivityData(serverId: number, roleId: string) {
}
async function getNextActivityData(serverId: number, roleId: string, oldHuntActivityId: number, oldHuntEndTime: Date, oldHuntRoundIndex: number) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let huntActivityId: number = 0; // 寻宝骑兵-活动Id
let huntEndTime: Date = null; // 寻宝骑兵-结束时间
let huntRoundIndex: number = oldHuntRoundIndex; // 寻宝骑兵-周期数
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, ACTIVITY_TYPE.TREASURE_HUNT, 1)//activityId从小到大排序
let activityArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.TREASURE_HUNT);
let treasureHuntDataArray: TreasureHuntData[] = [];
let createTime = await getRoleCreateTime(roleId);
let serverTime = await getServerCreateTime(serverId);