From bff1837b1f805a35dc99ca4439f27112a986747f Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 13 十月 2018 17:12:12 +0800
Subject: [PATCH] 4075 【后端】限时抢购开发-预约通知修改

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.py |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.py
index 8b8b8dc..c067a93 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.py
@@ -226,11 +226,11 @@
     if not cfgID:
         return
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FlashSaleYY % goodsID, packData.State, ChConfig.Def_PDictType_FlashSale)
-    Sync_FlashSaleAppointmentInfo(curPlayer)
+    Sync_FlashSaleAppointmentInfo(curPlayer, goodsID)
     return
 
 
-def Sync_FlashSaleAppointmentInfo(curPlayer):
+def Sync_FlashSaleAppointmentInfo(curPlayer, goodsID=0):
     ##通知限时抢购预约情况
     actInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_FlashSale, {})
     if not actInfo:
@@ -243,17 +243,29 @@
         return
     packInfo = ChPyNetSendPack.tagMCFlashSaleAppointmentInfo()
     packInfo.GoodsList = []
-    shopTypeList = flashSaleIpyData.GetShopTypeList()
-    for dayIndex, shopList in enumerate(shopTypeList):
-        for timeIndex, shopType in enumerate(shopList):
-            shopItemIpyDataList = IpyGameDataPY.GetIpyGameDataByCondition("Store", {"ShopType":shopType}, True, True)
-            if not shopItemIpyDataList:
-                continue
-            for i in xrange(len(shopItemIpyDataList)):
-                goodsMark = dayIndex * 10000 + timeIndex * 100 + i  #商品标识
-                isAppointment = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FlashSaleYY % goodsMark, 0, ChConfig.Def_PDictType_FlashSale)
-                if isAppointment:
-                    packInfo.GoodsList.append(goodsMark)
+    if goodsID == 0:
+        packInfo.IsAll = 1
+        shopTypeList = flashSaleIpyData.GetShopTypeList()
+        for dayIndex, shopList in enumerate(shopTypeList):
+            for timeIndex, shopType in enumerate(shopList):
+                shopItemIpyDataList = IpyGameDataPY.GetIpyGameDataByCondition("Store", {"ShopType":shopType}, True, True)
+                if not shopItemIpyDataList:
+                    continue
+                for i in xrange(len(shopItemIpyDataList)):
+                    goodsMark = dayIndex * 10000 + timeIndex * 100 + i  #商品标识
+                    isAppointment = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FlashSaleYY % goodsMark, 0, ChConfig.Def_PDictType_FlashSale)
+                    if isAppointment:
+                        appoinetmentPack = ChPyNetSendPack.tagMCFlashSaleAppointmentState()
+                        appoinetmentPack.GoodsMark = goodsMark
+                        appoinetmentPack.State = 1
+                        packInfo.GoodsList.append(appoinetmentPack)
+    else:
+        packInfo.IsAll = 0
+        isAppointment = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FlashSaleYY % goodsID, 0, ChConfig.Def_PDictType_FlashSale)
+        appoinetmentPack = ChPyNetSendPack.tagMCFlashSaleAppointmentState()
+        appoinetmentPack.GoodsMark = goodsID
+        appoinetmentPack.State = isAppointment
+        packInfo.GoodsList.append(appoinetmentPack)
     packInfo.GoodsCount = len(packInfo.GoodsList)
     NetPackCommon.SendFakePack(curPlayer, packInfo)
     return

--
Gitblit v1.8.0