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-23 11:43:50 +08:00
parent 0fc828793a
commit 6759a7dcb1
9 changed files with 162 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
game-server/app/servers/battle/handler/guildTrainHandler.ts
View File

@@ -180,18 +180,24 @@ export class GuildTrainHandler {
return resResult(STATUS.GUILD_TRAIN_SCRIPT_NOT_OPENED);
}
let trainInstance = findWhere(guildTrain.trainInstances, { hid });
if (!trainInstance)
if (!trainInstance) {
res.releaseCallback();//解锁
return resResult(STATUS.WRONG_PARMS);
}
let { trainInstances, soloRewardRatio } = getArmyTrainJuDian(trainId);
let instance = findWhere(trainInstances, { hid });
if (!instance)
if (!instance) {
res.releaseCallback();//解锁
return resResult(STATUS.WRONG_PARMS);
}
let trainSoloReward = getTrainSoloReward(battleRecord.record.difficulty);
if (!trainSoloReward)
if (!trainSoloReward) {
res.releaseCallback();//解锁
return resResult(STATUS.WRONG_PARMS);
let addScore = Math.floor((isSuccess?trainSoloReward.winScore:trainSoloReward.failScore) * (soloRewardRatio + 100 ) / 100);
let goods = await addItems(roleId, roleName, sid, [{id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.HONOUR), count: isSuccess?trainSoloReward.failHonour:trainSoloReward.failHonour}]);
}
let addScore = Math.floor((isSuccess?trainSoloReward.winScore:trainSoloReward.failScore));
let goods = await addItems(roleId, roleName, sid, [{id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.HONOUR), count: (isSuccess?trainSoloReward.failHonour:trainSoloReward.failHonour) * (soloRewardRatio + 100 ) / 100}]);
//是否压制
let { isComplete, ranks } = guildTrain;
let reports = [];
@@ -266,14 +272,20 @@ export class GuildTrainHandler {
return resResult(STATUS.GUILD_TRAIN_SCRIPT_NOT_OPENED);
}
let trainInstance = findWhere(guildTrain.trainInstances, { hid });
if (trainInstance.endTime < nowSeconds())
if (trainInstance.endTime < nowSeconds()) {
res.releaseCallback();//解锁
return resResult(STATUS.GUILD_TRAIN_BOX_IS_OVER_TIME);
}
let trainBox = findWhere(trainInstance.trainBoxs, { index })
if (!!trainBox)
if (!!trainBox) {
res.releaseCallback();//解锁
return resResult(STATUS.GUILD_TRAIN_BOX_INDEX_IS_GOT);
}
trainBox = findWhere(trainInstance.trainBoxs, { roleId })
if (!!trainBox)
if (!!trainBox) {
res.releaseCallback();//解锁
return resResult(STATUS.GUILD_TRAIN_BOX_IS_GOT);
}
let good = getRandomByLen(heroRewards);
good.count = Math.floor((100 + shilianRewardRatio) * good.count/100);
let goods = await addItems(roleId, roleName, sid, [good]);
@@ -282,8 +294,7 @@ export class GuildTrainHandler {
res.releaseCallback();//解锁
if (!resGuildTrain) {
let result:any = getGuildTrainRewards(guildTrain);
return resResult(STATUS.GUILD_GET_TRAIN_BOX_FAIL, result);
return resResult(STATUS.GUILD_GET_TRAIN_BOX_FAIL);
}
let result:any = getGuildTrainRewards(resGuildTrain);