寻宝:机器人显示奖励

This commit is contained in:
luying
2022-07-29 17:34:29 +08:00
parent 7e6e10a1a2
commit 452130a797
+7 -5
View File
@@ -65,7 +65,7 @@ export function getRandComBtlRobots(topLineupCe: number, ceLimit: number, lv: nu
let robotStatus = new RoleStatus({ let robotStatus = new RoleStatus({
roleId: robotRoleId, roleId: robotRoleId,
roleName: robotRoleName, roleName: robotRoleName,
ce: robotCe, topLineupCe: robotCe,
lv: robotLv lv: robotLv
}, '', false, false, robot, true); }, '', false, false, robot, true);
robotStArr.push(robotStatus); 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<ComBattleReward[]> { export async function getRealReward(blueprtId: number, roleSts: RoleStatus[], roleSt: RoleStatus, hasTimeExtraReward: boolean): Promise<ComBattleReward[]> {
let dicReward = getRewardByBlueprtId(blueprtId); let dicReward = getRewardByBlueprtId(blueprtId);
if(!dicReward || roleSt.isRobot) return []; if(!dicReward) return [];
let fixRewards: RewardInter[] = [], extraRewards: RewardInter[] = []; let fixRewards: RewardInter[] = [], extraRewards: RewardInter[] = [];
if (roleSt.isCap) { if (roleSt.isCap) {
fixRewards.push(...dicReward.captainReward); fixRewards.push(...dicReward.captainReward);
} else { } else {
if (roleSt.isFrd) { if (roleSt.isFrd && !roleSt.isRobot) {
// 情谊值有上限,送到上限为止 // 情谊值有上限,送到上限为止
let frdPointRec = await FriendPointModel.getFrdPointRecToday(roleSt.roleId, FRIEND_DROP_TYPE.COM_BATTLE); let frdPointRec = await FriendPointModel.getFrdPointRecToday(roleSt.roleId, FRIEND_DROP_TYPE.COM_BATTLE);
let { comBattleCnt = 0 } = frdPointRec || {}; let { comBattleCnt = 0 } = frdPointRec || {};
@@ -261,8 +261,10 @@ export async function handleComBtlProgress(teamStatus: MemComBtlTeam, robotHurtT
}); });
for (let st of teamStatus.roleStatus) { for (let st of teamStatus.roleStatus) {
st.rewards = await getRealReward(teamStatus.blueprtId, teamStatus.roleStatus, st, teamStatus.hasTimeExtraReward); 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); if(!st.isRobot) {
await ComBattleTeamModel.updateRewardSt(teamCode, st.roleId, true); 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); await checkTaskInComBattleEnd(teamStatus.roleStatus, teamStatus.capId);