From 508089df19dbc0e05e259556478167deb31b67a1 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 27 十二月 2018 10:03:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index 3723bc7..cffb8e4 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -126,8 +126,8 @@
WindowCenter.Instance.Open<CrossServerOneVsOneRoundWin>();
}
}
-
- if(mission.isStart == 1)
+ DebugEx.LogFormat("鍓湰甯姪淇℃伅鍥炲悎鏄惁寮�濮嬶細锛歿0}",mission.isStart);
+ if (mission.isStart == 1)
{
if(WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())
{
@@ -363,6 +363,20 @@
return true;
}
+ var teamModel = ModelCenter.Instance.GetModel<TeamModel>();
+ bool isTeamMatch = teamModel.isMatching;
+ if(isTeamMatch)
+ {
+ SysNotifyMgr.Instance.ShowTip("CrossMatching6");
+ return true;
+ }
+
+ bool isDungeonPrepare = teamModel.teamPrepare.isPreparing;
+ if(isDungeonPrepare)
+ {
+ SysNotifyMgr.Instance.ShowTip("CrossMatching7");
+ return true;
+ }
return false;
}
--
Gitblit v1.8.0