6332 【后端】【2.0】主要是拍品相关规则调整及背包优化（GivePlayerItem 默认都给非拍品）

hxp

2019-03-07 06af11e5d1bb4c8462ead020ccdb7431f9647754

6332 【后端】【2.0】主要是拍品相关规则调整及背包优化（GivePlayerItem 默认都给非拍品）

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py

@@ -5064,7 +5064,7 @@
            PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")

            return

        for itemID, itemCount, isBind in itemList:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem])

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

    

    #给经验

    giveExp = 0


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.py

@@ -449,7 +449,7 @@
        itemCount = 1

        # 摘除的宝石都绑定

        if ItemCommon.CheckPackHasSpace(curPlayer, stonePackType):

            ItemControler.GivePlayerItem(curPlayer, stoneID, itemCount, True if stoneIsBind else False,

            ItemControler.GivePlayerItem(curPlayer, stoneID, itemCount, 0,

                                         [stonePackType], 

                                         event=[ChConfig.ItemGive_StonePickoff, False, {"EquipPlace":equipPlace, "HoleIndex":holeIndex}])

        else:


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py

@@ -747,7 +747,7 @@
    

    # 返还物品

    for itemID, itemCount, isBind in giveItemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], 
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], 
                                     event=["ItemDecompound", True, {"decompoundItemNoteDict":decompoundItemNoteDict}])

        

    GameWorld.Log("拆解物品成功: decompoundItemNoteDict=%s" % str(decompoundItemNoteDict), playerID)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/ShopItemManage.py

@@ -507,7 +507,7 @@
#        

#        if isAppoint == 0:

#            realItemID = itemID

#            ItemControler.GivePlayerItem(curPlayer, itemID, totalCnt, isBind, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], 
#            ItemControler.GivePlayerItem(curPlayer, itemID, totalCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], 
#                                         True, showSysInfo=True, event=["BuyShopItem", True, eventDataEx])

#        else:

#            realItemID = ItemControler.GetAppointItemRealID(itemID)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearFruitAttr.py

@@ -87,7 +87,7 @@
    PlayerControl.PlayerControl(curPlayer).ReCalcAllState()

    

    for itemID, itemCount in giveFruitItemList:

        if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, True, [IPY_GameWorld.rptItem]):

        if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem]):

            break

    GameWorld.DebugAnswer(curPlayer, "OK!")

    return


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItemB.py

@@ -37,10 +37,10 @@
    bindCount = msgList[2] if len(msgList) > 2 else 0

    

    if unBindCount > 0:

        ItemControler.GivePlayerItem(curPlayer, itemID, unBindCount, False, [IPY_GameWorld.rptItem], 
        ItemControler.GivePlayerItem(curPlayer, itemID, unBindCount, 0, [IPY_GameWorld.rptItem], 
                                     event=[ChConfig.ItemGive_GMMake, False, {"CMD":"MakeItemB"}])

    if bindCount:

        ItemControler.GivePlayerItem(curPlayer, itemID, bindCount, True, [IPY_GameWorld.rptItem], 
        ItemControler.GivePlayerItem(curPlayer, itemID, bindCount, 0, [IPY_GameWorld.rptItem], 
                                     event=[ChConfig.ItemGive_GMMake, False, {"CMD":"MakeItemB"}])



    return


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.py

@@ -355,7 +355,7 @@
                randAwardList = GameWorld.GetResultByRandomList(actionRandAwardList)

                if randAwardList:

                    for itemID, itemCnt, isBind in randAwardList:

                        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind,

                        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0,

                                                     [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True)

            

                


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BZZD.py

@@ -251,7 +251,7 @@
    if goldPaper:

        PlayerControl.GiveMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Paper, goldPaper)

    if itemID:

        ItemControler.GivePlayerItem(curPlayer, itemID, 1, 1, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, 1, 0, [IPY_GameWorld.rptItem])

    GameWorld.DebugLog("首次进入给奖励：silverMoney=%s,goldPaper=%s,itemID=%s" 

                       % (silverMoney, goldPaper, itemID), curPlayer.GetPlayerID())

    return


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.py

@@ -370,7 +370,7 @@
                GameWorld.DebugLog("背包空间不够，发送邮件: mailItemList=%s" % str(prizeItemList), curPlayer.GetPlayerID())

            else:

                for itemID, itemCnt, isBind in prizeItemList:

                    ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem], event=["ChaosDemon", False, {}])

                    ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], event=["ChaosDemon", False, {}])

            

            reExp = PlayerControl.GetPlayerReExp(curPlayer)

            addExp = int(eval(giveExp) * rate/100)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py

@@ -449,7 +449,7 @@
        GameWorld.DebugLog("背包空间不够，发送邮件: mailItemList=%s" % str(prizeItemList), curPlayer.GetPlayerID())

    else:

        for itemID, itemCnt, isBind in prizeItemList:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem],

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem],

                                            event=["Dojie", False, {}])

    return




 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.py

