ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -36,7 +36,7 @@
import ShareDefine
import PlayerGodWeapon
import PlayerSuccess
import PlayerMagicWeapon
import PlayerGreatMaster
import PlayerHorse
import GameObj
import random
@@ -47,6 +47,7 @@
import PassiveBuffEffMng
import SkillShell
import FBCommon
import IpyGameDataPY
#---------------------------------------------------------------------
GameWorld.ImportAll("Script\\Skill\\" , "GameSkills")
GameWorld.ImportAll("Script\\Skill\\" , "GameBuffs")
@@ -1781,7 +1782,11 @@
    if curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_HorseSkill and SkillCommon.isPassiveAttr(curSkill):
        PlayerHorse.RefreshHorseAttr(curPlayer)
    else:
        PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveEff(curPlayer, curSkill.GetSkillID())
        if SkillCommon.isPassiveAttr(curSkill):
            curControl = PlayerControl.PlayerControl(curPlayer)
            curControl.RefreshPlayerAttrState()
        else:
            PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveEff(curPlayer, curSkill.GetSkillID())
        #curControl = PlayerControl.PlayerControl(curPlayer)
        #curControl.CalcPassiveBuffAttr()
        #curControl.RefreshAllState()
@@ -1805,27 +1810,7 @@
    return True
#---------------------------------------------------------------------
##技能升级消耗逻辑
# @param curPlayer 玩家实例
# @param curSkill 技能实例
# @param curSkillID 技能ID
# @return BOOL 是否扣除消耗成功
def DoLogic_PlayerSkillLVUpCost(curPlayer, curSkill, curSkillID):
    #GameWorld.Log("尝试升级技能名 = %s, 当前等级 = %s"%(curSkill.GetSkillName(),curSkill.GetSkillLV()) , curPlayer.GetPlayerID())
    curSkillLV = curSkill.GetSkillLV()
    if curSkillLV == curSkill.GetSkillMaxLV():
        #已经是最高等级
        PlayerControl.NotifyCode(curPlayer, "UseMagicLost16")
        return False
    #--获得下一级技能---
    curSkillTypeID = curSkill.GetSkillTypeID()
    return DoLogic_PlayerSkillLvUpCost(curPlayer, curSkillTypeID, curSkillID, curSkillLV + 1, curSkill)
##学习技能消耗逻辑
# @param curPlayer 玩家实例
# @param curSkillTypeID 技能类型ID
@@ -1849,7 +1834,10 @@
    if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_HorseSkill:
        if not PlayerHorse.CheckLearnHorseSkill(curPlayer, curSkillTypeID):
            return False
    #天赋技学习点数判断
    if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill:
        if not PlayerGreatMaster.GetGreatMasterFreeSkillPoint(curPlayer):
            return False
    #经验检测
    skillLvUpNeedExp = upSkill.GetLVUpCostExp()
    
@@ -1913,6 +1901,8 @@
        #GeRen_jin_474794  <n color="255,255,0" BKCOLOR="0,0,0">您消耗了经验值:</n><n color="0,190,255" BKCOLOR="0,0,0">{%S1%}</n>
        PlayerControl.NotifyCode(curPlayer, "GeRen_jin_474794", [skillLvUpNeedExp])
    
    if upSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill:
        PlayerGreatMaster.AddGreatMasterSkillPointByLV(curPlayer, -1)
    return True
#---------------------------------------------------------------------
##检测学习技能需求条件
@@ -1944,7 +1934,11 @@
    #当前技能前置技能需求,前置技能等级需求
    curSkillLearnReq = curSkill.GetLearnSkillReq()
    lvCurSkillLearnReq = curSkill.GetLearnSkillLV()
    #需要对应天赋系别点数
    learnSkillPointReq = curSkill.GetLearnSkillPointReq()
    needSeries, needSeriesPoint= learnSkillPointReq/10000, learnSkillPointReq%10000
    ipyData = IpyGameDataPY.GetIpyGameDataNotLog('TalentSkill', curSkill.GetSkillTypeID())
    curTalentType = ipyData.GetTalentType() if ipyData else 0
    #获取玩家目前所有技能
    for i in range(0, skillManager.GetSkillCount()):
        skill = skillManager.GetSkillByIndex(i)
@@ -1961,9 +1955,10 @@
        #满足前置技能需求
        if skillTypeID == curSkillLearnReq and lvSkill >= lvCurSkillLearnReq and not hasLearnSkillReq:
            hasLearnSkillReq = True
        #投入分支点总和
        numLearnSkillPoint += skill.GetSkillLV()
        ipyData = IpyGameDataPY.GetIpyGameDataNotLog('TalentSkill', skillTypeID)
        if ipyData and ipyData.GetTalentType() is curTalentType and ipyData.GetSeries() is needSeries:
            #投入分支点总和
            numLearnSkillPoint += skill.GetSkillLV()
    
    #有前置技能ID需要
    if curSkillLearnReq != 0 and not hasLearnSkillReq:
@@ -1975,10 +1970,10 @@
#        PlayerControl.NotifyCode(curPlayer, "UseMagicLost15", [ curSkillStateReq, lvCurSkillStateReq ])
#        return False
             
#    #有分支点总和要求
#    if curSkill.GetLearnSkillPointReq() != 0 and numLearnSkillPoint < curSkill.GetLearnSkillPointReq():
#        PlayerControl.NotifyCode( curPlayer, "UseMagicLost13",[ curSkill.GetLearnSkillPointReq() ] )
#        return False
    #有分支点总和要求
    if learnSkillPointReq != 0 and numLearnSkillPoint < needSeriesPoint:
        PlayerControl.NotifyCode( curPlayer, "UseMagicLost13",[ needSeriesPoint ] )
        return False
    
    return True