From 6ce4ae16561fd205c8bb3f530d5a20033f207f4f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 24 八月 2018 18:19:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/OpenServerActivity/OSGiftBehaviour.cs | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/System/OpenServerActivity/OSGiftBehaviour.cs b/System/OpenServerActivity/OSGiftBehaviour.cs
index 2bc822c..95f58c1 100644
--- a/System/OpenServerActivity/OSGiftBehaviour.cs
+++ b/System/OpenServerActivity/OSGiftBehaviour.cs
@@ -18,6 +18,7 @@
[SerializeField] Text m_OriginalMoneyValue;
[SerializeField] Button m_BuyBtn;
[SerializeField] Image m_Complete;
+ [SerializeField] Text m_OwnMoney;
StoreModel m_StoreModel;
StoreModel storeModel
@@ -55,11 +56,21 @@
private void OnEnable()
{
storeModel.RefreshBuyShopLimitEvent += RefreshBuyShopLimitEvent;
+ PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;
}
private void OnDisable()
{
storeModel.RefreshBuyShopLimitEvent -= RefreshBuyShopLimitEvent;
+ PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent;
+ }
+
+ private void PlayerDataRefreshInfoEvent(PlayerDataRefresh refreshType)
+ {
+ if (refreshType == PlayerDataRefresh.Gold || refreshType == PlayerDataRefresh.GoldPaper)
+ {
+ DisplayOwnMoney();
+ }
}
private void RefreshBuyShopLimitEvent()
@@ -111,11 +122,22 @@
m_OriginalMoneyValue.text = _storeConfig.MoneyOriginal.ToString();
}
+ DisplayOwnMoney();
+
var _limit = storeModel.GetBuyShopLimit((uint)storeId);
m_Complete.gameObject.SetActive(_limit != null && _limit.BuyCnt >= _storeConfig.PurchaseNumber[0]);
m_BuyBtn.gameObject.SetActive(_limit == null || _limit.BuyCnt < _storeConfig.PurchaseNumber[0]);
}
+ private void DisplayOwnMoney()
+ {
+ if (m_OwnMoney != null)
+ {
+ var config = Config.Instance.Get<StoreConfig>(storeId);
+ m_OwnMoney.text = UIHelper.GetMoneyCnt(config == null ? 1 : config.MoneyType).ToString();
+ }
+ }
+
private void OnBuyBtn()
{
var _storeConfig = Config.Instance.Get<StoreConfig>(storeId);
--
Gitblit v1.8.0