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/HappyXB/XBStoreWin.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/HappyXB/XBStoreWin.cs b/System/HappyXB/XBStoreWin.cs
index 995cec1..1b5d6e5 100644
--- a/System/HappyXB/XBStoreWin.cs
+++ b/System/HappyXB/XBStoreWin.cs
@@ -22,7 +22,7 @@
PackModelInterface modelInterface { get { return ModelCenter.Instance.GetModel<PackModelInterface>(); } }
- List<StoreConfig> shoplist;
+ List<StoreModel.StoreData> shoplist;
int SingleLineCnt = 2;
protected override void BindController()
@@ -110,7 +110,7 @@
private void CreateShopCell()
{
shopCtrl.Refresh();
- shoplist = StoreConfig.GetTypeStoreModel((int)m_storeModel.storeFuncType);
+ shoplist = m_storeModel.TryGetStoreDatas((int)m_storeModel.storeFuncType);
if (shoplist.Count > 0)
{
int i = 0;
@@ -141,7 +141,7 @@
if(shoplist.Count >= cellCount)
{
shopCell.gameObject.SetActive(true);
- shopCell.SetModel(shoplist[cellCount-1]);
+ shopCell.SetModel(shoplist[cellCount-1].storeConfig);
}
else
{
--
Gitblit v1.8.0