@@ -409,7 +409,7 @@
        PlayerControl.SendMailByKey("ElderBattlefieldMail" if mapID == ChConfig.Def_FBMapID_ElderBattlefield else 'ElderBattlefieldMail2', [curPlayer.GetPlayerID()], rewardItemList)

    else:

        for itemID, itemCnt, isBind in rewardItemList:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem], event=["ElderBattlefield", False, {}])

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], event=["ElderBattlefield", False, {}])

    

        overDict = {FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(itemList), FBCommon.Over_succItemInfo:FBCommon.GetJsonItemList(succAwardDict.items())}

        FBCommon.NotifyFBOver(curPlayer, ChConfig.Def_FBMapID_ElderBattlefield, lineID, 1, overDict)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py

@@ -414,7 +414,7 @@
    #给奖励

    itemAward = IpyGameDataPY.GetFuncEvalCfg('FamilyPartyDesk', 3)

    for itemID, itemCount, isBind in itemAward:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

    addPoint = IpyGameDataPY.GetFuncCfg('FamilyPartyDesk')

    PlayerControl.NotifyCode(curPlayer, 'Party_CollectSuccess', [addPoint])

    PlayerFamily.AddPlayerFamilyActiveValue(curPlayer, addPoint, True, ShareDefine.Def_AddFAVReason_FamilyParty)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.py

@@ -1487,7 +1487,7 @@
    Sync_ChampionFamilyDailyRewardState(curPlayer)

    

    for itemID, itemCnt, isBind in itemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

        

    GameWorld.DebugLog("领取王者仙盟每日俸禄: itemList=%s" % itemList, playerID)

    return


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GatherSoul.py

@@ -597,7 +597,7 @@
            GameWorld.DebugLog("背包空间不够，发送邮件: mailItemList=%s" % str(totalItemList), curPlayer.GetPlayerID())

        else:

            for itemID, itemCnt, isBind in totalItemList:

                ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [],

                ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [],

                                                event=["GatherSoulFB", False, {}])

            

    fbCfg = GetGatherSoulFBCfg()


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Guard.py

@@ -186,7 +186,7 @@
    if step == Def_EndGuard:

        itemID, giveExp = FBCommon.GetFBLineReward(GameWorld.GetMap().GetMapID(), 0)

        if itemID:

            ItemControler.GivePlayerItem(curPlayer, itemID, 1, 1, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True)

            ItemControler.GivePlayerItem(curPlayer, itemID, 1, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True)

    

    # 新手本玩家退出默认关闭副本

    GameWorldProcess.CloseFB(tick)

@@ -437,7 +437,7 @@
    if isPass:

        itemID, giveExp = FBCommon.GetFBLineReward(GameWorld.GetMap().GetMapID(), 0)

        #物品改在退出副本时给

        #ItemControler.GivePlayerItem(curPlayer, itemID, 1, 1, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True)

        #ItemControler.GivePlayerItem(curPlayer, itemID, 1, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True)

        if giveExp:

            PlayerControl.PlayerControl(curPlayer).AddExp(giveExp)

            overDict[FBCommon.Over_exp] = giveExp


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.py

@@ -588,7 +588,7 @@
            PlayerControl.SendMailByKey('', [curPlayer.GetID()], itemList)

        else:

            for itemID, itemCount, isBind in itemList:

                ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem])

                ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

        

        jsonItemList = FBCommon.GetJsonItemList(itemList)

        overDict[FBCommon.Over_itemInfo] = jsonItemList

@@ -672,7 +672,7 @@
        PlayerControl.SendMailByKey(0, [curPlayer.GetID()], itemList)

    else:

        for itemID, itemCnt, isBind in itemList:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

    #直接将5条线星级改为3星

    addCnt = 0

    starCnt, lineList = GetIceLodeAllStarCnt(curPlayer)

@@ -739,7 +739,7 @@
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_IceLodeStarAwardRecord, awardRecord|pow(2, starIndex))

    

    for itemID, itemCount, isBind in awardList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

    #֪ͨ

    SyncIceLoddInfo(curPlayer)

    return


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ManorWar.py

@@ -981,7 +981,7 @@
    # 给奖励

    packIndexList = [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere] 

    for itemID, itemCount, itemBind in totalItemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, itemBind, packIndexList, True, showSysInfo=True)

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, packIndexList, True, showSysInfo=True)

        

    addDataDict = {"AwardIndex":awardIndex, "WinLeaderID":winLeaderID, "AwardItemList":totalItemList}

    DataRecordPack.DR_FuncGiveItem(curPlayer, "ManorWar", addDataDict)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py

@@ -449,7 +449,7 @@
            #    GameWorld.DebugLog("背包空间不够，发送邮件: mailItemList=%s" % str(prizeItemList), curPlayer.GetPlayerID())

            # else:

            #    for itemID, itemCnt, isBind in prizeItemList:

            #        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem], event=["MunekadoTrial", False, {}])

            #        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], event=["MunekadoTrial", False, {}])

            #overDict[FBCommon.Over_itemInfo] = FBCommon.GetJsonItemList(prizeItemList)

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

            

