From 4b29a5b47b786cf320cb4f17f0a323a3944b52d8 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 14 十一月 2018 15:02:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Store/BagStoreWin.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/System/Store/BagStoreWin.cs b/System/Store/BagStoreWin.cs
index 8ad2f86..d9236db 100644
--- a/System/Store/BagStoreWin.cs
+++ b/System/Store/BagStoreWin.cs
@@ -85,12 +85,13 @@
SuccessConfig successConfig = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
if (successConfig.Type == 96)
{
- p_shopItemlist = StoreConfig.GetTypeStoreModel((int)m_storeModel.storeFuncType);
+ p_shopItemlist = m_storeModel.TryGetStoreDatas((int)m_storeModel.storeFuncType);
for (int i = 0; i < p_shopItemlist.Count; i++)
{
- if (p_shopItemlist[i].ItemID == m_storeModel.jumpToItemId)
+ var storeData = p_shopItemlist[i];
+ if (storeData.storeConfig.ItemID == m_storeModel.jumpToItemId)
{
- shopId = p_shopItemlist[i].ID;
+ shopId = storeData.shopId;
int index = i / 2;
_shopCtrl.JumpIndex(index);
_shopCtrl.m_Scorller.RefreshActiveCellViews();
@@ -127,7 +128,7 @@
if (p_shopItemlist.Count >= cellCount)
{
- StoreConfig shopInfo = p_shopItemlist[cellCount - 1];
+ StoreConfig shopInfo = p_shopItemlist[cellCount - 1].storeConfig;
cell.transform.GetChild(childCode).gameObject.SetActive(true);
if (shopInfo.SalesStatus.Trim() != "")
{
@@ -140,7 +141,7 @@
shopItemCell.stateImage.gameObject.SetActive(false);
}
- ItemConfig chinModel = Config.Instance.Get<ItemConfig>(m_storeModel.ReplaceItemIdByJob(shopInfo.ID, shopInfo.ItemID));
+ ItemConfig chinModel = Config.Instance.Get<ItemConfig>(m_storeModel.GetReplaceId(shopInfo.ID));
if (chinModel != null)
{
ItemCellModel cellModel = new ItemCellModel(chinModel.ID, true, 0, shopInfo.IsBind);
--
Gitblit v1.8.0