8650 【主干】【BT2】活动规则优化（限时礼包支持多活动编号同时开启 同步主干冲突）；

hxp

2021-03-08 3cccf71d1f55e891a03b957bb12f633f951688e7

 ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py

@@ -61,6 +61,7 @@
import PyGameData

import GMShell

import IPY_PlayerDefine

import GameWorldArena

import CrossRealmPK

import AuctionHouse

import PlayerAssist

@@ -89,9 +90,7 @@
    except:

        curPlayer.Kick(IPY_PlayerDefine.disWaitForPlayerLoinError)

        import traceback

        GameWorld.ErrLog("玩家上线逻辑错误~~~~~\r\n%s" % traceback.format_exc())

        if GameWorld.GetGameWorld().GetDebugLevel():

            raise Exception("玩家上线逻辑错误~~~~\r\n%s" % traceback.format_exc())

        GameWorld.RaiseException("玩家上线逻辑错误\r\n%s" % traceback.format_exc())

    return



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

@@ -183,6 +182,8 @@
        GameWorldActionControl.OnPlayerLogin(curPlayer)

        #玩家等级记录

        PyGameData.g_todayPlayerLVDict[curPlayer.GetID()] = curPlayer.GetLV()

        #竞技场

        GameWorldArena.OnPlayerLogin(curPlayer)

        #跨服PK

        CrossRealmPK.OnPlayerLogin(curPlayer)

        #诛仙BOSS

@@ -519,9 +520,7 @@
        __Func_PlayerDisconnect(curPlayer, tick)

    except:

        import traceback

        GameWorld.ErrLog("玩家下线逻辑错误~~~~~\r\n%s" % traceback.format_exc())

        if GameWorld.GetGameWorld().GetDebugLevel():

            raise Exception("玩家下线逻辑错误~~~~\r\n%s" % traceback.format_exc())

        GameWorld.RaiseException("玩家下线逻辑错误\r\n%s" % traceback.format_exc())

    #调用底层下线

    curPlayer.DoDisconnect()

    return

@@ -567,8 +566,8 @@
#  @return None

#  @remarks 函数详细说明.

def SetPlayerOfflineTime(curPlayer):

    if PlayerControl.GetIsTJG(curPlayer):

        return

    #if PlayerControl.GetIsTJG(curPlayer):

    #    return

    

    curPlayerID = curPlayer.GetPlayerID()

    curFamily = curPlayer.GetFamily()