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-18 22:26:48 +08:00
parent 6568be2b92
commit a0db79d0a8
6 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app/services/activity/activityService.ts
View File

@@ -205,7 +205,7 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
activityData = await getTimeLimitRankDataShow(activityId, serverId);
break;
}
case ACTIVITY_TYPE.TASK_PASS: // 限时排行
case ACTIVITY_TYPE.TASK_PASS: // 战令、朝花夕拾
{
activityData = await getTaskPassDataShow(activityId, serverId, roleId);
break;

15
game-server/app/services/activity/timeLimitRankService.ts
View File

@@ -66,25 +66,20 @@ export async function recordGuildFund(serverId: number, guild: GuildType, fund:
*/
export async function sendRankMail(data: TimeLimitRankData, serverId: number) {
let redisKey = getRedisKeyByRankType(data.rankType, true);
console.log('#### redisKey', redisKey, serverId)
if (!redisKey) return null;
let r = new Rank(redisKey, { activityId: data.activityId, serverId });
console.log('#### getRankByRange',r.infoKey, await r.getRankByRange())
if(r.infoKey == REDIS_KEY.GUILD_INFO) {
let allRank = <GuildRankInfo[]>(await r.getRankByRange());
for(let { rank, code, name, leader } of allRank) {
let reward = data.getRewardByRank(rank);
if(reward) {
if(leader.roleId) {
await sendMailByContent(MAIL_TYPE.TIME_LIMIT_RANK, leader.roleId, {
let guild = await GuildModel.findByCode(code, serverId, '+members');
console.log(guild.members)
for(let roleId of guild.members) {
await sendMailByContent(MAIL_TYPE.TIME_LIMIT_RANK, roleId, {
params: [data.tabName,`${rank}`],
goods: stringWithTypeToRewardInter(reward.rewards)
});
} else {
await sendMailToGuildByContent(MAIL_TYPE.TIME_LIMIT_RANK, code, {
params: [data.tabName,`${rank}`],
goods: stringWithTypeToRewardInter(reward.guildRewards)
goods: stringWithTypeToRewardInter(roleId == leader.roleId? reward.rewards: reward.guildRewards)
});
}
}

2
game-server/app/services/redisService.ts
View File

@@ -79,7 +79,7 @@ export async function initActivitiesRank(serverId: number) {
let serverTime = await getServerCreateTime(serverId);
let activityGroup = await ActivityGroupModel.findByServerId(serverId);
let activityGroupId = activityGroup.map(cur => cur.groupId);
let activities = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.TIME_LIMIT_RANK, new Date());
let activities = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.TIME_LIMIT_RANK);
for(let activity of activities) {
let data = new TimeLimitRankData(activity, 0, serverTime);
if(data.beginTime <= Date.now() && data.endTime >= Date.now()) {

11
shared/db/Activity.ts
View File

@@ -43,23 +43,22 @@ export default class Activity extends BaseModel {
// 获取正在开启和即将到来的活动列表
public static async findOpenAndComingActivityes() {
let now = new Date();
let result: ActivityModelType[] = await ActivityModel.find({ endTime: { $gte: now } }).lean();
let result: ActivityModelType[] = await ActivityModel.find({ isEnable: true }).lean();
return result;
}
//根据活动类型查询开启的活动数据
public static async findOpenActivityByType(activityGroupId: number[], type: number, date: Date) {
public static async findOpenActivityByType(activityGroupId: number[], type: number) {
let result: ActivityModelType[] = await ActivityModel.find(
{ groupId: { $in: activityGroupId }, type, beginTime: { $lte: date }, endTime: { $gte: date } }
{ groupId: { $in: activityGroupId }, type, isEnable: true }
).sort({ activityId: -1 }).lean(true);
return result;
}
//根据活动类型查询开启的活动数据
public static async findOpenActivityByTypes(activityGroupId: number[], types: number[], date: Date) {
public static async findOpenActivityByTypes(activityGroupId: number[], types: number[]) {
let result: ActivityModelType[] = await ActivityModel.find(
{ groupId: { $in: activityGroupId }, type: { $in: types }, beginTime: { $lte: date }, endTime: { $gte: date } }
{ groupId: { $in: activityGroupId }, type: { $in: types }, isEnable: true }
).sort({ activityId: -1 }).lean(true);
return result;
}

3
shared/domain/activityField/activityField.ts
View File

@@ -61,7 +61,6 @@ export abstract class ActivityBase {
this.endTime = moment(activityData.endTime).add(this.delayDay, 'd').valueOf();
this.todayIndex = deltaDays(moment(this.beginTime).toDate(), new Date) + 1;
this.roundIndex = 1;
this.nextRefreshTime = this.endTime;
this.name = activityData.name;
this.isEnable = activityData.isEnable;
this.interval = activityData.interval * 86400;
@@ -102,6 +101,8 @@ export abstract class ActivityBase {
this.roundIndex = Math.ceil((moment(new Date).valueOf() - this.beginTime) / (activityData.interval * 86400000));
this.nextRefreshTime = moment(this.beginTime).add(activityData.interval * (this.roundIndex - 1), 'day').add(activityData.effectDay, 'd').valueOf();
this.todayIndex = Math.ceil(((moment(new Date).valueOf() - this.beginTime) / (24 * 60 * 60 * 1000)));
} else {
this.nextRefreshTime = this.endTime;
}
if(activityData.hideDayByServer > 0) {
let hidOverTime = moment(serverTime * 1000).add(activityData.hideDayByServer, 'd').startOf('d').add(REFRESH_TIME, 'h').valueOf();

6
shared/domain/activityField/timeLimitRankField.ts
View File

@@ -49,8 +49,8 @@ export class TimeLimitRankData extends ActivityBase {
public getRewardByRank(rank: number) {
let result: TimeLimitRankReward;
for(let reward of this.rankRewards) {
if(reward.rank > rank) break;
result = reward;
if(reward.rank >= rank) break;
}
return result;
}
@@ -68,8 +68,8 @@ export class TimeLimitRankData extends ActivityBase {
let dataObj: TimeLimitInDb = JSON.parse(data);
this.rankType = dataObj.rankType;
this.hid = dataObj.hid;
this.rankEndTime = new Date(moment(this.beginTime).add(dataObj.rankEndDay, 'd').format(`YYYY-MM-DD ${dataObj.rankEndTime}`)).getTime() ;
this.sendMailTime = this.rankEndTime + this.sendMailTime * 1000;
this.rankEndTime = new Date(moment(this.beginTime).add(dataObj.rankEndDay - 1, 'd').format(`YYYY-MM-DD ${dataObj.rankEndTime}`)).getTime() ;
this.sendMailTime = this.rankEndTime + dataObj.sendMailTime * 1000;
for(let rank of dataObj.rankRewards) {
this.rankRewards.push(new TimeLimitRankReward(rank));
}