xdh
2018-10-31 8a3b39e2b66ab9f7d1f1ac65082980d1de8a9582
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -75,7 +75,7 @@
import Operate_EquipSuitCompose
import PlayerEquipDecompose
import PlayerCoat
import PlayerQQ
import PlayerGreatMaster
import PlayerCostVIP
import PlayerMergeKing
import PlayerMergePK
@@ -328,7 +328,7 @@
    Operate_EquipStone.OnLogin(curPlayer)
    
    #大师
    #PlayerGreatMaster.MasterOnLogin(curPlayer)
    PlayerGreatMaster.MasterOnLogin(curPlayer)
    
    #֪ͨVIP
    PlayerVip.DoOnLogin(curPlayer, tick)
@@ -925,14 +925,23 @@
    #这里只做初始化逻辑
    #在玩家切换场景的时候, 不会调用到这里
    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
    InitLoginPlayer(curPlayer, tick)
    DoPlayerLogin(curPlayer, tick)
    try:
        InitLoginPlayer(curPlayer, tick)
        DoPlayerLogin(curPlayer, tick)
        #锁住玩家, 等到读取地图成功, 再解锁
        curPlayer.SetCanMove(False)
        #登陆发图形验证码
        PlayerAutoCheckOnline.PlayerLoginCaptcha(curPlayer, tick)
    except:
        curPlayer.Kick(IPY_GameWorld.disWaitForPlayerLoinError)
        import traceback
        GameWorld.ErrLog("玩家上线逻辑错误~~~~~\r\n%s" % traceback.format_exc())
        if GameWorld.GetGameWorld().GetDebugLevel():
            raise Exception("玩家上线逻辑错误~~~~\r\n%s" % traceback.format_exc())
    return
    
    #锁住玩家, 等到读取地图成功, 再解锁
    curPlayer.SetCanMove(False)
    #登陆发图形验证码
    PlayerAutoCheckOnline.PlayerLoginCaptcha(curPlayer, tick)
    
#---------------------------------------------------------------------
##C++封包触发, 玩家切换地图的时候, 在本地图登录
@@ -2420,7 +2429,7 @@
        import traceback
        GameWorld.ErrLog("玩家下线逻辑错误~~~~~\r\n%s" % traceback.format_exc())
        if GameWorld.GetGameWorld().GetDebugLevel():
            raise Exception("玩家下线~~~~~\r\n%s" % traceback.format_exc())
            raise Exception("玩家下线逻辑错误~~~~~\r\n%s" % traceback.format_exc())
        
    #调用底层使玩家下线
    curPlayer.DoDisconnect(tick)
@@ -2531,6 +2540,7 @@
#    DWORD        Value3;    // 自定义值3
#    DWORD        Value4;    // 自定义值4
#    DWORD        Value5;    // 自定义值5
#    DWORD        Value6;    // 自定义值6
#};
def OnSetLittleHelper(index, clientData, tick):
    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
@@ -5040,7 +5050,9 @@
    # 领取许愿池奖励
    elif rewardType == ChConfig.Def_RewardType_WishingWell:
        PlayerWishingWell.DoGetWishingAward(curPlayer)
    # 功能开启奖励
    elif rewardType == ChConfig.Def_RewardType_OpenFunc:
        GameFuncComm.GetFuncOpenAward(curPlayer, dataEx)
#
#    # 充值豪礼奖励
#    elif rewardType == ShareDefine.Def_RewardType_GoldGift: