6332 【后端】【2.0】主要是拍品相关规则调整及背包优化(GivePlayerItem 删除无用参数)
30个文件已修改
117 ■■■■■ 已修改文件
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/ShopItemManage.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Guard.py 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ManorWar.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/HighLadderTube.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCostVIP.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEquipDecompose.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFestivalLogin.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewGuyCard.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerProduce.py 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerQQ.py 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecall.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerReincarnation.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTeHui.py 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.py 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FamilyArrestAward.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/ShopItemManage.py
@@ -507,8 +507,7 @@
#        
#        if isAppoint == 0:
#            realItemID = itemID
#            ItemControler.GivePlayerItem(curPlayer, itemID, totalCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere],
#                                         True, showSysInfo=True, event=["BuyShopItem", True, eventDataEx])
#            ItemControler.GivePlayerItem(curPlayer, itemID, totalCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], event=["BuyShopItem", True, eventDataEx])
#        else:
#            realItemID = ItemControler.GetAppointItemRealID(itemID)
#            for i in range(buyCount):
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.py
@@ -355,8 +355,7 @@
                randAwardList = GameWorld.GetResultByRandomList(actionRandAwardList)
                if randAwardList:
                    for itemID, itemCnt, isBind in randAwardList:
                        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0,
                                                     [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True)
                        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])
            
                
        # 同步伤害列表
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, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True)
            ItemControler.GivePlayerItem(curPlayer, itemID, 1, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])
    
    # 新手本玩家退出默认关闭副本
    GameWorldProcess.CloseFB(tick)
@@ -437,7 +437,7 @@
    if isPass:
        itemID, giveExp = FBCommon.GetFBLineReward(GameWorld.GetMap().GetMapID(), 0)
        #物品改在退出副本时给
        #ItemControler.GivePlayerItem(curPlayer, itemID, 1, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True)
        #ItemControler.GivePlayerItem(curPlayer, itemID, 1, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])
        if giveExp:
            PlayerControl.PlayerControl(curPlayer).AddExp(giveExp)
            overDict[FBCommon.Over_exp] = giveExp
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, 0, packIndexList, True, showSysInfo=True)
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, packIndexList)
        
    addDataDict = {"AwardIndex":awardIndex, "WinLeaderID":winLeaderID, "AwardItemList":totalItemList}
    DataRecordPack.DR_FuncGiveItem(curPlayer, "ManorWar", addDataDict)
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py
@@ -450,8 +450,7 @@
    prizeItemList = winCntAwardDict[str(prizeEx)]
    # 给物品 [奖励物品id,个数,是否绑定]
    for itemID, itemCnt, isBind in prizeItemList:
        if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0,
                                        [IPY_GameWorld.rptItem], True, showSysInfo=True):
        if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem]):
    
            playerID = curPlayer.GetPlayerID()
            GameWorld.ErrLog("OnGetXMZZPrizeResult(), give item itemid:%s,count:%s" % (itemID, itemCnt), playerID)
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
@@ -2016,8 +2016,7 @@
#                return
#        else:
#            #给予物品
#            if not ItemControler.GivePlayerItem(curPlayer, newItemId, itemCount, 0,
#                                         [IPY_GameWorld.rptItem], False):
#            if not ItemControler.GivePlayerItem(curPlayer, newItemId, itemCount, 0, [IPY_GameWorld.rptItem]):
#                GameWorld.ErrLog("使用特殊运营物品 给予普通物品失败")
#                return
#        #PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [makeItemID, itemCount])
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, 0, [IPY_GameWorld.rptItem], True)
                ItemControler.GivePlayerItem(curPlayer, giveItemID, itemCnt, 0, [IPY_GameWorld.rptItem])
    
    #通知结果
    packData = ChPyNetSendPack.tagMCZhuXianDecomposeResult()
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -2056,8 +2056,7 @@
        
    return
def GivePlayerItem(curPlayer, itemID, itemCount, auctionGroup, packIndexList, showEff=False, defaultPile=True,
                   returnItemObj=False, showSysInfo=False, event=["", False, {}]):
def GivePlayerItem(curPlayer, itemID, itemCount, auctionGroup, packIndexList, event=["", False, {}]):
    '''给玩家物品
    @param auctionGroup: 拍品组数,0为非拍品,大于0为总给的物品数拆成的拍品组数;注意这个不一定按叠加拆分,策划自行决定非几组拍
    '''
@@ -2086,7 +2085,7 @@
    itemControl = PlayerItemControler(curPlayer)
    for packIndex in packIndexList:
        #可以放入背包
        if itemControl.CanPutInItem(packIndex, itemID, itemCount, auctionGroup, defaultPile):
        if itemControl.CanPutInItem(packIndex, itemID, itemCount, auctionGroup):
            canPutIn = True
            break
    if not canPutIn:
