From 9be514e9360f01ea27db903282074fcd081a1928 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Wed, 30 Dec 2020 17:31:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AF=BB=E5=AE=9D=E6=9C=80=E5=BC=BA?=
 =?UTF-8?q?=E4=BA=94=E4=BA=BA=E6=88=98=E5=8A=9B=E7=BC=A9=E5=B0=8F=E5=80=8D?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/servers/battle/handler/comBattleHandler.ts       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts
index 57036eff9..01416efd7 100644
--- a/game-server/app/servers/battle/handler/comBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/comBattleHandler.ts
@@ -10,7 +10,7 @@ import { ComBattleTeamModel, BossHp } from '../../../db/ComBattleTeam';
 import Role, { RoleModel } from '../../../db/Role';
 import { STATUS } from '../../../consts/statusCode';
 import { Application, BackendSession } from 'pinus';
-import { resResult, getRandomByLen, calculateNum, getRandValue, ratioReward } from '../../../pubUtils/util';
+import { resResult, getRandomByLen, calculateNum, getRandValue, ratioReward, reduceCe } from '../../../pubUtils/util';
 import { RoleStatus } from '../../../db/ComBattleTeam';
 import { ItemModel } from '../../../db/Item';
 import { handleFixedReward, addItems, handleCost } from '../../../services/rewardService';
@@ -95,6 +95,8 @@ export class ComBattleHandler {
 
         // 检查藏宝图是否足够
         let { lv, headHid = 19, topFiveCe = 100, sHid = 19 } = await RoleModel.findByRoleId(roleId);
+        topFiveCe = reduceCe(topFiveCe);
+
         if (lv < COM_BTL_CONST.ENABLE_LV) return resResult(STATUS.COM_BATTLE_LV_NOT_ENOUGH);
 
         let blueprt = await ItemModel.findbyRoleAndGidAndCount(roleId, blueprtId, 1);
@@ -116,6 +118,7 @@ export class ComBattleHandler {
                 let roleInfo = await RoleModel.findByRoleId(teammate.roleId);
                 if (!roleInfo || roleIds.indexOf(teammate.roleId) !== -1) continue;
                 let {roleId, roleName, headHid = 19, sHid = 19, topFiveCe, lv} = roleInfo;
+                topFiveCe = reduceCe(topFiveCe);
                 if (topFiveCe < ceLimit) continue;
 
                 let isFrd = await getFrd(roleId, goodData.quality);
@@ -198,6 +201,8 @@ export class ComBattleHandler {
         let sid = session.get('sid');
         const { qualityArr } = msg;
         let { lv, headHid = 19, topFiveCe = 1000, sHid = 19 } = await RoleModel.findByRoleId(roleId);
+
+        topFiveCe = reduceCe(topFiveCe);
         for (let q of qualityArr) {
             let setting = getComBtlSetByQuality(q);
             if (lv < setting.assistanceLevel) {
@@ -288,6 +293,8 @@ export class ComBattleHandler {
         if (!teamStatus || teamStatus.status !== COM_TEAM_STATUS.DEFAULT || teamStatus.roleIds.length === 3) return resResult(STATUS.COM_BATTLE_MEMBER_LIMIT);
         if (teamStatus.roleIds.indexOf(roleId) !== -1) return resResult(STATUS.COM_BATTLE_DUP_ENTER);
         let { lv = 1, headHid = 19, topFiveCe = 0, sHid = 19 } = await Role.findByRoleId(roleId);
+
+        topFiveCe = reduceCe(topFiveCe);
         let { quality } = getGoodById(teamStatus.blueprtId);
         let { assistanceLevel, assistanceTime } = getComBtlSetByQuality(quality);
         if (lv < COM_BTL_CONST.ENABLE_LV) {