From a1dd4e92306ad37bacf390825efd39ca315e8b5e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 16 八月 2021 15:25:04 +0800
Subject: [PATCH] 8721 【主干】【BT3】【后端】H.活动-合服庆典（转盘活动改为支持配置消耗的货币类型 主干冲突）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/OperControlManager.py | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/OperControlManager.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/OperControlManager.py
index dc0d328..4aedf30 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/OperControlManager.py
+++ b/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):
#是否在传送的进度条中
--
Gitblit v1.8.0