ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/OperControlManager.py
@@ -30,6 +30,7 @@
import PlayerHorse
import ShareDefine
import SkillCommon
import PassiveBuffEffMng
#GameObj字典-----------------------------------------------------------
@@ -98,9 +99,12 @@
# @param curOperState 请求状态
# @return boolֵ
# @remarks 判断对象是否可执行操作
def IsObjCanDoAction(curObj, keyType, curOperState):
def IsObjCanDoAction(curObj, keyType, curOperState, curSkill=None):
    if SkillCommon.GetUsingPassiveSkill(curObj):
        # 被动技能不限制
        return True
    if curSkill and PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(curObj, None, curSkill, ChConfig.TriggerType_NoControl):
        return True
    curActionState = GetObjActStateByType(curObj, keyType)
    #GameWorld.Log("玩家 当前状态%s,判断行为 %s, 在 %s端的验证是否通过"%\
@@ -167,9 +171,7 @@
    #下马
    if not IsCanDoAction(curServerActionState, IPY_GameWorld.oalRide):
        #是否可以下马
        if PlayerHorse.CheckPlayerRideHorseDown(curObj) == True:
            PlayerHorse.PlayerRideHorseDown(curObj, True)
        PlayerHorse.PlayerRideHorseDown(curObj, True)
    
    if not IsCanDoAction(curServerActionState, IPY_GameWorld.oalTransmit):
        #是否在传送的进度条中