红点:每日战斗结算增加返回

This commit is contained in:
luying
2021-06-02 20:41:36 +08:00
parent b9a3a96514
commit 6d99619050
2 changed files with 36 additions and 27 deletions
@@ -153,6 +153,7 @@ export class NormalBattleHandler {
return resResult(STATUS.BATTLE_ACTION_POINT_LACK);
}
let { warStar } = await RoleModel.findByRoleId(roleId);
let warReward = new WarReward(roleId, roleName, sid, battleId, isSuccess);
let dailyNum = {};
@@ -160,7 +161,7 @@ export class NormalBattleHandler {
let dungeonNum = {};
if (warInfo.warType == WAR_TYPE.DAILY) {
let checkResult = await checkDailyAndIncrease(roleId, battleId, 1, false);
let checkResult = await checkDailyAndIncrease(roleId, [{id: battleId, star, warType: warInfo.warType}, ...warStar], battleId, 1, false);
if (checkResult.status == -1) {
return checkResult.resResult;
}
@@ -208,7 +209,6 @@ export class NormalBattleHandler {
if (isSuccess) { // 挑战胜利
// 是否首通
let { warStar } = await RoleModel.findByRoleId(roleId);
let condition1 = warStar.find(cur => cur.id == battleId);
if (!condition1) {
await switchOnFunc(roleId, FUNC_OPT_TYPE.BATTLE_END, battleId, session);
@@ -274,7 +274,7 @@ export class NormalBattleHandler {
let dailyNum = {};
let dungeonNum = {};
if (warInfo.warType == WAR_TYPE.DAILY) {
let checkResult = await checkDailyAndIncrease(roleId, battleId, count, true);
let checkResult = await checkDailyAndIncrease(roleId, warStar, battleId, count, true);
if (checkResult.status == -1) {
return checkResult.resResult
}