xdh
2019-07-05 df744c751c6367ea362236f8ec7cbb6a66f2d9d8
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -537,37 +537,6 @@
#  @param itemMark 当前物品
#  @return 是否是贵重品
def IsValuableItem(curItem):
    #装备是否卓越物品
    #===========================================================================
    # ValuableItemQualityList = ReadChConfig.GetEvalChConfig("ValuableItemQuality")
    # if curItem.GetItemQuality() in ValuableItemQualityList:
    #    return True
    #
    # # 贵重物品配置[[贵重物品id], [贵重物品类型], 贵重物品加强等级, 贵重物品追加等级]
    # valuablesInfo = ReadChConfig.GetEvalChConfig("ValuablesConfigInfo")
    # valuablesIDList, valuablesTypeList, valuableMinStar, valuableAddAttrLV = valuablesInfo
    #
    # #物品ID满足
    # if curItem.GetItemTypeID() in valuablesIDList:
    #    return True
    #
    # #物品类型满足
    # if curItem.GetType() in valuablesTypeList:
    #    return True
    #
    # #普通装备判定
    # if ItemCommon.CheckItemIsEquip(curItem):
    #
    #    #套装物品
    #    if curItem.GetIsSuite():
    #        return True
    #
    #    #装备强化星级
    #    if curItem.GetItemStarLV() >= valuableMinStar:
    #        return True
    #===========================================================================
    return False
@@ -1048,8 +1017,8 @@
            PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_FamilyActivity, itemCount)
        elif itemID == ChConfig.Def_ItemID_SP:
            PlayerControl.PlayerAddZhenQi(curPlayer, itemCount)
        elif itemID == ChConfig.Def_ItemID_GoldPaper:
            PlayerControl.GiveMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Paper, itemCount)
        #elif itemID == ChConfig.Def_ItemID_GoldPaper:
        #    PlayerControl.GiveMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Paper, itemCount, eventName, addDict)
        elif itemID == ChConfig.Def_ItemID_RealmPoint:
            PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_RealmPoint, itemCount)
        elif itemID == ChConfig.Def_ItemID_BossReborn:
@@ -1065,11 +1034,15 @@
            PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_SoulCore, itemCount)
        elif itemID == ChConfig.Def_ItemID_Honor:
            PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_Honor, itemCount)
        elif itemID == ChConfig.Def_ItemID_GoldMoney:
            PlayerControl.GiveMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Money, itemCount)
        elif itemID == ChConfig.Def_ItemID_XianyuanCoin:
            PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_XianyuanCoin, itemCount)
        return True
    
    def __CrossServerPutInItem(self, packIndex, tagItem, event=["", False, {}]):
        ## 跨服获得物品
        if packIndex not in [IPY_GameWorld.rptItem, ShareDefine.rptDogzItem, ShareDefine.rptZhuXianItem]:
        if packIndex not in [IPY_GameWorld.rptItem, ShareDefine.rptDogzItem]:
            #GameWorld.DebugLog("跨服获得物品不同步, packIndex=%s" % (packIndex))
            return
        curPlayer = self.__Player
