From efc4f490488935020d1b58a451a396ee420de9da Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 06 八月 2025 18:21:05 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(NPC、技能使用新表N.NPC表卡牌、J.技能表卡牌;重构战斗系统;优化战利品掉落;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |  231 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 150 insertions(+), 81 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index e39ca0d..dff0eec 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -56,8 +56,64 @@
                         ("BYTE", "OPLimitInAct", 0),
                         ),
 
+                "NPC":(
+                        ("DWORD", "NPCID", 1),
+                        ("char", "NPCName", 0),
+                        ("BYTE", "Country", 0),
+                        ("BYTE", "AtkDistType", 0),
+                        ("WORD", "LV", 0),
+                        ("DWORD", "Atk", 0),
+                        ("DWORD", "Def", 0),
+                        ("DWORD", "MaxHP", 0),
+                        ("list", "SkillIDList", 0),
+                        ("DWORD", "FinalDamPer", 0),
+                        ("DWORD", "FinalDamPerDef", 0),
+                        ("DWORD", "MissRate", 0),
+                        ("DWORD", "MissRateDef", 0),
+                        ("DWORD", "SuperHitRate", 0),
+                        ("DWORD", "SuperHitRateDef", 0),
+                        ("DWORD", "StunRate", 0),
+                        ("DWORD", "StunRateDef", 0),
+                        ("DWORD", "ComboRate", 0),
+                        ("DWORD", "ComboRateDef", 0),
+                        ("DWORD", "ParryRate", 0),
+                        ("DWORD", "ParryRateDef", 0),
+                        ("DWORD", "SuckHPPer", 0),
+                        ("DWORD", "SuckHPPerDef", 0),
+                        ("dict", "SpecAttrInfo", 0),
+                        ),
+
+                "Skill":(
+                        ("DWORD", "SkillID", 1),
+                        ("DWORD", "SkillTypeID", 0),
+                        ("WORD", "SkillMaxLV", 0),
+                        ("char", "SkillName", 0),
+                        ("BYTE", "FuncType", 0),
+                        ("BYTE", "SkillType", 0),
+                        ("BYTE", "HurtType", 0),
+                        ("BYTE", "AtkType", 0),
+                        ("BYTE", "TagAim", 0),
+                        ("BYTE", "TagFriendly", 0),
+                        ("BYTE", "TagAffect", 0),
+                        ("BYTE", "TagCount", 0),
+                        ("WORD", "HappenRate", 0),
+                        ("WORD", "LastTime", 0),
+                        ("WORD", "CoolDownTime", 0),
+                        ("WORD", "Priority", 0),
+                        ("DWORD", "EffectID1", 0),
+                        ("list", "EffectValues1", 0),
+                        ("DWORD", "EffectID2", 0),
+                        ("list", "EffectValues2", 0),
+                        ("DWORD", "EffectID3", 0),
+                        ("list", "EffectValues3", 0),
+                        ("DWORD", "ConnSkill", 0),
+                        ("list", "EnhanceSkillList", 0),
+                        ("DWORD", "FightPower", 0),
+                        ),
+
                 "Hero":(
                         ("DWORD", "HeroID", 1),
+                        ("char", "Name", 0),
                         ("BYTE", "Country", 0),
                         ("BYTE", "Quality", 0),
                         ("BYTE", "AtkDistType", 0),
@@ -161,7 +217,6 @@
                 "MainChapter":(
                         ("BYTE", "ChapterID", 1),
                         ("list", "DailyBootyUpperList", 0),
-                        ("list", "BootyWeightList", 0),
                         ),
 
                 "MainLevel":(
@@ -730,33 +785,6 @@
                         ("float", "AttrPer", 0),
                         ("dict", "AttrSpecDict", 0),
                         ("dict", "AttrExDict", 0),
-                        ),
-
-                "NPCEx":(
-                        ("DWORD", "NPCID", 1),
-                        ("BYTE", "FightPowerLackAtkLimit", 0),
-                        ("DWORD", "SuppressFightPower", 0),
-                        ("BYTE", "AtkDistType", 0),
-                        ("DWORD", "Atk", 0),
-                        ("DWORD", "Def", 0),
-                        ("DWORD", "MaxHP", 0),
-                        ("list", "SkillIDList", 0),
-                        ("DWORD", "FinalHurtPer", 0),
-                        ("DWORD", "FinalHurtReducePer", 0),
-                        ("DWORD", "MissRate", 0),
-                        ("DWORD", "MissDefRate", 0),
-                        ("DWORD", "SuperHitRate", 0),
-                        ("DWORD", "SuperHitRateReduce", 0),
-                        ("DWORD", "FaintRate", 0),
-                        ("DWORD", "FaintDefRate", 0),
-                        ("DWORD", "ComboRate", 0),
-                        ("DWORD", "ComboDefRate", 0),
-                        ("DWORD", "ParryRate", 0),
-                        ("DWORD", "ParryDefRate", 0),
-                        ("DWORD", "ParryDamPer", 0),
-                        ("DWORD", "SuckHPPer", 0),
-                        ("DWORD", "SuckHPDefPer", 0),
-                        ("dict", "SpecAttrInfo", 0),
                         ),
 
                 "NPCRealmStrengthen":(
@@ -2840,6 +2868,71 @@
     def GetSortReverse(self): return self.attrTuple[6] # 是否倒序 BYTE
     def GetOPLimitInAct(self): return self.attrTuple[7] # 活动期间限制队伍操作 BYTE
 
+# NPC表
+class IPY_NPC():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetNPCID(self): return self.attrTuple[0] # NPCID DWORD
+    def GetNPCName(self): return self.attrTuple[1] # 名称 char
+    def GetCountry(self): return self.attrTuple[2] # 国家 BYTE
+    def GetAtkDistType(self): return self.attrTuple[3] # 远近类型;1-近战;2-远程 BYTE
+    def GetLV(self): return self.attrTuple[4] # 等级 WORD
+    def GetAtk(self): return self.attrTuple[5] # 攻击力 DWORD
+    def GetDef(self): return self.attrTuple[6] # 防御值 DWORD
+    def GetMaxHP(self): return self.attrTuple[7] # 最大生命值,可超过20E DWORD
+    def GetSkillIDList(self): return self.attrTuple[8] # 技能ID列表 list
+    def GetFinalDamPer(self): return self.attrTuple[9] # 最终增伤 DWORD
+    def GetFinalDamPerDef(self): return self.attrTuple[10] # 最终减伤 DWORD
+    def GetMissRate(self): return self.attrTuple[11] # 闪避概率 DWORD
+    def GetMissRateDef(self): return self.attrTuple[12] # 抗闪避概率 DWORD
+    def GetSuperHitRate(self): return self.attrTuple[13] # 暴击概率 DWORD
+    def GetSuperHitRateDef(self): return self.attrTuple[14] # 抗暴击概率 DWORD
+    def GetStunRate(self): return self.attrTuple[15] # 击晕概率 DWORD
+    def GetStunRateDef(self): return self.attrTuple[16] # 抗击晕概率 DWORD
+    def GetComboRate(self): return self.attrTuple[17] # 连击概率 DWORD
+    def GetComboRateDef(self): return self.attrTuple[18] # 抗连击概率 DWORD
+    def GetParryRate(self): return self.attrTuple[19] # 格挡概率 DWORD
+    def GetParryRateDef(self): return self.attrTuple[20] # 抗格挡概率 DWORD
+    def GetSuckHPPer(self): return self.attrTuple[21] # 吸血比率 DWORD
+    def GetSuckHPPerDef(self): return self.attrTuple[22] # 抗吸血比率 DWORD
+    def GetSpecAttrInfo(self): return self.attrTuple[23] # 特殊属性信息 {"属性ID":值, ...} dict
+
+# 技能表
+class IPY_Skill():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetSkillID(self): return self.attrTuple[0] # 技能ID DWORD
+    def GetSkillTypeID(self): return self.attrTuple[1] # 技能TypeID DWORD
+    def GetSkillMaxLV(self): return self.attrTuple[2] # 最高等级 WORD
+    def GetSkillName(self): return self.attrTuple[3] # 技能名 char
+    def GetFuncType(self): return self.attrTuple[4] # 功能分类 BYTE
+    def GetSkillType(self): return self.attrTuple[5] # 技能类型 BYTE
+    def GetHurtType(self): return self.attrTuple[6] # 伤害类型 BYTE
+    def GetAtkType(self): return self.attrTuple[7] # 释放方式 BYTE
+    def GetTagAim(self): return self.attrTuple[8] # 瞄准位置 BYTE
+    def GetTagFriendly(self): return self.attrTuple[9] # 敌我目标 BYTE
+    def GetTagAffect(self): return self.attrTuple[10] # 目标细分 BYTE
+    def GetTagCount(self): return self.attrTuple[11] # 目标个数 BYTE
+    def GetHappenRate(self): return self.attrTuple[12] # 释放或添加几率 WORD
+    def GetLastTime(self): return self.attrTuple[13] # 持续时间 WORD
+    def GetCoolDownTime(self): return self.attrTuple[14] # 冷却时间 WORD
+    def GetPriority(self): return self.attrTuple[15] # 优先级 WORD
+    def GetEffectID1(self): return self.attrTuple[16] # 效果ID1 DWORD
+    def GetEffectValues1(self): return self.attrTuple[17] # 效果值列表1 list
+    def GetEffectID2(self): return self.attrTuple[18] # 效果ID2 DWORD
+    def GetEffectValues2(self): return self.attrTuple[19] # 效果值列表2 list
+    def GetEffectID3(self): return self.attrTuple[20] # 效果ID3 DWORD
+    def GetEffectValues3(self): return self.attrTuple[21] # 效果值列表3 list
+    def GetConnSkill(self): return self.attrTuple[22] # 关联技能 DWORD
+    def GetEnhanceSkillList(self): return self.attrTuple[23] # 触发技能ID列表 list
+    def GetFightPower(self): return self.attrTuple[24] # 技能战斗力 DWORD
+
 # 武将表
 class IPY_Hero():
     
@@ -2848,17 +2941,18 @@
         return
         
     def GetHeroID(self): return self.attrTuple[0] # 英雄ID DWORD
-    def GetCountry(self): return self.attrTuple[1] #  国家 BYTE
-    def GetQuality(self): return self.attrTuple[2] #  品质 BYTE
-    def GetAtkDistType(self): return self.attrTuple[3] # 远近类型;1-近战;2-远程 BYTE
-    def GetSkinIDList(self): return self.attrTuple[4] #  皮肤ID列表 list
-    def GetNormalSkillID(self): return self.attrTuple[5] # 普攻技能ID DWORD
-    def GetAngerSkillID(self): return self.attrTuple[6] # 怒气技能ID DWORD
-    def GetAtkInheritPer(self): return self.attrTuple[7] # 攻击继承 WORD
-    def GetDefInheritPer(self): return self.attrTuple[8] # 防御继承 WORD
-    def GetHPInheritPer(self): return self.attrTuple[9] # 生命继承 WORD
-    def GetBatAttrDict(self): return self.attrTuple[10] # 其他战斗属性字典 {"属性ID":值, ...} dict
-    def GetFetterIDList(self): return self.attrTuple[11] # 羁绊ID列表 list
+    def GetName(self): return self.attrTuple[1] # 名称 char
+    def GetCountry(self): return self.attrTuple[2] #  国家 BYTE
+    def GetQuality(self): return self.attrTuple[3] #  品质 BYTE
+    def GetAtkDistType(self): return self.attrTuple[4] # 远近类型;1-近战;2-远程 BYTE
+    def GetSkinIDList(self): return self.attrTuple[5] #  皮肤ID列表 list
+    def GetNormalSkillID(self): return self.attrTuple[6] # 普攻技能ID DWORD
+    def GetAngerSkillID(self): return self.attrTuple[7] # 怒气技能ID DWORD
+    def GetAtkInheritPer(self): return self.attrTuple[8] # 攻击继承 WORD
+    def GetDefInheritPer(self): return self.attrTuple[9] # 防御继承 WORD
+    def GetHPInheritPer(self): return self.attrTuple[10] # 生命继承 WORD
+    def GetBatAttrDict(self): return self.attrTuple[11] # 其他战斗属性字典 {"属性ID":值, ...} dict
+    def GetFetterIDList(self): return self.attrTuple[12] # 羁绊ID列表 list
 
 # 武将星级天赋表
 class IPY_HeroTalent():
@@ -3010,8 +3104,7 @@
         return
         
     def GetChapterID(self): return self.attrTuple[0] # 章节ID BYTE
-    def GetDailyBootyUpperList(self): return self.attrTuple[1] #  每日战利品掉落上限,[[物品ID,每日上限], ...] list
-    def GetBootyWeightList(self): return self.attrTuple[2] #  战利品掉落权重,[[权重,物品ID,掉落个数下限, 上限], ...] list
+    def GetDailyBootyUpperList(self): return self.attrTuple[1] #  每日战利品掉落上限,[[物品ID,每日上限], ...] list
 
 # 主线关卡表
 class IPY_MainLevel():
@@ -3890,38 +3983,6 @@
     def GetAttrPer(self): return self.attrTuple[5] # 对应等级表中的比例 float
     def GetAttrSpecDict(self): return self.attrTuple[6] # 特殊属性值字典 {attrKey:value, ...} dict
     def GetAttrExDict(self): return self.attrTuple[7] # 特殊属性值字典 {attrKey:value, ...} dict
-
-# NPC表扩展
-class IPY_NPCEx():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetNPCID(self): return self.attrTuple[0] # NPCID DWORD
-    def GetFightPowerLackAtkLimit(self): return self.attrTuple[1] # 战力不足限制攻击 BYTE
-    def GetSuppressFightPower(self): return self.attrTuple[2] # 推荐/压制战力 DWORD
-    def GetAtkDistType(self): return self.attrTuple[3] # 远近类型;1-近战;2-远程 BYTE
-    def GetAtk(self): return self.attrTuple[4] # 攻击力 DWORD
-    def GetDef(self): return self.attrTuple[5] # 防御值 DWORD
-    def GetMaxHP(self): return self.attrTuple[6] # 最大生命值,可超过20E DWORD
-    def GetSkillIDList(self): return self.attrTuple[7] # 技能ID列表 list
-    def GetFinalHurtPer(self): return self.attrTuple[8] # 最终增伤 DWORD
-    def GetFinalHurtReducePer(self): return self.attrTuple[9] # 最终减伤 DWORD
-    def GetMissRate(self): return self.attrTuple[10] # 闪避概率 DWORD
-    def GetMissDefRate(self): return self.attrTuple[11] # 抗闪避概率 DWORD
-    def GetSuperHitRate(self): return self.attrTuple[12] # 暴击概率 DWORD
-    def GetSuperHitRateReduce(self): return self.attrTuple[13] # 抗暴击概率 DWORD
-    def GetFaintRate(self): return self.attrTuple[14] # 击晕概率 DWORD
-    def GetFaintDefRate(self): return self.attrTuple[15] # 抗击晕概率 DWORD
-    def GetComboRate(self): return self.attrTuple[16] # 连击概率 DWORD
-    def GetComboDefRate(self): return self.attrTuple[17] # 抗连击概率 DWORD
-    def GetParryRate(self): return self.attrTuple[18] # 格挡概率 DWORD
-    def GetParryDefRate(self): return self.attrTuple[19] # 抗格挡概率 DWORD
-    def GetParryDamPer(self): return self.attrTuple[20] # 格挡减伤比率 DWORD
-    def GetSuckHPPer(self): return self.attrTuple[21] # 吸血比率 DWORD
-    def GetSuckHPDefPer(self): return self.attrTuple[22] # 抗吸血比率 DWORD
-    def GetSpecAttrInfo(self): return self.attrTuple[23] # 特殊属性信息 {"属性ID":值, ...} dict
 
 # 成长型境界怪物表
 class IPY_NPCRealmStrengthen():
@@ -7084,6 +7145,8 @@
         self.__LoadFileData("DirtyList", onlyCheck)
         self.__LoadFileData("DirtyName", onlyCheck)
         self.__LoadFileData("FuncTeamSet", onlyCheck)
+        self.__LoadFileData("NPC", onlyCheck)
+        self.__LoadFileData("Skill", onlyCheck)
         self.__LoadFileData("Hero", onlyCheck)
         self.__LoadFileData("HeroTalent", onlyCheck)
         self.__LoadFileData("HeroBreak", onlyCheck)
@@ -7159,7 +7222,6 @@
         self.__LoadFileData("PlayerLV", onlyCheck)
         self.__LoadFileData("SpecMapPlayerAttrFormat", onlyCheck)
         self.__LoadFileData("GMAttr", onlyCheck)
-        self.__LoadFileData("NPCEx", onlyCheck)
         self.__LoadFileData("NPCRealmStrengthen", onlyCheck)
         self.__LoadFileData("NPCStrengthen", onlyCheck)
         self.__LoadFileData("NPCTimeLostHP", onlyCheck)
@@ -7603,6 +7665,20 @@
     def GetFuncTeamSetByIndex(self, index):
         self.CheckLoadData("FuncTeamSet")
         return self.ipyFuncTeamSetCache[index]
+
+    def GetNPCCount(self):
+        self.CheckLoadData("NPC")
+        return self.ipyNPCLen
+    def GetNPCByIndex(self, index):
+        self.CheckLoadData("NPC")
+        return self.ipyNPCCache[index]
+
+    def GetSkillCount(self):
+        self.CheckLoadData("Skill")
+        return self.ipySkillLen
+    def GetSkillByIndex(self, index):
+        self.CheckLoadData("Skill")
+        return self.ipySkillCache[index]
 
     def GetHeroCount(self):
         self.CheckLoadData("Hero")
@@ -8128,13 +8204,6 @@
     def GetGMAttrByIndex(self, index):
         self.CheckLoadData("GMAttr")
         return self.ipyGMAttrCache[index]
-
-    def GetNPCExCount(self):
-        self.CheckLoadData("NPCEx")
-        return self.ipyNPCExLen
-    def GetNPCExByIndex(self, index):
-        self.CheckLoadData("NPCEx")
-        return self.ipyNPCExCache[index]
 
     def GetNPCRealmStrengthenCount(self):
         self.CheckLoadData("NPCRealmStrengthen")

--
Gitblit v1.8.0