2126 【主干】【1.0.18】GM后台封锁解锁IP报错

hxp

2018-10-11 a0675393eb85910110ce5a081c41bc8299ad529d

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

@@ -33,6 +33,7 @@
import Operate_EquipStone

import Operate_EquipSuitCompose

import IpyGameDataPY

import EventShell



#---------------------------------------------------------------------

## 放不下主角背包放入万能背包的逻辑, curGiveItem 要先 SetCount

@@ -893,7 +894,7 @@
            Operate_EquipStone.DoMoveEquipStone(curPlayer, packEquipIndex)

            #套装降级处理

            Operate_EquipSuitCompose.CheckEquipSuitReduce(curPlayer, packEquipIndex)

            
            EventShell.EventRespons_EquipStar(curPlayer)

        self.RefreshStartEquipCount()

        return packEquipIndex if result else -1

    

@@ -990,6 +991,7 @@
        self.RefreshStartEquipCount()

        #套装降级处理

        Operate_EquipSuitCompose.CheckEquipSuitReduce(curPlayer, equipIndex)

        EventShell.EventRespons_EquipStar(curPlayer)

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

#        #destItemPlace = 卸下物品的位置        

#        destItemPlace = curPack.GetAt(packIndex)

@@ -1009,7 +1011,7 @@
#    小心, 小心, 小心, 小心, 小心

#    eggxp

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

    def __PutItemInVPack(self, packIndex, tagItem, event):

    def PutItemInVPack(self, packIndex, tagItem, event=["", False, {}]):

        # 虚拟背包, 默认不做叠加

        curPlayer = self.__Player

        canPutInCnt = 1

@@ -1017,7 +1019,8 @@
        eventName, isForceEvent, addDict = event

        isNeedRecord = isForceEvent or ItemNeedRecord(tagItem)

        if packIndex == ShareDefine.rptRune:

            setItemKeyData = GetRuneItemKeyData(tagItem.GetItemTypeID(), tagItem.GetUserAttr(ShareDefine.Def_IudetRuneLV))

            runeSource = tagItem.GetUserAttr(ShareDefine.Def_IudetRuneSource) or 1

            setItemKeyData = GetRuneItemKeyData(tagItem.GetItemTypeID(), tagItem.GetUserAttr(ShareDefine.Def_IudetRuneLV), source=runeSource)



        refreshPlaceList = []

        for place in xrange(ItemCommon.GetVPackCnt(packIndex)):

@@ -1044,11 +1047,11 @@
            Sync_VPackItem_Refresh(curPlayer, packIndex, refreshPlaceList)



        if tagItem and not tagItem.IsEmpty():

            tagItem.Clear()

            #tagItem.Clear()

            return False

        return True

    

    def __DoTransformItem(self, curPlayer, tagItem):

    def DoTransformItem(self, curPlayer, tagItem):

        ## 将特殊物品转化为对应数值

        itemID = tagItem.GetItemTypeID()

        if itemID not in ChConfig.Def_TransformItemIDList:

@@ -1070,6 +1073,8 @@
        elif itemID == ChConfig.Def_ItemID_BossReborn:

            msgStr = str(itemCount)

            GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'AddBossRebornPoint', msgStr, len(msgStr))

        elif itemID == ChConfig.Def_ItemID_Ysog:

            PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_Ysog, itemCount)

        

        return True

    

@@ -1082,8 +1087,8 @@
    def PutInItem(self, packIndex, tagItem, defaultPile=True, event=["", False, {}]):

        curPlayer = self.__Player

        

        if self.__DoTransformItem(curPlayer, tagItem):

            tagItem.Clear() # 需清除，不然会导致内存泄露

        if packIndex != ShareDefine.rptTreasure and self.DoTransformItem(curPlayer, tagItem):

            tagItem.Clear() # 需清除，不然会导致内存泄露   寻宝仓库可暂存直接转化数值的物品

            return True

        

        isEquip = ItemCommon.CheckItemIsEquip(tagItem)

@@ -1103,7 +1108,7 @@
        

        # 虚拟背包, 默认不做叠加

        if packIndex in ShareDefine.Def_VPack_TypeList:

            return self.__PutItemInVPack(packIndex, tagItem, event)

            return self.PutItemInVPack(packIndex, tagItem, event)

        

        eventName, isForceEvent, addDict = event



@@ -1196,6 +1201,9 @@
                    ItemCommon.DR_GetItem(curPlayer, packIndex, eventName, itemNoteDict, addDict)

            else:

                #可以放下

                if isEquip:

                    self.CheckEquipAttr(packIndex, tagItem)

                    
                if tagItem.GetGameWorldItemType() == IPY_GameWorld.gwitRoleItem:

                    item.PutIn(tagItem)

                elif tagItem.GetGameWorldItemType() == IPY_GameWorld.gwitSingleItem:

