From fbf3fe5655d97c67db3bf07706ab5af232dcc9a5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 18 九月 2025 19:17:48 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(甘夫人技能;增加连击、追击增伤减伤属性;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |  200 +++++++++++++++++++++++++++++---------------------
 1 files changed, 116 insertions(+), 84 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 778bbbf..c93bd71 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -60,14 +60,11 @@
                         ("DWORD", "NPCID", 1),
                         ("char", "NPCName", 0),
                         ("DWORD", "RelatedHeroID", 0),
-                        ("BYTE", "Country", 0),
-                        ("BYTE", "AtkDistType", 0),
-                        ("BYTE", "Sex", 0),
                         ("WORD", "LV", 0),
+                        ("BYTE", "BossType", 0),
                         ("DWORD", "Atk", 0),
                         ("DWORD", "Def", 0),
                         ("DWORD", "MaxHP", 0),
-                        ("list", "SkillIDList", 0),
                         ("DWORD", "FinalDamPer", 0),
                         ("DWORD", "FinalDamPerDef", 0),
                         ("DWORD", "MissRate", 0),
@@ -121,6 +118,7 @@
                         ("BYTE", "CalcType", 0),
                         ("WORD", "SkillPer", 0),
                         ("DWORD", "SkillValue", 0),
+                        ("DWORD", "HurtAtkPerMax", 0),
                         ("WORD", "HappenRate", 0),
                         ("DWORD", "EffectID1", 0),
                         ("list", "EffectValues1", 0),
@@ -149,6 +147,7 @@
                 "Hero":(
                         ("DWORD", "HeroID", 1),
                         ("char", "Name", 0),
+                        ("BYTE", "PlayerCanUse", 0),
                         ("BYTE", "Country", 0),
                         ("BYTE", "Quality", 0),
                         ("BYTE", "AtkDistType", 0),
@@ -161,6 +160,8 @@
                         ("WORD", "HPInheritPer", 0),
                         ("dict", "BatAttrDict", 0),
                         ("list", "FetterIDList", 0),
+                        ("BYTE", "RecruitBySelf", 0),
+                        ("BYTE", "Specialty", 0),
                         ),
 
                 "HeroTalent":(
@@ -544,7 +545,6 @@
 
                 "EquipColor":(
                         ("BYTE", "ItemColor", 1),
-                        ("DWORD", "MoneyBase", 0),
                         ("DWORD", "AtkStep", 0),
                         ("DWORD", "DefStep", 0),
                         ("DWORD", "HPStep", 0),
@@ -1543,7 +1543,6 @@
                         ("list", "CostMoneyList", 0),
                         ("WORD", "EnsureCount", 0),
                         ("BYTE", "OnceLucky", 0),
-                        ("WORD", "FullLucky", 0),
                         ("char", "LuckyRateFormat", 0),
                         ("BYTE", "LuckyGridNum", 0),
                         ("dict", "GridNumMaxLimitInfo", 0),
@@ -1563,7 +1562,7 @@
                         ("list", "GridItemRateList1", 0),
                         ("list", "GridItemRateList2", 0),
                         ("dict", "GridItemRateList3", 0),
-                        ("list", "LuckyItemRateList", 0),
+                        ("dict", "LuckyItemRateInfo", 0),
                         ),
 
                 "TreasureItemLib":(
@@ -2540,6 +2539,8 @@
                         ("DWORD", "LVUPNeedMoney", 0),
                         ("DWORD", "LVUPNeedTime", 0),
                         ("list", "EquipColorRateList", 0),
+                        ("list", "EquipColorRateList1", 0),
+                        ("list", "EquipColorRateList2", 0),
                         ),
 
                 "GoldRushCamp":(
@@ -2562,6 +2563,11 @@
                         ("DWORD", "RefreshWeight", 0),
                         ("BYTE", "WorkerMax", 0),
                         ("BYTE", "NeedSeconds", 0),
+                        ),
+
+                "Robot":(
+                        ("DWORD", "ID", 1),
+                        ("char", "ViewCache", 0),
                         ),
                 }
 
@@ -2612,29 +2618,26 @@
     def GetNPCID(self): return self.attrTuple[0] # NPCID DWORD
     def GetNPCName(self): return self.attrTuple[1] # 名称 char
     def GetRelatedHeroID(self): return self.attrTuple[2] # 关联武将ID DWORD
-    def GetCountry(self): return self.attrTuple[3] # 国家 BYTE
-    def GetAtkDistType(self): return self.attrTuple[4] # 远近类型;1-近战;2-远程 BYTE
-    def GetSex(self): return self.attrTuple[5] # 性别;1-男,2-女 BYTE
-    def GetLV(self): return self.attrTuple[6] # 等级 WORD
-    def GetAtk(self): return self.attrTuple[7] # 攻击力 DWORD
-    def GetDef(self): return self.attrTuple[8] # 防御值 DWORD
-    def GetMaxHP(self): return self.attrTuple[9] # 最大生命值,可超过20E DWORD
-    def GetSkillIDList(self): return self.attrTuple[10] # 技能ID列表 list
-    def GetFinalDamPer(self): return self.attrTuple[11] # 最终增伤 DWORD
-    def GetFinalDamPerDef(self): return self.attrTuple[12] # 最终减伤 DWORD
-    def GetMissRate(self): return self.attrTuple[13] # 闪避概率 DWORD
-    def GetMissRateDef(self): return self.attrTuple[14] # 抗闪避概率 DWORD
-    def GetSuperHitRate(self): return self.attrTuple[15] # 暴击概率 DWORD
-    def GetSuperHitRateDef(self): return self.attrTuple[16] # 抗暴击概率 DWORD
-    def GetStunRate(self): return self.attrTuple[17] # 击晕概率 DWORD
-    def GetStunRateDef(self): return self.attrTuple[18] # 抗击晕概率 DWORD
-    def GetComboRate(self): return self.attrTuple[19] # 连击概率 DWORD
-    def GetComboRateDef(self): return self.attrTuple[20] # 抗连击概率 DWORD
-    def GetParryRate(self): return self.attrTuple[21] # 格挡概率 DWORD
-    def GetParryRateDef(self): return self.attrTuple[22] # 抗格挡概率 DWORD
-    def GetSuckHPPer(self): return self.attrTuple[23] # 吸血比率 DWORD
-    def GetSuckHPPerDef(self): return self.attrTuple[24] # 抗吸血比率 DWORD
-    def GetSpecAttrInfo(self): return self.attrTuple[25] # 特殊属性信息 {"属性ID":值, ...} dict
+    def GetLV(self): return self.attrTuple[3] # 等级 WORD
+    def GetBossType(self): return self.attrTuple[4] # Boss类型 BYTE
+    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 GetFinalDamPer(self): return self.attrTuple[8] # 最终增伤 DWORD
+    def GetFinalDamPerDef(self): return self.attrTuple[9] # 最终减伤 DWORD
+    def GetMissRate(self): return self.attrTuple[10] # 闪避概率 DWORD
+    def GetMissRateDef(self): return self.attrTuple[11] # 抗闪避概率 DWORD
+    def GetSuperHitRate(self): return self.attrTuple[12] # 暴击概率 DWORD
+    def GetSuperHitRateDef(self): return self.attrTuple[13] # 抗暴击概率 DWORD
+    def GetStunRate(self): return self.attrTuple[14] # 击晕概率 DWORD
+    def GetStunRateDef(self): return self.attrTuple[15] # 抗击晕概率 DWORD
+    def GetComboRate(self): return self.attrTuple[16] # 连击概率 DWORD
+    def GetComboRateDef(self): return self.attrTuple[17] # 抗连击概率 DWORD
+    def GetParryRate(self): return self.attrTuple[18] # 格挡概率 DWORD
+    def GetParryRateDef(self): return self.attrTuple[19] # 抗格挡概率 DWORD
+    def GetSuckHPPer(self): return self.attrTuple[20] # 吸血比率 DWORD
+    def GetSuckHPPerDef(self): return self.attrTuple[21] # 抗吸血比率 DWORD
+    def GetSpecAttrInfo(self): return self.attrTuple[22] # 特殊属性信息 {"属性ID":值, ...} dict
 
 # NPC成长表
 class IPY_NPCStronger():
@@ -2683,29 +2686,30 @@
     def GetCalcType(self): return self.attrTuple[13] # 计算方式 BYTE
     def GetSkillPer(self): return self.attrTuple[14] # 技能万分比 WORD
     def GetSkillValue(self): return self.attrTuple[15] # 技能固定值 DWORD
-    def GetHappenRate(self): return self.attrTuple[16] # 释放或添加几率 WORD
-    def GetEffectID1(self): return self.attrTuple[17] # 效果ID1 DWORD
-    def GetEffectValues1(self): return self.attrTuple[18] # 效果值列表1 list
-    def GetTriggerWay1(self): return self.attrTuple[19] # 触发方式 BYTE
-    def GetTriggerSrc1(self): return self.attrTuple[20] # 有效来源 BYTE
-    def GetEffectID2(self): return self.attrTuple[21] # 效果ID2 DWORD
-    def GetEffectValues2(self): return self.attrTuple[22] # 效果值列表2 list
-    def GetTriggerWay2(self): return self.attrTuple[23] # 触发方式 BYTE
-    def GetTriggerSrc2(self): return self.attrTuple[24] # 有效来源 BYTE
-    def GetEffectID3(self): return self.attrTuple[25] # 效果ID3 DWORD
-    def GetEffectValues3(self): return self.attrTuple[26] # 效果值列表3 list
-    def GetTriggerWay3(self): return self.attrTuple[27] # 触发方式 BYTE
-    def GetTriggerSrc3(self): return self.attrTuple[28] # 有效来源 BYTE
-    def GetCoolDownTime(self): return self.attrTuple[29] # 技能冷却时间 WORD
-    def GetIgnoreStates(self): return self.attrTuple[30] # 无视限制列表 list
-    def GetCurBuffState(self): return self.attrTuple[31] # Buff状态值 BYTE
-    def GetLastTime(self): return self.attrTuple[32] # 持续时间 WORD
-    def GetLayerCnt(self): return self.attrTuple[33] # Buff层数 BYTE
-    def GetLayerMax(self): return self.attrTuple[34] # 最大层数 BYTE
-    def GetBuffRepeat(self): return self.attrTuple[35] # Buff叠加规则 DWORD
-    def GetDieContinue(self): return self.attrTuple[36] # Buff死亡存在 DWORD
-    def GetFightPower(self): return self.attrTuple[37] # 技能战斗力 DWORD
-    def GetSkillMotionName(self): return self.attrTuple[38] # 技能动作名 char
+    def GetHurtAtkPerMax(self): return self.attrTuple[16] # 最大万分比,限制最终伤害不超过攻击力万分率 DWORD
+    def GetHappenRate(self): return self.attrTuple[17] # 释放或添加几率 WORD
+    def GetEffectID1(self): return self.attrTuple[18] # 效果ID1 DWORD
+    def GetEffectValues1(self): return self.attrTuple[19] # 效果值列表1 list
+    def GetTriggerWay1(self): return self.attrTuple[20] # 触发方式 BYTE
+    def GetTriggerSrc1(self): return self.attrTuple[21] # 有效来源 BYTE
+    def GetEffectID2(self): return self.attrTuple[22] # 效果ID2 DWORD
+    def GetEffectValues2(self): return self.attrTuple[23] # 效果值列表2 list
+    def GetTriggerWay2(self): return self.attrTuple[24] # 触发方式 BYTE
+    def GetTriggerSrc2(self): return self.attrTuple[25] # 有效来源 BYTE
+    def GetEffectID3(self): return self.attrTuple[26] # 效果ID3 DWORD
+    def GetEffectValues3(self): return self.attrTuple[27] # 效果值列表3 list
+    def GetTriggerWay3(self): return self.attrTuple[28] # 触发方式 BYTE
+    def GetTriggerSrc3(self): return self.attrTuple[29] # 有效来源 BYTE
+    def GetCoolDownTime(self): return self.attrTuple[30] # 技能冷却时间 WORD
+    def GetIgnoreStates(self): return self.attrTuple[31] # 无视限制列表 list
+    def GetCurBuffState(self): return self.attrTuple[32] # Buff状态值 BYTE
+    def GetLastTime(self): return self.attrTuple[33] # 持续时间 WORD
+    def GetLayerCnt(self): return self.attrTuple[34] # Buff层数 BYTE
+    def GetLayerMax(self): return self.attrTuple[35] # 最大层数 BYTE
+    def GetBuffRepeat(self): return self.attrTuple[36] # Buff叠加规则 DWORD
+    def GetDieContinue(self): return self.attrTuple[37] # Buff死亡存在 DWORD
+    def GetFightPower(self): return self.attrTuple[38] # 技能战斗力 DWORD
+    def GetSkillMotionName(self): return self.attrTuple[39] # 技能动作名 char
 
 # 武将表
 class IPY_Hero():
@@ -2716,18 +2720,21 @@
         
     def GetHeroID(self): return self.attrTuple[0] # 英雄ID DWORD
     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 GetSex(self): return self.attrTuple[5] # 性别;1-男,2-女 BYTE
-    def GetSkinIDList(self): return self.attrTuple[6] #  皮肤ID列表 list
-    def GetNormalSkillID(self): return self.attrTuple[7] # 普攻技能ID DWORD
-    def GetAngerSkillID(self): return self.attrTuple[8] # 怒气技能ID DWORD
-    def GetAtkInheritPer(self): return self.attrTuple[9] # 攻击继承 WORD
-    def GetDefInheritPer(self): return self.attrTuple[10] # 防御继承 WORD
-    def GetHPInheritPer(self): return self.attrTuple[11] # 生命继承 WORD
-    def GetBatAttrDict(self): return self.attrTuple[12] # 其他战斗属性字典 {"属性ID":值, ...} dict
-    def GetFetterIDList(self): return self.attrTuple[13] # 羁绊ID列表 list
+    def GetPlayerCanUse(self): return self.attrTuple[2] # 玩家可用 BYTE
+    def GetCountry(self): return self.attrTuple[3] #  国家 BYTE
+    def GetQuality(self): return self.attrTuple[4] #  品质 BYTE
+    def GetAtkDistType(self): return self.attrTuple[5] # 远近类型;1-近战;2-远程 BYTE
+    def GetSex(self): return self.attrTuple[6] # 性别;1-男,2-女 BYTE
+    def GetSkinIDList(self): return self.attrTuple[7] #  皮肤ID列表 list
+    def GetNormalSkillID(self): return self.attrTuple[8] # 普攻技能ID DWORD
+    def GetAngerSkillID(self): return self.attrTuple[9] # 怒气技能ID DWORD
+    def GetAtkInheritPer(self): return self.attrTuple[10] # 攻击继承 WORD
+    def GetDefInheritPer(self): return self.attrTuple[11] # 防御继承 WORD
+    def GetHPInheritPer(self): return self.attrTuple[12] # 生命继承 WORD
+    def GetBatAttrDict(self): return self.attrTuple[13] # 其他战斗属性字典 {"属性ID":值, ...} dict
+    def GetFetterIDList(self): return self.attrTuple[14] # 羁绊ID列表 list
+    def GetRecruitBySelf(self): return self.attrTuple[15] #  招募需要本体 BYTE
+    def GetSpecialty(self): return self.attrTuple[16] #  武将特长 BYTE
 
 # 武将星级天赋表
 class IPY_HeroTalent():
@@ -3311,13 +3318,12 @@
         return
         
     def GetItemColor(self): return self.attrTuple[0] # 装备品质 BYTE
-    def GetMoneyBase(self): return self.attrTuple[1] # 分解货币 DWORD
-    def GetAtkStep(self): return self.attrTuple[2] # 攻击步长 DWORD
-    def GetDefStep(self): return self.attrTuple[3] # 防御步长 DWORD
-    def GetHPStep(self): return self.attrTuple[4] # 生命步长 DWORD
-    def GetAttrLibCntList(self): return self.attrTuple[5] # 库属性条数列表 list
-    def GetAttrRange(self): return self.attrTuple[6] # 通用属性范围,下限|上限 list
-    def GetAttrRangeDict(self): return self.attrTuple[7] # 指定属性范围字典,{指定属性ID:[范围下限, 上限], ...} dict
+    def GetAtkStep(self): return self.attrTuple[1] # 攻击步长 DWORD
+    def GetDefStep(self): return self.attrTuple[2] # 防御步长 DWORD
+    def GetHPStep(self): return self.attrTuple[3] # 生命步长 DWORD
+    def GetAttrLibCntList(self): return self.attrTuple[4] # 库属性条数列表 list
+    def GetAttrRange(self): return self.attrTuple[5] # 通用属性范围,下限|上限 list
+    def GetAttrRangeDict(self): return self.attrTuple[6] # 指定属性范围字典,{指定属性ID:[范围下限, 上限], ...} dict
 
 # 装备部位表
 class IPY_EquipPlace():
@@ -4770,14 +4776,13 @@
     def GetCostMoneyList(self): return self.attrTuple[11] # 消耗货币列表 list
     def GetEnsureCount(self): return self.attrTuple[12] # 每x次必出 WORD
     def GetOnceLucky(self): return self.attrTuple[13] # 单次幸运值 BYTE
-    def GetFullLucky(self): return self.attrTuple[14] # 满幸运值 WORD
-    def GetLuckyRateFormat(self): return self.attrTuple[15] # 幸运格子概率公式 char
-    def GetLuckyGridNum(self): return self.attrTuple[16] # 幸运格子编号 BYTE
-    def GetGridNumMaxLimitInfo(self): return self.attrTuple[17] # 格子最大产出次数限制,{"格子":最大可产出次数, ...} dict
-    def GetNotifyGridNumList(self): return self.attrTuple[18] # 需要额外广播的格子 list
-    def GetNotifyKey(self): return self.attrTuple[19] # 广播key char
-    def GetAwardMoneyType(self): return self.attrTuple[20] # 额外奖励货币类型 BYTE
-    def GetAwardMoneyValue(self): return self.attrTuple[21] # 单次奖励货币数 WORD
+    def GetLuckyRateFormat(self): return self.attrTuple[14] # 幸运格子概率公式 char
+    def GetLuckyGridNum(self): return self.attrTuple[15] # 幸运格子编号 BYTE
+    def GetGridNumMaxLimitInfo(self): return self.attrTuple[16] # 格子最大产出次数限制,{"格子":最大可产出次数, ...} dict
+    def GetNotifyGridNumList(self): return self.attrTuple[17] # 需要额外广播的格子 list
+    def GetNotifyKey(self): return self.attrTuple[18] # 广播key char
+    def GetAwardMoneyType(self): return self.attrTuple[19] # 额外奖励货币类型 BYTE
+    def GetAwardMoneyValue(self): return self.attrTuple[20] # 单次奖励货币数 WORD
 
 # 寻宝产出库表
 class IPY_TreasureHouse():
@@ -4795,7 +4800,7 @@
     def GetGridItemRateList1(self): return self.attrTuple[6] # 常规产出格子编号饼图 [[概率, 格子编号], ...] list
     def GetGridItemRateList2(self): return self.attrTuple[7] # 每满x次保底产出格子编号饼图 [[概率, 格子编号], ...] list
     def GetGridItemRateList3(self): return self.attrTuple[8] # 第x次必出产出格子编号饼图 {次数:[[概率, 格子编号], ...], ...} dict
-    def GetLuckyItemRateList(self): return self.attrTuple[9] # 满幸运产出概率饼图 [[概率, 格子编号], ...] list
+    def GetLuckyItemRateInfo(self): return self.attrTuple[9] # 幸运产出概率饼图 {"幸运值":[[概率, 格子编号], ...], ...} dict
 
 # 寻宝物品库
 class IPY_TreasureItemLib():
@@ -6336,7 +6341,7 @@
     def GetNeedQiyun(self): return self.attrTuple[1] # 所需气运值 DWORD
     def GetAwardItemList(self): return self.attrTuple[2] # 奖励物品列表 list
 
-# 仙树等级表
+# 祝福树
 class IPY_TreeLV():
     
     def __init__(self):
@@ -6346,7 +6351,9 @@
     def GetTreeLV(self): return self.attrTuple[0] # 仙树等级 BYTE
     def GetLVUPNeedMoney(self): return self.attrTuple[1] # 升到下一级所需货币数 DWORD
     def GetLVUPNeedTime(self): return self.attrTuple[2] # 升级下一级所需所需秒 DWORD
-    def GetEquipColorRateList(self): return self.attrTuple[3] # 产出装备品质概率列表,[0品质万分率, 1品质万分率, ...] list
+    def GetEquipColorRateList(self): return self.attrTuple[3] # 小怪产出装备品质概率列表,[0品质万分率, 1品质万分率, ...] list
+    def GetEquipColorRateList1(self): return self.attrTuple[4] # 精英产出装备品质概率列表,[0品质万分率, 1品质万分率, ...] list
+    def GetEquipColorRateList2(self): return self.attrTuple[5] # boss产出装备品质概率列表,[0品质万分率, 1品质万分率, ...] list
 
 # 淘金营地表
 class IPY_GoldRushCamp():
@@ -6384,6 +6391,16 @@
     def GetRefreshWeight(self): return self.attrTuple[4] # 常规刷新权重 DWORD
     def GetWorkerMax(self): return self.attrTuple[5] # 监工上限 BYTE
     def GetNeedSeconds(self): return self.attrTuple[6] # 耗时秒 BYTE
+
+# 机器人
+class IPY_Robot():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetID(self): return self.attrTuple[0] # 机器人ID,同玩家ID DWORD
+    def GetViewCache(self): return self.attrTuple[1] # 机器人缓存 char
 
 
 def Log(msg, playerID=0, par=0):
@@ -6698,6 +6715,7 @@
         self.__LoadFileData("GoldRushCamp", onlyCheck)
         self.__LoadFileData("GoldRushWorker", onlyCheck)
         self.__LoadFileData("GoldRushItem", onlyCheck)
+        self.__LoadFileData("Robot", onlyCheck)
         Log("IPY_DataMgr ReloadOK! onlyCheck=%s" % onlyCheck)
         return
     
@@ -6893,7 +6911,7 @@
     
     def __StrToList(self, strValue):
         setList = []
-        if ("[" in strValue and "]" in strValue) or ("(" in strValue and ")" in strValue):
+        if (strValue.startswith("[") and strValue.endswith("]")) or (strValue.startswith("(") and strValue.endswith(")")):
             setList = eval(strValue)
         elif strValue in ["0", "-", ""]:
             pass
@@ -6903,6 +6921,13 @@
             for value in strValue.split(ChConfig.Def_Str_Montant):
                 if value.isdigit():
                     value = int(value)
+                elif (value.startswith("[") and value.endswith("]")) or (value.startswith("(") and value.endswith(")")):
+                    value = eval(value)
+                else:
+                    try:
+                        value = float(value)
+                    except:
+                        pass
                 setList.append(value)
             if setList:
                 setList = tuple(setList)
@@ -8714,6 +8739,13 @@
     def GetGoldRushItemByIndex(self, index):
         self.CheckLoadData("GoldRushItem")
         return self.ipyGoldRushItemCache[index]
+
+    def GetRobotCount(self):
+        self.CheckLoadData("Robot")
+        return self.ipyRobotLen
+    def GetRobotByIndex(self, index):
+        self.CheckLoadData("Robot")
+        return self.ipyRobotCache[index]
 
 IPYData = IPY_DataMgr()
 def IPY_Data(): return IPYData

--
Gitblit v1.8.0