寻宝：取消匹配

game-server/app/servers/battle/handler/comBattleHandler.ts

@@ -4,7 +4,7 @@
  * @Last Modified by: 梁桐川
  * @Last Modified time: 2020-12-03 21:36:00
  */
-import { IT_TYPE, GOLD_COST_RATIO, CURRENCY_BY_TYPE, CURRENCY_TYPE, COM_TEAM_STATUS, COM_BTL_CONST } from './../../../consts/consts';
+import { IT_TYPE, GOLD_COST_RATIO, CURRENCY_BY_TYPE, CURRENCY_TYPE, COM_TEAM_STATUS, COM_BTL_CONST, GOOD_QUALITY } from './../../../consts/consts';
 import { getGoodById, getBossHpByBlueprtId, getComBtlSetByQuality, getBlueprtComposeByQuality, getBluePrtByQuality, getWarById, getWarIdByBlueprtId } from '../../../pubUtils/gamedata';
 import { ComBattleTeamModel, BossHp } from '../../../db/ComBattleTeam';
 import Role, { RoleModel } from '../../../db/Role';
@@ -258,6 +258,20 @@ export class ComBattleHandler {
         return resResult(STATUS.SUCCESS);
     }
 
+    /**
+     * @description 取消匹配
+     * @param {{}} msg
+     * @param {BackendSession} session
+     * @memberof ComBattleHandler
+     */
+    async cancelSearch(msg: {}, session: BackendSession) {
+        let roleId = session.get('roleId');
+        let sid = session.get('sid');
+
+        await rmRoleFromQueue(roleId, sid, GOOD_QUALITY);
+        return resResult(STATUS.SUCCESS);
+    }
+
     /**
      * @description 当匹配 searchTeam 匹配到其它队伍时，需要调用此接口加入
      * @param {{teamCode: string, isFrd: boolean}} msg 要加入的队伍编号，是否情谊助战
@@ -630,7 +644,7 @@ export class ComBattleHandler {
             if (!team) return resResult(STATUS.COM_BATTLE_RESULT_ERR);
 
             // 战斗胜利队长扣减藏宝图
-            if (result) {
+            if (result && teamStatus.capId != 'robot') {
                 let res = await ItemModel.decreaseItems(teamStatus.capId, [{id: teamStatus.blueprtId, count: 1}]);
                 if (!res) return resResult(STATUS.COM_BATTLE_BLUEPRT_NOT_ENOUGH);
             }