From cb0ee4d845b5452beeb2a19dceb4de9ecf191c54 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期四, 22 十一月 2018 15:09:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OpenServerGiftWin.cs | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerGiftWin.cs b/System/OpenServerActivity/OpenServerGiftWin.cs
index f9788a0..15e82e1 100644
--- a/System/OpenServerActivity/OpenServerGiftWin.cs
+++ b/System/OpenServerActivity/OpenServerGiftWin.cs
@@ -15,17 +15,14 @@
public class OpenServerGiftWin : Window
{
[SerializeField] RectTransform m_ContainerDisplay;
- [SerializeField] OSGiftBehaviour[] m_OSGifts;
+ [SerializeField] SuperValueGiftBehaviour[] m_OSGifts;
[SerializeField] RectTransform m_ContainerTime;
[SerializeField] Text m_Overdue;
[SerializeField] Text m_Timer;
- StoreModel m_Model;
- StoreModel model
+
+ VipModel vipModel
{
- get
- {
- return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<StoreModel>());
- }
+ get { return ModelCenter.Instance.GetModel<VipModel>(); }
}
OSGiftModel giftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } }
@@ -45,7 +42,6 @@
giftModel.selectIndex = giftModel.alreadyOpens[0];
}
- model.RefreshBuyShopLimitEvent += RefreshBuyShopLimitEvent;
GlobalTimeEvent.Instance.secondEvent += SecondEvent;
giftModel.onSelectUpdate += OnSelectUpdate;
giftModel.jumpGiftId = 0;
@@ -58,7 +54,6 @@
protected override void OnPreClose()
{
- model.RefreshBuyShopLimitEvent -= RefreshBuyShopLimitEvent;
GlobalTimeEvent.Instance.secondEvent -= SecondEvent;
giftModel.onSelectUpdate -= OnSelectUpdate;
}
@@ -69,11 +64,6 @@
#endregion
private void OnSelectUpdate()
- {
- Display();
- }
-
- private void RefreshBuyShopLimitEvent()
{
Display();
}
@@ -114,7 +104,8 @@
{
if (giftModel.selectIndex == i)
{
- m_OSGifts[i].Display(giftModel.gifts[i].giftId);
+ var rechargeId = giftModel.GetRechargeId(giftModel.gifts[i].payType);
+ m_OSGifts[i].Display(rechargeId);
_index = i;
break;
}
--
Gitblit v1.8.0