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

一键领取bug

Browse Source
This commit is contained in:
mamengke01
2021-02-22 15:39:00 +08:00
parent 60b2e6351f
commit de1e46293d
5 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/battle/handler/guildTrainHandler.ts
+1 -1
View File
@@ -42,7 +42,7 @@ export class GuildTrainHandler {
}
let { trainCount, trainRewards, buyTrainCount } = userGuild;
let result:any = getGuildTrainInfo(guildTrain, roleId, trainCount, trainRewards);
result.buyTrainCount = buyTrainCount;
result.buyTrainCount = buyTrainCount||0;
result.trainLv = trainLv;
return resResult(STATUS.SUCCESS, result);
}
game-server/app/servers/gm/remote/gmRemote.ts
+5 -5
View File
@@ -160,14 +160,14 @@ export class GMRemote {
if (!gmMail || !gmMail.goods.length|| gmMail.endTime < nowSeconds()) {
return;
}
mailGoods.push(...goods);
mailGoods.push(...gmMail.goods);
} else {
if (goods.length)
if (!goods.length)
return;
mailGoods.push(...goods);
}
mails.push({id: _id, status: MAIL_STATUS.RECEIVED, mailType: MAIL_TYPE.GROUPMAIL});
groupMailIds.push(ObjectId(_id));
groupMailIds.push(_id);
});
mailRewards.map(({_id, goods, mailId, mailTemType})=>{
if (mailTemType == MAIL_TEM_TYPE.GMTYPE) {
@@ -177,12 +177,12 @@ export class GMRemote {
}
mailGoods.push(...gmMail.goods);
} else {
if (goods.length)
if (!goods.length)
return;
mailGoods.push(...goods);
}
mails.push({id: _id, status: MAIL_STATUS.RECEIVED, mailType: MAIL_TYPE.SINGLEMAIL});
mailIds.push(ObjectId(_id));
mailIds.push(_id);
});
return {mailIds, groupMailIds, mails, mailGoods};
}
game-server/app/servers/role/handler/mailHandler.ts
+6 -7
View File
@@ -58,13 +58,13 @@ export class RoleHandler {
let resGroupMailIds = await GroupMailModel.findReadAndRewardsMails(roleId);
let groupMailIds = resGroupMailIds.map(({_id})=>{
mails.push({id:_id, status: MAIL_STATUS.DELETE, mailType: MAIL_TYPE.GROUPMAIL});
return ObjectId(_id);
return _id;
});
await GroupMailModel.updateMailStatus(groupMailIds, MAIL_STATUS.DELETE, roleId);
let resMailIds = await MailModel.findReadAndRewardsMails(roleId);
let mailIds = resMailIds.map(({_id})=>{
mails.push({id: _id, status: MAIL_STATUS.DELETE, mailType: MAIL_TYPE.SINGLEMAIL});
return ObjectId(_id);
return _id;
});
await MailModel.updateMailStatus(mailIds, MAIL_STATUS.DELETE);
@@ -106,13 +106,12 @@ export class RoleHandler {
} else {//一键领取
let groupMailRewards = await GroupMailModel.findRewardsMails(roleId);
let mailRewards = await MailModel.findRewardsMails(roleId);
let { mailGoods: goods, mailIds, groupMailIds, mails: resMails} = await this.app.rpc.gm.gmRemote.getUseMails.toServer('gm-server-1', serverId, groupMailRewards, mailRewards);
let { mailGoods: goods, mailIds, groupMailIds} = await this.app.rpc.gm.gmRemote.getUseMails.toServer('gm-server-1', serverId, groupMailRewards, mailRewards);
mailGoods = goods;
mails = resMails;
if (!!mailIds.length)
await GroupMailModel.updateMailStatus(mailIds, MAIL_STATUS.RECEIVED, roleId);
if (!!groupMailIds.length)
await MailModel.updateMailStatus(groupMailIds, MAIL_STATUS.RECEIVED);
mails = await GroupMailModel.updateMailStatus(groupMailIds, MAIL_STATUS.RECEIVED, roleId);
if (!!mailIds.length)
mails = await MailModel.updateMailStatus(mailIds, MAIL_STATUS.RECEIVED);
}
let resGoods = [];
if (!!mailGoods && !!mailGoods.length)