hxp
2019-03-28 9cc23ba064d9daf14a9085685f961b10d4f379f3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -49,7 +49,6 @@
import PlayerLVAward
import PlayerGoldGift
import PlayerSignDay
import MixServerCampaign
import PlayerPet
import PlayerPrestigeSys
import PlayerFamily
@@ -65,7 +64,6 @@
import PlayerAttrFruit
import PlayerSuccess
import PlayerDienstgrad
import PlayerMixLoginDayAward
import PlayerFreeGoods
import PlayerRecover
import GameLogic_IceLode
@@ -105,6 +103,7 @@
import PlayerFairyCeremony
import PlayerNewFairyCeremony
import PlayerFeastRedPacket
import PlayerLuckyTreasure
import CrossRealmPlayer
import ChNetSendPack
import FamilyRobBoss
@@ -137,10 +136,6 @@
#@return 返回值无意义
#@remarks 玩家登陆游戏初始化
def InitLoginPlayer(curPlayer, tick):
    #初始化职业阶数,默认1
    if PlayerControl.GetJobRank(curPlayer) == 0:
        PlayerControl.SetJobRank(curPlayer, 1)
    ##初始化交易列表
    if curPlayer.GetTradeList().GetTradeItemCount() == 0:
        curPlayer.GetTradeList().SetTradeListCount(ChConfig.Def_PlayerTradeMaxItemCount)
@@ -482,10 +477,7 @@
    SyncGuideState(curPlayer)
    
    #上线检查一次装备属性
    ItemControler.PlayerItemControler(curPlayer).CheckRolePackEquipAttr()
    #上线检查加点属性点
    PlayerControl.FixOldAddPoint(curPlayer)
    ItemControler.PlayerItemControler(curPlayer).CheckRolePackEquipAttr()
    #更新服务器组ID
    PlayerControl.UpdPlayerServerGroupID(curPlayer)
    
@@ -497,10 +489,6 @@
    
    #通知玩家技能信息
    __Sync_ClientSkill(curPlayer)
    #替换旧物品
    ItemControler.LoginCheckChangeOldItem(curPlayer)
    #清除生产采集Buff
    #PlayerControl.DelProduceBuff(curPlayer, tick)
    #清除国家答题Buff
    #PlayerExam.DoLogic_ExitExam(curPlayer, tick, needRefresh = False)
    #清除VIPbuff
@@ -540,11 +528,11 @@
    SyncPKModel(curPlayer)
        
    #通用强化星级信息
    ChEquip.NotifyEquipPartStarLV(curPlayer)
    ChEquip.NotifyEquipPartPlusLV(curPlayer)
    ChEquip.NotifyEquipPartStar(curPlayer)
    Operate_EquipWash.OnEquipWashLogin(curPlayer)
    #通知套装信息
    ChEquip.NotifyEquipPartSuiteLV(curPlayer)
    ChEquip.SyncAllEquipAttrActiveInfo(curPlayer)
    #ChEquip.SyncAllEquipAttrActiveInfo(curPlayer)
    #装备位宝石镶嵌通知
    Operate_EquipStone.OnLogin(curPlayer)
    
@@ -590,9 +578,6 @@
    # 首充/天天首充/充值豪礼
    PlayerGoldGift.OnLogin(curPlayer)
    
    #玩家回归通知
    #PlayerRecall.PlayerBack(curPlayer)
    #通知购买功能中各购买类型的已购买和可购买次数
    Operate_PlayerBuyZhenQi.DoPlayerLogin(curPlayer)
#    
@@ -623,78 +608,54 @@
    #通知运行成功
    curPlayer.BalanceServer_PlayerLoginInitOK()
    
    # 新手指导员上线处理
#    #PlayerFreshmanGuide.FreshmanGuiderOnLogin(curPlayer)
#
    # 坐骑相关通知
    PlayerHorse.PlayerHorseLogin(curPlayer)
    
    PlayerTreasure.OnTreasureLogin(curPlayer)
    
#    # 通知累计登陆礼
    # 通知累计登陆礼
    PlayerLoginDayAward.OnLoginNotifyLoginDayAward(curPlayer)
#
    # 开服活动奖励信息
    OpenServerCampaign.OnOpenServerCampaignLogin(curPlayer)
#
#    # 通知合服奖励领取状态
#    PlayerMixLoginDayAward.OnLoginNotifyMixLoginDayAward(curPlayer)
#
#    # 通知合服奖励
#    MixServerCampaign.OnMixServerCampaignLogin(curPlayer)
#
#    # 节日登陆奖励
#    PlayerFestivalLogin.OnLoginFestivalLogin(curPlayer)
    # 试炼之塔
    GameLogic_TrialTower.OnFBPlayerLogin(curPlayer)
    # 古神禁地
    GameLogic_GodArea.GodAreaOnLogin(curPlayer)
#    # 采集NPC次数通知
    # 采集NPC次数通知
    NPCCommon.SyncCollNPCTime(curPlayer)
#
#    # 特惠活动
#    PlayerTeHui.PlayerLogin_TeHui(curPlayer)
#
#    # 自定义商店
#    ShopItemManage.DoOnLogin(curPlayer)
#
#    # 每日活跃度
    # 每日活跃度
    PlayerActivity.OnLogin(curPlayer)
#
#    # 副本进入时间
    # 副本进入时间
    FBCommon.FBOnLogin(curPlayer)
#
#    #天梯竞技场
#    HighLadderTube.OnLogin(curPlayer)
#
#    #世界等级
    #世界等级
    PlayerWorldAverageLv.OnLogin(curPlayer)
#
    # 投资理财
    PlayerGoldInvest.OnLogin(curPlayer)
#
#    #节日活动
#    PlayerAction.ActionOnLogin(curPlayer)
#
#    #属性果实使用情况
    #属性果实使用情况
    PlayerAttrFruit.AttrFruitOnLogin(curPlayer)
#
#    #成就
    #成就
    PlayerSuccess.SuccOnLogin(curPlayer)
#
#    #同步自动战斗配置记录
    #同步自动战斗配置记录
#    Sync_AutoFightSetting(curPlayer)
#
    PlayerFamily.FamilyPlayerOnLogin(curPlayer, tick)
    #改到 GameServerRefresh GameSever_PlayerInitOK后处理才能保证玩家已经在Gameserver注册
    #PlayerDienstgrad.RefreshBillBoardDienstgrad(curPlayer)
    # 称号
    PlayerDienstgrad.Sync_AllDienstgradOnLogin(curPlayer)
#    # 资源找回OnLogin
    # 资源找回OnLogin
    PlayerRecover.RecoverOnLogin(curPlayer)
#
#    # ʱװ
    # ʱװ
    PlayerCoat.OnLogin_Coat(curPlayer)
    
    # 跨服PK
@@ -715,17 +676,11 @@
    PlayerFlashGiftbag.OnPlayerLogin(curPlayer)
    #限时抢购
    PlayerFlashSale.OnPlayerLogin(curPlayer)
#    # 消费VIP
#    PlayerCostVIP.CostVIPOnLogin(curPlayer, tick)
#
#    # QQ相关奖励OnLogin
#    #PlayerQQ.Sync_QQAllAwardRecord(curPlayer)
#
#    # 世界boss
    # 世界boss
    BossHurtMng.OnLogin(curPlayer)
    ChItem.Sync_ItemDayUseCnt(curPlayer)
#    # 悬赏登录通知
#    PlayerArrestTask.OnLogin(curPlayer)
    # 悬赏登录通知
    #PlayerArrestTask.OnLogin(curPlayer)
    # 符印登录通知
    PlayerRune.PlayerRuneLogin(curPlayer)
    # 仙盟红包登录通知
@@ -778,6 +733,8 @@
    PlayerBindJadeWheel.OnLogin(curPlayer)
    # 许愿池
    PlayerWishingWell.OnLogin(curPlayer)
    #幸运鉴宝
    PlayerLuckyTreasure.OnLogin(curPlayer)
    # 上线查询一次充值订单
    curPlayer.SendDBQueryRecharge()
    # 小助手
