From 4baf073008f5bafc7c819eda73cee1dca0f455c4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 17 九月 2025 14:45:55 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(武将表、NPC表关联优化:武将表可配置NPC怪物,增加是否开放玩家的配置,NPC表去除字段:国家、远近、性别、技能、特长,统一取关联武将的相关数据;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
index 082ab50..e5a4564 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -618,7 +618,7 @@
     else:
         heroID = 0
         skinID = 0
-        skillIDList = [] + npcData.GetSkillIDList()
+        skillIDList = []# + npcData.GetSkillIDList()
         
     # boss额外随机技能
     bossID = lineupIpyData.GetBossID()
@@ -664,7 +664,7 @@
     angerSkillID = heroIpyData.GetAngerSkillID()
     skillIDList = [normalSkillID, angerSkillID]
     
-    breakIpyDataList = IpyGameDataPY.GetIpyGameDataList("HeroBreak", heroID)
+    breakIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("HeroBreak", heroID)
     if breakIpyDataList:
         for breakIpyData in breakIpyDataList:
             if breakIpyData.GetBreakLV() > breakLV:
@@ -740,11 +740,12 @@
         heroID = heroInfo.get("HeroID", 0)
         skinID = heroInfo.get("SkinID", 0)
         lv = heroInfo.get("LV", 1)
+        specialty, atkDistType, country, sex = 0, 1, 0, 1
         heroIpyData = IpyGameDataPY.GetIpyGameData("Hero", heroID) if heroID else None
         if heroIpyData:
+            objName = heroIpyData.GetName()
             specialty = heroIpyData.GetSpecialty()
             atkDistType = heroIpyData.GetAtkDistType()
-            objName = heroIpyData.GetName()
             country = heroIpyData.GetCountry()
             sex = heroIpyData.GetSex()
             
@@ -758,11 +759,7 @@
             if not npcDataEx:
                 continue
             if not heroIpyData:
-                specialty = npcDataEx.GetSpecialty()
-                atkDistType = npcDataEx.GetAtkDistType()
                 objName = npcDataEx.GetNPCName()
-                country = npcDataEx.GetCountry()
-                sex = npcDataEx.GetSex()
                 
         batObj = batObjMgr.addBatObj()
         if not batObj:

--
Gitblit v1.8.0