@@ -1212,6 +1220,51 @@
        #放入东西

        return putResult

    

    def CheckEquipAttr(self, packType, curItem):

        legendAttrIDCount = curItem.GetUserAttrCount(ShareDefine.Def_IudetLegendAttrID)

        legendAttrValueCount = curItem.GetUserAttrCount(ShareDefine.Def_IudetLegendAttrValue)

        
        if legendAttrIDCount and legendAttrValueCount and legendAttrIDCount == legendAttrValueCount:

            return

        
        legendAttrInfo = GetAddEquipLegendAttr(curItem)

        if not legendAttrInfo:

            return

        
        curPlayer = self.__Player

        srcScore = ItemCommon.GetEquipGearScore(curItem)

        legendAttrIDList, legendAttrValueList = legendAttrInfo

        curItem.ClearUserAttr(ShareDefine.Def_IudetLegendAttrID)

        curItem.ClearUserAttr(ShareDefine.Def_IudetLegendAttrValue)

        for i in xrange(len(legendAttrIDList)):

            curItem.AddUserAttr(ShareDefine.Def_IudetLegendAttrID, legendAttrIDList[i])

            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" 
                         % (packType, curItem.GetItemTypeID(), legendAttrIDList, legendAttrValueList, srcScore, updScore), curPlayer.GetPlayerID())

        return

    
    def CheckRolePackEquipAttr(self):

        curPlayer = self.__Player

        key = "LoginCheckEquipAttr"

        if curPlayer.NomalDictGetProperty(key):

            return

        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

                self.CheckEquipAttr(packType, curItem)

        PlayerControl.NomalDictSetProperty(curPlayer, key, 1)

        return



    ## 是否能放入物品 

    #  @param packIndex 背包索引

    #  @param curItemID 当前物品ID

@@ -1249,6 +1302,9 @@
        if maxPackCount == 0:

            GameWorld.Log("策划填表错误 %s -> maxPackCount = %s" % (curItemID , maxPackCount))

            return False, 0

        
        # 特殊处理不同的物品放入不同的背包，如神兽背包

        packIndex = ChConfig.GetItemPackType(curItemData.GetType(), packIndex)

        

        maxCanPutItem = 0

        curPlayer = self.__Player

@@ -1295,13 +1351,14 @@
        return True, itemIndex

    

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

# 符印物品存储字典数值数据结构: 前5位为物品ID, 6~8位为强化等级, 第10位为是否锁定

def GetRuneItemKeyData(itemID, RuneLV, lockState=0):

# 符印物品存储字典数值数据结构: 前5位为物品ID, 6~8位为强化等级, 第9位为来源（老号0,默认1，合成2）,第10位为是否锁定

def GetRuneItemKeyData(itemID, RuneLV, lockState=0, source=1):

    lockState = 1 if lockState > 0 else 0

    return lockState * 1000000000 + min(RuneLV, 999) * 100000 + itemID

    return lockState * 1000000000 + source * 100000000 + min(RuneLV, 999) * 100000 + itemID

def GetRuneItemID(keyData): return keyData % 100000

def GetRuneItemPlusLV(keyData): return keyData % 100000000 / 100000

def GetRuneItemIsLock(keyData): return keyData / 1000000000

def GetRuneItemSource(keyData): return keyData % 1000000000 / 100000000

def IsRuneItemNeedRecord(curItem, plusLV):

    return plusLV > 0 or curItem.GetItemColor() >= ChConfig.Def_Quality_Orange



@@ -1360,7 +1417,7 @@
    DropItemToOtherPack(curPlayer, clientData.SrcBackpack, clientData.DesBackPack, clientData.SrcIndex, clientData.IsAll)

    return



def DropItemToOtherPack(curPlayer, fromPackIndex, toPackIndex, index, isAll=False):

def DropItemToOtherPack(curPlayer, fromPackIndex, desPackIndex, index, isAll=False):

    '''拖动某个背包物品到玩家物品背包

    '''

    movePack = curPlayer.GetItemManager().GetPack(fromPackIndex)

@@ -1371,26 +1428,46 @@
    

    #整个背包转移

    if isAll:

        fullPackList = []

        for itemIndex in xrange(movePack.GetCount()):

            curItem = movePack.GetAt(itemIndex)

            if not curItem or curItem.IsEmpty():

                continue

            toPackIndex = ChConfig.GetItemPackType(curItem.GetType(), desPackIndex)

            if toPackIndex in fullPackList:

                continue

            if not __DoDropItemToOtherPack(curPlayer, itemControl, fromPackIndex, toPackIndex, itemIndex, curItem):

                return

                if toPackIndex not in fullPackList:

                    fullPackList.append(toPackIndex)

                    
        for fullPackIndex in fullPackList:

            PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [fullPackIndex])

            

    #单个物品转移

    else:

        curItem = movePack.GetAt(index)

        if not curItem or curItem.IsEmpty():

            return

        toPackIndex = ChConfig.GetItemPackType(curItem.GetType(), desPackIndex)

        __DoDropItemToOtherPack(curPlayer, itemControl, fromPackIndex, toPackIndex, index, curItem)

    return