@@ -821,37 +778,57 @@
    if not isMixServer:
        return
    
    lastMixServerDayKey = ShareDefine.Def_Notify_WorldKey_LastMixServerDay
    lastMixServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(lastMixServerDayKey)
    GameWorld.DebugLog("合服首登处理lastMixServerDay=%s" % lastMixServerDay, curPlayer.GetPlayerID())
    playerID = curPlayer.GetPlayerID()
    lastMixServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_LastMixServerDay)
    
    playerDay = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MixLoginDay)
    
    if playerDay == lastMixServerDay:
        GameWorld.DebugLog("本次合服已经登录过.")
        GameWorld.DebugLog("本次合服已经登录过. lastMixServerDay=%s" % (lastMixServerDay), playerID)
        return
    mixServerWorldLV = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_LastMixServerWorldLV) # 合服时的世界等级
    GameWorld.Log("玩家合服首登处理! lastMixServerDay=%s,mixServerWorldLV=%s" % (lastMixServerDay, mixServerWorldLV), playerID)
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MixLoginDay, lastMixServerDay)
    
    # 重置首充双倍
    PlayerCoin.DoResetCTGCount(curPlayer, "MixServer")
    # 重置商店购买次数,暂定只重置类型 7 的
    FunctionNPCCommon.ResetShopItemBuyCount(curPlayer, [7])
    # 合服邮件,盟主专属邮件在GameServer处理
    mailItemList = IpyGameDataPY.GetFuncEvalCfg("MixServerMail", 1)
    worldLVMailItemList = IpyGameDataPY.GetFuncEvalCfg("MixServerMail", 2)
    mailMoneyList = IpyGameDataPY.GetFuncEvalCfg("MixServerMail", 3)
    worldLVDown = IpyGameDataPY.GetFuncCfg("MixServerMail", 5) # 等级丹相对合服世界等级差值
    itemWorldLV = max(150, mixServerWorldLV - worldLVDown)
    goldPaper, silver = mailMoneyList
    worldLVItemList = []
    for itemID, itemCount, isBind in worldLVMailItemList:
        itemData = GameWorld.GetGameData().GetItemByTypeID(itemID)
        if not itemData:
            continue
        curEff = itemData.GetEffectByIndex(0)
        curEffID = curEff.GetEffectID()
        if curEffID != ChConfig.Def_Effect_ItemAddLV:
            continue
        lvLimit = curEff.GetEffectValue(1)
        if not lvLimit:
            continue
        if lvLimit <= itemWorldLV:
            worldLVItemList = [[itemID, itemCount, isBind]]
        else:
            break
    detailDict = {"MixServerWorldLV":mixServerWorldLV, "LastMixServerDay":lastMixServerDay, "ItemWorldLV":itemWorldLV}
    addItemList = mailItemList + worldLVItemList
    PlayerControl.SendMailByKey("MixServer1", [playerID], addItemList, goldPaper=goldPaper, silver=silver, detail=detailDict)
    GameWorld.Log("    发送合服补偿邮件: itemWorldLV=%s,addItemList=%s" % (itemWorldLV, addItemList), playerID)
    # 同步排行榜
    PlayerBillboard.UpdBillboardOnMixServerFirstLogin(curPlayer, lastMixServerDay)
    # 其他
    # ...
    # 重置登录奖励领取状态
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MixLoginDayState, 0)
    PlayerMixLoginDayAward.NotifyPlayerAwardState(curPlayer)
    # 重置各合服活动数据
    for campaignType in ShareDefine.Def_MixCampaign_Type_List:
        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MixServerCampaign_AwardRecord \
                                % campaignType, 0, ChConfig.Def_PDictType_OpenServerCampaign)
        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MixServerCampaign_RecordData \
                                % campaignType, 0, ChConfig.Def_PDictType_OpenServerCampaign)
    PlayerBillboard.UpdatePlayerBillboardOnLeaveServer(curPlayer, isAll=True)
    
    # 重置玩家改名次数
    UpdatePlayerName.ResetChangeNameCnt(curPlayer)
    #UpdatePlayerName.ResetChangeNameCnt(curPlayer)
    return
#---------------------------------------------------------------------
        
@@ -1339,7 +1316,7 @@
    #设置装备实际个数
    curPack = itemManager.GetPack(IPY_GameWorld.rptEquip)
    curPack.SetCount(ShareDefine.retMax)
    curPack.SetCount(ChConfig.Def_PackCnt_Equip)
    
    #初始化垃圾桶
    #curPack = itemManager.GetPack(IPY_GameWorld.rptRecycle)
