From b992d3c7b6b4aab900876a63433dc36527152893 Mon Sep 17 00:00:00 2001
From: liangtongchuan <liangtongchuan@bantus.cn>
Date: Wed, 13 Jan 2021 16:32:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E5=AE=9D=EF=BC=9A=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=96=B0=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=90=8C=E6=97=B6=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=97=8F=E5=AE=9D=E5=9B=BE=E6=95=B0=E9=87=8F=E5=92=8C?=
 =?UTF-8?q?=E5=8A=A9=E6=88=98=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../battle/handler/comBattleHandler.ts        | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts
index 01416efd7..b5b885a54 100644
--- a/game-server/app/servers/battle/handler/comBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/comBattleHandler.ts
@@ -348,23 +348,6 @@ export class ComBattleHandler {
         return resResult(STATUS.SUCCESS, { teamInfos: teams});
     }
 
-    /**
-     * @description 获取今日已助战次数
-     * @param {{}} msg
-     * @param {BackendSession} session
-     * @returns
-     * @memberof ComBattleHandler
-     */
-    async getAssistCnt(msg: {}, session: BackendSession) {
-        let roleId = session.get('roleId');
-        let cntMap = await getAssistTimesByQuality(roleId);
-        let cnt = [];
-        for (let i = 0; i < 5; ++i) {
-            cnt[i] = cntMap.get(i + 1) || 0;
-        }
-        return resResult(STATUS.SUCCESS, {cnt});
-    }
-
     /**
      * @description 队伍准备-deprecate
      * @param {{teamCode: string, heroes: Array<number>}} msg
@@ -779,6 +762,40 @@ export class ComBattleHandler {
         return resResult(STATUS.SUCCESS, { blueprts });
     }
 
+    /**
+     * @description 获取今日已助战次数
+     * @param {{}} msg
+     * @param {BackendSession} session
+     * @returns
+     * @memberof ComBattleHandler
+     */
+    async getAssistCnt(msg: {}, session: BackendSession) {
+        let roleId = session.get('roleId');
+        let cntMap = await getAssistTimesByQuality(roleId);
+        let cnt = [];
+        for (let i = 0; i < 5; ++i) {
+            cnt[i] = cntMap.get(i + 1) || 0;
+        }
+        return resResult(STATUS.SUCCESS, {cnt});
+    }
+    /**
+     * @description 获取寻宝可用次数，包含藏宝图数量和助战次数，分别用于创建和加入队伍
+     * @param {{}} msg 无参数
+     * @param {BackendSession} session
+     * @returns
+     * @memberof ComBattleHandler
+     */
+    async getComBtlCnt(msg: {}, session: BackendSession) {
+        let roleId = session.get('roleId');
+        let cntMap = await getAssistTimesByQuality(roleId);
+        let cnt = [];
+        for (let i = 0; i < 5; ++i) {
+            cnt[i] = cntMap.get(i + 1) || 0;
+        }
+        const blueprts = await ItemModel.findByRoleAndType(roleId, CONSUME_TYPE.BLUEPRT);
+        return resResult(STATUS.SUCCESS, { blueprts, assistCnt: cnt });
+    }
+
     /**
      * @description 藏宝图合成
      * @param {{original: Array<{id: number, count: number}>}} msg