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

活动：修改string变id&count的转换方法

Browse Source
This commit is contained in:
luying
2022-04-27 16:51:34 +08:00
parent c259883dca
commit a9b3dba5b3
6 changed files with 62 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
game-server/app/services/activity/giftPackageService.ts
View File

@@ -119,7 +119,7 @@ export async function addReward(roleId: string, roleName: string, sid: string, s
}
//表中的奖励数据(包括礼包)转换成具体对应奖励物品的实例
function rewardItemData(reward: Array<RewardParam>) {
export function rewardItemData(reward: Array<RewardParam>) {
let goods: Array<RewardInter> = [];
let heroes: Array<CreateHeroParam> = [];
for (let obj of reward) {
@@ -209,4 +209,3 @@ export function stringToRewardInter(rewardStr: string): Array<RewardInter> {
}
return result
}

6
game-server/app/services/activity/monthlyTicketService.ts
View File

@@ -3,7 +3,7 @@ import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityMonthlyTicketModel, ActivityMonthlyTicketModelType } from '../../db/ActivityMonthlyTicket';
import { RewardParam } from '../../domain/activityField/rewardField';
import { MonthlyTicketData } from '../../domain/activityField/monthlyTicketField';
import { addReward, stringToRewardInter, stringToRewardParam } from './giftPackageService';
import { addReward, stringToRewardParam } from './giftPackageService';
import moment = require('moment');
import { ServerlistModel } from '../../db/Serverlist';
import { sendMailByContent } from './../mailService';
@@ -11,7 +11,7 @@ import { RoleModel, RoleType } from '../../db/Role';
import { getActivitiesByType, getActivityById } from './activityService';
import { RewardInter } from '../../pubUtils/interface';
import { DUNGEON_CONST, PVP, VIP } from '../../pubUtils/dicParam';
import { cal } from '../../pubUtils/util';
import { cal, stringWithTypeToRewardInter } from '../../pubUtils/util';
import { pinus } from 'pinus';
import { getGoldId } from '../role/rewardService';
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
@@ -44,7 +44,7 @@ export async function monthlyTicketActivity(serverId: number, roleId: string, ty
if (playerData.todayIndex - 1 > playerData.dayIndex) {//过期还没领取
//下发邮件奖励
for (let i = playerData.dayIndex + 1; i < playerData.todayIndex; i++) {
let goods = stringToRewardInter(playerData.baseReward)
let goods = stringWithTypeToRewardInter(playerData.baseReward)
await sendMailByContent(MAIL_TYPE.MONTHLY_REWARD, roleId, { params: [], goods });
}
await ActivityMonthlyTicketModel.setDayIndex(serverId, roleId, playerData.activityId, playerData.todayIndex - 1);

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

@@ -5,11 +5,11 @@ import { GuildModel, GuildType } from "../../db/Guild";
import { RoleModel } from "../../db/Role";
import { TimeLimitRankData } from "../../domain/activityField/timeLimitRankField";
import { GuildRankInfo, RoleRankInfo } from "../../domain/rank";
import { stringWithTypeToRewardInter } from "../../pubUtils/util";
import { sendMailByContent, sendMailToGuildByContent } from "../mailService";
import { Rank } from "../rankService";
import { getServerCreateTime } from "../redisService";
import { getActivitiesByType, getActivityById } from "./activityService";
import { stringToRewardInter } from "./giftPackageService";
/**
@@ -77,11 +77,11 @@ export async function sendRankMail(data: TimeLimitRankData, serverId: number) {
if(reward) {
await sendMailToGuildByContent(MAIL_TYPE.TIME_LIMIT_RANK, code, {
params: [data.tabName,`${rank}`],
goods: stringToRewardInter(reward.guildRewards)
goods: stringWithTypeToRewardInter(reward.guildRewards)
});
if(leader.roleId) await sendMailByContent(MAIL_TYPE.TIME_LIMIT_RANK, leader.roleId, {
params: [data.tabName,`${rank}`],
goods: stringToRewardInter(reward.rewards)
goods: stringWithTypeToRewardInter(reward.rewards)
});
}
}
@@ -93,7 +93,7 @@ export async function sendRankMail(data: TimeLimitRankData, serverId: number) {
if(reward) {
await sendMailByContent(MAIL_TYPE.TIME_LIMIT_RANK, roleId, {
params: [data.tabName, `${rank}`],
goods: stringToRewardInter(reward.rewards)
goods: stringWithTypeToRewardInter(reward.rewards)
});
}
}