Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

hch

2018-09-19 fe645e03c09fce1624ff7354beaed01375f1453c

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

@@ -125,6 +125,7 @@
    # 助战状态换装需要刷属性

    if GetDogzIsHelpFight(curPlayer, dogzID):

        RefreshDogzAttr(curPlayer)

        PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()

        

    return



@@ -201,6 +202,7 @@
    if GetDogzIsHelpFight(curPlayer, dogzID):

        SetDogzIsHelpFight(curPlayer, dogzID, False) # 因为脱下了状态，所以必须设置为非助战状态

        RefreshDogzAttr(curPlayer)

        PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()

        

    return



@@ -262,6 +264,7 @@
    GameWorld.DebugLog("神兽助战状态变更！dogzID=%s,isFight=%s" % (dogzID, isFight), playerID)

    SetDogzIsHelpFight(curPlayer, dogzID, isFight)

    RefreshDogzAttr(curPlayer)

    PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()

    return





@@ -311,6 +314,7 @@
#    BYTE        EquipIndex;    //神兽装备背包中索引

#    BYTE        IndexCount;        //材料所在神兽物品背包索引的数量

#    BYTE        IndexList[IndexCount];    //材料所在神兽物品背包索引列表

#    BYTE        IndexUseCountList[IndexCount];    //材料所在神兽物品背包索引对应使用个数列表

#    BYTE        IsDouble;        //是否双倍强化

#};

def OnDogzEquipPlus(index, clientData, tick):

@@ -318,8 +322,14 @@
    playerID = curPlayer.GetPlayerID()

    equipIndex = clientData.EquipIndex

    indexList = clientData.IndexList

    indexUseCountList = clientData.IndexUseCountList

    isDouble = clientData.IsDouble

    GameWorld.DebugLog("神兽装备强化: equipIndex=%s,indexList=%s,isDouble=%s" % (equipIndex, indexList, isDouble), playerID)

    GameWorld.DebugLog("神兽装备强化: equipIndex=%s,indexList=%s,indexUseCountList=%s,isDouble=%s" 
                       % (equipIndex, indexList, indexUseCountList, isDouble), playerID)

    
    if len(indexList) != len(indexUseCountList):

        GameWorld.DebugLog("    指定消耗的个数数据长度错误！")

        return

    

    dogzEquipPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzEquip)

    curEquip = dogzEquipPack.GetAt(equipIndex)

@@ -367,24 +377,25 @@
            GameWorld.ErrLog("神兽背包物品无经验效果，无法强化！i=%s,itemID=%s" % (i, curItem.GetItemTypeID()), playerID)

            return

        

        delCount = max(1, min(curItem.GetCount(), indexUseCountList[i]))

        baseExp = effect.GetEffectValue(0)

        doubleCostGold = effect.GetEffectValue(1)

        

        addExp = baseExp

        addExp = baseExp * delCount

        plusInfoCount = curItem.GetUserAttrCount(ShareDefine.Def_IudetDogzEquipPlus)

        if not plusInfoCount:

            if isDouble and doubleCostGold:

                addExp = (baseExp * 2)

                costGoldTotal += doubleCostGold

            GameWorld.DebugLog("    强化: addExp=%s,baseExp=%s,isDouble=%s,doubleCostGold=%s,costGoldTotal=%s" 
                               % (addExp, baseExp, isDouble, doubleCostGold, costGoldTotal), playerID)

                addExp = (baseExp * 2 * delCount)

                costGoldTotal += doubleCostGold * delCount

            GameWorld.DebugLog("    强化: addExp=%s,delCount=%s,baseExp=%s,isDouble=%s,doubleCostGold=%s,costGoldTotal=%s" 
                               % (addExp, delCount, baseExp, isDouble, doubleCostGold, costGoldTotal), playerID)

        else:

            #plusLV = curItem.GetUserAttrByIndex(ShareDefine.Def_IudetDogzEquipPlus, 0)

            plusExpTotal = curItem.GetUserAttrByIndex(ShareDefine.Def_IudetDogzEquipPlus, 1)

            addExp += plusExpTotal

            GameWorld.DebugLog("    强化: addExp=%s,baseExp=%s,plusExpTotal=%s" % (addExp, baseExp, plusExpTotal), playerID)

            GameWorld.DebugLog("    强化: addExp=%s,delCount=%s,baseExp=%s,plusExpTotal=%s" % (addExp, delCount, baseExp, plusExpTotal), playerID)

        addExpTotal += addExp

        delItemList.append(curItem)

        delItemList.append([curItem, delCount])

        

    if not delItemList:

        GameWorld.DebugLog("    没有材料可强化！", playerID)

@@ -398,8 +409,8 @@
                                      ChConfig.Def_Cost_DogzEquipPlus, infoDict):

            return

        

    for delItem in delItemList:

        ItemCommon.DelItem(curPlayer, delItem, curItem.GetCount(), False, ChConfig.ItemDel_DogzEquipPlus, infoDict)

    for delItem, delCount in delItemList:

        ItemCommon.DelItem(curPlayer, delItem, delCount, False, ChConfig.ItemDel_DogzEquipPlus, infoDict)

        

    updPlusLV = curPlusLV

    doCount, maxDoCount = 0, maxPlusLV * 2

@@ -432,6 +443,7 @@
    

    if isRefreshAtrr:

        RefreshDogzAttr(curPlayer)

        PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()

        

    return



@@ -460,6 +472,7 @@
def RefreshDogzAttr(curPlayer):

    ## 刷新神兽属性

    

    fightPowerEx = 0

    allAttrList = [{} for _ in range(4)]

    

    dogzEquipPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzEquip)

@@ -520,8 +533,12 @@
            ChEquip.CalcAttr_LegendAttr(curPlayer, curEquip, allAttrList)

            #GameWorld.DebugLog("    装备传奇: itemID=%s,%s" % (itemID, allAttrList))

            

        # 附加战力

        fightPowerEx += ipyData.GetFightPowerEx()

        
    # 保存计算值

    PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_Dogz, allAttrList)

    curPlayer.SetDict(ChConfig.Def_PlayerKey_MFPEx % ShareDefine.Def_MFPType_Dogz, fightPowerEx)

    return



def Sync_DogzInfo(curPlayer):