5424 【后端】【1.4】跨服竞技场开发（修复报错）

hxp

2018-12-22 ef11263b50150e4454815ffc85a78509989cc432

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

@@ -72,11 +72,11 @@
import PlayerFreeGoods

import ShopItemManage

import PlayerRecover

import Operate_EquipSuitCompose

import GameLogic_IceLode

import PlayerEquipDecompose

import PlayerCoat

import PlayerGreatMaster

import PlayerCostVIP

import PlayerGatherSoul

import PlayerMergeKing

import PlayerMergePK

import GameFuncComm

@@ -105,10 +105,13 @@
import PlayerFlashSale

import PlayerFlashGiftbag

import PlayerCostRebate

import PlayerActTotalRecharge

import PlayerSpringSale

import PlayerFairyCeremony

import CrossRealmPlayer

import ChNetSendPack

import FamilyRobBoss

import FBHelpBattle

import PyGameData

import PlayerCoin

import PlayerGeTui

@@ -245,6 +248,11 @@
    #同步GameServer自己的地图ID

    curPlayer.Sync_GameServer_MapID()

    

    # 屏蔽跨服下关闭和子服重复的数据的发送 pushsend接口， notifyall正常发送

    # ！！！必要发送的数据要注意位置

    if GameWorld.IsCrossServer():

        curPlayer.SetForbiddenSyncClientState(True)

    
    SyncGuideState(curPlayer)

    

    #初始化玩家背包

@@ -301,7 +309,10 @@
        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FuncChangeLineID, 0)

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

        #GameWorld.DebugLog("离线超过10秒重置切线临时保存的相关记录值!leaveServerSecond=%s" % leaveServerSecond, curPlayer.GetPlayerID())

        
        # 离线过久恢复为非跨服状态

        if PlayerControl.GetCrossRealmState(curPlayer):

            PlayerControl.SetCrossRealmState(curPlayer, 0)

            
    # 合服首登处理

    __DoMixServerFirstLogin(curPlayer)

    PlayerBillboard.BillboardOnLogin(curPlayer)

@@ -487,6 +498,8 @@
    

    #消费返利

    PlayerCostRebate.OnPlayerLogin(curPlayer)

    #累计充值

    PlayerActTotalRecharge.OnPlayerLogin(curPlayer)

    #限时特惠

    PlayerSpringSale.OnPlayerLogin(curPlayer)

    #限时礼包

@@ -521,7 +534,6 @@
    #仙魔之争

    GameLogic_XMZZ.OnXMZZLogin(curPlayer)

    PlayerOnlinePrize.OnPlayerLogin(curPlayer)

    GameLogic_SealDemon.NotifyFMTDouble(curPlayer)

    #装备分解

    PlayerEquipDecompose.PlayerLogin(curPlayer)

    #防沉迷

@@ -552,7 +564,12 @@
    curPlayer.SendDBQueryRecharge()

    # 小助手

    SyncLittleHelper(curPlayer)

    
    # 聊天气泡框

    SyncChatBubbleBoxState(curPlayer)

    # 副本助战

    FBHelpBattle.DoPlayerLogin(curPlayer)

    # 聚魂

    PlayerGatherSoul.PlayerLogin(curPlayer)

    curPlayer.SetState(0)   # 脱机挂恢复为正常上线

    curPlayer.SetFacePic(0) # 通知数据库是否保存还是下线，做一次恢复，1为保存 0为正常下线

    tjgTime = PlayerTJG.GetTJGTime(curPlayer)

@@ -562,6 +579,13 @@
    # 如果被禁言的，上线同步前端

    if curPlayer.GetGMForbidenTalk():

        curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ForbidenTalk, curPlayer.GetGMForbidenTalk(), False)

        
    # 屏蔽跨服下关闭和子服重复的数据的发送 pushsend接口， notifyall正常发送

    # ！！！必要发送的数据要注意位置

    if GameWorld.IsCrossServer():

        curPlayer.SetForbiddenSyncClientState(False)

        PlayerControl.SetCrossRealmState(curPlayer, 1) # 因为主服上传数据之前该值为1，所以登录跨服后在跨服服务器要设置为1

        
    return





@@ -682,8 +706,21 @@
    itemManager = curPlayer.GetItemManager()

    

    for packIndex in ChConfig.Def_PlayerLoginInitPackIndexList:

        itemManager.GetPack(packIndex).Sync_Refresh()



        rolePack = itemManager.GetPack(packIndex)

        rolePack.Sync_Refresh()

        
        # 刷下装备评分，仓库可以暂不处理，取出装备后登录触发刷新

        for i in xrange(rolePack.GetCount()):

            curItem = rolePack.GetAt(i)

            if curItem.IsEmpty():

                continue

            newScore = ItemCommon.CalcEquipGS(curItem)

            hisScore = ItemCommon.GetEquipGearScore(curItem)

            if hisScore != newScore:

                ItemCommon.SetEquipGearScore(curItem, newScore)

                GameWorld.Log("登录更新装备评分: packType=%s,i=%s,hisScore=%s,newScore=%s,itemID=%s,guid=%s" 
                              % (packIndex, i, hisScore, newScore, curItem.GetItemTypeID(), curItem.GetGUID()), curPlayer.GetPlayerID())

                
    for packIndex in ChConfig.Def_VPackCnt_Dict.keys():

        ItemControler.Sync_VPackItem_Refresh(curPlayer, packIndex)

        

@@ -803,7 +840,7 @@


def UpdatePlayerServerGroupID(curPlayer):

    # 更新自己的服务器组ID, 跨服服务器不处理

    if GameWorld.IsMergeServer():

    if GameWorld.IsCrossServer():

        return

    serverGroupID = GameWorld.GetServerGroupID()

    if not serverGroupID:

@@ -2487,7 +2524,7 @@
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_RoomID, 0)

    

    #下线召回宠物

    #PetControl.ReCallFightPet(curPlayer)

    PetControl.ReCallFightPet(curPlayer)

    

    PlayerTJG.CalcPlayerTJG(curPlayer, tick)

    

@@ -2529,6 +2566,59 @@
    curPlayer.SetSetting(setting)

    return



#// A2 30 设置聊天气泡框 #tagCMSetChatBubbleBox

#

#struct    tagCMSetChatBubbleBox

#{

#    tagHead         Head;

#    BYTE        BubbleBoxType;    //气泡框类型

#};

def OnSetChatBubbleBox(index, clientData, tick):

    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)

    useBoxID = clientData.BubbleBoxType

    GameWorld.DebugLog("设置使用的聊天气泡框ID: useBoxID=%s" % useBoxID, curPlayer.GetPlayerID())

    
    ipyData = IpyGameDataPY.GetIpyGameData("ChatBubbleBox", useBoxID)

    if not ipyData:

        return

    
    curBoxState = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_ChatBubbleBoxState, useBoxID)

    if not curBoxState:

        needLV = ipyData.GetNeedLV()

        if needLV and curPlayer.GetLV() < needLV:

            GameWorld.DebugLog("    等级不足，无法使用该气泡框！needLV=%s" % needLV, curPlayer.GetPlayerID())

            return

        
        needVIPLVGift = ipyData.GetNeedVIPLVGift() # 兼容已购买VIP礼包的老号用

        if needVIPLVGift:

            record = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_VipAwardRecord)

            hasBuy = record & pow(2, needVIPLVGift)

            if not hasBuy:

                GameWorld.DebugLog("    未购买VIP礼包，无法使用该气泡框！needVIPLVGift=%s" % needVIPLVGift, curPlayer.GetPlayerID())

                return

            
    PlayerControl.SetChatBubbleBox(curPlayer, useBoxID)

    return



def DoActivateChatBubbleBox(curPlayer, boxID):

    ## 激活聊天气泡框

    ipyData = IpyGameDataPY.GetIpyGameData("ChatBubbleBox", boxID)

    if not ipyData:

        return

    GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_PDict_ChatBubbleBoxState, boxID, 1)

    SyncChatBubbleBoxState(curPlayer)

    return True



def SyncChatBubbleBoxState(curPlayer):

    ## 同步聊天气泡框状态

    boxState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ChatBubbleBoxState % 0)

    if not boxState:

        return

    boxStatePack = ChPyNetSendPack.tagMCChatBubbleBoxState()

    boxStatePack.BoxState = boxState

    NetPackCommon.SendFakePack(curPlayer, boxStatePack)

    return



#// A2 29 设置小助手 #tagCMSetLittleHelper

#

#struct    tagCMSetLittleHelper

@@ -2540,6 +2630,7 @@
#    DWORD        Value3;    // 自定义值3

#    DWORD        Value4;    // 自定义值4

#    DWORD        Value5;    // 自定义值5

#    DWORD        Value6;    // 自定义值6

#};

def OnSetLittleHelper(index, clientData, tick):

    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)

@@ -3510,7 +3601,7 @@
#@return 返回值无意义

#@remarks 客户端封包响应 //03 10 退出副本#tagCExitFB

def __Func_ExitFB(curPlayer, tick):

    if GameWorld.GetMap().GetMapFBType() == IPY_GameWorld.fbtNull:

    if GameWorld.GetMap().GetMapFBType() == IPY_GameWorld.fbtNull and curPlayer.GetMapID() not in IpyGameDataPY.GetFuncEvalCfg("MapLine", 4):

        return

    

    GameWorld.Log('玩家 = %s , 主动离开副本' % (curPlayer.GetName()) , curPlayer.GetID())

@@ -3742,7 +3833,7 @@
    #复活冷却时间（秒）

    rebornTime = GetRebronTime(curPlayer, playerRebornType)    

    #冷却时间到了

    if not CanRebornByTimeOver(curPlayer, rebornTime):

    if playerRebornType != ChConfig.rebornType_System and not CanRebornByTimeOver(curPlayer, rebornTime):

        PlayerControl.NotifyCode(curPlayer, 'RebornCD')

        return False

    

@@ -3849,15 +3940,22 @@
        SkillCommon.AddBuffBySkillType_NoRefurbish(curPlayer , ChConfig.Def_SkillID_ReviveTired, tick, buffSkillLV)

        GameWorld.DebugLog('    复活疲劳BUff buffSkillLV=%s'%(buffSkillLV))

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

    #复活后清除角色身上的打BOSS和PK状态

    validTime = IpyGameDataPY.GetFuncCfg("PKConfig", 4) * 1000

    if PlayerState.IsInPKState(curPlayer):

        PlayerState.SetPKStateTick(curPlayer, tick - validTime)

    if PlayerState.IsInBossState(curPlayer):

        PlayerState.SetBossStateTick(curPlayer, tick- validTime)

    



    #重算属性

    playerControl = PlayerControl.PlayerControl(curPlayer)

    playerControl.RefreshAllState()

    

    #设置血量

    curPlayer.SetHP(curPlayer.GetMaxHP() * resetHpPercent / ChConfig.Def_MaxRateValue)

    curPlayer.SetMP(curPlayer.GetMaxMP() * resetMpPercent / ChConfig.Def_MaxRateValue)

    #curPlayer.SetMP(curPlayer.GetMaxMP() * resetMpPercent / ChConfig.Def_MaxRateValue)

    #护盾

    PlayerControl.SetProDef(curPlayer, PlayerControl.GetMaxProDef(curPlayer))

    

    #玩家复活后副本处理

    FBLogic.OnPlayerRebornOver(curPlayer, playerRebornType)

@@ -5034,6 +5132,9 @@
    # 领取消费返利奖励

    elif rewardType == ChConfig.Def_RewardType_CostRebate:

        PlayerCostRebate.OnGetCostRebateAward(curPlayer, dataEx)

    # 领取累计充值奖励

    elif rewardType == ChConfig.Def_RewardType_TotalRecharge:

        PlayerActTotalRecharge.OnGetTotalRechargeAward(curPlayer, dataEx)

    # 领取boss复活活动奖励

    elif rewardType == ChConfig.Def_RewardType_BossReborn:

        PlayerBossReborn.GetBossRebornActionAward(curPlayer, dataEx)

@@ -5049,6 +5150,12 @@
    # 领取许愿池奖励

    elif rewardType == ChConfig.Def_RewardType_WishingWell:

        PlayerWishingWell.DoGetWishingAward(curPlayer)

    # 功能开启奖励

    elif rewardType == ChConfig.Def_RewardType_OpenFunc:

        GameFuncComm.GetFuncOpenAward(curPlayer, dataEx)

    # 冰晶矿脉星级奖励

    elif rewardType == ChConfig.Def_RewardType_IceLodeStar:

        GameLogic_IceLode.GetIceLodeStarAward(curPlayer, dataEx)

    

#

#    # 充值豪礼奖励

@@ -5567,7 +5674,7 @@
    sendPack.Speed = curPlayer.GetSpeed()

    sendPack.MoveType = moveType

    # NotifyAll 做过滤或者数量处理

    PlayerControl.PyNotifyAll(curPlayer, sendPack, False, -1)

    PlayerControl.PyNotifyAll(curPlayer, sendPack, False, 0)

    return



def GetDownloadAward(curPlayer, dataEx):