From 73ecb4c90051a6ae90c4bfd520d455cd6940a358 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 27 十二月 2018 10:07:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index 8e89973..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>())
{
@@ -324,6 +324,8 @@
/// <param name="type"></param>
public void SendCrossMatch(int type)
{
+ if (type == 1 && TryGetMatchTip()) return;
+
CC101_tagCMCrossRealmPKMatch match = new CC101_tagCMCrossRealmPKMatch();
match.Type = (byte)type;
GameNetSystem.Instance.SendInfo(match);
@@ -334,6 +336,50 @@
CC102_tagCMCrossRealmPKBuy pKBuy = new CC102_tagCMCrossRealmPKBuy();
GameNetSystem.Instance.SendInfo(pKBuy);
}
+
+ public bool TryGetMatchTip()
+ {
+ int mapId = PlayerDatas.Instance.baseData.MapID;
+ int dataMapId = dungeonModel.GetDataMapIdByMapId(mapId);
+ bool isCrossDungeon = dataMapId == CrossServerDataMapId;
+ if(isCrossDungeon)
+ {
+ SysNotifyMgr.Instance.ShowTip("CrossMatching3");
+ return true;
+ }
+
+ var mapConfig = Config.Instance.Get<MapConfig>(mapId);
+ bool isDungeon = mapConfig != null && mapConfig.MapFBType != 0 ? true : false;
+ if (isDungeon)
+ {
+ SysNotifyMgr.Instance.ShowTip("CrossMatching4");
+ return true;
+ }
+
+ var deadModel = ModelCenter.Instance.GetModel<PlayerDeadModel>();
+ if(deadModel.playerIsDie)
+ {
+ SysNotifyMgr.Instance.ShowTip("CrossMatching5");
+ 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;
+
+ }
#endregion
#region 鍘嗗彶璁板綍
--
Gitblit v1.8.0