From 631226708e6ba39636e219a9e92a0c7c496aa442 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 27 十二月 2019 19:36:48 +0800
Subject: [PATCH] 8352 【后端】GM工具后台增加可补偿上架拍品
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.py | 10 ++++++++--
1 files changed, 8 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 ae6aa90..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
## 攻击
@@ -111,11 +118,10 @@
if GameObj.GetHP(curTagNormalNPC) <= 0:
if not ChNPC.OnCheckCanDie(curPlayer, curTagNormalNPC, skill, tick):
- GameObj.SetHP(curTagNormalNPC, 1)
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