From c2acfe7cf4641bc560a8454a985af16cf349f3ad Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 25 六月 2021 17:42:38 +0800
Subject: [PATCH] 5090 【主干】【BT2】【BT3】【bt2_1.100.1】【gt_1.100.7】循环活动优化-日期活动结束后周循环开启异常(修复活动日期时间头尾衔接导致的活动开启异常问题)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyRedPacket.py |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyRedPacket.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyRedPacket.py
index 4e2b21a..d462c82 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyRedPacket.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyRedPacket.py
@@ -23,6 +23,7 @@
 import NetPackCommon
 import PlayerVip
 import ShareDefine
+import CommFunc
 
 import time
 #---------------------------------------------------------------------
@@ -60,12 +61,12 @@
             NotifyOSRedPacket(curPlayer)
     return
 
-def OnPlayerRecharge(curPlayer, orderRMB):
+def OnPlayerRecharge(curPlayer, orderCoin):
     ## 玩家充值
     
-    todayCoin = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AllCoinToday)
+    todayCoin = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TodayCTGCoinTotal)
     # 每日首充红包
-    if todayCoin - orderRMB * 100 == 0:
+    if todayCoin - orderCoin == 0:
         dayFirstRedPacketID = IpyGameDataPY.GetFuncCfg("RechargeRedPacket", 1)
         GameWorld.DebugLog("每日首充红包: dayFirstRedPacketID=%s" % dayFirstRedPacketID)
         if dayFirstRedPacketID:
@@ -79,12 +80,12 @@
     rmbList = rmbRedPackIDDict.keys()
     rmbList.sort()
     for rmb in rmbList:
-        if orderRMB <= rmb:
+        if orderCoin <= CommFunc.RMBToCoin(rmb):
             rmbRedPacketID = rmbRedPackIDDict[rmb]
             break
         
     if rmbRedPacketID:
-        GameWorld.DebugLog("单笔充值红包: orderRMB=%s,rmbRedPacketID=%s" % (orderRMB, rmbRedPacketID))
+        GameWorld.DebugLog("单笔充值红包: orderRMB=%s,rmbRedPacketID=%s" % (orderCoin, rmbRedPacketID))
         CreatRedPacketByID(curPlayer, rmbRedPacketID)
     return
 
@@ -303,11 +304,11 @@
     #获取全服红包可抢次数
     # @return: -1为不限
     vipLVMaxGrabCntDict = IpyGameDataPY.GetFuncEvalCfg("RechargeRedPacket", 3, {})
-    vipLVList = vipLVMaxGrabCntDict.keys()
+    vipLVList = [int(vipStr) for vipStr in vipLVMaxGrabCntDict.keys()]
     vipLVList.sort()
     for vipLV in vipLVList:
         if curPlayer.GetVIPLv() <= vipLV:
-            maxGrabCnt = vipLVMaxGrabCntDict[vipLV]
+            maxGrabCnt = vipLVMaxGrabCntDict[str(vipLV)]
             if not maxGrabCnt:
                 return -1
             todayGrabCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ServerRedPacketGrabCnt)

--
Gitblit v1.8.0