From 30e8238a8b6660a2524048a171495ad8ee7baf0b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 16:56:49 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Store/StoreModel.cs | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/System/Store/StoreModel.cs b/System/Store/StoreModel.cs
index 8586001..400548f 100644
--- a/System/Store/StoreModel.cs
+++ b/System/Store/StoreModel.cs
@@ -58,6 +58,7 @@
{
IsMustBuyDay = false;
isLogin = true;
+ ClearJumpModel();
StageManager.Instance.onStageLoadFinish -= OnStageLoadFinish;
FuncOpen.Instance.OnFuncStateChangeEvent -= FuncStateChange;
WindowCenter.Instance.windowAfterCloseEvent -= windowAfterOpen;
@@ -1019,7 +1020,7 @@
List<StoreConfig> storelist = StoreConfig.GetAllShoplist();
for(int i = 0; i < storelist.Count; i++)
{
- if (storelist[i].ShopType != (int)StoreFunc.GrowStrongerStore) continue;
+ if (storelist[i].ShopType != (int)StoreFunc.BindStore) continue;
ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(storelist[i].ItemID);
string key = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID,"ShopId",storelist[i].ID);
@@ -1242,6 +1243,24 @@
}
#endregion
+
+ #region 澶勭悊璺宠浆鏁版嵁
+ public int funcOrder { get; private set; }
+ public int jumpShopId { get; private set; }
+ public void SetJumpModel(StoreFunc storeFunc,int shopId)
+ {
+ if (shopId == 0) return;
+
+ funcOrder = (int)storeFunc - 1;
+ jumpShopId = shopId;
+ }
+
+ public void ClearJumpModel()
+ {
+ funcOrder = -1;
+ jumpShopId = 0;
+ }
+ #endregion
}
public enum StoreFunc
--
Gitblit v1.8.0