129 【战斗】战斗系统-服务端（贾诩所有技能；5022效果支持配置buff额外属性计算方式；）

hxp

6 天以前 a075f7841fb2d0a3b32bf10c8bc2df5bf02d6acb

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

@@ -20,13 +20,14 @@
import ShareDefine

import NetPackCommon

import PlayerControl

import PlayerSuccess

import ChPyNetSendPack

import IPY_GameWorld

import IpyGameDataPY

import GameFuncComm

import PlayerOnline

import PlayerTask

import GameWorld

import ObjPool



import time



@@ -94,10 +95,10 @@
        costItemIndexList, bindCnt, unBindCnt = ItemCommon.GetPackItemBindStateIndexInfo(curPlayer, costItemID, costItemCount)

        lackCnt = costItemCount - bindCnt - unBindCnt

        if lackCnt > 0:

            GameWorld.DebugLog("消耗道具不足，无法升级坐骑! costItemID=%s,costItemCount=%s,bindCnt=%s,unBindCnt=%s,lackCnt=%s" 
            costItemCount -= lackCnt

            GameWorld.DebugLog("消耗道具不足，有多少消耗多少! costItemID=%s,costItemCount=%s,bindCnt=%s,unBindCnt=%s,lackCnt=%s" 
                               % (costItemID, costItemCount, bindCnt, unBindCnt, lackCnt))

            return

        
            
        # 扣除消耗

        ItemCommon.DelCostItemByBind(curPlayer, costItemIndexList, bindCnt, unBindCnt, costItemCount, ChConfig.ItemDel_Horse)

        

@@ -119,6 +120,9 @@
    # 有升级额外处理

    if updHorseLV > horseLV:

        RefreshHorseAttr(curPlayer)

        
    PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_HorseLVUP, costItemCount)

    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_OSAHorseLVUP, costItemCount)

    return



#// B2 02 坐骑进阶 #tagCSHorseClassUP

@@ -245,7 +249,7 @@
    return



def SyncHorseClassInfo(curPlayer):

    clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCHorseClassInfo)

    clientPack = ChPyNetSendPack.tagSCHorseClassInfo()

    clientPack.ClassLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseClassLV)

    clientPack.HorseLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseLV)

    clientPack.Exp = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseExp)

@@ -308,21 +312,25 @@
    ipyData = IpyGameDataPY.GetIpyGameData("HorseSkin", horseSkinID)

    if not ipyData:

        return

    if ipyData.GetUnlockWay() != 2:

        GameWorld.DebugLog("非道具激活的不用添加: horseSkinID=%s" % (horseSkinID), playerID)

        return

    if not isFree:

        itemID = ipyData.GetUnlockValue()

        itemCount = ipyData.GetUnlockNeedCnt()

        if not itemID or not itemCount:

            return

        needItemList = [[itemID, itemCount]]

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

        lackItemDict, delInfoDict = ItemCommon.GetCostItemIndexList(needItemList, itemPack)

        if lackItemDict:

            GameWorld.DebugLog("激活所需物品不足! horseSkinID=%s,lackItemDict=%s" % (horseSkinID, lackItemDict), playerID)

            return

        ItemCommon.DelCostItem(curPlayer, itemPack, delInfoDict, "AddHorseSkin")

        unlockWay = ipyData.GetUnlockWay()

        if unlockWay == 1:

            classLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseClassLV)

            if classLV < ipyData.GetUnlockValue():

                GameWorld.DebugLog("坐骑阶级不足无法解锁! classLV=%s < %s" % (classLV, ipyData.GetUnlockValue()), playerID)

                return

        elif unlockWay == 2:

            itemID = ipyData.GetUnlockValue()

            itemCount = ipyData.GetUnlockNeedCnt()

            if not itemID or not itemCount:

                return

            needItemList = [[itemID, itemCount]]

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

            lackItemDict, delInfoDict = ItemCommon.GetCostItemIndexList(needItemList, itemPack)

            if lackItemDict:

                GameWorld.DebugLog("激活所需物品不足! horseSkinID=%s,lackItemDict=%s" % (horseSkinID, lackItemDict), playerID)

                return

            ItemCommon.DelCostItem(curPlayer, itemPack, delInfoDict, "AddHorseSkin")

        

    ipyExpireSeconds = ipyData.GetExpireMinutes() * 60

    

@@ -388,6 +396,8 @@
    for index in range(ipyDataMgr.GetHorseSkinCount()):

        ipyData = ipyDataMgr.GetHorseSkinByIndex(index)

        horseSkinID = ipyData.GetSkinID()

        if horseSkinID <= 0:

            continue

        if ipyData.GetUnlockWay() != 1:

            continue

        if ipyData.GetUnlockValue() > 0:

@@ -407,9 +417,11 @@
    if ipyData:

        unlockWay = ipyData.GetUnlockWay()

        if unlockWay == 1:

            classLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseClassLV)

            if classLV >= ipyData.GetUnlockValue():

            if not ipyData.GetUnlockValue():

                return True

            #classLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseClassLV)

            #if classLV >= ipyData.GetUnlockValue():

            #    return True

            

    return False



@@ -437,7 +449,7 @@
    if ipyData.GetUnlockWay() != 2:

        return

    itemID = ipyData.GetUnlockValue()

    itemCount = ipyData.GetUnlockNeedCnt()

    itemCount = ipyData.GetUpNeedCnt()

    if not itemID or not itemCount:

        return

    needItemList = [[itemID, itemCount]]

@@ -480,7 +492,7 @@
        state = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_HorseSkinState, horseSkinID)

        if not state and horseSkinIDList == None:

            continue

        horseSkin = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCHorseSkin)

        horseSkin = ChPyNetSendPack.tagSCHorseSkin()

        horseSkin.HorseSkinID = horseSkinID

        horseSkin.State = state

        horseSkin.EndTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseSkinEndTime % horseSkinID)

@@ -490,7 +502,7 @@
    if not horseSkinList:

        return

    

    clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCHorseSkinInfo)

    clientPack = ChPyNetSendPack.tagSCHorseSkinInfo()

    clientPack.HorseSkinList = horseSkinList

    clientPack.Count = len(clientPack.HorseSkinList)

    NetPackCommon.SendFakePack(curPlayer, clientPack)