From 5c08fa1fdaf2dbebe6838456fc16fd9cd161e499 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 11 二月 2020 00:28:53 +0800
Subject: [PATCH] 8375 【主干】【后端】秘境探索修改（增加B029查询活跃放置信息封包）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.py | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.py
index 3c06144..bda684b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.py
@@ -21,18 +21,16 @@
# @change: "2015-04-11 15:30" hxp 增加最终伤害逻辑
# @change: "2016-02-26 17:00" hxp 增加PVP伤害统计
#------------------------------------------------------------------------------
-"""Version = 2016-02-26 17:00"""
+#"""Version = 2016-02-26 17:00"""
#---------------------------------------------------------------------
import NPCCommon
import GameWorld
import AttackCommon
import IPY_GameWorld
-import PlayerControl
-import SkillCommon
import ChConfig
-import ChEquip
-import SkillShell
+import FBLogic
import GameObj
+import ChNPC
#---------------------------------------------------------------------
#---------------------------------------------------------------------
@@ -70,6 +68,13 @@
#怪物的召唤兽,不考虑攻击模式问题
return ChConfig.Type_Relation_Enemy , ChConfig.Def_PASysMessage_None
+ #私有木桩只能自己打自己的
+ if curTagSummonNPC.GetType() in [ChConfig.ntPriWoodPilePVE, ChConfig.ntPriWoodPilePVP]:
+ summonPlayerID = curTagSummonNPC.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
+
#自己的召唤兽,不能攻击
if GameWorld.IsSameObj(curPlayer, curTagPlayer) :
return ChConfig.Type_Relation_Friend , ChConfig.Def_PASysMessage_None
@@ -94,7 +99,6 @@
# @return hurtType ： HurtType 伤害结构体类
# @remarks 攻击
def DoAttack(curPlayer, curTagSummon, skill, skillValue, skillPercent, skillHurtList, tick):
- #finalHurtPer = SkillCommon.GetSkillFinalHurtPer(curPlayer, curTagSummon, skill, tick)
#攻击前血量
curTagSummonBeHP = GameObj.GetHP(curTagSummon)
@@ -141,8 +145,11 @@
#召唤兽死亡
if GameObj.GetHP(curTagSummon) <= 0:
NPCCommon.OnPlayerAttackNPCDie(curTagSummon, curPlayer, skill)
+ FBLogic.DoFB_Player_KillNPC(curPlayer , curTagSummon , tick)
#获得控制器
curTagNormalNPCControl = NPCCommon.NPCControl(curTagSummon)
curTagNormalNPCControl.SetKilled()
-
+ else:
+ ChNPC.OnNPCAttacked(curPlayer, curTagSummon, skill, tick)
+
return True
--
Gitblit v1.8.0