From 2bdca925498c2b06de803cd6ec1704faef8eec30 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 18 十月 2018 15:34:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OperationFlashRushToBuy.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/System/OpenServerActivity/OperationFlashRushToBuy.cs b/System/OpenServerActivity/OperationFlashRushToBuy.cs
index c8036bd..41ac8b8 100644
--- a/System/OpenServerActivity/OperationFlashRushToBuy.cs
+++ b/System/OpenServerActivity/OperationFlashRushToBuy.cs
@@ -91,9 +91,22 @@
{
if(PlayerDatas.Instance.baseData.LV >= limitLv)
{
- if(InAdvanceTime(TimeUtility.ServerNow) || InTime(TimeUtility.ServerNow))
+ if(flashShops.Count > 0)
{
- return true;
+ int openSeconds = 0;
+ int endSeconds = 0;
+ var fristShop = flashShops[0];
+ var lastShop = flashShops[flashShops.Count - 1];
+ int OpenState = GetBuyTimeState(TimeUtility.ServerNow,fristShop.dayIndex,fristShop.timeIndex, out openSeconds);
+ int endState = GetBuyTimeState(TimeUtility.ServerNow,lastShop.dayIndex, lastShop.timeIndex,out endSeconds);
+ if(OpenState == -1 && openSeconds <= inAdvanceMinute*60)
+ {
+ return true;
+ }
+ else if(endState != 1 && OpenState != -1)
+ {
+ return true;
+ }
}
}
return false;
@@ -132,7 +145,7 @@
var item = new FlashSaleItem();
var saleItem = shop.GiftbagInfo[k];
item.shopId = (int)saleItem.GiftID;
- item.shopGuid = shop.DayIndex*1000 + shop.TimeIndex*100 + k;
+ item.shopGuid = shop.DayIndex*10000 + shop.TimeIndex*100 + k;
item.limitNum = saleItem.BuyCountLimit;
item.fullServerLimitNum = saleItem.ServerBuyCountLimit;
item.moneyType = saleItem.MoneyType;
--
Gitblit v1.8.0