@@ -1584,9 +1561,6 @@
    #防止玩家读取地图时未触发OnDay,读取地图后再次验证(2009.9.11)
    PlayerEventCounter.UpdatePlayerLoginTime(curPlayer)
    
    #特惠活动事件
    #PlayerTeHui.PlayerLoadMapOK(curPlayer)
    #设置阵营
    if curPlayer.GetFaction() != ChConfig.CampType_Neutral \
                and FBCommon.GetRecordMapID(GameWorld.GetMap().GetMapID()) not in ChConfig.Def_MapID_NeedCamp:
@@ -1733,80 +1707,103 @@
#@return 返回值无意义
#@remarks //03 01 加属性点#tagCAddPoint
def AddPoint(index, tick):
    GameWorld.GetPsycoFunc(__Func_AddPoint)(index, tick)
    return
##//03 01 加属性点#tagCAddPoint
#@param index 玩家索引
#@param tick 时间戳
#@return 返回值无意义
#@remarks //03 01 加属性点#tagCAddPoint
def __Func_AddPoint(index, tick):
#// B2 06 玩家加点 #tagCMAddPoint
#
#struct    tagCMAddPoint
#{
#    tagHead         Head;
#    BYTE        PointAttrIDCount;    // 加点属性ID个数
#    BYTE        PointAttrIDList[PointAttrIDCount];    // 加点属性ID列表
#    WORD        PointValueList[PointAttrIDCount];    // 加点属性ID对应的点数列表
#};
def OnAddPoint(index, clientData, tick):
    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
    playerControl = PlayerControl.PlayerControl(curPlayer)
    #JobQuotiety = PlayerControl.JobQuotiety
    pointAttrIDList = clientData.PointAttrIDList
    pointValueList = clientData.PointValueList
    if not pointAttrIDList or not pointValueList or len(pointAttrIDList) != len(pointValueList):
        return
    needTotalPoint = 0
    for i, attrID in enumerate(pointAttrIDList):
        if not IpyGameDataPY.GetIpyGameData("RolePoint", attrID):
            return
        needTotalPoint += pointValueList[i]
    curFreePoint = curPlayer.GetFreePoint()
    #job = curPlayer.GetJob()
    recvAddPoint = IPY_GameWorld.IPY_CAddPoint()
    addValue = recvAddPoint.GetPoint()
    #检验是否能够加点
    if addValue < 1 or addValue > curFreePoint:
        #检验不通过, 返回
        #GameWorld.ErrLog("(%s,%s)检验是否能够加点,检验不通过, 返回"%(addValue,curFreePoint) , curPlayer.GetPlayerID())
    if needTotalPoint > curFreePoint:
        GameWorld.DebugLog("剩余点数不足! curFreePoint(%s) < needTotalPoint(%s)" % (curFreePoint, needTotalPoint))
        return
    
    #封包加点类型
    addPointType = recvAddPoint.GetType()
    #加点
    if addPointType == ShareDefine.Def_Effect_STR:
        curPlayer.SetBaseSTR(addValue + curPlayer.GetBaseSTR())
    curPlayer.SetFreePoint(curFreePoint - needTotalPoint)
    for i, attrID in enumerate(pointAttrIDList):
        addPoint = pointValueList[i]
        curPoint = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AddPointValue % attrID)
        updPoint = curPoint + addPoint
        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_AddPointValue % attrID, updPoint)
        GameWorld.DebugLog("玩家加点: attrID=%s,curPoint=%s,addPoint=%s,updPoint=%s" % (attrID, curPoint, addPoint, updPoint))
        
    elif addPointType == ShareDefine.Def_Effect_PNE:
        curPlayer.SetBasePNE(addValue + curPlayer.GetBasePNE())
    elif addPointType == ShareDefine.Def_Effect_PHY:
        curPlayer.SetBasePHY(addValue + curPlayer.GetBasePHY())
    elif addPointType == ShareDefine.Def_Effect_CON:
        curPlayer.SetBaseCON(addValue + curPlayer.GetBaseCON())
    else:
        #异常超出边界
        GameWorld.ErrLog("AddPoint GetTypeErr = %s" % (addPointType) , curPlayer.GetID())
        return
    curPlayer.SetFreePoint(curFreePoint - addValue)
    DataRecordPack.DR_Freepoint(curPlayer, "AddPoint", curFreePoint, {"AddPointType":addPointType})
    playerControl.RefreshPlayerAttrState()
    NotifyPlayerBasePoint(curPlayer, pointAttrIDList)
    playerControl = PlayerControl.PlayerControl(curPlayer)
    playerControl.RefreshPlayerAttrState()
    return
