From 0501f99c58363fa437eeba57789d9dff574bde31 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 19 九月 2018 14:46:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/ComposeWin.cs | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/System/Compose/New/ComposeWin.cs b/System/Compose/New/ComposeWin.cs
index 16496fc..460aa62 100644
--- a/System/Compose/New/ComposeWin.cs
+++ b/System/Compose/New/ComposeWin.cs
@@ -67,6 +67,35 @@
protected override void OnPreOpen()
{
ComposeModel.ResetModel();
+ if(WindowJumpMgr.Instance.IsJumpState)
+ {
+ if(ComposeModel.CurComposeModel != null)
+ {
+ ComposeModel.SetJumpToModel((ComposeFuncType)ComposeModel.CurComposeModel.firstType,
+ ComposeModel.CurComposeModel.secondType, ComposeModel.CurComposeModel.thirdType);
+ switch ((ComposeFuncType)ComposeModel.CurComposeModel.firstType)
+ {
+ case ComposeFuncType.Wings:
+ functionOrder = _wingsUITitleType.order;
+ break;
+ case ComposeFuncType.Ticket:
+ functionOrder = _ticketUITitleType.order;
+ break;
+ case ComposeFuncType.Fairy:
+ functionOrder = _godequipUITitleType.order;
+ break;
+ case ComposeFuncType.Equip:
+ functionOrder = _equipUITitleType.order;
+ break;
+ case ComposeFuncType.Item:
+ functionOrder = _itemUITitleType.order;
+ break;
+ case ComposeFuncType.MountDogz:
+ functionOrder = _dogzEquipFunc.order;
+ break;
+ }
+ }
+ }
}
protected override void OnActived()
--
Gitblit v1.8.0