def __DoDropItemToOtherPack(curPlayer, itemControl, fromPackIndex, toPackIndex, itemIndex, curItem):

    if itemControl.DoTransformItem(curPlayer, curItem):

        curItem.Clear()

        return True

    curItemTypeID = curItem.GetItemTypeID()

    #curItemGUID = curItem.GetGUID()

    curItemCount = curItem.GetCount()

    curItemIsBind = curItem.GetIsBind()

    #toPackIndex = ChConfig.GetItemPackType(curItem.GetType(), toPackIndex)

    
    # 常规物品转移到虚拟符印背包

    if toPackIndex == ShareDefine.rptRune:

        if not ItemCommon.CheckPackHasSpace(curPlayer, toPackIndex, True):

            return False

        return itemControl.PutItemInVPack(toPackIndex, curItem)

    
    checkRet, putIndex = itemControl.CanPutInItemEx(toPackIndex, curItemTypeID, curItemCount, curItemIsBind)

    if not checkRet:

        return False

@@ -1571,6 +1648,8 @@
    itemList = []   # 非装备普通物品

    equipGSGreaterList = [] # 属于本职业的高评分装备

    equipGSLesserList = []  # 低评分装备和非本职业

    runeItemList = []   # 符印

    
    #EquipGSTypeForSort

    equipPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)

    #组合列表

@@ -1591,7 +1670,9 @@
                equipGS = 1

                cmpEquipGS = 2

                

            if equipGS == 0:

            if tmpItem.GetType() in [ChConfig.Def_ItemType_Rune, ChConfig.Def_ItemType_RuneExp]:

                runeItemList.append(tmpItem)

            elif equipGS == 0:

                itemList.append(tmpItem)

            elif equipGS > cmpEquipGS:

                equipGSGreaterList.append(tmpItem)

@@ -1601,7 +1682,8 @@
    equipGSGreaterList.sort(__CmpRolePack)

    itemList.sort(__CmpRolePack)

    equipGSLesserList.sort(__CmpRolePack)



    runeItemList.sort(__CmpRolePack)

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

    # GameWorld.DebugLog("equipGSGreaterList")

    # for item in equipGSGreaterList:

@@ -1636,6 +1718,11 @@
    for item in equipGSLesserList:

        curPack.GetAt(putPlace).AssignItem(item, False)

        putPlace += 1

        
    for item in runeItemList:

        curPack.GetAt(putPlace).AssignItem(item, False)

        putPlace += 1

        
    return





@@ -2241,9 +2328,11 @@
    # {属性ID:{颜色:数值, ...}, ...}

    if isDogzEquip:

        # 神兽装备数值不一样 

        legAttrValueColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor2")

        legAttrValueColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor2", 1, {})

        legAttrValueClassLVColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor2", 2, {})

    else:

        legAttrValueColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor")

        legAttrValueColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor", 1, {})

        legAttrValueClassLVColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor", 2, {})

    legAttrValueClassLVDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByClassLV")

    for attrID in randAttrIDList:

        if attrID in legAttrValueColorDict:

@@ -2252,6 +2341,24 @@
                GameWorld.ErrLog("没有配置传奇属性ID装备颜色对应的数值, attrID=%s,itemColor=%s" % (attrID, itemColor))

                continue

            attrValue = colorValueDict[itemColor]

        # {属性ID:{阶:{颜色:数值, ...}, ...}, ...}

        elif attrID in legAttrValueClassLVColorDict:

            classLVColorValueDict = legAttrValueClassLVColorDict[attrID]

            if itemClassLV in classLVColorValueDict:

                colorValueDict = classLVColorValueDict[itemClassLV]

            else:

                minClassLV, maxClassLV = min(classLVColorValueDict), max(classLVColorValueDict)

                if itemClassLV <= minClassLV:

                    colorValueDict = classLVColorValueDict[minClassLV]

                elif itemClassLV >= maxClassLV:

                    colorValueDict = classLVColorValueDict[maxClassLV]

                else:

                    GameWorld.ErrLog("没有配置传奇属性ID装备阶级颜色对应的数值, attrID=%s,itemClassLV=%s" % (attrID, itemClassLV))

                    continue

            if itemColor not in colorValueDict:

                GameWorld.ErrLog("没有配置传奇属性ID装备阶级颜色对应的数值, attrID=%s,itemClassLV=%s,itemColor=%s" % (attrID, itemClassLV, itemColor))

                continue

            attrValue = colorValueDict[itemColor]

        elif attrID in legAttrValueClassLVDict:

            classLVValueDict = legAttrValueClassLVDict[attrID]

            if itemClassLV in classLVValueDict: