6733 【后端】【2.0】装备相关整理优化（去除部分GetItemQuality逻辑）

hxp

2019-05-10 1828f670644c08d387752eb8d9d703372fe7518d

6733 【后端】【2.0】装备相关整理优化（去除部分GetItemQuality逻辑）

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

@@ -278,12 +278,12 @@
        ItemCommon.SyncMakeItemAnswer(curPlayer, ShareDefine.Def_mitItemCompound, ChConfig.Def_ComposeState_Sucess, makeItemID)

        #成功合成1个物品成就

        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_CompoundItemEx, compoundCnt, [makeItemID])

        #合成X阶X颜色X星级以上装备

        classLV = ItemCommon.GetItemClassLV(makeItemData)

        itemColor = makeItemData.GetItemColor()

        itemQuality = makeItemData.GetItemQuality()

        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_CompoundEquip, compoundCnt, [classLV, itemColor, itemQuality])

        EventShell.EventRespons_CompoundEquip(curPlayer, itemColor, itemQuality)

        #合成X阶X颜色X星级以上装备, 星级改为装备位了，暂时没有用，屏蔽

        #classLV = ItemCommon.GetItemClassLV(makeItemData)

        #itemColor = makeItemData.GetItemColor()

        #itemQuality = makeItemData.GetItemQuality()

        #PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_CompoundEquip, compoundCnt, [classLV, itemColor, itemQuality])

        #EventShell.EventRespons_CompoundEquip(curPlayer, itemColor, itemQuality)

    # 合成失败

    else:

        GameWorld.DebugLog("合成失败！")


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

@@ -2501,23 +2501,7 @@
# @return 返回值, 是否判断成功

# @remarks <QualityEquipCnt quality="装备品质" value="期望数量"/> 

def ConditionType_Qualityequipcnt(curPlayer, curMission, curConditionNode):

    conditionValue = GameWorld.ToIntDef(curConditionNode.GetAttribute("value"), 0)

    quality = GameWorld.ToIntDef(curConditionNode.GetAttribute("quality"), 0)

    conditionType = curConditionNode.GetAttribute("type")

    curQualityEquipCnt = 0 #达到该品质的装备数量，品质高的兼容品质低的

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

    for equipIndex in range(0, equipPack.GetCount()):

        #备用装备栏不处理

        if equipIndex not in ShareDefine.RoleEquipType:

            continue

        curEquip = equipPack.GetAt(equipIndex)

        if curEquip.IsEmpty():

            continue

        if curEquip.GetItemQuality() < quality:

            continue

        curQualityEquipCnt += 1

    
    return QuestRunnerValue.GetEval(conditionType, curQualityEquipCnt, conditionValue)

    return ChEquip.GetEquipOrangeCount(curPlayer)



##强化 X件装备强化到X级

# @param curPlayer 玩家实例


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

@@ -483,21 +483,6 @@
                       % (lineID, bossID, rank, totalExp, totalMoney, jsonItemList), curPlayer.GetPlayerID())

    

    prizeItemList = equipList + FBCommon.GetJsonItemList(prizeItemDict.items())

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

    # if not isMail:

    #    for itemDict in prizeItemList:

    #        itemID = itemDict["ItemID"]

    #        itemData = GameWorld.GetGameData().GetItemByTypeID(itemID)

    #        if not itemData:

    #            continue

    #        userData = itemDict.get("UserData", '')

    #        equipInfo = [itemData.GetEquipPlace(), ItemCommon.GetItemClassLV(itemData), itemData.GetItemColor(), 
    #                 itemData.GetItemQuality(), userData]

    #        mapID = ChConfig.Def_FBMapID_SealDemon

    #        NPCCommon.SendGameServerGoodItemRecord(mapID, bossID, curPlayer.GetName(), 
    #                                               curPlayer.GetPlayerID(), itemID, equipInfo)

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

    
    

    if rank == 1:

        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FMTFirst, addCnt)


 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






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

@@ -73,7 +73,7 @@
                if curEquip.IsEmpty():

                    result = 0

                    break

                if curEquip.GetItemQuality() < ChConfig.Def_Quality_Orange:

                if curEquip.GetItemColor() < ChConfig.Def_Quality_Orange:

                    result = 0

                    break

                equipClassLV = ItemCommon.GetItemClassLV(curEquip)


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

@@ -124,23 +124,7 @@
#  @return itemName

#  @remarks 函数详细说明.

def __ParseItemName(item):

    #卓越的护生短刀

    #{ 白 -> 破旧的,粗制的,普通的, 蓝 -> 4 优秀的,精良的,卓越的, 紫 -> 稀有的,无暇的,完美的}

    
    itemName = item.GetName()

    itemQuality = item.GetItemQuality()

    
    if not itemQuality:

        return itemName

    
#    parseName = {

#                1: ['%s%s'%('破旧的',itemName) , '%s%s'%('粗制的',itemName) ,'%s%s'%('普通的',itemName)] , 
#                2: ['%s%s'%('优秀的',itemName) , '%s%s'%('精良的',itemName) ,'%s%s'%('卓越的',itemName)] ,

#                3: ['%s%s'%('稀有的',itemName) , '%s%s'%('无暇的',itemName) ,'%s%s'%('完美的',itemName)] ,

#                }

#    if parseName.has_key(itemColor):

#        return parseName[itemColor][itemQuality - 1]

    
    return itemName

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

## 获取背包字典