From 6e68408870278c607c7f33df5a5df58c8b7cef78 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 十一月 2025 16:10:18 +0800
Subject: [PATCH] 252 【付费内容】每日特惠-服务端

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py |  147 +++++++++++++++----------------------------------
 1 files changed, 45 insertions(+), 102 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
index 394c127..b44dfb8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
@@ -95,10 +95,6 @@
 def OnLogin(curPlayer):
     if not DoResetCTGCountByTime(curPlayer):
         Sync_CoinToGoldCountInfo(curPlayer)
-    if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_DayFreeGoldGiftState):
-        Sync_DayFreeGoldGiftState(curPlayer)
-    if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OnlineRechargeTHAward):
-        SyncOnlineRechargeTH(curPlayer)
     return
 
 def DoResetCTGCountByTime(curPlayer):
@@ -205,9 +201,6 @@
     if syncRecordIDList:
         Sync_CoinToGoldCountInfo(curPlayer, syncRecordIDList)
         
-    if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_DayFreeGoldGiftState):
-        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_DayFreeGoldGiftState, 0)
-        Sync_DayFreeGoldGiftState(curPlayer)
     return
 
 def OnWeek(curPlayer):
@@ -576,21 +569,8 @@
             return
         addDRDict.update({"selectItemList":selectItemList})
         
-    totalBuyCountUpd = min(totalBuyCount + 1, ChConfig.Def_UpperLimit_DWord)
-    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CTGGoodsBuyCount % recordID, totalBuyCountUpd)
-    addDRDict.update({"totalBuyCountUpd":totalBuyCountUpd})
-    
-    todayBuyCountUpd = min(todayBuyCount + 1, ChConfig.Def_UpperLimit_DWord)
-    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TodayCTGCount % recordID, todayBuyCountUpd)
-    addDRDict.update({"todayBuyCountUpd":todayBuyCountUpd})
-    
-    weekBuyCountUpd = min(weekBuyCount + 1, ChConfig.Def_UpperLimit_DWord)
-    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_WeekCTGCount % recordID, weekBuyCountUpd)
-    addDRDict.update({"weekBuyCountUpd":weekBuyCountUpd})
-    
-    monthBuyCountUpd = min(monthBuyCount + 1, ChConfig.Def_UpperLimit_DWord)
-    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MonthCTGCount % recordID, monthBuyCountUpd)
-    addDRDict.update({"monthBuyCountUpd":monthBuyCountUpd})
+    totalBuyCountUpd, todayBuyCountUpd, weekBuyCountUpd, monthBuyCountUpd = __addCTGIDBuyCnt(curPlayer, recordID)
+    addDRDict.update({"totalBuyCountUpd":totalBuyCountUpd, "todayBuyCountUpd":todayBuyCountUpd, "weekBuyCountUpd":weekBuyCountUpd, "monthBuyCountUpd":monthBuyCountUpd})
     
     giveItemList = []
     giveItemList += GetCTGGiveItemList(ipyData)
@@ -610,8 +590,50 @@
             prizeGold += actPrizeGold
             addDRDict.update({"actRechargePrize":1})
             
-    Sync_CoinToGoldCountInfo(curPlayer, [recordID])
+    syncRecordIDList = [recordID]
+    # 打包购买 - 目前用于每日特惠,有需要可扩展为通用
+    if recordID == IpyGameDataPY.GetFuncCfg("DailyTehui", 2):
+        packItemDict = {}
+        packCTGIDDict = {}
+        dailyTehuiCTGIDList = IpyGameDataPY.GetFuncEvalCfg("DailyTehui", 1)
+        for ctgID in dailyTehuiCTGIDList:
+            ctgIpyData = IpyGameDataPY.GetIpyGameData("CTG", ctgID)
+            if not ctgIpyData:
+                continue
+            if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TodayCTGCount % ctgID):
+                continue
+            syncRecordIDList.append(ctgID)
+            ctgItemList = GetCTGGiveItemList(ctgIpyData)
+            packCTGIDDict[ctgID] = ctgItemList
+            for itemID, itemCount, _ in ctgItemList:
+                packItemDict[itemID] = packItemDict.get(itemID, 0) + itemCount
+            __addCTGIDBuyCnt(curPlayer, ctgID)
+        if packCTGIDDict:
+            GameWorld.Log("打包购买: recordID=%s,packCTGIDDict=%s" % (recordID, packCTGIDDict), curPlayer.GetPlayerID())
+            addDRDict.update({"packCTGIDDict":packCTGIDDict})
+        for itemID, itemCount in packItemDict.items():
+            giveItemList.append([itemID, itemCount, 0])
+            
+    Sync_CoinToGoldCountInfo(curPlayer, syncRecordIDList)
     return moneyType, addGold, prizeGold, giveItemList, ipyData
