9693 【后端】【越南】【主干】坐骑觉醒吞噬没有战力提升

hxp

2022-08-24 0fa4fc2d2abcc271fb286c845e2eeee12250b0a1

9693 【后端】【越南】【主干】坐骑觉醒吞噬没有战力提升

# Conflicts:
#	PySysDB/PySysDBPY.h
#	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py

@@ -402,6 +402,15 @@
                continue

            PlayerControl.CalcAttrDict_Type(attrID, attrValue, allAttrListSkin)

            

        #觉醒战力

        skintype = 1

        horseID = skinPlusIpyData.GetHorseID()

        skinData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorsePetSkinData % (skintype, horseID))

        skinIpyData = IpyGameDataPY.GetIpyGameDataNotLog('HorsePetSkin', skintype, horseID, skinData / 100)

        if skinIpyData:

            for attrID, attrValue in skinIpyData.GetAttrInfo().items():

                PlayerControl.CalcAttrDict_Type(attrID, attrValue, allAttrListSkin)

                
    # 新培养属性

    for index in xrange(ipyDataMgr.GetHorseTrainCount()):

        trainIpyData = ipyDataMgr.GetHorseTrainByIndex(index)

@@ -670,6 +679,7 @@
    skintype = curPackData.Type

    horsePetID = curPackData.ID

    eatItemID = curPackData.EatItemID

    GameWorld.DebugLog("骑宠觉醒: skintype=%s,horsePetID=%s,eatItemID=%s" % (skintype, horsePetID, eatItemID))

    if not IpyGameDataPY.GetIpyGameDataByCondition('HorsePetSkin', {'Type':skintype, 'ID':horsePetID}):

        return

#    if skintype == 1:

@@ -698,10 +708,10 @@
        return

    curEff = curItem.GetEffectByIndex(4)

    curEffID = curEff.GetEffectID()

    if curEffID != ChConfig.Def_Effect_HorsePetSkinExp:

        return

    addExp = curEff.GetEffectValue(0)

    if not addExp:

    if curEffID != ChConfig.Def_Effect_HorsePetSkinExp or not addExp:

        GameWorld.ErrLog('物品效果5没有配置骑宠觉醒经验效果! eatItemID=%s,curEffID=%s,addExp=%s,needEffID=%s' 
                         % (eatItemID, curEffID, addExp, ChConfig.Def_Effect_HorsePetSkinExp))

        return

    itemPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)

    hasEnough, itemList = ItemCommon.GetItem_FromPack_ByID(eatItemID, itemPack, 1)

@@ -728,6 +738,7 @@
    updSkinData = updSkinLV * 100 + updSkinIndex

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_HorsePetSkinData % (skintype, horsePetID), updSkinData)

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_HorsePetSkinExp % (skintype, horsePetID), updExp)

    GameWorld.DebugLog("skinData=%s,curExp=%s,updSkinData=%s,updExp=%s" % (skinData, curExp, updSkinData, updExp))

    if curSkinIndex != updSkinIndex:

        __DoHorsePetSkinChange(curPlayer, skintype, horsePetID, updSkinIndex)

    if updSkinLV != curSkinLV: