From 41abd81c4c063de2cfc36415eb21f49c32660b27 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 18 十月 2018 16:24:55 +0800
Subject: [PATCH] 4235 【前端】【1.10】组队进入地图切图逻辑
---
System/MainInterfacePanel/TaskBoxBGMWin.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/System/MainInterfacePanel/TaskBoxBGMWin.cs b/System/MainInterfacePanel/TaskBoxBGMWin.cs
index b1c1c55..ae21e05 100644
--- a/System/MainInterfacePanel/TaskBoxBGMWin.cs
+++ b/System/MainInterfacePanel/TaskBoxBGMWin.cs
@@ -143,11 +143,15 @@
if (_AllMissionDict.ContainsKey(_TaskId))
{
- if (_AllMissionDict[_TaskId].Type == 7 || (_AllMissionDict[_TaskId].Type == 12 /*&& vipmodel.GetVipPrivilegeCnt(VipPrivilegeType.AutoFairyMisstion) >= 1*/))
+ if (_AllMissionDict[_TaskId].Type == 7 || (_AllMissionDict[_TaskId].Type == 12))
{
- taskmodel.RequestGetTaskAward("OK");
- WindowCenter.Instance.CloseImmediately<TaskBoxBGMWin>();
- WindowCenter.Instance.Open<MainInterfaceWin>();
+ if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)
+ {
+ taskmodel.RequestGetTaskAward("OK");
+ WindowCenter.Instance.CloseImmediately<TaskBoxBGMWin>();
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
+
}
}
}
--
Gitblit v1.8.0