@@ -789,7 +789,7 @@
    ItemCommon.DelCostItem(curPlayer, itemPack, delInfoDict)

    

    #给物品

    ItemControler.GivePlayerItem(curPlayer, exchangeItemID, exchangeItemCount, exchangeItemIsBind, [IPY_GameWorld.rptItem], 
    ItemControler.GivePlayerItem(curPlayer, exchangeItemID, exchangeItemCount, 0, [IPY_GameWorld.rptItem], 
                                 event=[ChConfig.ItemGive_TrialExchange, False, {}])

    #任务

    EventShell.EventRespons_TrialExchange(curPlayer, costItemID)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.py

@@ -601,7 +601,7 @@
        PlayerControl.SendMailByKey("QueenRelicsMail", [curPlayer.GetPlayerID()], rewardItemList)

    else:

        for itemID, itemCount, isBind in rewardItemList:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], event=["QueenRelics", False, {}])

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], event=["QueenRelics", False, {}])

            

    GameWorld.DebugLog("    总奖励：totalSP=%s,rewardItemList=%s" % (totalSP, rewardItemList), curPlayer.GetPlayerID())

    return needSyncFBData, startRewardLineID, totalSP, rewardItemList


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.py

@@ -399,7 +399,7 @@
        GameWorld.DebugLog("背包空间不够，发送邮件: mailItemList=%s" % str(prizeItemList), curPlayer.GetPlayerID())

    else:

        for itemID, itemCnt, isBind in prizeItemList:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [ShareDefine.rptRune],

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [ShareDefine.rptRune],

                                            event=["RuneTower", False, {}])

                

    moneyDict = {ShareDefine.TYPE_Price_Rune:addJH, ShareDefine.TYPE_Price_Ysog:RuneMagicEssence}

@@ -647,7 +647,7 @@
        GameWorld.DebugLog("背包空间不够，发送邮件: mailItemList=%s" % str(giveItemList), curPlayer.GetPlayerID())

    else:

        for itemID, itemCnt, isBind in giveItemList:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [ShareDefine.rptRune],

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [ShareDefine.rptRune],

                                            event=["RuneTowerSD", False, {}])

    overDict = {FBCommon.Over_isSweep:1, FBCommon.Over_dataMapID:ChConfig.Def_FBMapID_TrialTower,

                "SDTowerItem":jsonItemDict, "SDTowerPoint":giveRunePointDict, "SDTowerYsog":giveRuneYsogDict}


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py

@@ -450,7 +450,7 @@
    prizeItemList = winCntAwardDict[str(prizeEx)]

    # 给物品 [奖励物品id,个数,是否绑定]

    for itemID, itemCnt, isBind in prizeItemList:

        if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind,

        if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0,

                                        [IPY_GameWorld.rptItem], True, showSysInfo=True):

    

            playerID = curPlayer.GetPlayerID()


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py

@@ -2017,7 +2017,7 @@
#                return

#        else:

#            #给予物品

#            if not ItemControler.GivePlayerItem(curPlayer, newItemId, itemCount, isBind, 
#            if not ItemControler.GivePlayerItem(curPlayer, newItemId, itemCount, 0, 
#                                         [IPY_GameWorld.rptItem], False):

#                GameWorld.ErrLog("使用特殊运营物品 给予普通物品失败")

#                return

@@ -2076,6 +2076,6 @@
        return

    #先删原物品再给新物品

    ItemCommon.DelItem(curPlayer, timeOutItem, 1, False, "RenewItem")

    ItemControler.GivePlayerItem(curPlayer, changeItemID, 1, True, [IPY_GameWorld.rptItem])

    ItemControler.GivePlayerItem(curPlayer, changeItemID, 1, 0, [IPY_GameWorld.rptItem])

    PlayerControl.NotifyCode(curPlayer, 'Guardian_ContinuePay')

    return

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.py

@@ -458,7 +458,7 @@
            PlayerControl.SendMailByKey("DefaultLackSpace", [curPlayer.GetPlayerID()], prizeItemList)

        else:

            for giveItemID, itemCnt in giveItemDict.items():

                ItemControler.GivePlayerItem(curPlayer, giveItemID, itemCnt, True, [IPY_GameWorld.rptItem], True)

                ItemControler.GivePlayerItem(curPlayer, giveItemID, itemCnt, 0, [IPY_GameWorld.rptItem], True)

    

    #通知结果

    packData = ChPyNetSendPack.tagMCZhuXianDecomposeResult()


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py

@@ -569,7 +569,7 @@
        for prizeItem in prizeItemList:

            if isinstance(prizeItem, list):

                itemID, itemCount, isBind = prizeItem

                ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], 
                ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], 
                                             event=event)

            else:

                ItemControler.DoLogic_PutItemInPack(curPlayer, prizeItem, event=event)

@@ -5462,7 +5462,7 @@
    giveItemList = collectNPCIpyData.GetCollectAward()

    if giveItemList:

        itemID, itemCount, isBind = giveItemList

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

        

    #采集成就

    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_Collect, collectCnt, [npcID])


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

@@ -5843,7 +5843,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




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

@@ -181,7 +181,7 @@
    

    # 给物品

    for itemID, itemCount in itemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 1, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

    Sync_FuncOpenState(curPlayer, [funcID])

    return

    


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

@@ -281,7 +281,7 @@
    GameWorld.DebugLog('HightLadder### OnGMHighLadderChallengeReuslt out') 

    if awardItemList:

        for itemID, itemCnt, isBind in awardItemList:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind,

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0,

                                         [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])

    

    SendHighLadderState(curPlayer, tick)

