From a251fc4f0bc58d18d9e48c2bed815d99f7ee25bd Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 13 六月 2019 14:38:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Vip/RechargeBehaviour.cs | 12 ++++++++----
System/Vip/VipRechargeWin.cs | 4 ----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/System/Vip/RechargeBehaviour.cs b/System/Vip/RechargeBehaviour.cs
index 688ebae..680dab1 100644
--- a/System/Vip/RechargeBehaviour.cs
+++ b/System/Vip/RechargeBehaviour.cs
@@ -45,12 +45,16 @@
}
chargeId = _id;
m_ChargeIcon.SetSprite(config.Icon);
- m_PriceValue.text = StringUtility.Contact("楼", model.GetPayRmb(config.RecordID));
- m_GetGoldValue.gameObject.SetActive(config.GainGold > 0);
- if(config.GainGold > 0)
+ m_PriceValue.text = StringUtility.Contact(model.GetPayRmb(config.RecordID), "x");
+ if (m_GetGoldValue != null)
{
- m_GetGoldValue.text = config.GainGold.ToString();
+ m_GetGoldValue.gameObject.SetActive(config.GainGold > 0);
+ if (config.GainGold > 0)
+ {
+ m_GetGoldValue.text = "x" + config.GainGold;
+ }
}
+
VipModel.RechargeCount _rechargeCount;
bool _firstRecharge = true;
if (model.TryGetRechargeCount(_id, out _rechargeCount))
diff --git a/System/Vip/VipRechargeWin.cs b/System/Vip/VipRechargeWin.cs
index 182e318..cc437df 100644
--- a/System/Vip/VipRechargeWin.cs
+++ b/System/Vip/VipRechargeWin.cs
@@ -14,8 +14,6 @@
public class VipRechargeWin : Window
{
- [SerializeField] Button leftBtn;
- [SerializeField] Button rightBtn;
[SerializeField] Button closeBtn;
[SerializeField] FunctionButton vipPayTitleBtn;
[SerializeField] FunctionButton vipTitleBtn;
@@ -43,8 +41,6 @@
protected override void AddListeners()
{
- leftBtn.onClick.AddListener(buttonGroup.TriggerLast);
- rightBtn.onClick.AddListener(buttonGroup.TriggerNext);
closeBtn.onClick.AddListener(OnClose);
vipPayTitleBtn.onClick.AddListener(OnVipPay);
vipTitleBtn.onClick.AddListener(OnVip);
--
Gitblit v1.8.0