From 452130a797bae31fa706b0b8f5ad9b6fd0a3013a Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 29 Jul 2022 17:34:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E5=AE=9D=EF=BC=9A=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E4=BA=BA=E6=98=BE=E7=A4=BA=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/comBattleService.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/game-server/app/services/comBattleService.ts b/game-server/app/services/comBattleService.ts index 9a49fc4d3..991b7fd68 100644 --- a/game-server/app/services/comBattleService.ts +++ b/game-server/app/services/comBattleService.ts @@ -65,7 +65,7 @@ export function getRandComBtlRobots(topLineupCe: number, ceLimit: number, lv: nu let robotStatus = new RoleStatus({ roleId: robotRoleId, roleName: robotRoleName, - ce: robotCe, + topLineupCe: robotCe, lv: robotLv }, '', false, false, robot, true); robotStArr.push(robotStatus); @@ -159,13 +159,13 @@ export function setComBtlTimer(teamCode: string, timer: NodeJS.Timer, timerMap: export async function getRealReward(blueprtId: number, roleSts: RoleStatus[], roleSt: RoleStatus, hasTimeExtraReward: boolean): Promise { let dicReward = getRewardByBlueprtId(blueprtId); - if(!dicReward || roleSt.isRobot) return []; + if(!dicReward) return []; let fixRewards: RewardInter[] = [], extraRewards: RewardInter[] = []; if (roleSt.isCap) { fixRewards.push(...dicReward.captainReward); } else { - if (roleSt.isFrd) { + if (roleSt.isFrd && !roleSt.isRobot) { // 情谊值有上限，送到上限为止 let frdPointRec = await FriendPointModel.getFrdPointRecToday(roleSt.roleId, FRIEND_DROP_TYPE.COM_BATTLE); let { comBattleCnt = 0 } = frdPointRec || {}; @@ -261,8 +261,10 @@ export async function handleComBtlProgress(teamStatus: MemComBtlTeam, robotHurtT }); for (let st of teamStatus.roleStatus) { st.rewards = await getRealReward(teamStatus.blueprtId, teamStatus.roleStatus, st, teamStatus.hasTimeExtraReward); - await addItems(st.roleId, st.roleName, st.sid, st.rewards, ITEM_CHANGE_REASON.COM_BATTLE_END); - await ComBattleTeamModel.updateRewardSt(teamCode, st.roleId, true); + 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);