From 64bf4f38fd8e437258e5689ae9b60288726633a2 Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 5 Aug 2022 10:11:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E5=AE=9D=EF=BC=9A=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E5=A5=96=E5=8A=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/servers/battle/handler/comBattleHandler.ts | 14 +++++++------- game-server/app/services/comBattleService.ts | 5 ----- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts index 224bb31b8..23e3b02ce 100644 --- a/game-server/app/servers/battle/handler/comBattleHandler.ts +++ b/game-server/app/servers/battle/handler/comBattleHandler.ts @@ -544,13 +544,13 @@ export class ComBattleHandler { clearRobotHurtTimer(team, this.robotHurtTimer); if (!team || team.status !== COM_TEAM_STATUS.WIN) return resResult(STATUS.COM_BATTLE_REWARD_ERR); let { roleStatus, blueprtId, status, bossHpArr } = team; - let roleSt: RoleStatus = null; - roleStatus.forEach(st => { - if (st && st.roleId === roleId) { - roleSt = st; - } - }); - return resResult(STATUS.SUCCESS, { teamInfo: {status, teamCode, roleStatus, bossHpArr} }); + let roleSt = roleStatus.find(st => st && st.roleId === roleId); + if(!roleSt) return resResult(STATUS.COM_BATTLE_REWARD_ERR); + + await ComBattleTeamModel.updateRewardSt(teamCode, roleId, true); + const goods = await addItems(roleId, roleName, sid, roleSt.rewards, ITEM_CHANGE_REASON.COM_BATTLE_END); + + return resResult(STATUS.SUCCESS, { battleGoods: goods, teamInfo: {status, teamCode, roleStatus, bossHpArr} }); } async getComBtlStatus(msg: {teamCode: string}, session: BackendSession) { diff --git a/game-server/app/services/comBattleService.ts b/game-server/app/services/comBattleService.ts index 991b7fd68..6c2d2c69d 100644 --- a/game-server/app/services/comBattleService.ts +++ b/game-server/app/services/comBattleService.ts @@ -261,11 +261,6 @@ export async function handleComBtlProgress(teamStatus: MemComBtlTeam, robotHurtT }); for (let st of teamStatus.roleStatus) { st.rewards = await getRealReward(teamStatus.blueprtId, teamStatus.roleStatus, st, teamStatus.hasTimeExtraReward); - if(!st.isRobot) { - await addItems(st.roleId, st.roleName, st.sid, st.rewards, ITEM_CHANGE_REASON.COM_BATTLE_END); - await ComBattleTeamModel.updateRewardSt(teamCode, st.roleId, true); - } - }; await checkTaskInComBattleEnd(teamStatus.roleStatus, teamStatus.capId); }