+
+def __addCTGIDBuyCnt(curPlayer, recordID):
+    totalBuyCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CTGGoodsBuyCount % recordID)
+    totalBuyCountUpd = min(totalBuyCount + 1, ChConfig.Def_UpperLimit_DWord)
+    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CTGGoodsBuyCount % recordID, totalBuyCountUpd)
+    
+    todayBuyCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TodayCTGCount % recordID)
+    todayBuyCountUpd = min(todayBuyCount + 1, ChConfig.Def_UpperLimit_DWord)
+    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TodayCTGCount % recordID, todayBuyCountUpd)
+    
+    weekBuyCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_WeekCTGCount % recordID)
+    weekBuyCountUpd = min(weekBuyCount + 1, ChConfig.Def_UpperLimit_DWord)
+    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_WeekCTGCount % recordID, weekBuyCountUpd)
+    
+    monthBuyCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MonthCTGCount % recordID)
+    monthBuyCountUpd = min(monthBuyCount + 1, ChConfig.Def_UpperLimit_DWord)
+    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MonthCTGCount % recordID, monthBuyCountUpd)
+    return totalBuyCountUpd, todayBuyCountUpd, weekBuyCountUpd, monthBuyCountUpd
 
 def GetSelectItemListInfo(selectItemInfo, selectItemValue):
     errorInfo = ""
@@ -909,82 +931,3 @@
     countInfoPack.RecordCount = len(countInfoPack.CTGCountInfoList)
     NetPackCommon.SendFakePack(curPlayer, countInfoPack)
     return
-
-## ---------- 每日免费直购礼包 ----------------
-
-def OnGetDayFreeGoldGift(curPlayer):
-    ''' 领取每日免费直购礼包
-    '''
-    
-    isGet = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_DayFreeGoldGiftState)
-    if isGet:
-        #GameWorld.DebugLog("已经领取过每日免费直购礼包!")
-        return
-    
-    rewardItemList = IpyGameDataPY.GetFuncEvalCfg("DayFreeGoldGift", 1)
-    if not rewardItemList:
-        return
-    
-    needSpace = len(rewardItemList)
-    packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, needSpace)
-    if needSpace > packSpace:
-        PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")
-        return
-    
-    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_DayFreeGoldGiftState, 1)
-    
-    # 给物品
-    isAuctionItem = False
-    for itemID, itemCount in rewardItemList:        
-        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isAuctionItem, [IPY_GameWorld.rptItem])
-        
-    # 通知客户端
-    Sync_DayFreeGoldGiftState(curPlayer)
-    return
-
-def Sync_DayFreeGoldGiftState(curPlayer):
-    clientPack = ChPyNetSendPack.tagMCDayFreeGoldGiftState()
-    clientPack.DayFreeGoldGiftState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_DayFreeGoldGiftState)
-    NetPackCommon.SendFakePack(curPlayer, clientPack)
-    return
-
-## ------------------------------------------
-## ---------- 创角在线充值特惠 ---------------
-
-def OnGetOnlineRechargeTH(curPlayer):
-    ## 领取创角在线充值特惠
-    awardState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OnlineRechargeTHAward)
-    if awardState:
-        #GameWorld.DebugLog("已领取该奖励!")
-        return
-    
-    # 后端只验证是否有充值其中一个即可,不验证充值时间(充值同步到游戏服务器有时间差)
-    canGet = False
-    needCtgIDList = IpyGameDataPY.GetFuncEvalCfg("OnlineRechargeTH", 2)
-    for ctgID in needCtgIDList:
-        if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CTGGoodsBuyCount % ctgID):
-            canGet = True
-            break
-        
-    if not canGet:
-        return
-    
-    awardItemList = IpyGameDataPY.GetFuncEvalCfg("OnlineRechargeTH", 3)
-    if not ItemControler.CheckPackSpaceEnough(curPlayer, awardItemList):
-        return
-    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_OnlineRechargeTHAward, 1)
-    
-    for itemID, itemCount, isAuctionItem in awardItemList:
-        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isAuctionItem, [IPY_GameWorld.rptItem], 
-                                     event=["OnlineRechargeTH", False, {}])
-        
-    SyncOnlineRechargeTH(curPlayer)
-    return
-
-def SyncOnlineRechargeTH(curPlayer):
-    clientPack = ChPyNetSendPack.tagMCOnlineRechargeTH()
-    clientPack.AwardState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OnlineRechargeTHAward)
-    NetPackCommon.SendFakePack(curPlayer, clientPack)
-    return
-
-## ------------------------------------------
\ No newline at end of file

--
Gitblit v1.8.0