From f5e2429d47046ddf1ea5c699949886a1c63ee36a Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 27 四月 2019 21:09:14 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 -- 肉盾反射战

---
 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