From 49c6aef8d723be2220edc53bb7f6bd1775175685 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 27 十二月 2018 00:07:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index 8e89973..3723bc7 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -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,36 @@
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;
+ }
+
+ return false;
+
+ }
#endregion
#region 鍘嗗彶璁板綍
--
Gitblit v1.8.0