8901 【BT2】【后端】全服红包（同步主干补冲突）

hxp

2021-04-23 de76bf6d9d264a24dfb7a3939fb68059e59b057d

8901 【BT2】【后端】全服红包（同步主干补冲突）

 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py

@@ -365,6 +365,8 @@
    #每5分钟触发一次仙盟总战力更新

    if curMinute % 5 == 0:

        PlayerFamily.UpdFamilyTotalFightPower()

        PlayerFamilyRedPacket.CheckDelRedpacketData()

        
    return



#---------------------------------------------------------------------

@@ -1243,6 +1245,8 @@
    GameWorldArena.OnServerStart()

    #跨服PK

    CrossRealmPK.OnGameServerInitOK()

    #红包

    PlayerFamilyRedPacket.OnServerStart()

    #世界boss被杀次数重置

    #GameWorldBoss.CheckResetBossKilledCntOnServerInit()

    

@@ -1928,6 +1932,7 @@
    ChPlayer.SavePlayerLVData()

    PlayerFBHelpBattle.OnServerClose()

    CrossActionControl.OnServerClose()

    PlayerFamilyRedPacket.OnServerClose()

    GameWorldArena.OnServerClose()

    GameWorld.Log("通知C++关服！")

    GameWorld.GetGameWorld().OnServerClose()


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py

@@ -52,6 +52,7 @@
import PlayerActManyDayRecharge

import PlayerActSingleRecharge

import PlayerActRechargePrize

import PlayerFamilyRedPacket

import CrossActCTGBillboard

import PlayerActGrowupBuy

import OpenServerCampaign

@@ -437,6 +438,8 @@
        #跨服充值排行活动

        CrossActCTGBillboard.AddCTGRMB(curPlayer, orderCoin)

        PlayerActManyDayRecharge.AddManyDayRechargeValue(curPlayer, orderCoin) # 多日连充

        #红包, 需要真实充值

        PlayerFamilyRedPacket.OnPlayerRecharge(curPlayer, orderCoin)

        

    # 只算充仙玉的

    if coinType == CoinType_Gold:


 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




 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py

@@ -175,7 +175,6 @@
#  @param curPlayer: 玩家

#  @return: None

def OnDay(curPlayer):

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_DailyChargeState, 0)

    return



## 充值豪礼OnLogin

@@ -196,7 +195,6 @@
#  @param addGold: 充元宝数

#  @return: None

def OnPlayerChargeGold(curPlayer):

    DayChargeRedPackAward(curPlayer)

    

    firstGoldServerDay = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldServerDay)

    if not firstGoldServerDay:

@@ -288,14 +286,6 @@
            GameWorld.DebugLog('首充试用物品过期了 背包仓库没武器则送一把 没给成功！！giveItemID=%s'%giveItemID, curPlayer.GetID())

            

    return

#每日充值任意金额红包奖励

def DayChargeRedPackAward(curPlayer):

    if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_DailyChargeState) == 1:

        return

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_DailyChargeState, 1)

    PlayerFamilyRedPacket.CreatRedPacketByID(curPlayer, 2)

    return





def OnGetHistoryRechargeAward(curPlayer, awardID):

    # 领取历史充值奖励