From 4748d44f3be160db080b6496c7e72289b41f5adb Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 11 一月 2019 15:08:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/WindowJump/WindowJumpMgr.cs |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 3a08cb2..f826bf8 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -508,6 +508,14 @@
                 }
                 SetJumpLogic<BlastFurnaceWin>(_tagWinSearchModel.TABID);
                 break;
+            case JumpUIType.SevenDaysTour281:
+            case JumpUIType.SevenDaysTour282:
+                var sevenDaysModel = ModelCenter.Instance.GetModel<OpenServiceAchievementModel>();
+                int jumpIndex = 0;
+                int.TryParse(_tagWinSearchModel.SelectActive,out jumpIndex);
+                sevenDaysModel.JumpIndex = jumpIndex;
+                SetJumpLogic<AchievementActivityWin>(_tagWinSearchModel.TABID);
+                break;
             case JumpUIType.TreasureFindHostFunc1:
             case JumpUIType.TreasureFindHostFunc2:
             case JumpUIType.TreasureFindHostFunc3:
@@ -1017,6 +1025,14 @@
             case JumpUIType.CrossServerOneVsOne278:
             case JumpUIType.CrossServerOneVsOne279:
                 if(!CrossServerOneVsOnePKSeason.Instance.IsEnterCrossServer(true))
+                {
+                    return false;
+                }
+                break;
+            case JumpUIType.SevenDaysTour281:
+            case JumpUIType.SevenDaysTour282:
+                var sevenDaysModel = ModelCenter.Instance.GetModel<OpenServiceAchievementModel>();
+                if(!sevenDaysModel.IsJumpOpen())
                 {
                     return false;
                 }
@@ -1560,6 +1576,8 @@
     CrossServerOneVsOne278 = 278, //璺ㄦ湇璧涘璧涘濂栧姳鐣岄潰
     CrossServerOneVsOne279 = 279, //璺ㄦ湇璧涘鑽h獕鍟嗗簵鐣岄潰
     FashionDress280 = 280, //鏃惰鍔熻兘鐣岄潰
+    SevenDaysTour281 = 281, //涓冩棩宸$ぜ
+    SevenDaysTour282 = 282, //涓冩棩宸$ぜ
     DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
     HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
     GyzTs = 1003,//楝肩墮鍒冨姛娉曟彁鍗囩晫闈�

--
Gitblit v1.8.0