From 98628e52c80ea22ed6c0ea5a2890d88bd5c14ffc Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 17 六月 2019 14:54:09 +0800
Subject: [PATCH] 7193 【2.0】仙盟联赛修改（无人参赛时所有成员获得拍品收益，不含中途转盟过来的；修复仙盟拍品无人收益时报错bug）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.py | 11 ++++++++++-
1 files changed, 10 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 11757cc..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
## 攻击
@@ -110,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