@@ -540,7 +540,7 @@
        #给予物品        

        # 一般物品

        if itemType == Def_ItemType_CommonItem:

            if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, \

            if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, \

                                                 [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True):

                continue

            #PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [itemID, itemCount])


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

@@ -334,7 +334,7 @@
        for itemInfo in giveItemList:

            itemID, itemCount = itemInfo[:2]

            isBind = itemInfo[2] if len(itemInfo) > 2 else 1

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], 
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], 
                                         event=[ChConfig.ItemGive_OpenServerCampaign, True, drDict])

    return




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

@@ -197,7 +197,7 @@
    #GameWorld.Log('  actionID=%s,curTimes=%s,gotTimes=%s,singleTimes=%s,newGotTimes=%s'%(actionID, curTimes, gotTimes,singleTimes, newGotTimes))

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_LoginAwardGotTimes % (day, templateID), newGotTimes, ChConfig.Def_PDictType_LoginAward)

    for itemID, itemCnt in awardDict.items():

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 1, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

    SyncLoginAwardPlayerInfo(curPlayer, day, templateID)

    return




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

@@ -229,7 +229,7 @@
        PlayerControl.WorldNotify(0, notifyKey, [curPlayer.GetPlayerName(), needGold])

        

    for itemID, itemCount, isBind in awardItemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

        

    addDataDict = {"TemplateID":templateID, "NeedGold":needGold, "AwardIndex":awardIndex,

                   "ItemList":str(awardItemList)}


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

@@ -403,7 +403,7 @@
        if not notifyItemID:

            notifyItemID = giveItemID

        giveTotalCnt = giveCnt * excCnt

        if not ItemControler.GivePlayerItem(curPlayer, giveItemID, giveTotalCnt, findItemIsBind,

        if not ItemControler.GivePlayerItem(curPlayer, giveItemID, giveTotalCnt, 0,

                                            [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere]):

            GameWorld.ErrLog("OnExchangeActionItem(), give itemID:%s,count:%s fail!" 

                             % (giveItemID, giveTotalCnt), curPlayer.GetPlayerID())


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

@@ -325,7 +325,7 @@
        return

    

    # 给物品

    ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem], True)

    ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], True)



    # 更新已领取成功标记

    updAwardRecord = getAwardRecord | (1 << awardIndex)


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

@@ -340,7 +340,7 @@
        return

    

    for itemID, itemCnt, isBind in awardItemList:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere],

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere],

                                         showEff=True, showSysInfo=True)

    

    #更新记录


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

@@ -169,7 +169,7 @@
    #GameWorld.Log('  actionID=%s,curTimes=%s,gotTimes=%s,singleTimes=%s,newGotTimes=%s'%(actionID, curTimes, gotTimes,singleTimes, newGotTimes))

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_BRActionGotTimes % actionID, newGotTimes)

    for itemID, itemCnt in awardDict.items():

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 1, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

    SyncBossRebornPlayerInfo(curPlayer, actionID)

    return




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

@@ -271,7 +271,7 @@
            PlayerControl.SendMailByKey("", [curPlayer.GetPlayerID()], giveItemList)

        else:

            for itemID, itemCount, isBind in giveItemList:

                ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], 
                ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], 
                                             event=[ChConfig.ItemGive_CTG, True, addDRDict])

        if notifyMark:

            mainItemID = giveItemList[0][0]


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

@@ -110,7 +110,7 @@
        itemID = curPackItem.ItemID

        if ItemControler.GetAppointItemRealID(itemID):

            #定制物品

            ItemControler.GivePlayerItem(curPlayer, itemID, curPackItem.Count, curPackItem.IsBind, [IPY_GameWorld.rptItem], 
            ItemControler.GivePlayerItem(curPlayer, itemID, curPackItem.Count, 0, [IPY_GameWorld.rptItem], 
                                         False, showSysInfo=False, event=[ChConfig.ItemGive_Mail, False, {"MailGUID":curPackData.GUID}])

            continue

        


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

@@ -238,7 +238,7 @@
        PlayerControl.WorldNotify(0, notifyKey, [curPlayer.GetPlayerName(), needCostGold])

        

    for itemID, itemCount, isBind in awardItemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

        

    addDataDict = {"TemplateID":templateID, "NeedCostGold":needCostGold, "AwardIndex":awardIndex,

                   "ItemList":str(awardItemList)}


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

@@ -320,7 +320,7 @@
        

        if itemType == Item_Type_Common:

            packIndexList = [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere]

            if not ItemControler.GivePlayerItem(curPlayer, itemId, itemNum, itemIsBind, packIndexList, True, showSysInfo=True):

            if not ItemControler.GivePlayerItem(curPlayer, itemId, itemNum, 0, packIndexList, True, showSysInfo=True):

                giveFailList.append(itemInfo)

            

        elif itemType == Item_Type_Appoint:


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

@@ -589,7 +589,7 @@
                       % (awardType, awardData, awardIndex, awardState, awardItemList), playerID)

    drDataDict.update({"awardIndex":awardIndex, "awardState":awardState, "awardItemList":awardItemList})

    for itemID, itemCnt, isBind in awardItemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

        

    if awardType == 3:

        PlayerControl.WorldNotify(0, "CrossMatching22", [curPlayer.GetPlayerName(), awardDanLV])

