From 44feb9db3b97f80331162d954946a3e272dcb19d Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 05 七月 2019 10:28:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowJump/WindowJumpMgr.cs | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 693c81f..2cb7620 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -764,6 +764,9 @@
case JumpUIType.ExchangeActiveToken:
SetJumpLogic<ExchangeActiveTokenWin>();
break;
+ case JumpUIType.SpiritWeapon:
+ SetJumpLogic("SpiritEquipWin", 0 ,false);
+ break;
default:
DebugEx.Log("鏈坊鍔犳璺宠浆鐣岄潰锛�" + jumpType);
IsJumpState = false;
@@ -1178,43 +1181,47 @@
SetJumpLogic<MultipleDifficultyDungeonWin>(0);
}
- private void SetJumpLogic<T>(int _functionalOrder = 0, bool _forceSync = true) where T : Window
+ private void SetJumpLogic<T>(int functionOrder = 0, bool sync = true) where T : Window
{
- string curOpenWin = typeof(T).Name;
- if (WindowCenter.Instance.IsOpen(curOpenWin))
+ SetJumpLogic(typeof(T).Name, functionOrder, sync);
+ }
+
+ private void SetJumpLogic(string windowName, int functionOrder, bool sync)
+ {
+ if (WindowCenter.Instance.IsOpen(windowName))
{
- Window window = WindowCenter.Instance.Get(curOpenWin);
- window.functionOrder = _functionalOrder;
+ Window window = WindowCenter.Instance.Get(windowName);
+ window.functionOrder = functionOrder;
window.ChildActive();
return;
}
GetPreAllOpenWin();
- jumpWinNameDict.Add(jumpPhase, curOpenWin);
+ jumpWinNameDict.Add(jumpPhase, windowName);
jumpType = _tagWinSearchModel.Type;
switch (_tagWinSearchModel.Type)
{
case 1:
WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.SystemAndCustom);
- WindowCenter.Instance.Open<T>(_forceSync, _functionalOrder);
+ WindowCenter.Instance.Open(windowName, sync, functionOrder);
WindowCenter.Instance.jumpWindowCloseEvent += CloseWindow;
break;
case 2:
WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.SystemAndCustom);
- WindowCenter.Instance.Open<T>(_forceSync, _functionalOrder);
+ WindowCenter.Instance.Open(windowName, sync, functionOrder);
WindowCenter.Instance.jumpWindowCloseEvent += CloseWindow;
break;
case 3:
WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.SystemAndCustom);
- WindowCenter.Instance.Open<T>(_forceSync, _functionalOrder);
+ WindowCenter.Instance.Open(windowName, sync, functionOrder);
WindowCenter.Instance.jumpWindowCloseEvent += CloseWindow;
break;
case 4:
WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.SystemAndCustom);
- WindowCenter.Instance.Open<T>(_forceSync, _functionalOrder);
+ WindowCenter.Instance.Open(windowName, sync, functionOrder);
WindowCenter.Instance.jumpWindowCloseEvent += CloseWindow;
break;
case 5:
- WindowCenter.Instance.Open<T>(_forceSync, _functionalOrder);
+ WindowCenter.Instance.Open(windowName, sync, functionOrder);
WindowCenter.Instance.jumpWindowCloseEvent += CloseWindow;
break;
default:
@@ -1741,6 +1748,7 @@
CrossServerBoss = 335,//钃幈浠欏
Alchemy10 = 336,
Alchemy11 = 337,
+ SpiritWeapon = 338,//榄傚櫒鐣岄潰
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0