From e95c880a51289fb5f4f54b1a24ff6d590dceef0d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 01 二月 2021 16:56:00 +0800
Subject: [PATCH] 8718 【主干】【BT2】充值前向服务器咨询是否可充值封包

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.py |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 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 2465e39..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
 
 ## 攻击
@@ -113,8 +120,8 @@
         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