def NotifyPlayerBasePoint(curPlayer):
    #上线通知基础属性点
    notifyList = []
    notifyBasePointDict = {
                 IPY_GameWorld.CDBPlayerRefresh_BaseSTR:'BaseSTR',
                 IPY_GameWorld.CDBPlayerRefresh_BasePHY:'BasePHY',
                 IPY_GameWorld.CDBPlayerRefresh_BaseCON:'BaseCON',
                 IPY_GameWorld.CDBPlayerRefresh_BasePNE:'BasePNE',
                }
    for refreshType, keyStr in notifyBasePointDict.items():
        notifyStruct = ChPyNetSendPack.tagRefreshType()
        notifyStruct.RefreshType = refreshType
        notifyStruct.Value = getattr(curPlayer, 'Get%s'%keyStr)()
        notifyList.append(notifyStruct)
def NotifyPlayerBasePoint(curPlayer, syncAttrIDList=[]):
    # 通知基础属性点,已分配的自由点数
    if not syncAttrIDList:
        ipyDataMgr = IpyGameDataPY.IPY_Data()
        syncAttrIDList = [ipyDataMgr.GetRolePointByIndex(index).GetAttrID() for index in xrange(ipyDataMgr.GetRolePointCount())]
        
    #属性组合包 通知自己
    sendPack = ChPyNetSendPack.tagObjInfoListRefresh()
    pointAttrIDList = []
    pointValueList = []
    for attrID in syncAttrIDList:
        curPoint = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AddPointValue % attrID)
        pointAttrIDList.append(attrID)
        pointValueList.append(curPoint)
    pointInfo = ChPyNetSendPack.tagMCRolePointInfo()
    pointInfo.PointAttrIDList = pointAttrIDList
    pointInfo.PointValueList = pointValueList
    pointInfo.PointAttrIDCount = len(pointAttrIDList)
    NetPackCommon.SendFakePack(curPlayer, pointInfo)
    return
#===============================================================================
# //B4 14 根据类型来决定移动的方式 #tagMCMoveByType
#
# struct    tagMCMoveByType
# {
#    tagHead        Head;
#    DWORD        ID;    //玩家ID
#    WORD        PosX;    // 目标X
#    WORD        PosY;    // 目标Y
#    BYTE        MoveType;    //移动方式
# };
#===============================================================================
def OnMoveByType(index, clientData, tick):
    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
    #玩家移动通用检查
    if not __CheckPlayerCanMove(curPlayer):
        return
    #先验证目标点是否合法
    if not GameWorld.GetMap().CanMove(clientData.PosX, clientData.PosY):
        return
    curPlayer.StopMove()
    curPlayer.ChangePos(clientData.PosX, clientData.PosY)
    sendPack = ChPyNetSendPack.tagMCMoveByType()
    sendPack.Clear()
    sendPack.ObjID = curPlayer.GetID()
    sendPack.ID = curPlayer.GetID()
    sendPack.ObjType = curPlayer.GetGameObjType()
    sendPack.Count = len(notifyList)
    sendPack.RefreshType = notifyList
    NetPackCommon.SendFakePack(curPlayer, sendPack)
    sendPack.PosX = clientData.PosX
    sendPack.PosY = clientData.PosY
    sendPack.MoveType = clientData.MoveType
    PlayerControl.PyNotifyAll(curPlayer, sendPack, False, -1)
    return
#===============================================================================
@@ -1840,7 +1837,15 @@
    #===========================================================================
    
    #超出视野
    if GameWorld.GetDist(curPlayer.GetPosX(), curPlayer.GetPosY(), clientData.PosX, clientData.PosY) > curPlayer.GetSight():
    if curPlayer.GetSight() and GameWorld.GetDist(curPlayer.GetPosX(), curPlayer.GetPosY(), clientData.PosX, clientData.PosY) > curPlayer.GetSight():
        return
    #玩家移动通用检查
    if not __CheckPlayerCanMove(curPlayer):
        return
    #先验证目标点是否合法
    if not GameWorld.GetMap().CanMove(clientData.PosX, clientData.PosY):
        return
    
    curPlayer.StopMove()
