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)

@@ -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)):

@@ -1198,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:

@@ -1214,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

@@ -1251,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

@@ -1297,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



@@ -2273,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:

@@ -2284,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: