From 060faec7b10ad7a3ff33a3dd2453ee7ebc1bb24d Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 21 九月 2018 11:12:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/ComposeWin.cs | 9 +++++++--
System/WindowJump/WindowJumpMgr.cs | 8 +++++---
System/Store/PetAndMountPushWin.cs | 3 +++
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/System/Compose/New/ComposeWin.cs b/System/Compose/New/ComposeWin.cs
index 68bfa55..74a40bc 100644
--- a/System/Compose/New/ComposeWin.cs
+++ b/System/Compose/New/ComposeWin.cs
@@ -67,7 +67,7 @@
protected override void OnPreOpen()
{
ComposeModel.ResetModel();
- if(WindowJumpMgr.Instance.IsJumpState)
+ if(WindowJumpMgr.Instance.IsJumpState && WindowJumpMgr.Instance.jumpType == 1)
{
if(ComposeModel.CurComposeModel != null)
{
@@ -154,14 +154,19 @@
{
ComposeModel.ResetJumpToModel();
selectModel.ClearSelectModel();
+
}
protected override void OnAfterClose()
{
-
if (!WindowJumpMgr.Instance.IsJumpState)
{
WindowCenter.Instance.Open<MainInterfaceWin>();
+
+ }
+ if(WindowJumpMgr.Instance.jumpType != 1)
+ {
+ ComposeModel.SetCurComposeModel(null);
}
}
#endregion
diff --git a/System/Store/PetAndMountPushWin.cs b/System/Store/PetAndMountPushWin.cs
index a836a2a..bdbb800 100644
--- a/System/Store/PetAndMountPushWin.cs
+++ b/System/Store/PetAndMountPushWin.cs
@@ -11,6 +11,7 @@
[SerializeField] RawImage rawImag;
[SerializeField] Button closeBtn;
[SerializeField] RichText m_Goto;
+ [SerializeField] Text fightPower;
StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
@@ -65,11 +66,13 @@
titleText.text = Language.Get("StorePetPush");
PetInfoConfig petInfo = tipsModel.unlockPetDict[storeConfig.ItemID];
var config = Config.Instance.Get<NPCConfig>(petInfo.ID);
+ fightPower.text = petInfo.ShowFightPower.ToString();
UI3DModelExhibition.Instance.BeginShowNPC(petInfo.ID, config.UIModeLOffset, config.UIModelRotation,rawImag);
break;
case 41:
titleText.text = Language.Get("StoreMountPush");
HorseConfig horseConfig = tipsModel.unlockMountDict[storeConfig.ItemID];
+ fightPower.text = horseConfig.ShowFightPower.ToString();
UI3DModelExhibition.Instance.BeginShowHourse(horseConfig.Model,rawImag);
break;
}
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 25ce56f..5759e78 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -49,7 +49,7 @@
public bool IsJumpState { get; private set; }
private int jumpPhase = 0;
-
+ public int jumpType { get; private set; }
public void GetPreAllOpenWin()
{
jumpPhase += 1;
@@ -79,6 +79,7 @@
{
IsJumpState = false;
jumpPhase = 0;
+ jumpType = 0;
openWindows.Clear();
jumpWinNameDict.Clear();
WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;
@@ -833,6 +834,7 @@
IsJumpState = false;
openWindows.Clear();
jumpWinNameDict.Clear();
+ jumpType = 0;
jumpPhase = 0;
break;
}
@@ -876,9 +878,9 @@
private void SetJumpLogic<T>(int _functionalOrder = 0, bool _forceSync = true) where T : Window
{
-
string curOpenWin = typeof(T).Name;
jumpWinNameDict.Add(jumpPhase, curOpenWin);
+ jumpType = _tagWinSearchModel.Type;
switch (_tagWinSearchModel.Type)
{
case 1:
@@ -921,7 +923,7 @@
}
DebugEx.Log("鍏抽棴鐣岄潰绫诲瀷锛�" + _tagWinSearchModel.Type);
WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;
-
+ jumpType = _tagWinSearchModel.Type;
int i = 0;
List<string> openWinlist = null;
switch (_tagWinSearchModel.Type)
--
Gitblit v1.8.0