From 2aefdb232d9d635d82dc64516e66fd79b582c9bb Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 25 五月 2019 11:31:17 +0800
Subject: [PATCH] 6501 增加宝石任务接口
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.py | 20 +++++++++++++-------
1 files changed, 13 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..3873af4 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,12 @@
#怪物的召唤兽,不考虑攻击模式问题
return ChConfig.Type_Relation_Enemy , ChConfig.Def_PASysMessage_None
+ #私有木桩只能自己打自己的
+ if curTagSummonNPC.GetType() in [ChConfig.ntPriWoodPilePVE, ChConfig.ntPriWoodPilePVP]:
+ if not GameWorld.IsSameObj(curPlayer, curTagPlayer):
+ 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 +98,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 +144,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