@@ -2108,7 +2107,7 @@
            outPutEquip = GetOutPutItemObj(itemID, 1, isAuctionItem, curPlayer=curPlayer)
            if not outPutEquip:
                return isOK
            if DoLogic_PutItemInPack(curPlayer, outPutEquip, event, packIndexList, defaultPile):
            if DoLogic_PutItemInPack(curPlayer, outPutEquip, event, packIndexList):
                isOK = True # 只要有成功的就返回成功,防止异常情况失败可能导致被刷
        return isOK
    
@@ -2124,7 +2123,7 @@
        giveItem = GetOutPutItemObj(itemID, giveCount, isAuctionItem, curPlayer=curPlayer)
        if not giveItem:
            return isOK
        if DoLogic_PutItemInPack(curPlayer, giveItem, event, packIndexList, defaultPile):
        if DoLogic_PutItemInPack(curPlayer, giveItem, event, packIndexList):
            isOK = True # 只要有成功的就返回成功,防止异常情况失败可能导致被刷
            
    return isOK
@@ -2181,10 +2180,8 @@
## 根据物品data字典给玩家装备/翅膀
#  @param curPlayer:玩家实例
#  @param itemData:物品数据
#  @param showEff:是否显示放入背包特效
#  @param packType:背包类型
#  @param defaultPile 默认先判断是否能进行物品堆叠
#  @param showSysInfo 是否显示系统提示
#  @return None
def GivePlayerEquip(curPlayer, itemData, event=["", False, {}], packType=[IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere],
                    defaultPile=True):
@@ -2250,7 +2247,6 @@
#  @param packIndexList 背包索引列表
#  @param showEff 放入背包特效
#  @param defaultPile 默认先判断是否能进行物品堆叠
#  @param returnItemObj 是否返回物品对象
#  @param showSysInfo 是否显示系统提示
#  @return 布尔值
def DoLogic_PutItemInPack(curPlayer, curGiveItem, event=["", False, {}], packIndexList=[IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], defaultPile=True):
@@ -2269,8 +2265,6 @@
            #    PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [itemID, count])
            #===================================================================
            
            #if returnItemObj:
            #    return curGiveItem
            return True
    #玩家背包已满, 清空物品,否则创建物品不删除,将导致内存溢出
@@ -2553,7 +2547,8 @@
    ## 临时背包放入物品
    # 临时交换背包目前只开放1个格子,每次放入前先清空再放入
    ClearPack(curPlayer, ShareDefine.rptTempSwap)
    return GivePlayerItem(curPlayer, itemID, 1, isBind, [ShareDefine.rptTempSwap])
    auctionGroup = 1 if not isBind else 0
    return GivePlayerItem(curPlayer, itemID, 1, auctionGroup, [ShareDefine.rptTempSwap])
