4491 【后端】【1.2】全民冲榜第三天榜单改成符印排行（增加符印排行活动类型7，排行榜18）

hxp

2018-11-01 13593cbcea1d674c51bcd11c1ef01003e428bf58

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

@@ -62,9 +62,9 @@
import PlayerActivity

import PlayerTeHui

import FBCommon

import HighLadderTube

import PlayerBindJadeWheel

import BossHurtMng

import PlayerAction

import PlayerWishingWell

import PlayerAttrFruit

import PlayerSuccess

import PlayerDienstgrad

@@ -75,7 +75,7 @@
import Operate_EquipSuitCompose

import PlayerEquipDecompose

import PlayerCoat

import PlayerQQ

import PlayerGreatMaster

import PlayerCostVIP

import PlayerMergeKing

import PlayerMergePK

@@ -102,7 +102,7 @@
import PlayerTJG

import GameLogic_XMZZ

import GameLogic_SealDemon

import GameLogic_Dogz

import PlayerFlashSale

import PlayerFlashGiftbag

import PlayerCostRebate

import PlayerSpringSale

@@ -328,7 +328,7 @@
    Operate_EquipStone.OnLogin(curPlayer)

    

    #大师

    #PlayerGreatMaster.MasterOnLogin(curPlayer)

    PlayerGreatMaster.MasterOnLogin(curPlayer)

    

    #֪ͨVIP

    PlayerVip.DoOnLogin(curPlayer, tick)

@@ -491,7 +491,8 @@
    PlayerSpringSale.OnPlayerLogin(curPlayer)

    #限时礼包

    PlayerFlashGiftbag.OnPlayerLogin(curPlayer)

    
    #限时抢购

    PlayerFlashSale.OnPlayerLogin(curPlayer)

#    # 消费VIP

#    PlayerCostVIP.CostVIPOnLogin(curPlayer, tick)

#    

@@ -541,13 +542,16 @@
    GameFuncComm.DoFuncOpenLogic(curPlayer)

    # 神兽

    PlayerDogz.OnPlayerLogin(curPlayer)

    # 神兽副本

    GameLogic_Dogz.SyncNPCRefreshTime(curPlayer.GetID())

    # 骑宠

    FamilyRobBoss.OnPlayerLogin(curPlayer)

    
    # 绑玉转盘

    PlayerBindJadeWheel.OnLogin(curPlayer)

    # 许愿池

    PlayerWishingWell.OnLogin(curPlayer)

    # 上线查询一次充值订单

    curPlayer.SendDBQueryRecharge()

    # 小助手

    SyncLittleHelper(curPlayer)

    

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

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

@@ -921,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++封包触发, 玩家切换地图的时候, 在本地图登录

@@ -2416,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)

@@ -2514,6 +2527,60 @@
        return

    

    curPlayer.SetSetting(setting)

    return



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

#

#struct    tagCMSetLittleHelper

#{

#    tagHead         Head;

#    BYTE        SetNum;    // 托管功能设置编号1~20，每个编号对应的托管功能前端自定义

#    DWORD        Value1;    // 自定义值1

#    DWORD        Value2;    // 自定义值2

#    DWORD        Value3;    // 自定义值3

#    DWORD        Value4;    // 自定义值4

#    DWORD        Value5;    // 自定义值5

#    DWORD        Value6;    // 自定义值6

#};

def OnSetLittleHelper(index, clientData, tick):

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

    setNum = clientData.SetNum

    if setNum > ChConfig.LittleHelperSetNumCount:

        GameWorld.ErrLog("小助手不支持该设置编号! setNum=%s" % setNum, curPlayer.GetPlayerID())

        return

    for i in xrange(1, ChConfig.LittleHelperValueCount + 1):

        if not hasattr(clientData, "Value%s" % i):

            GameWorld.ErrLog("小助手不支持该值编号设置! setNum=%s,value%s" % (setNum, i), curPlayer.GetPlayerID())

            continue

        value = getattr(clientData, "Value%s" % i)

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_LittleHelperValue % (setNum, i), value)

        GameWorld.DebugLog("小助手值设置: setNum=%s,value%s=%s" % (setNum, i, value), curPlayer.GetPlayerID())

    return



def SyncLittleHelper(curPlayer):

    ## 同步小助手设置，仅有值的同步

    funcSetList = []

    for setNum in xrange(ChConfig.LittleHelperSetNumCount + 1):

        funcSet = None

        for i in xrange(1, ChConfig.LittleHelperValueCount + 1):

            value = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_LittleHelperValue % (setNum, i))

            if not value:

                continue

            if not funcSet:

                funcSet = ChPyNetSendPack.tagMCLittleHelperFuncSet()

                funcSet.SetNum = setNum

            if hasattr(funcSet, "Value%s" % i):

                setattr(funcSet, "Value%s" % i, value)

        if funcSet:

            funcSetList.append(funcSet)

            
    if not funcSetList:

        return

    
    setPack = ChPyNetSendPack.tagMCLittleHelperSet()

    setPack.FuncSetList = funcSetList

    setPack.FuncSetCount = len(setPack.FuncSetList)

    NetPackCommon.SendFakePack(curPlayer, setPack)

    return



#// A2 22 设置引导成功 #tagCMSetGuideOK

@@ -4390,16 +4457,6 @@
        PlayerControl.NotifyCode(curPlayer, "04BBF813-7A30-47A8-927DE1ACCC4F378E")

        return



#===============================================================================

#    isFreedomTransBuff = SkillCommon.GetPlayerBuffBySkillTypeID(curPlayer, ShareDefine.Def_FreedomTransBuffID)

#    if not PlayerControl.IsPlayerInFight(curPlayer):

# 
#        if (transportType == ChConfig.Def_Transport_Type_BigMap) or (not isFreedomTransBuff):

#            #传送支付处理

# 
#            if not PayForTransport(curPlayer, transportType, isAutoBuy):

#                return

#===============================================================================

    #是任务传送，VIP等级不够，且传送符不足，不处理

    if transportType == ChConfig.Def_Transport_Type_Mission and \

       not TransportVipLvRestrict(curPlayer, transportType) and \

@@ -4501,12 +4558,6 @@
#  @param transportType 传送类型

#  @return 是否vip等级限制

def TransportVipLvRestrict(curPlayer, transportType):

    
    #大地图标记传送不能体验无限飞buff功能

    if transportType != ChConfig.Def_Transport_Type_BigMap:

        if SkillCommon.GetPlayerBuffBySkillTypeID(curPlayer, ShareDefine.Def_FreedomTransBuffID):

            #有无限飞buff

            return True

    return PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_FreeTransport)





@@ -4996,6 +5047,12 @@
    # 领取分包下载奖励

    elif rewardType == ChConfig.Def_RewardType_DownLoad:

        GetDownloadAward(curPlayer, dataEx)

    # 领取许愿池奖励

    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:

@@ -5547,4 +5604,17 @@
    sendPack.Clear()

    sendPack.Record = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_DownloadAwardState)

    NetPackCommon.SendFakePack(curPlayer, sendPack)

    return
    return



def NotifyPlayerMove(curPlayer, posX, posY, npcID=0):

    '''通知前端向某个点移动

                这里前端可能需要针对某次移动做额外处理，比如移动到某个点后需要自动战斗等

                所以这里只做通知前端可以向某个点移动，最终移动由前端发起

    '''

    sendPack = ChPyNetSendPack.tagMCNotifyPlayerMove()

    sendPack.Clear()

    sendPack.PosX = posX

    sendPack.PosY = posY

    sendPack.NPCID = npcID

    NetPackCommon.SendFakePack(curPlayer, sendPack)

    return