From b1db5a388da4238ed2031b4fec34ac43478509c2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 七月 2019 18:45:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.py | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.py
index cddd6b8..c67d95b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.py
@@ -63,6 +63,8 @@
# @param isTrue 是否设置该状态
# @return None
def SetPyPlayerState(gameObj, pyState, isAdd):
+ if pyState == 0:
+ return
if pyState not in ChConfig.Def_PlayerStateList:
return
@@ -94,6 +96,11 @@
# # 故该状态标记仅为一个非精确的标记，应用中请注意！！！(当且仅当多个buff有同一个效果时会提前结束该状态)
#===============================================================================
def GetPyPlayerState(gameObj, pyState, ownerID = 0, ownerType = 0):
+ if not gameObj:
+ return False
+ if pyState == 0:
+ # 0不需要判断
+ return True
curState = gameObj.GetDictByKey(ChConfig.Def_PlayerKey_CurState)
state = curState & pow(2, pyState)
@@ -128,10 +135,10 @@
if effect.GetEffectValue(0) != stateType:
continue
- if buffManager.GetEffectOwnerID() != ownerID:
+ if buffManager.GetEffectOwnerID(i) != ownerID:
continue
- if buffManager.GetEffectOwnerType() != ownerType:
+ if buffManager.GetEffectOwnerType(i) != ownerType:
continue
return True
--
Gitblit v1.8.0