From 252d46b8642ad4ecebe1a8b9d3a0678913413ebf Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 14 十一月 2018 15:30:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Store/UnionStoreWin.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/System/Store/UnionStoreWin.cs b/System/Store/UnionStoreWin.cs
index 8b9f45c..16af840 100644
--- a/System/Store/UnionStoreWin.cs
+++ b/System/Store/UnionStoreWin.cs
@@ -113,15 +113,15 @@
SuccessConfig successConfig = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
if (successConfig.Type == 97)
{
- p_shopItemlist = StoreConfig.GetTypeStoreModel((int)m_storeModel.storeFuncType);
- List<StoreConfig> orderlist = new List<StoreConfig>();
+ p_shopItemlist = m_storeModel.TryGetStoreDatas((int)m_storeModel.storeFuncType);
+ List<StoreModel.StoreData> orderlist = new List<StoreModel.StoreData>();
orderlist.AddRange(p_shopItemlist);
orderlist.Sort(CompareByMoney);
for (int i = 0; i < p_shopItemlist.Count; i++)
{
- if (p_shopItemlist[i].ID == orderlist[0].ID)
+ if (p_shopItemlist[i].shopId == orderlist[0].shopId)
{
- shopId = p_shopItemlist[i].ID;
+ shopId = p_shopItemlist[i].shopId;
int index = i / 2;
_shopCtrl.JumpIndex(index);
_shopCtrl.m_Scorller.RefreshActiveCellViews();
@@ -133,10 +133,10 @@
}
}
- public int CompareByMoney(StoreConfig start, StoreConfig end)
+ public int CompareByMoney(StoreModel.StoreData start, StoreModel.StoreData end)
{
- int money1 = start.MoneyNumber;
- int money2 = end.MoneyNumber;
+ int money1 = start.storeConfig.MoneyNumber;
+ int money2 = end.storeConfig.MoneyNumber;
if (money1.CompareTo(money2) != 0) return money1.CompareTo(money2);
int index1 = p_shopItemlist.IndexOf(start);
int index2 = p_shopItemlist.IndexOf(end);
@@ -180,7 +180,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() != "")
{
@@ -191,7 +191,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,false, 0, shopInfo.IsBind);
--
Gitblit v1.8.0