@@ -712,7 +712,7 @@
        PlayerControl.SendMailByKey(mailTypeKey, [playerID], awardItemList, mailParamList, detail=mailDetail)

    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])

            

    GameWorld.Log("领取成功! awardItemList=%s" % (awardItemList), playerID)

    drDataDict = {"awardItemList":awardItemList, "order":order, "danLV":danLV, "seasonAwardLV":seasonAwardLV, "isMail":isMail}


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

@@ -143,7 +143,7 @@
            PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")

            return

        # 给物品

        ItemControler.GivePlayerItem(curPlayer, itemInfo[0], itemInfo[1], 1, [IPY_GameWorld.rptItem], 
        ItemControler.GivePlayerItem(curPlayer, itemInfo[0], itemInfo[1], 0, [IPY_GameWorld.rptItem], 
                                     event=[ChConfig.ItemGive_DiceEx, False, {}])

    reExp = PlayerControl.GetPlayerReExp(curPlayer)

    exp = eval(prizeInfo.get("exp", '0'))


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

@@ -115,7 +115,7 @@
            PlayerControl.SendMailByKey("DefaultLackSpace", [curPlayer.GetPlayerID()], prizeItemList)

        else:

            for giveItemID, itemCnt in giveItemIDDict.items():

                ItemControler.GivePlayerItem(curPlayer, giveItemID, itemCnt, True, [IPY_GameWorld.rptItem], True)

                ItemControler.GivePlayerItem(curPlayer, giveItemID, itemCnt, 0, [IPY_GameWorld.rptItem], True)

    

    #同步客户端

    Sync_EDLVInfo(curPlayer, jsonItemList)


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

@@ -189,7 +189,7 @@
    

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FCRechargeState, 2)

    for itemID, itemCnt, isBind in awardList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

    

    SyncFCRechargeInfo(curPlayer)

    

@@ -257,7 +257,7 @@
    awardRecord |= awardMark

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FCPartyAwardRecord, awardRecord)

    for itemID, itemCnt, isBind in awardList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

    #֪ͨ

    SyncFCPartyInfo(curPlayer, isGetAward=True)

    return


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

@@ -254,7 +254,7 @@
        itemDict['IsBind'] = isBind

        ItemControler.GivePlayerEquip(curPlayer, itemDict, event=[ChConfig.ItemGive_FamilyStore, False, {}])

    else:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], 
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], 
                                     event=[ChConfig.ItemGive_FamilyStore, False, {}])

        

    # 广播战盟频道


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

@@ -281,7 +281,7 @@
    #GameWorld.Log('  actionID=%s,curTimes=%s,gotTimes=%s,singleTimes=%s,newGotTimes=%s'%(actionID, curTimes, gotTimes,singleTimes, newGotTimes))

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FeastWeekPartyGotTimes % (day, templateID), newGotTimes, ChConfig.Def_PDictType_FeastWeekParty)

    for itemID, itemCnt in awardDict.items():

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 1, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

    SyncFeastWeekPartyPlayerInfo(curPlayer, day, templateID)

    return



@@ -318,7 +318,7 @@
        return

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FeastWeekPartyAwardRecord % day, awardRecord | pow(2, getIndex), ChConfig.Def_PDictType_FeastWeekParty)

    for itemID, itemCnt, isBind in itemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

    SyncFeastWeekPartyPlayerInfo(curPlayer, day)

    DataRecordPack.DR_FeastWeekPartyPoint(curPlayer, day, getPoint)

    return


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

@@ -249,7 +249,7 @@
            continue

        

        if itemType == Item_Type_Common:

            ItemControler.GivePlayerItem(curPlayer, itemId, itemNum, itemIsBind, [IPY_GameWorld.rptItem], True)

            ItemControler.GivePlayerItem(curPlayer, itemId, itemNum, 0, [IPY_GameWorld.rptItem], True)

            

        elif itemType == Item_Type_Appoint:

            ItemControler.GivePlayerAppointItem(curPlayer, itemId, itemIsBind, True)


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

@@ -162,7 +162,7 @@
            PlayerControl.SendMailByKey("", [curPlayer.GetPlayerID()], giftItemList)

        else:

            for itemID, itemCount, isBind in giftItemList:

                ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], 
                ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], 
                                             event=[ChConfig.ItemGive_CTG, True, addDRDict])

    

    # 取玩家APPID，混服使用


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

@@ -130,7 +130,7 @@
        else:

            # 给物品

            for itemID, itemCount, isBind in awardItemList:

                ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem])

                ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

        

    Sync_FreeGoodsInfo(curPlayer, [freeGoodsID])

    return


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

@@ -449,7 +449,7 @@
    

    isBind = hasBind or isBind

    if itemType == 0:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, 
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, 
                                     [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])

    elif itemType == 1:

        ItemControler.GivePlayerAppointItem(curPlayer, itemID, isBind)


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

@@ -156,7 +156,7 @@
        

        # 一般物品

        if itemType == Def_ItemType_CommonItem:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], True, showSysInfo=True)

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)

        

        # 特殊定制物品

        elif itemType == Def_ItemType_AppointItem:

@@ -314,7 +314,7 @@
    

    # 给物品

    for itemID, itemCount, isBind in rewardItemList:        

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

        

    # 全服提示

    if len(rewardItemList) >= 2:

