寻宝：扣减藏宝图推送；倒计时解散或加入队伍的判断条件

game-server/app/services/comBattleService.ts

@@ -1,3 +1,4 @@
+// import { EquipPrintDropType, EquipPrintDropModel } from './../db/EquipPrintDrop';
 import { FriendPointModel } from './../db/FriendPoint';
 import { STATUS } from './../consts/statusCode';
 import { COM_BATTLE_ROBOT_ID_NAME, COM_TEAM_STATUS, CURRENCY_BY_TYPE, CURRENCY_TYPE, FRIEND_DROP_TYPE, COM_BTL_CONST, FRIEND_DROP_MAX } from './../consts';
@@ -299,6 +300,7 @@ export function comBtlLvInvalid(lv: number, lvRange: number) {
 export async function dismissTeam(teamStatus, teamMap: Map<string, any>, roleId: string, teamDisTimer: Map<string, NodeJS.Timer>, app) {
     const { teamCode } = teamStatus;
     if (!teamStatus || !teamStatus.roleIds || teamStatus.roleIds.indexOf(roleId) === -1) return resResult(STATUS.COM_BATTLE_TEAM_INVALID);
+    if (teamStatus.status !== COM_TEAM_STATUS.DEFAULT) return resResult(STATUS.COM_BATTLE_DISSMISS_ERR);
     if (roleId !== teamStatus.capId) return resResult(STATUS.COM_BATTLE_CAP_ONLY);
 
     let team = await ComBattleTeamModel.removeTeam(teamCode);
@@ -316,7 +318,7 @@ export async function dismissTeam(teamStatus, teamMap: Map<string, any>, roleId:
 }
 
 export function setDismissTimer(teamStatus, teamMap: Map<string, any>, roleId: string, teamDisTimer: Map<string, NodeJS.Timer>, app) {
-    if (teamStatus && teamStatus.roleIds && teamStatus.roleIds.length === 3) {
+    if (teamStatus && teamStatus.roleIds && teamStatus.roleIds.length === 3 && teamStatus.status === COM_TEAM_STATUS.DEFAULT) {
         let timer = setTimeout(async () => {
             await dismissTeam(teamStatus, teamMap, roleId, teamDisTimer, app);
         }, COM_BTL_CONST.CAP_START_TIME);