From d555ead90b4167b9c8cdda5ee2cadbbe69e9c505 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 23 五月 2019 20:21:06 +0800
Subject: [PATCH] 6805 【后端】【2.0】副本前端化（删除无用包）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/OperControlManager.py | 6 +++++-
1 files changed, 5 insertions(+), 1 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..6fed33f 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,10 +99,13 @@
# @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端的验证是否通过"%\
#(curActionState, curOperState, keyType), curObj.GetID())
--
Gitblit v1.8.0