From 096bc211e02f3e010ada28ad5b67a687307382b7 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 21 十一月 2018 16:54:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/MysticalPurchaseWin.cs | 85 +++++++++++++-----------------------------
1 files changed, 27 insertions(+), 58 deletions(-)
diff --git a/System/OpenServerActivity/MysticalPurchaseWin.cs b/System/OpenServerActivity/MysticalPurchaseWin.cs
index 397741a..facb677 100644
--- a/System/OpenServerActivity/MysticalPurchaseWin.cs
+++ b/System/OpenServerActivity/MysticalPurchaseWin.cs
@@ -19,8 +19,7 @@
Vector3 startPos = Vector3.zero;
StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
MysticalPurchaseModel purchaseModel { get { return ModelCenter.Instance.GetModel<MysticalPurchaseModel>(); } }
- OperationMysticalPurchase operation = null;
-
+ int moneyType = 0;
#region Built-in
protected override void BindController()
{
@@ -32,9 +31,9 @@
}
protected override void OnPreOpen()
{
- OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent;
- OperationTimeHepler.Instance.operationTimeUpdateEvent += OperationTimeUpdateEvent;
- PlayerDatas.Instance.PlayerDataRefreshInfoEvent += UpdateMoney;
+ purchaseModel.UpdateMysticalShopEvent += UpdateSaleItems;
+ storeModel.RefreshBuyShopLimitEvent += UpdateMoney;
+ SetDisplay();
}
protected override void OnAfterOpen()
@@ -44,9 +43,8 @@
protected override void OnPreClose()
{
- OperationTimeHepler.Instance.operationStartEvent -= OperationStartEvent;
- OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent;
- PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= UpdateMoney;
+ purchaseModel.UpdateMysticalShopEvent -= UpdateSaleItems;
+ storeModel.RefreshBuyShopLimitEvent -= UpdateMoney;
saleItemsContent.anchoredPosition3D = startPos;
}
protected override void OnAfterClose()
@@ -57,74 +55,45 @@
private void SetDisplay()
{
- operation = null;
- OperationBase operationBase;
- if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.MysticalPurchase, out operationBase))
- {
- operation = operationBase as OperationMysticalPurchase;
- }
-
- if(operation != null)
- {
- opreationTimeText.text = StringUtility.Contact(Language.Get("ExpActivity_Text1"), UIHelper.AppendStringColor(TextColType.Green, operation.ToDisplayTime()));
- UpdateMoneyInfo();
- activityOpenObj.SetActive(true);
- activityCloseObj.SetActive(false);
- UpdateSaleItems();
- }
+ UpdateSaleItems();
+ UpdateMoneyInfo();
}
private void UpdateSaleItems()
{
- if (operation == null) return;
-
- List<OperationMysticalPurchase.FlashSaleItem> flashSaleItems = null;
- for(int i = 0; i < saleItems.Count; i++)
+ List<MysticalPurchaseModel.MysticalShop> mysticalShops = null;
+ bool isHaveSell = purchaseModel.TryGetCurSellShop(out mysticalShops);
+ activityCloseObj.SetActive(!isHaveSell);
+ activityOpenObj.SetActive(isHaveSell);
+ if (isHaveSell)
{
- var saleItem = saleItems[i];
-
- if (i < flashSaleItems.Count)
+ for (int i = 0; i < saleItems.Count; i++)
{
- saleItem.SetDisplay(i);
- saleItem.gameObject.SetActive(true);
- }
- else
- {
- saleItem.gameObject.SetActive(false);
+ var saleItem = saleItems[i];
+ if (i < mysticalShops.Count)
+ {
+ var mysticalShop = mysticalShops[i];
+ moneyType = mysticalShop.storeConfig.MoneyType;
+ saleItem.SetDisplay(mysticalShop);
+ saleItem.gameObject.SetActive(true);
+ }
+ else
+ {
+ saleItem.gameObject.SetActive(false);
+ }
}
}
}
private void UpdateMoneyInfo()
{
- if (operation == null) return;
-
- var moneyType = 1;
moneyIcon.SetIconWithMoneyType(moneyType);
moneyNumText.text = UIHelper.GetMoneyCnt(moneyType).ToString();
}
- private void UpdateMoney(PlayerDataRefresh type)
+ private void UpdateMoney()
{
- if (type != PlayerDataRefresh.Gold) return;
-
UpdateMoneyInfo();
- }
-
- private void OperationTimeUpdateEvent(Operation type)
- {
- if (type == Operation.MysticalPurchase)
- {
- SetDisplay();
- }
- }
-
- private void OperationStartEvent(Operation type, int state)
- {
- if (type == Operation.MysticalPurchase && state == 0)
- {
- SetDisplay();
- }
}
}
}
--
Gitblit v1.8.0