From 17560a1577601d1d177d5e0df2d28dabbdb56cab Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 11 三月 2024 19:33:42 +0800
Subject: [PATCH] 10130 【后端】福地争夺资源功能（优化启动加载福地物品数据逻辑；修复坐标转小数点问题；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.py | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.py
index 403c638..5f596f8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.py
@@ -33,6 +33,7 @@
import SkillShell
import ChNPC
import GameObj
+import TurnAttack
#---------------------------------------------------------------------
#---------------------------------------------------------------------
@@ -58,7 +59,7 @@
def GetTagRelation(curSummonNPC, curTagNormalNPC, skill, tick):
#防守方阵营
- defenderCampType = NPCCommon.GetFaction(curTagNormalNPC)
+ defenderCampType = GameObj.GetFaction(curTagNormalNPC)
#玩家的召唤兽才能攻击普通NPC
npcOwner_Player = NPCCommon.GetSummonNPCOwner(IPY_GameWorld.gotPlayer, curSummonNPC)
@@ -72,7 +73,7 @@
return ChConfig.Type_Relation_Enemy, ChConfig.Def_PASysMessage_None
#攻击方阵营
- attackerCampType = curSummonNPC.GetDictByKey(ChConfig.Def_NpcDictKey_CampType)
+ attackerCampType = GameObj.GetFaction(curSummonNPC)
if attackerCampType != defenderCampType:
return ChConfig.Type_Relation_Enemy, ChConfig.Def_PASysMessage_None
return ChConfig.Type_Relation_Friend, ChConfig.Def_PASysMessage_None
@@ -143,6 +144,9 @@
#玩家击杀NPC副本触发器
curPlayer = NPCCommon.GetSummonNPCOwner(IPY_GameWorld.gotPlayer, curSummonNPC)
+ if TurnAttack.SetKilled(curTagNPC):
+ return
+
if not ChNPC.OnCheckCanDie(curPlayer, curTagNPC, skill, tick):
return
--
Gitblit v1.8.0