From 5b9cfd3917819cfe493dae693508e1b685cc14fa Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 28 十二月 2018 16:58:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowJump/WindowJumpMgr.cs | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 27a6d12..0e3846d 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -303,6 +303,16 @@
SetJumpLogic<DailyQuestWin>(_tagWinSearchModel.TABID);
break;
+ case JumpUIType.CrossServerOneVsOne275:
+ case JumpUIType.CrossServerOneVsOne276:
+ case JumpUIType.CrossServerOneVsOne277:
+ case JumpUIType.CrossServerOneVsOne278:
+ case JumpUIType.CrossServerOneVsOne279:
+ int oneVsOneFuncId = 0;
+ int.TryParse(_tagWinSearchModel.SelectActive,out oneVsOneFuncId);
+ CrossServerOneVsOneWin.funcId = oneVsOneFuncId;
+ SetJumpLogic<CrossServerWin>(_tagWinSearchModel.TABID);
+ break;
case JumpUIType.AncientBattle:
GotoNormalDungeon((int)DailyQuestType.AncientBattleGround, dungeonModel.GetBelongToLine((int)DailyQuestType.AncientBattleGround));
break;
@@ -1000,6 +1010,16 @@
return false;
}
break;
+ case JumpUIType.CrossServerOneVsOne275:
+ case JumpUIType.CrossServerOneVsOne276:
+ case JumpUIType.CrossServerOneVsOne277:
+ case JumpUIType.CrossServerOneVsOne278:
+ case JumpUIType.CrossServerOneVsOne279:
+ if(!CrossServerOneVsOnePKSeason.Instance.IsEnterCrossServer)
+ {
+ return false;
+ }
+ break;
}
return true;
}
@@ -1533,6 +1553,11 @@
GatherSoul272 = 272, //鑱氶瓊闀跺祵鐣岄潰
GatherSoul273 = 273, //鑱氶瓊闀跺祵鐣岄潰
Daily_GatherSoul274 = 274,//鏃ュ父浠诲姟-鑱氶瓊鍓湰
+ CrossServerOneVsOne275 = 275, //璺ㄦ湇澶╂璧涚晫闈�
+ CrossServerOneVsOne276 = 276, //璺ㄦ湇璧涘绔炴妧鐣岄潰
+ CrossServerOneVsOne277 = 277, //璺ㄦ湇璧涘娈典綅濂栧姳鐣岄潰
+ CrossServerOneVsOne278 = 278, //璺ㄦ湇璧涘璧涘濂栧姳鐣岄潰
+ CrossServerOneVsOne279 = 279, //璺ㄦ湇璧涘鑽ｈ獕鍟嗗簵鐣岄潰
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
GyzTs = 1003,//楝肩墮鍒冨姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0