From 2106e7a430c3c104989c4022d9a7e7826f7eb1cf Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 27 十二月 2018 10:58:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index 3723bc7..0c04cdc 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>())
{
@@ -170,6 +170,7 @@
public string priceFormula { get;private set;} //璐拱鍖归厤娆℃暟闇�瑕佷环鏍煎叕寮�
public string winStreakScoreFormula { get; private set; } //杩炶儨绉垎鍏紡
public List<AwardType> dayAwardTypelist { get; private set; }
+ public int afterOpenDayOpenCross { get; private set;}
private void ParseFuncConfig()
{
var CrossRealmPKAward = Config.Instance.Get<FuncConfigConfig>("CrossRealmPKAward");
@@ -241,6 +242,9 @@
var CrossRealmPKScore = Config.Instance.Get<FuncConfigConfig>("CrossRealmPKScore");
winStreakScoreFormula = CrossRealmPKScore.Numerical3;
+
+ var CrossRealmCfg = Config.Instance.Get<FuncConfigConfig>("CrossRealmCfg");
+ afterOpenDayOpenCross = int.Parse(CrossRealmCfg.Numerical1);
}
public class AwardType
@@ -363,6 +367,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