@@ -554,7 +554,7 @@
        if not giveItemID:

            return

        GameWorld.DebugLog('首充试用物品过期了 背包仓库没武器则送一把giveItemID=%s'%giveItemID, curPlayer.GetID())

        if not ItemControler.GivePlayerItem(curPlayer, giveItemID, 1, True, [IPY_GameWorld.rptItem], True):

        if not ItemControler.GivePlayerItem(curPlayer, giveItemID, 1, 0, [IPY_GameWorld.rptItem], True):

            GameWorld.DebugLog('首充试用物品过期了 背包仓库没武器则送一把 没给成功！！giveItemID=%s'%giveItemID, curPlayer.GetID())

            

    return


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

@@ -341,7 +341,7 @@
    GameWorld.DebugLog("    领取投资理财回报 rewardItemList=%s" % (rewardItemList))

    if rewardItemList:

        for itemID, itemCnt, isBind in rewardItemList:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True)

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True)

    

    __CheckInvestReset(curPlayer)

    # 记录领取事件


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

@@ -102,7 +102,7 @@
    

    # 给物品

    for itemID, itemCount in itemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 1, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

        

    # 更新已领取成功标记

    awardMark = pow(2, awardID - 1)


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

@@ -98,7 +98,7 @@
    

    # 给物品

    for itemID, itemCount in itemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 1, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

    

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_LoginDayAward, awardInfo | awardMark)

    


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

@@ -190,7 +190,7 @@
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_LuckyTreasureCnt, curLuckyCnt + 1)

    

    for itemID, itemCount, isBind in [giveItem]:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], event=[ChConfig.ItemGive_LuckyTreasure, False, {"isFree":not hasFree}])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], event=[ChConfig.ItemGive_LuckyTreasure, False, {"isFree":not hasFree}])

    

    SyncLuckyTreasureResultInfo(curPlayer, giveItem)

    return


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

@@ -150,7 +150,7 @@
        if 1 > packSpace:

            PlayerControl.SendMailByKey('TreasureWakeUp', [curPlayer.GetID()], [itemAward])

        else:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind,

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0,

                                             [IPY_GameWorld.rptItem], True, showSysInfo=True, event=["MWAward", False, {"mwID":mwID}])

    activeMWID = upIpyData.GetActiveMWID()

    if activeMWID == mwID:

@@ -507,7 +507,7 @@
    # 给物品

    if awardItemList:

        for itemID, itemCnt in awardItemList:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 1, [IPY_GameWorld.rptItem], True)

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], True)

       

    #给钱

    for moneyType, value in ipyData.GetMoney():

@@ -727,7 +727,7 @@
            return

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MWSoulGotItemState % privilege, 1)

        for itemid, cnt, isBind in itemList:

            ItemControler.GivePlayerItem(curPlayer, int(itemid), int(cnt), isBind,

            ItemControler.GivePlayerItem(curPlayer, int(itemid), int(cnt), 0,

                                         [IPY_GameWorld.rptItem], True, showSysInfo=True, event=["MWSoulAward", False, {"privilege":privilege}])

    

    #֪ͨ


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

@@ -189,7 +189,7 @@
    

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_NewFCRechargeState, 2)

    for itemID, itemCnt, isBind in awardList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

    

    SyncFCRechargeInfo(curPlayer)

    

@@ -257,7 +257,7 @@
    awardRecord |= awardMark

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_NewFCPartyAwardRecord, awardRecord)

    for itemID, itemCnt, isBind in awardList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

    #֪ͨ

    SyncFCPartyInfo(curPlayer, isGetAward=True)

    return


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

@@ -187,7 +187,7 @@
    

    #给予物品

    itemID, itemCnt, isBand = itemInfo

    if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBand, [IPY_GameWorld.rptItem]):

    if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem]):

        #背包空间不足

        PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [IPY_GameWorld.rptItem])

        return True

@@ -238,7 +238,7 @@
    #给予物品

    itemID, itemCnt, isBand = itemInfo

    GameWorld.DebugLog("    itemInfo=%s" % str(itemInfo))

    if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBand, [IPY_GameWorld.rptItem]):

    if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem]):

        #背包空间不足

        PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [IPY_GameWorld.rptItem])

        return True

@@ -432,7 +432,7 @@
    

    #给予物品

    itemID, itemCnt, isBand = itemInfo

    if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBand, [IPY_GameWorld.rptItem]):

    if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem]):

        #背包空间不足

        PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [IPY_GameWorld.rptItem])

        return

@@ -544,7 +544,7 @@
        if isAppoint:

            isOK = ItemControler.GivePlayerAppointItem(curPlayer, itemID, itemBind, True, True)

        else:

            isOK = ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, itemBind, [IPY_GameWorld.rptItem],

            isOK = ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem],

                                                True, showSysInfo=True)

        if isOK:

            succGiveItemList.append(itemInfo)


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

@@ -75,7 +75,7 @@
    

    # 给物品

    for itemID, itemCount in itemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 1, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])

    

   

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_OnlinePrizeNote % dayID, awardInfo | awardMark)


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

