From 65fb6364670f86e21adfab1ae0b42a7be8dc07f4 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 08 十二月 2018 15:52:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/New/FBHelpPointExchageNotify.cs | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/System/KnapSack/New/FBHelpPointExchageNotify.cs b/System/KnapSack/New/FBHelpPointExchageNotify.cs
index 1a763b5..755ad46 100644
--- a/System/KnapSack/New/FBHelpPointExchageNotify.cs
+++ b/System/KnapSack/New/FBHelpPointExchageNotify.cs
@@ -6,13 +6,13 @@
{
public class FBHelpPointExchageNotify : MonoBehaviour
{
- [SerializeField] CommonItemBaisc itemBaisc;
[SerializeField] Text titleText;
[SerializeField] Button closeBtn;
[SerializeField] Button gotoBtn;
FBHelpPointExchageModel ExchageModel { get { return ModelCenter.Instance.GetModel<FBHelpPointExchageModel>(); } }
ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
+ StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
public void Awake()
{
@@ -24,25 +24,13 @@
{
int shopId = ExchageModel.currentShopId;
this.gameObject.SetActive(shopId != 0);
- if (shopId == 0) return;
-
- StoreConfig storeConfig = Config.Instance.Get<StoreConfig>(shopId);
- if(storeConfig != null)
- {
- ItemCellModel cellModel = new ItemCellModel(storeConfig.ItemID);
- itemBaisc.Init(cellModel);
- itemBaisc.cellBtn.RemoveAllListeners();
- itemBaisc.cellBtn.AddListener(()=>
- {
- ItemAttrData attrData = new ItemAttrData(storeConfig.ItemID);
- tipsModel.SetItemTipsModel(attrData);
- });
- }
}
public void ClickGoto()
{
+
StoreConfig storeConfig = Config.Instance.Get<StoreConfig>(ExchageModel.currentShopId);
+ storeModel.SetJumpModel(StoreFunc.IntegralStore, ExchageModel.currentShopId);
switch ((StoreFunc)storeConfig.ShopType)
{
case StoreFunc.WeekStore:
--
Gitblit v1.8.0