From eedeb8a020fce13e0e63ad7c57adfdff7578e875 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 14 三月 2019 21:05:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Store/BagStoreWin.cs | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/System/Store/BagStoreWin.cs b/System/Store/BagStoreWin.cs
index 37f5587..d660c9b 100644
--- a/System/Store/BagStoreWin.cs
+++ b/System/Store/BagStoreWin.cs
@@ -11,7 +11,8 @@
using Snxxz.UI;
-namespace Snxxz.UI {
+namespace Snxxz.UI
+{
public class BagStoreWin : StoreUIBasic
{
@@ -27,12 +28,10 @@
private Text _sliverText;
#endregion
- StoreModel _storeModel;
- StoreModel m_storeModel
- {
- get { return _storeModel ?? (_storeModel = ModelCenter.Instance.GetModel<StoreModel>()); }
- }
+ StoreModel m_storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
+
int shopId = 0;
+
#region Built-in
protected override void BindController()
{
@@ -76,7 +75,7 @@
{
if (AchievementGoto.guideAchievementId != 0)
{
- SuccessConfig successConfig = SuccessConfig.Get(AchievementGoto.guideAchievementId);
+ var successConfig = SuccessConfig.Get(AchievementGoto.guideAchievementId);
if (successConfig.Type == 96)
{
p_shopItemlist = m_storeModel.TryGetStoreDatas(m_storeModel.storeFuncType);
@@ -100,7 +99,7 @@
public void InitModel()
{
- CreateShopItemCell(_shopCtrl,2);
+ CreateShopItemCell(_shopCtrl, 2);
}
protected override void CreateShopItemCell(ScrollerController shopCtrl, int row)
@@ -135,7 +134,7 @@
shopItemCell.stateImage.gameObject.SetActive(false);
}
- ItemConfig chinModel = ItemConfig.Get(m_storeModel.GetReplaceId(shopInfo.ID,shopInfo.ItemID));
+ ItemConfig chinModel = ItemConfig.Get(m_storeModel.GetReplaceId(shopInfo.ID, shopInfo.ItemID));
if (chinModel != null)
{
ItemCellModel cellModel = new ItemCellModel(chinModel.ID, true, 0);
@@ -161,8 +160,8 @@
shopItemCell.vipText.gameObject.SetActive(true);
shopItemCell.vipText.text = Language.Get("StoreWin101", shopInfo.VIPLV[nextVipIndex]);
shopItemCell.sellImage.gameObject.SetActive(false);
- shopItemCell.itemNameText.color = UIHelper.GetUIColor(TextColType.Red,true);
- shopItemCell.vipText.color = UIHelper.GetUIColor(TextColType.Red,true);
+ shopItemCell.itemNameText.color = UIHelper.GetUIColor(TextColType.Red, true);
+ shopItemCell.vipText.color = UIHelper.GetUIColor(TextColType.Red, true);
isShowBuyPrice = false;
}
}
@@ -199,29 +198,31 @@
}
shopItemCell.itemNameText.color = UIHelper.GetUIColor(chinModel.ItemColor, true);
- shopItemCell.vipText.color = UIHelper.GetUIColor(TextColType.Black,true);
+ shopItemCell.vipText.color = UIHelper.GetUIColor(TextColType.Black, true);
}
- shopItemCell.LoadGuidEffectCtrl(shopInfo.ID,shopId);
+ shopItemCell.LoadGuidEffectCtrl(shopInfo.ID, shopId);
}
shopItemCell.ShopCellBtn.RemoveAllListeners();
- shopItemCell.ShopCellBtn.AddListener(() => {
+ shopItemCell.ShopCellBtn.AddListener(() =>
+ {
if (shopInfo.ID == shopId)
{
shopId = 0;
- shopItemCell.LoadGuidEffectCtrl(shopInfo.ID,shopId);
+ shopItemCell.LoadGuidEffectCtrl(shopInfo.ID, shopId);
}
m_storeModel.OnClickShopCell(shopInfo);
});
shopItemCell.buyBtn.RemoveAllListeners();
- shopItemCell.buyBtn.AddListener(()=> {
- if(shopInfo.ID == shopId)
+ shopItemCell.buyBtn.AddListener(() =>
+ {
+ if (shopInfo.ID == shopId)
{
shopId = 0;
- shopItemCell.LoadGuidEffectCtrl(shopInfo.ID,shopId);
+ shopItemCell.LoadGuidEffectCtrl(shopInfo.ID, shopId);
}
- m_storeModel.SendBuyShopItem(shopInfo,1);
+ m_storeModel.SendBuyShopItem(shopInfo, 1);
});
}
else
@@ -230,13 +231,12 @@
}
}
}
-
+
public void OnFrenshMoneyInfo()
{
if (PlayerDatas.Instance.baseData != null)
{
_goldText.text = PlayerDatas.Instance.baseData.diamond.ToString();
- _goldPaperText.text = PlayerDatas.Instance.baseData.bindDiamond.ToString();
_sliverText.text = ItemLogicUtility.Instance.OnChangeCoinsUnit(PlayerDatas.Instance.baseData.allCopper);
}
else
--
Gitblit v1.8.0