@@ -217,7 +217,7 @@
        return False

    

    #给玩家物品

    if not ItemControler.GivePlayerItem(curPlayer, produceID, produceCnt, produceIsBind, 
    if not ItemControler.GivePlayerItem(curPlayer, produceID, produceCnt, 0, 
                                                                     [IPY_GameWorld.rptItem]):

        #背包空间不足!

        PlayerControl.NotifyCode(curPlayer, "Collect_lhs_31379")

@@ -393,7 +393,7 @@
            

        for proItemID, proCnt in proIemCntDict.items():

            # 给合成物品不成功

            if not ItemControler.GivePlayerItem(curPlayer, proItemID, proCnt, isBind, 
            if not ItemControler.GivePlayerItem(curPlayer, proItemID, proCnt, 0, 
                                                [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True):

                #背包空间不足!

                PlayerControl.NotifyCode(curPlayer, "Collect_lhs_31379")        


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

@@ -283,7 +283,7 @@
    

    # 给物品

    for itemID, itemCount, isBind in itemInfoList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], True, showSysInfo=True)

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)



    # 更新已领取成功标记

    __SetAwardRecord(curPlayer, recordKey, getLVIndex)

@@ -330,7 +330,7 @@
    

    # 给物品

    for itemID, itemCount, isBind in awardItemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], True, showSysInfo=True)

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)

    

    # 更新已领取成功标记

    updRecord = recordValue | pow(2, getVIPType)

@@ -397,7 +397,7 @@
    GameWorld.DebugLog("awardItemList=%s" % awardItemList)

    # 给物品

    for itemID, itemCount, isBind in awardItemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], True, showSysInfo=True)

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)

    

    # 更新已领取成功标记

    updRecord = recordValue | pow(2, awardIndex)

@@ -456,7 +456,7 @@
    

    # 给物品

    for itemID, itemCount, isBind in itemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], True, showSysInfo=True)

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)



    # 更新已领取成功标记

    __SetAwardRecord(curPlayer, recordKey, awardIndex)

@@ -497,7 +497,7 @@
    

    # 给物品

    for itemID, itemCount, isBind in awardItemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], True, showSysInfo=True)

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)

    

    # 更新已领取成功标记

    __SetQQPDictValue(curPlayer, recordKey, 1)

@@ -541,7 +541,7 @@


    # 给物品

    for itemID, itemCount, isBind in awardItemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], True, showSysInfo=True)

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)

    

    # 更新已领取成功标记

    __SetQQPDictValue(curPlayer, recordKey, 1)


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

@@ -140,7 +140,7 @@
    

    #把地图物品放到背包中

    dataDict = {'PlayerLV':playerLV, 'OffDays':offDays}

    if not ItemControler.GivePlayerItem(curPlayer, itemID, count, True, [IPY_GameWorld.rptItem], True,

    if not ItemControler.GivePlayerItem(curPlayer, itemID, count, 0, [IPY_GameWorld.rptItem], True,

                                        showSysInfo=True, event=["PlayerBackAward", True, dataDict]):

        return

    


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

@@ -288,7 +288,7 @@
            

        else:

            for itemID, itemCnt in totalItemDict.items(): 

                ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 1, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True)

                ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True)

    if Def_TJGRecoverID in recoverCntDict:

        #脱机挂经验找回后重置

        PlayerTJG.ResetTJGDeadInfo(curPlayer)


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

@@ -205,7 +205,7 @@
        makeItemBind = False

    else:

        makeItemBind = delItemHasBind

    ItemControler.GivePlayerItem(curPlayer, makeItemID, itemCount, makeItemBind, [IPY_GameWorld.rptItem], 
    ItemControler.GivePlayerItem(curPlayer, makeItemID, itemCount, 0, [IPY_GameWorld.rptItem], 
                                 event=[ChConfig.ItemGive_Refine, False, {}])

    

    Sycn_AlchemyMsg(curPlayer, makeItemID)

@@ -400,7 +400,7 @@
    if not PlayerControl.PayMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Money, costMoney, ChConfig.Def_Cost_AlchemyPray):

        return

    #给物品

    ItemControler.GivePlayerItem(curPlayer, makeItemID, itemCount, True, [IPY_GameWorld.rptItem], 
    ItemControler.GivePlayerItem(curPlayer, makeItemID, itemCount, 0, [IPY_GameWorld.rptItem], 
                                 event=[ChConfig.ItemGive_Refine, False, {}])

    #GameWorld.DebugLog('makeItemID=%s,newItemInfoList=%s'%(makeItemID, newItemInfoList))

    


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

@@ -269,7 +269,7 @@
        if isAppoint:

            ItemControler.GivePlayerAppointItem(curPlayer, itemID, isBind, True, True)

        else:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], True, showSysInfo=True)

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)

    

    

    GameWorld.Log('领取转生奖励成功，dataEx=%s' % dataEx)


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

@@ -273,7 +273,7 @@
    packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, signCount)

    if packSpace >= signCount:

        for awardInfo in awardInfoList:

            ItemControler.GivePlayerItem(curPlayer, awardInfo[0], awardInfo[1], awardInfo[2], [IPY_GameWorld.rptItem], True, showSysInfo=True) 
            ItemControler.GivePlayerItem(curPlayer, awardInfo[0], awardInfo[1], 0, [IPY_GameWorld.rptItem], True, showSysInfo=True) 
    else:       

        GameWorld.DebugLog("背包已满 邮件发送物品")

        PlayerControl.SendMailByKey(mailTypeKey, [curPlayer.GetPlayerID()], awardInfoList)


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

