From f2cd8cf71a54e251e5f507c7d69c6f91f90e5074 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 25 九月 2018 20:23:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Store/StoreWin.cs | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/System/Store/StoreWin.cs b/System/Store/StoreWin.cs
index 39b8b6f..7c4d282 100644
--- a/System/Store/StoreWin.cs
+++ b/System/Store/StoreWin.cs
@@ -130,6 +130,11 @@
functionOrder = _integralStoreTitle.order;
}
}
+
+ if(!WindowJumpMgr.Instance.IsJumpState && m_storeModel.funcOrder != -1)
+ {
+ functionOrder = m_storeModel.funcOrder;
+ }
_funcBtnGroup.TriggerByOrder(functionOrder);
GlobalTimeEvent.Instance.secondEvent += RefreshResetTime;
}
@@ -182,8 +187,25 @@
AchievementGoto.guideAchievementId = 0;
}
}
+ else
+ {
+ if(m_storeModel.jumpShopId != 0)
+ {
+ _tagStoreModellist = StoreConfig.GetTypeStoreModel((int)m_storeModel.storeFuncType);
+ for (int i = 0; i < _tagStoreModellist.Count; i++)
+ {
+ if (_tagStoreModellist[i].ID == m_storeModel.jumpShopId)
+ {
+ int index = i / 2 ;
+ _shopCtrl.JumpIndex(index > 2 ? index - 1 : index);
+ _shopCtrl.m_Scorller.RefreshActiveCellViews();
+ break;
+ }
+ }
+ m_storeModel.ClearJumpModel();
+ }
+ }
}
-
private void RefreshResetTime()
{
--
Gitblit v1.8.0