From 787c076b2fdc73a11b9b76e2ea928f3da1f5873e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 19 十二月 2019 16:35:02 +0800
Subject: [PATCH] 8359 【主干】活跃兑换
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.py | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.py
index f9231ca..8cabede 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.py
@@ -66,6 +66,13 @@
if defenderCampType == ChConfig.CampType_Justice:
return ChConfig.Type_Relation_Friend, ChConfig.Def_PASysMessage_None
+ #私有木桩只能自己打自己的
+ if curTagNormalNPC.GetType() in [ChConfig.ntPriWoodPilePVE, ChConfig.ntPriWoodPilePVP]:
+ summonPlayerID = curTagNormalNPC.GetDictByKey(ChConfig.Def_NPC_Dict_PriWoodPilePlayerID)
+ if curPlayer.GetPlayerID() != summonPlayerID:
+ return ChConfig.Type_Relation_Friend , ChConfig.Def_PASysMessage_None
+ return ChConfig.Type_Relation_Enemy , ChConfig.Def_PASysMessage_None
+
return ChConfig.Type_Relation_Enemy , ChConfig.Def_PASysMessage_None
## 攻击
@@ -79,7 +86,6 @@
# @return hurtType ： HurtType 伤害结构体类
# @remarks 函数详细说明.
def DoAttack(curPlayer, curTagNormalNPC, skill, skillValue, skillPercent, skillHurtList, tick):
- #finalHurtPer = SkillCommon.GetSkillFinalHurtPer(curPlayer, curTagNormalNPC, skill, tick)
curTagNPCHPBeforeAtk = GameObj.GetHP(curTagNormalNPC)
hurtType = AttackCommon.GetHurtHP(curPlayer, curTagNormalNPC, skill, skillValue, skillPercent, tick)
@@ -111,9 +117,11 @@
return
if GameObj.GetHP(curTagNormalNPC) <= 0:
+ if not ChNPC.OnCheckCanDie(curPlayer, curTagNormalNPC, skill, tick):
+ return
#执行击杀NPC逻辑
- FBLogic.DoFB_Player_KillNPC(curPlayer , curTagNormalNPC , tick)
NPCCommon.OnPlayerAttackNPCDie(curTagNormalNPC, curPlayer, skill)
+ FBLogic.DoFB_Player_KillNPC(curPlayer , curTagNormalNPC , tick)
#NPC死亡
curTagNormalNPCControl = NPCCommon.NPCControl(curTagNormalNPC)
curTagNormalNPCControl.SetKilled()
--
Gitblit v1.8.0