From ee0976feabc604ac91bdc86fc368941cf85d97b7 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 12 二月 2019 11:39:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
index 981b4d0..0f41d31 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
@@ -137,7 +137,9 @@
if not __DoClientUseSkillEx(curPlayer, useSkillData, tick):
SkillShell.AttackFailNotify(curPlayer, useSkillData)
GameWorld.DebugLog("----攻击失败 可能是技能CD %s"%skillTypeID)
-
+ # 根据策划需求 以客户端动作为标准，不可攻击状态也进入CD
+ BaseAttack.Sync_AttackResult(curPlayer, useSkillData)
+
if useSkillData and useSkillData.GetSkillID() != ChConfig.Def_SkillID_Somersault:
# 跟随玩家同频率攻击
PetControl.PetFight(curPlayer, tick)
@@ -1493,6 +1495,14 @@
ProcessProDef(curPlayer, tick)
return
+def Sync_PKBossState(curPlayer):
+ psState = 1 if curPlayer.GetDictByKey(ChConfig.Def_PDict_PKStateTick) else 0
+ curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_PKState, psState, False)
+
+ bossState = 1 if curPlayer.GetDictByKey(ChConfig.Def_PDict_BossStateTick) else 0
+ curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_BossState, bossState, False)
+ return
+
# 脱离PK战斗 X秒后按比例恢复
def ProcessProDef(curPlayer, tick):
if PlayerControl.GetProDefHPPer(curPlayer) == 0:
--
Gitblit v1.8.0