@@ -5219,81 +5224,6 @@
                                         'RequestIsFamily', sendMsg, len(sendMsg))
    return
#===============================================================================
#// AF 02 合服活动奖励 #tagCMMixCampaignAward
#
#struct    tagCMMixCampaignAward
#
#{
#    tagHead         Head;
#    BYTE        Type;    //0-查询;1-领取
#    DWORD        CampaignType;        //奖励类型
#    BYTE        Index;    //奖励位,领取时用
#};
#===============================================================================
## 合服活动奖励
#  @param index: 玩家索引
#  @param clientData: 封包结构体
#  @param tick: 时间戳
#  @return:
def GiveMixServerCampaignAward(index, clientData, tick):
    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
    campaignType = clientData.CampaignType
    queryType = clientData.Type
    awardIndex = clientData.Index # 奖励位
    GameWorld.DebugLog("GiveMixServerCampaignAward campaignType=%s,queryType=%s,awardIndex=%s"
                       % (campaignType, queryType, awardIndex))
    if queryType == ShareDefine.Def_MSCGameServerQuery_MailAward:
        GameWorld.DebugLog("    客户端不可发领取合服邮件奖励类型")
        return
    isMix = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_IsMixServer)
    if not isMix:
        GameWorld.ErrLog("    当前非合服状态!")
        return
    if campaignType not in ShareDefine.Def_MixCampaign_Type_List:
        GameWorld.ErrLog("    合服活动类型错误campaignType=%s error! not define" % campaignType)
        return
    # 如果直接在MapServer中处理,则返回
    if MixServerCampaign.DoMixServerCampaignOnMapServer(curPlayer, campaignType, queryType, awardIndex):
        return
    awardRecord = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MixServerCampaign_AwardRecord \
                                % campaignType, 0, ChConfig.Def_PDictType_OpenServerCampaign)
    awardState = GameWorld.GetDataByDigitPlace(awardRecord, awardIndex)
    if awardState == MixServerCampaign.Def_AwardState_Got:
        if queryType == ShareDefine.Def_MSCGameServerQuery_QueryAward:
            recordData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MixServerCampaign_RecordData \
                                % campaignType, 0, ChConfig.Def_PDictType_OpenServerCampaign)
            MixServerCampaign.Sync_MixServerCampaignAward(curPlayer, campaignType, awardState, recordData)
        GameWorld.DebugLog("    已经领取过该奖励...")
        return
    #领奖的需要等待GameServer回包以后才处理下一个封包
    if queryType != ShareDefine.Def_MSCGameServerQuery_QueryAward:
        if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_QueryMixServerAwardState) == 1:
            GameWorld.DebugLog("    已经在查询中...")
            return
    curPlayer.SetDict(ChConfig.Def_PlayerKey_QueryMixServerAwardState, 1)
    familyID = curPlayer.GetFamilyID()
    #[请求类型, 活动类型, 领取索引, 家族ID]
    msgList = [queryType, campaignType, awardIndex, familyID]
    GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(curPlayer.GetID(), 0, 0, 'MixServerCampaignAward', \
            '%s' % (msgList), len(str(msgList)))
    GameWorld.DebugLog("    msgList=%s" % str(msgList))
    return
#===============================================================================
## 领取奖励表奖励
@@ -5357,9 +5287,6 @@
    # 首充礼包奖励
    elif rewardType == ChConfig.Def_RewardType_GoldGiftFirst:
        PlayerGoldGift.GetPlayerGoldGiftFirst(curPlayer)
    # 领取法宝之魂奖励
    elif rewardType == ChConfig.Def_RewardType_MWSoulAward:
        PlayerMagicWeapon.GetMWSoulAward(curPlayer, dataEx)
    # 领取极品白拿
    elif rewardType == ChConfig.Def_RewardType_FreeGoods:
        PlayerFreeGoods.OnGetFreeGoods(curPlayer, dataEx)
@@ -5859,7 +5786,7 @@
        PlayerControl.SendMailByKey('SubpackageDownload', [curPlayer.GetID()], awardItemList)
    else:
        for itemID, itemCnt, isBind in awardItemList:
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
    SyncPackDownloadAward(curPlayer)
    return