From a619ed5c25fe6c47580c7f16a024e2dc8531a311 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期一, 15 十月 2018 14:19:46 +0800
Subject: [PATCH] 4074 【前端】限时抢购开发
---
System/OpenServerActivity/FlashSaleItemCell.cs | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/System/OpenServerActivity/FlashSaleItemCell.cs b/System/OpenServerActivity/FlashSaleItemCell.cs
index 2abace9..5a1498f 100644
--- a/System/OpenServerActivity/FlashSaleItemCell.cs
+++ b/System/OpenServerActivity/FlashSaleItemCell.cs
@@ -26,7 +26,7 @@
ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
OperationFlashRushToBuy.FlashSaleItem saleItem;
-
+ int buyState = -1;
private void OnEnable()
{
battleModel.RefreshGameRecInfoAct += UpdateFullServerBuy;
@@ -95,7 +95,7 @@
flashSaleBtn.RemoveAllListeners();
var operation = rushToBuyModel.GetOperationFlashRushToBuy();
int seconds = 0;
- int buyState = operation.GetBuyTimeState(TimeUtility.ServerNow,rushToBuyModel.presentFlashShop.dayIndex,
+ buyState = operation.GetBuyTimeState(TimeUtility.ServerNow,rushToBuyModel.presentFlashShop.dayIndex,
rushToBuyModel.presentFlashShop.timeIndex,out seconds);
switch(buyState)
@@ -147,32 +147,39 @@
/// <returns></returns>
private int GetSellSate(out int fullRemainNum)
{
+ fullRemainNum = 0;
+
var buyInfo = storeModel.GetBuyShopLimit((uint)saleItem.shopId);
var buyCount = 0;
var fullServerInfo = rushToBuyModel.GetFullServerInfo();
- fullRemainNum = 0;
- if (fullServerInfo != null && fullServerInfo.Value1 == saleItem.shopId)
+ if(buyState != -1)
{
- fullRemainNum = saleItem.fullServerLimitNum - fullServerInfo.Value2;
+ if (fullServerInfo != null && fullServerInfo.Value1 == saleItem.shopId)
+ {
+ fullRemainNum = saleItem.fullServerLimitNum - fullServerInfo.Value2;
+ }
+ else
+ {
+ fullRemainNum = saleItem.fullServerLimitNum;
+ }
+ if (buyInfo != null)
+ {
+ buyCount = buyInfo.BuyCnt;
+ }
+ if (buyCount >= saleItem.limitNum)
+ {
+ return 1;
+ }
+
+ if (fullRemainNum <= 0)
+ {
+ return 2;
+ }
}
else
{
fullRemainNum = saleItem.fullServerLimitNum;
}
- if (buyInfo != null)
- {
- buyCount = buyInfo.BuyCnt;
- }
- if(buyCount >= saleItem.limitNum)
- {
- return 1;
- }
-
- if (fullRemainNum <= 0)
- {
- return 2;
- }
-
return 0;
}
}
--
Gitblit v1.8.0