@@ -1265,7 +1238,7 @@
            curItem.AddUserAttr(ShareDefine.Def_IudetLegendAttrValue, legendAttrValueList[i])
        ItemCommon.MakeEquipGS(curItem)
        updScore = ItemCommon.GetEquipGearScore(curItem)
        GameWorld.ErrLog("传奇属性异常,重新刷新一次属性: packType=%s,itemID=%s,legendAttrIDList=%s,legendAttrValueList=%s,srcScore=%s,updScore=%s"
        GameWorld.DebugLog("传奇属性异常,重新刷新一次属性: packType=%s,itemID=%s,legendAttrIDList=%s,legendAttrValueList=%s,srcScore=%s,updScore=%s"
                         % (packType, curItem.GetItemTypeID(), legendAttrIDList, legendAttrValueList, srcScore, updScore), curPlayer.GetPlayerID())
        return
    
@@ -1280,45 +1253,6 @@
#            return
#        playerID = curPlayer.GetPlayerID()
#        GameWorld.Log("玩家上线处理装备属性! curVersion=%s,checkVersion=%s" % (curVersion, checkVersion), playerID)
#
#        outOfPrintAttrItemDict = {} # 有绝版属性的定制物品属性信息 {itemID:[绝版属性ID列表, 绝版属性数值列表], ...}
#        ipyDataMgr = IpyGameDataPY.IPY_Data()
#        for i in xrange(ipyDataMgr.GetAppointItemCount()):
#            ipyData = ipyDataMgr.GetAppointItemByIndex(i)
#            outOfPrintAttrList = ipyData.GetOutOfPrintAttr()
#            outOfPrintAttrValueList = ipyData.GetOutOfPrintAttrValue()
#            if not outOfPrintAttrList or len(outOfPrintAttrList) != len(outOfPrintAttrValueList):
#                continue
#            itemID = GetAppointItemRealID(ipyData.GetID())
#            if not itemID:
#                continue
#            outOfPrintAttrItemDict[itemID] = [outOfPrintAttrList, outOfPrintAttrValueList]
#
#        checkPackList = [IPY_GameWorld.rptEquip, IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse]
#        for packType in checkPackList:
#            curPack = curPlayer.GetItemManager().GetPack(packType)
#            for i in xrange(curPack.GetCount()):
#                curItem = curPack.GetAt(i)
#                #GameWorld.DebugLog("packType=%s,i=%s" % (packType, i))
#                if curItem.IsEmpty():
#                    continue
#                isEquip = ItemCommon.CheckItemIsEquip(curItem)
#                if not isEquip:
#                    continue
#                itemID = curItem.GetItemTypeID()
#                self.CheckEquipAttr(packType, curItem)
#
#                # 重刷绝版属性
#                if itemID in outOfPrintAttrItemDict:
#                    outOfPrintAttrList, outOfPrintAttrValueList = outOfPrintAttrItemDict[itemID]
#                    curItem.ClearUserAttr(ShareDefine.Def_IudetOutOfPrintAttrID)
#                    curItem.ClearUserAttr(ShareDefine.Def_IudetOutOfPrintAttrValue)
#                    for outOfPrintAttrIndex in xrange(len(outOfPrintAttrList)):
#                        curItem.AddUserAttr(ShareDefine.Def_IudetOutOfPrintAttrID, outOfPrintAttrList[outOfPrintAttrIndex])
#                        curItem.AddUserAttr(ShareDefine.Def_IudetOutOfPrintAttrValue, outOfPrintAttrValueList[outOfPrintAttrIndex])
#                    GameWorld.Log("    玩家登录重刷装备绝版属性: packType=%s,i=%s,itemID=%s,outOfPrintAttrList=%s,outOfPrintAttrValueList=%s"
#                                  % (packType, i, itemID, outOfPrintAttrList, outOfPrintAttrValueList), playerID)
#
#        PlayerControl.NomalDictSetProperty(curPlayer, key, checkVersion)
        return
@@ -2127,15 +2061,11 @@
   
    itemDictData['legendAttrID'] = ipyData.GetLegendAttrID()
    itemDictData['legendAttrValue'] = ipyData.GetLegendAttrValue()
    #itemDictData['SuiteLV'] = ipyData.GetSuiteLV()
    itemDictData['ItemID'] = itemID
    itemDictData['CancelUseLimit'] = ipyData.GetCancelUseLimit()
    
    itemDictData['IsAuctionItem'] = isAuctionItem
    
    #装备绝版属性,随等级变化
    itemDictData['OutOfPrintAttrID'] = ipyData.GetOutOfPrintAttr()
    itemDictData['OutOfPrintAttrValue'] = ipyData.GetOutOfPrintAttrValue()
    return itemDictData
def GetAppointItemRealID(itemID):
@@ -2189,9 +2119,6 @@
    
    tmpEquipData.legendAttrIDList = itemData.get('legendAttrID', [])
    tmpEquipData.legendAttrValueList = itemData.get('legendAttrValue', [])
    tmpEquipData.OutOfPrintAttrIDList = itemData.get('OutOfPrintAttrID', []) # 绝版属性ID
    tmpEquipData.OutOfPrintAttrValueList = itemData.get('OutOfPrintAttrValue', []) # 绝版属性最大值
    
    # 装备附加属性
    ChItem.EquipAddAdditionEx(equipItem, tmpEquipData)
@@ -2395,9 +2322,10 @@
    itemID = curItem.GetItemTypeID()
    itemType = curItem.GetType()
    itemColor = curItem.GetItemColor()
    itemQuality = curItem.GetItemQuality()
    isSuit = 1 if curItem.GetSuiteID() else 0
    # 1. 定条数
    attrCountIpyData = IpyGameDataPY.GetIpyGameDataNotLog("EquipLegendAttrCount", itemType, itemColor, isSuit)
    attrCountIpyData = IpyGameDataPY.GetIpyGameDataNotLog("EquipLegendAttrCount", itemType, itemColor, isSuit, itemQuality)
    if not attrCountIpyData:
        if itemColor >= ChConfig.Def_Quality_Purple:
            GameWorld.DebugLog("该装备没有传奇属性: itemID=%s" % (itemID))
@@ -2445,10 +2373,10 @@
            #                   % (attrCount, libNumList, attrIDList, curLegAttrIDList), playerID)
            
    # 3. 定数值
    attrValueIpyData = IpyGameDataPY.GetIpyGameData("EquipLegendAttrValue", itemType, itemClassLV, itemColor, isSuit)
    attrValueIpyData = IpyGameDataPY.GetIpyGameData("EquipLegendAttrValue", itemType, itemClassLV, itemColor, isSuit, itemQuality)
    if not attrValueIpyData:
        GameWorld.ErrLog("传奇属性等级数值表找不到配置!itemID=%s,itemType=%s,itemClassLV=%s,itemColor=%s,isSuit=%s"
                         % (itemID, itemType, itemClassLV, itemColor, isSuit), playerID)
        GameWorld.ErrLog("传奇属性等级数值表找不到配置!itemID=%s,itemType=%s,itemClassLV=%s,itemColor=%s,isSuit=%s,itemQuality=%s"
                         % (itemID, itemType, itemClassLV, itemColor, isSuit, itemQuality), playerID)
        return
    
    attrLVLibNumDict = attrValueIpyData.GetLVLegendAttrLibNumInfo() # {属性ID:{等级:库编号, ...}}
@@ -2502,9 +2430,6 @@
        self.source = ShareDefine.Item_Source_Unkown    #物品来源
        self.legendAttrIDList = [] # 传奇属性ID
        self.legendAttrValueList = [] # 传奇属性值
        self.OutOfPrintAttrIDList = [] # 绝版属性ID
        self.OutOfPrintAttrValueList = [] # 绝版属性最大值
        return
    
def ClearPack(curPlayer, packType):