def OpenPickupItemPutInTemp(curPlayer, isClearItem):
    ''' 开启拾取的物品放入临时存放背包
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/HighLadderTube.py
@@ -540,8 +540,7 @@
        #给予物品        
        # 一般物品
        if itemType == Def_ItemType_CommonItem:
            if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, \
                                                 [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True):
            if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere]):
                continue
            #PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [itemID, itemCount])
        # 特殊定制物品
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
@@ -325,7 +325,7 @@
        return
    
    # 给物品
    ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], True)
    ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
    # 更新已领取成功标记
    updAwardRecord = getAwardRecord | (1 << awardIndex)
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.py
@@ -340,8 +340,7 @@
        return
    
    for itemID, itemCnt, isBind in awardItemList:
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere],
                                         showEff=True, showSysInfo=True)
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])
    
    #更新记录
    awardRecord |= pow(2, scoreIndex)
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.py
@@ -111,7 +111,7 @@
        if ItemControler.GetAppointItemRealID(itemID):
            #定制物品
            ItemControler.GivePlayerItem(curPlayer, itemID, curPackItem.Count, 0, [IPY_GameWorld.rptItem], 
                                         False, showSysInfo=False, event=[ChConfig.ItemGive_Mail, False, {"MailGUID":curPackData.GUID}])
                                         event=[ChConfig.ItemGive_Mail, False, {"MailGUID":curPackData.GUID}])
            continue
        
        curCreateItem = ItemCommon.CreateSingleItem(itemID, curPackItem.Count, not curPackItem.IsBind)
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, 0, packIndexList, True, showSysInfo=True):
            if not ItemControler.GivePlayerItem(curPlayer, itemId, itemNum, 0, packIndexList):
                giveFailList.append(itemInfo)
            
        elif itemType == Item_Type_Appoint:
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, 0, [IPY_GameWorld.rptItem], True)
                ItemControler.GivePlayerItem(curPlayer, giveItemID, itemCnt, 0, [IPY_GameWorld.rptItem])
    
    #同步客户端
    Sync_EDLVInfo(curPlayer, jsonItemList)
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, 0, [IPY_GameWorld.rptItem], True)
            ItemControler.GivePlayerItem(curPlayer, itemId, itemNum, 0, [IPY_GameWorld.rptItem])
            
        elif itemType == Item_Type_Appoint:
            ItemControler.GivePlayerAppointItem(curPlayer, itemId, False)
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py
@@ -156,7 +156,7 @@
        
        # 一般物品
        if itemType == Def_ItemType_CommonItem:
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
        
        # 特殊定制物品
        elif itemType == Def_ItemType_AppointItem:
@@ -554,7 +554,7 @@
        if not giveItemID:
            return
        GameWorld.DebugLog('首充试用物品过期了 背包仓库没武器则送一把giveItemID=%s'%giveItemID, curPlayer.GetID())
        if not ItemControler.GivePlayerItem(curPlayer, giveItemID, 1, 0, [IPY_GameWorld.rptItem], True):
        if not ItemControler.GivePlayerItem(curPlayer, giveItemID, 1, 0, [IPY_GameWorld.rptItem]):
            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, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True)
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])
    
    __CheckInvestReset(curPlayer)
    # 记录领取事件
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
@@ -150,8 +150,7 @@
        if 1 > packSpace:
            PlayerControl.SendMailByKey('TreasureWakeUp', [curPlayer.GetID()], [itemAward])
        else:
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0,
                                             [IPY_GameWorld.rptItem], True, showSysInfo=True, event=["MWAward", False, {"mwID":mwID}])
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], event=["MWAward", False, {"mwID":mwID}])
    activeMWID = upIpyData.GetActiveMWID()
    if activeMWID == mwID:
        GameWorld.ErrLog('    TreasureUp.txt 配置异常 不可激活自身法宝 mwID=%s'%mwID)
@@ -507,7 +506,7 @@
    # 给物品
    if awardItemList:
        for itemID, itemCnt in awardItemList:
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], True)
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
       
    #给钱
    for moneyType, value in ipyData.GetMoney():
@@ -727,8 +726,7 @@
            return
        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MWSoulGotItemState % privilege, 1)
        for itemid, cnt, isBind in itemList:
            ItemControler.GivePlayerItem(curPlayer, int(itemid), int(cnt), 0,
                                         [IPY_GameWorld.rptItem], True, showSysInfo=True, event=["MWSoulAward", False, {"privilege":privilege}])
            ItemControler.GivePlayerItem(curPlayer, int(itemid), int(cnt), 0, [IPY_GameWorld.rptItem], event=["MWSoulAward", False, {"privilege":privilege}])
    
    #֪ͨ
    Sycn_MWPrivilegeData(curPlayer, privilege)
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewGuyCard.py
@@ -544,8 +544,7 @@
        if isAppoint:
            isOK = ItemControler.GivePlayerAppointItem(curPlayer, itemID, False)
        else:
            isOK = ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem],
                                                True, showSysInfo=True)
            isOK = ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
        if isOK:
            succGiveItemList.append(itemInfo)
            
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerProduce.py
@@ -217,8 +217,7 @@
        return False
    
    #给玩家物品
    if not ItemControler.GivePlayerItem(curPlayer, produceID, produceCnt, 0,
                                                                     [IPY_GameWorld.rptItem]):
    if not ItemControler.GivePlayerItem(curPlayer, produceID, produceCnt, 0, [IPY_GameWorld.rptItem]):
        #背包空间不足!
        PlayerControl.NotifyCode(curPlayer, "Collect_lhs_31379")
        return False
@@ -393,8 +392,7 @@
            
        for proItemID, proCnt in proIemCntDict.items():
            # 给合成物品不成功
            if not ItemControler.GivePlayerItem(curPlayer, proItemID, proCnt, 0,
                                                [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True):
            if not ItemControler.GivePlayerItem(curPlayer, proItemID, proCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere]):
                #背包空间不足!
                PlayerControl.NotifyCode(curPlayer, "Collect_lhs_31379")        
                break
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, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
    # 更新已领取成功标记
    __SetAwardRecord(curPlayer, recordKey, getLVIndex)
@@ -330,7 +330,7 @@
    
    # 给物品
    for itemID, itemCount, isBind in awardItemList:
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
    
    # 更新已领取成功标记
    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, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
    
    # 更新已领取成功标记
    updRecord = recordValue | pow(2, awardIndex)
@@ -456,7 +456,7 @@
    
    # 给物品
    for itemID, itemCount, isBind in itemList:
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
    # 更新已领取成功标记
    __SetAwardRecord(curPlayer, recordKey, awardIndex)
@@ -497,7 +497,7 @@
    
    # 给物品
    for itemID, itemCount, isBind in awardItemList:
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
    
    # 更新已领取成功标记
    __SetQQPDictValue(curPlayer, recordKey, 1)
@@ -541,7 +541,7 @@
    # 给物品
    for itemID, itemCount, isBind in awardItemList:
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
    
    # 更新已领取成功标记
    __SetQQPDictValue(curPlayer, recordKey, 1)
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecall.py
@@ -140,8 +140,7 @@
    
    #把地图物品放到背包中
    dataDict = {'PlayerLV':playerLV, 'OffDays':offDays}
    if not ItemControler.GivePlayerItem(curPlayer, itemID, count, 0, [IPY_GameWorld.rptItem], True,
                                        showSysInfo=True, event=["PlayerBackAward", True, dataDict]):
    if not ItemControler.GivePlayerItem(curPlayer, itemID, count, 0, [IPY_GameWorld.rptItem], event=["PlayerBackAward", True, dataDict]):
        return
    
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_OffDaysAward, 0)
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, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True)
                ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])
    if Def_TJGRecoverID in recoverCntDict:
        #脱机挂经验找回后重置
        PlayerTJG.ResetTJGDeadInfo(curPlayer)
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerReincarnation.py
@@ -269,7 +269,7 @@
        if isAppoint:
            ItemControler.GivePlayerAppointItem(curPlayer, itemID, False)
        else:
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
    
    
    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], 0, [IPY_GameWorld.rptItem], True, showSysInfo=True)
            ItemControler.GivePlayerItem(curPlayer, awardInfo[0], awardInfo[1], 0, [IPY_GameWorld.rptItem])
    else:       
        GameWorld.DebugLog("背包已满 邮件发送物品")
        PlayerControl.SendMailByKey(mailTypeKey, [curPlayer.GetPlayerID()], awardInfoList)
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py
@@ -1011,8 +1011,7 @@
    # 给物品
    if isGiveItem:
        for itemID, itemCnt in itemDict.items():
            isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0,
                                                   [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True)
            isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])
       
    #给钱
    for moneyType, value in succData.moneyDict.items():
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTeHui.py
@@ -551,8 +551,7 @@
    
    # 给物品
    for itemID, itemCnt, isBind in itemList:
        isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0,
                                               [IPY_GameWorld.rptItem], True)
        isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
        if isPutIn:
            PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [itemID, itemCnt])
            
@@ -639,8 +638,7 @@
            itemID, itemCnt, isBind = itemInfo[job]
        else:
            itemID, itemCnt, isBind = itemInfo
        isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0,
                                               [IPY_GameWorld.rptItem], True)
        isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
        if isPutIn:
            PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [itemID, itemCnt])
            
@@ -823,7 +821,7 @@
    
    itemInfoList = actionAwardInfo[CostProfit_ItemList]
    for itemId, itemNum, itemIsBind in itemInfoList:
        ItemControler.GivePlayerItem(curPlayer, itemId, itemNum, 0, [IPY_GameWorld.rptItem], True)
        ItemControler.GivePlayerItem(curPlayer, itemId, itemNum, 0, [IPY_GameWorld.rptItem])
    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, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], showEff=True)
            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])
            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,8 +195,8 @@
    EventShell.EventResponse_BuyVIPItem(curPlayer, vipLV)
    GameWorld.DebugLog("vip礼包-%s" % itemList)
    for itemid, cnt, isBind in itemList:
        ItemControler.GivePlayerItem(curPlayer, int(itemid), int(cnt), 0,
                                     [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True, event=["buyVIPGift", False, {"VIPLV":vipLV}])
        ItemControler.GivePlayerItem(curPlayer, int(itemid), int(cnt), 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere],
                                     event=["buyVIPGift", False, {"VIPLV":vipLV}])
#    else:
#        __AwardToPlayerByMail(curPlayer, itemList)
    openuiid = IpyGameDataPY.GetFuncEvalCfg('VIPPanel', 1, {}).get(vipLV, 0)
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FamilyArrestAward.py
@@ -84,8 +84,7 @@
    # 给物品
    for itemID, itemCnt, isBind in awardItemList:
        recordData = {'FamilyArrest':state, 'ArrestID':arrestID}
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], True,
                                     showSysInfo=True, event=["FamilyArrestAward", False, recordData])
        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], event=["FamilyArrestAward", False, recordData])
    #设置奖励领取成功
    state = state|pow(2, bit)