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

寻宝：修改掉落bug；修改战斗结果判断

Browse Source
This commit is contained in:
liangtongchuan
2020-12-02 13:13:09 +08:00
parent a001ec4478
commit 3515f99260
6 changed files with 88 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/comBattleService.ts
+12 -4
View File
@@ -1,5 +1,5 @@
import { STATUS } from './../consts/statusCode';
import { COM_BATTLE_ROBOT_ID_NAME, COM_BATTLE_ROBOT_CE_RATIO, COM_BATTLE_ROBOT_ROUND_LMT, COM_BATTLE_ROBOT_HURT_RATIO, COM_BATTLE_ROBOT_HURT_CH_RATIO, COM_TEAM_STATUS } from './../consts/consts';
import { COM_BATTLE_ROBOT_ID_NAME, COM_BATTLE_ROBOT_CE_RATIO, COM_BATTLE_ROBOT_ROUND_LMT, COM_BATTLE_ROBOT_HURT_RATIO, COM_BATTLE_ROBOT_HURT_CH_RATIO, COM_TEAM_STATUS, COM_BATTLE_ASSIST_REWARD_RATIO } from './../consts/consts';
import { RoleStatus, ComBattleTeamModel } from './../db/ComBattleTeam';
import { getBluePrtByQuality, getRewardByBlueprtId } from "../pubUtils/gamedata";
import { getRandEelm, getRandValue, resResult, ratioReward } from "../pubUtils/util";
@@ -47,7 +47,8 @@ export function checkComBattleResult(teamStatus) {
let robotRestHurt = 0;
// 看看是否还有活人
teamStatus.roleStatus.forEach(st => {
if (!st.isRobot && st.killed.length < st.heroes.length) {
// 设置了阵容，且阵容人数和阵亡人数一样，说明玩家战败
if (!st.isRobot && st.heroes && st.heroes.length > 0 && st.killed.length < st.heroes.length) {
allPlayerKilled = false
}
});
@@ -73,6 +74,13 @@ export function checkComBattleResult(teamStatus) {
return COM_TEAM_STATUS.FIGHTING;
}
/**
* @description 计算寻宝结算-deprecated
* @export
* @param {string} roleId
* @param {string} battleCode
* @returns
*/
export async function checkComBattleDrop(roleId: string, battleCode: string) {
let team = await ComBattleTeamModel.getTeamByRoleAndBattleCode(roleId, battleCode);
if (team.status !== COM_TEAM_STATUS.WIN) return { status: -1, resResult: resResult(STATUS.COM_BATTLE_REWARD_ERR) };
@@ -89,10 +97,10 @@ export async function checkComBattleDrop(roleId: string, battleCode: string) {
fixReward = '&';
// TODO: 消耗品情谊点添加
} else {
fixReward = ratioReward(fixReward, COM_BATTLE_ROBOT_HURT_CH_RATIO);
fixReward = ratioReward(fixReward, COM_BATTLE_ASSIST_REWARD_RATIO);
}
}
await ComBattleTeamModel.updateRewardSt(roleId, battleCode, true);
await ComBattleTeamModel.updateRewardSt(roleId, true);
return {status: 0, fixReward};
}