@@ -1011,7 +1011,7 @@
    # 给物品

    if isGiveItem:

        for itemID, itemCnt in itemDict.items():

            isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 1,

            isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0,

                                                   [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True)

       

    #给钱


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

@@ -551,7 +551,7 @@
    

    # 给物品

    for itemID, itemCnt, isBind in itemList:

        isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, 
        isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, 
                                               [IPY_GameWorld.rptItem], True)

        if isPutIn:

            PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [itemID, itemCnt])

@@ -639,7 +639,7 @@
            itemID, itemCnt, isBind = itemInfo[job]

        else:

            itemID, itemCnt, isBind = itemInfo

        isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, 
        isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, 
                                               [IPY_GameWorld.rptItem], True)

        if isPutIn:

            PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [itemID, itemCnt])

@@ -823,7 +823,7 @@
    

    itemInfoList = actionAwardInfo[CostProfit_ItemList]

    for itemId, itemNum, itemIsBind in itemInfoList:

        ItemControler.GivePlayerItem(curPlayer, itemId, itemNum, itemIsBind, [IPY_GameWorld.rptItem], True)

        ItemControler.GivePlayerItem(curPlayer, itemId, itemNum, 0, [IPY_GameWorld.rptItem], True)

    addDataDict = {"actionId":actionId, "needCostGold":needGoldNum, "costGold":curGoldNum,

                   "itemInfoList":str(itemInfoList)}

    DataRecordPack.DR_FuncGiveItem(curPlayer, "CostProfitAward", addDataDict)


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

@@ -1326,7 +1326,7 @@
    TruckCreatAwardDict = ReadChConfig.GetEvalChConfig("TruckCreatAward")

    if truckLv in TruckCreatAwardDict:

        for itemID, itemCount, isBind in TruckCreatAwardDict[truckLv]:

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], showEff=True)

            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], showEff=True)

            PlayerControl.NotifyCode(curPlayer, "GeRen_liubo_366028", [itemID, itemCount])

            PlayerControl.WorldNotify(0, "GeRen_liubo_161795", [curPlayer.GetPlayerName(), itemID, itemCount])

        


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

@@ -195,7 +195,7 @@
    EventShell.EventResponse_BuyVIPItem(curPlayer, vipLV)

    GameWorld.DebugLog("vip礼包-%s" % itemList)

    for itemid, cnt, isBind in itemList:

        ItemControler.GivePlayerItem(curPlayer, int(itemid), int(cnt), isBind,

        ItemControler.GivePlayerItem(curPlayer, int(itemid), int(cnt), 0,

                                     [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True, event=["buyVIPGift", False, {"VIPLV":vipLV}])

#    else:

#        __AwardToPlayerByMail(curPlayer, itemList)


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

@@ -284,7 +284,7 @@
    #GameWorld.Log('  actionID=%s,curTimes=%s,gotTimes=%s,singleTimes=%s,newGotTimes=%s'%(actionID, curTimes, gotTimes,singleTimes, newGotTimes))

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_WeekPartyGotTimes % (day, templateID), newGotTimes, ChConfig.Def_PDictType_WeekParty)

    for itemID, itemCnt in awardDict.items():

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 1, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

    SyncWeekPartyPlayerInfo(curPlayer, day, templateID)

    return



@@ -321,7 +321,7 @@
        return

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_WeekPartyAwardRecord % day, awardRecord | pow(2, getIndex), ChConfig.Def_PDictType_WeekParty)

    for itemID, itemCnt, isBind in itemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

    SyncWeekPartyPlayerInfo(curPlayer, day)

    DataRecordPack.DR_WeekPartyPoint(curPlayer, day, getPoint)

    return


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

@@ -355,7 +355,7 @@
        PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")

        return

    for itemID, itemCnt, isBind in giveItemList:

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])

    for i in xrange(count):

        __SetItemData(curPlayer, WellType_Get, i, 0, 0, 0, 0)

    SyncWishingWellPlayerInfo(curPlayer)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FamilyArrestAward.py

@@ -84,7 +84,7 @@
    # 给物品

    for itemID, itemCnt, isBind in awardItemList:

        recordData = {'FamilyArrest':state, 'ArrestID':arrestID}

        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem], True, 
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], True, 
                                     showSysInfo=True, event=["FamilyArrestAward", False, recordData])



    #设置奖励领取成功


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_PlayerGetReward.py

@@ -61,7 +61,7 @@
            continue

        

        #给予物品

        isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, False, 
        isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, 
                                               [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])

        if isPutIn:

            #PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [itemID, itemCnt])


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ReveiveRecallAward.py

@@ -44,7 +44,7 @@
    flag, itemID, itemCnt = packCMDList

    

    #把物品放到背包中

    if not ItemControler.GivePlayerItem(curFindPlayer, itemID, itemCnt, True, [IPY_GameWorld.rptItem]):

    if not ItemControler.GivePlayerItem(curFindPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem]):

        return '0'



    #通知放入背包特效