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 |  849 +++++++++++++++++++-------------------------------------
 1 files changed, 294 insertions(+), 555 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 3dabc17..c93bd71 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -59,13 +59,12 @@
                 "NPC":(
                         ("DWORD", "NPCID", 1),
                         ("char", "NPCName", 0),
-                        ("BYTE", "Country", 0),
-                        ("BYTE", "AtkDistType", 0),
+                        ("DWORD", "RelatedHeroID", 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),
@@ -81,6 +80,25 @@
                         ("DWORD", "SuckHPPer", 0),
                         ("DWORD", "SuckHPPerDef", 0),
                         ("dict", "SpecAttrInfo", 0),
+                        ),
+
+                "NPCStronger":(
+                        ("DWORD", "NPCID", 1),
+                        ("float", "AtkRatio", 0),
+                        ("float", "DefRatio", 0),
+                        ("float", "MaxHPRatio", 0),
+                        ("float", "StunRateRatio", 0),
+                        ("float", "SuperHitRateRatio", 0),
+                        ("float", "ComboRateRatio", 0),
+                        ("float", "MissRateRatio", 0),
+                        ("float", "ParryRateRatio", 0),
+                        ("float", "SuckHPPerRatio", 0),
+                        ("float", "StunRateDefRatio", 0),
+                        ("float", "SuperHitRateDefRatio", 0),
+                        ("float", "ComboRateDefRatio", 0),
+                        ("float", "MissRateDefRatio", 0),
+                        ("float", "ParryRateDefRatio", 0),
+                        ("float", "SuckHPPerDefRatio", 0),
                         ),
 
                 "Skill":(
@@ -100,22 +118,20 @@
                         ("BYTE", "CalcType", 0),
                         ("WORD", "SkillPer", 0),
                         ("DWORD", "SkillValue", 0),
+                        ("DWORD", "HurtAtkPerMax", 0),
                         ("WORD", "HappenRate", 0),
                         ("DWORD", "EffectID1", 0),
                         ("list", "EffectValues1", 0),
                         ("BYTE", "TriggerWay1", 0),
                         ("BYTE", "TriggerSrc1", 0),
-                        ("list", "TriggerParams1", 0),
                         ("DWORD", "EffectID2", 0),
                         ("list", "EffectValues2", 0),
                         ("BYTE", "TriggerWay2", 0),
                         ("BYTE", "TriggerSrc2", 0),
-                        ("list", "TriggerParams2", 0),
                         ("DWORD", "EffectID3", 0),
                         ("list", "EffectValues3", 0),
                         ("BYTE", "TriggerWay3", 0),
                         ("BYTE", "TriggerSrc3", 0),
-                        ("list", "TriggerParams3", 0),
                         ("WORD", "CoolDownTime", 0),
                         ("list", "IgnoreStates", 0),
                         ("BYTE", "CurBuffState", 0),
@@ -124,7 +140,6 @@
                         ("BYTE", "LayerMax", 0),
                         ("DWORD", "BuffRepeat", 0),
                         ("DWORD", "DieContinue", 0),
-                        ("list", "EnhanceSkillList", 0),
                         ("DWORD", "FightPower", 0),
                         ("char", "SkillMotionName", 0),
                         ),
@@ -132,9 +147,11 @@
                 "Hero":(
                         ("DWORD", "HeroID", 1),
                         ("char", "Name", 0),
+                        ("BYTE", "PlayerCanUse", 0),
                         ("BYTE", "Country", 0),
                         ("BYTE", "Quality", 0),
                         ("BYTE", "AtkDistType", 0),
+                        ("BYTE", "Sex", 0),
                         ("list", "SkinIDList", 0),
                         ("DWORD", "NormalSkillID", 0),
                         ("DWORD", "AngerSkillID", 0),
@@ -143,6 +160,8 @@
                         ("WORD", "HPInheritPer", 0),
                         ("dict", "BatAttrDict", 0),
                         ("list", "FetterIDList", 0),
+                        ("BYTE", "RecruitBySelf", 0),
+                        ("BYTE", "Specialty", 0),
                         ),
 
                 "HeroTalent":(
@@ -295,6 +314,8 @@
                         ("list", "WaveLineupIDList6", 0),
                         ("list", "BossLineupIDList", 0),
                         ("list", "AwardItemList", 0),
+                        ("WORD", "NPCLV", 0),
+                        ("float", "Difficulty", 0),
                         ),
 
                 "NPCLineup":(
@@ -307,6 +328,8 @@
                         ("DWORD", "PosNPCID6", 0),
                         ("DWORD", "PosNPCID7", 0),
                         ("DWORD", "BossID", 0),
+                        ("list", "SkillIDExList", 0),
+                        ("BYTE", "SkillExCnt", 0),
                         ),
 
                 "Dienstgrad":(
@@ -465,10 +488,8 @@
                 "FuncOpenLV":(
                         ("DWORD", "FuncId", 1),
                         ("DWORD", "LimitLV", 0),
-                        ("DWORD", "LimitMagicWeapon", 0),
                         ("WORD", "LimiRealmLV", 0),
                         ("DWORD", "LimitMissionID", 0),
-                        ("BYTE", "LimitVIPLV", 0),
                         ("char", "MailKey", 0),
                         ),
 
@@ -524,7 +545,6 @@
 
                 "EquipColor":(
                         ("BYTE", "ItemColor", 1),
-                        ("DWORD", "MoneyBase", 0),
                         ("DWORD", "AtkStep", 0),
                         ("DWORD", "DefStep", 0),
                         ("DWORD", "HPStep", 0),
@@ -823,6 +843,23 @@
                         ("DWORD", "MaxHP", 0),
                         ("DWORD", "Atk", 0),
                         ("DWORD", "Def", 0),
+                        ("BYTE", "ReHeroBreakLV", 0),
+                        ("BYTE", "ReHeroAwakeLV", 0),
+                        ("DWORD", "ReAtk", 0),
+                        ("DWORD", "ReDef", 0),
+                        ("DWORD", "ReMaxHP", 0),
+                        ("DWORD", "ReStunRate", 0),
+                        ("DWORD", "ReSuperHitRate", 0),
+                        ("DWORD", "ReComboRate", 0),
+                        ("DWORD", "ReMissRate", 0),
+                        ("DWORD", "ReParryRate", 0),
+                        ("DWORD", "ReSuckHPPer", 0),
+                        ("DWORD", "ReStunRateDef", 0),
+                        ("DWORD", "ReSuperHitRateDef", 0),
+                        ("DWORD", "ReComboRateDef", 0),
+                        ("DWORD", "ReMissRateDef", 0),
+                        ("DWORD", "ReParryRateDef", 0),
+                        ("DWORD", "ReSuckHPPerDef", 0),
                         ),
 
                 "SpecMapPlayerAttrFormat":(
@@ -858,26 +895,6 @@
                         ("DWORD", "MDef", 0),
                         ("DWORD", "FireDef", 0),
                         ("DWORD", "SP", 0),
-                        ),
-
-                "NPCStrengthen":(
-                        ("DWORD", "NPCID", 1),
-                        ("BYTE", "IsStrengthenByPlayerCount", 0),
-                        ("BYTE", "LVStrengthenMark", 0),
-                        ("BYTE", "LVStrengthenType", 0),
-                        ("BYTE", "CmpNPCBaseLV", 0),
-                        ("DWORD", "HitTime", 0),
-                        ("DWORD", "DefCoefficient", 0),
-                        ("DWORD", "AtkCoefficient", 0),
-                        ("DWORD", "AdjustCoefficient", 0),
-                        ("DWORD", "AtkInterval", 0),
-                        ("DWORD", "HitRate", 0),
-                        ("DWORD", "MissRate", 0),
-                        ("DWORD", "MonterNum", 0),
-                        ("DWORD", "IceAtkCoefficient", 0),
-                        ("DWORD", "IceDefCoefficient", 0),
-                        ("DWORD", "MaxEnduranceTime", 0),
-                        ("DWORD", "FightPowerCoefficient", 0),
                         ),
 
                 "NPCTimeLostHP":(
@@ -1526,7 +1543,6 @@
                         ("list", "CostMoneyList", 0),
                         ("WORD", "EnsureCount", 0),
                         ("BYTE", "OnceLucky", 0),
-                        ("WORD", "FullLucky", 0),
                         ("char", "LuckyRateFormat", 0),
                         ("BYTE", "LuckyGridNum", 0),
                         ("dict", "GridNumMaxLimitInfo", 0),
@@ -1546,7 +1562,7 @@
                         ("list", "GridItemRateList1", 0),
                         ("list", "GridItemRateList2", 0),
                         ("dict", "GridItemRateList3", 0),
-                        ("list", "LuckyItemRateList", 0),
+                        ("dict", "LuckyItemRateInfo", 0),
                         ),
 
                 "TreasureItemLib":(
@@ -1690,88 +1706,6 @@
                         ("BYTE", "NeedNotify", 0),
                         ),
 
-                "ActGarbageSorting":(
-                        ("DWORD", "CfgID", 1),
-                        ("char", "StartDate", 0),
-                        ("char", "EndDate", 0),
-                        ("BYTE", "ResetType", 0),
-                        ("WORD", "LVLimit", 0),
-                        ("BYTE", "CTGTypeEffValue", 0),
-                        ),
-
-                "ActGarbageTask":(
-                        ("DWORD", "GarbageTasklD", 1),
-                        ("DWORD", "FinishNeedValue", 0),
-                        ("DWORD", "FinishTimeMax", 0),
-                        ("BYTE", "AutoProduce", 0),
-                        ("list", "ProduceGarbageRateList", 0),
-                        ),
-
-                "ActBossTrial":(
-                        ("DWORD", "CfgID", 1),
-                        ("char", "StartDate", 0),
-                        ("char", "EndDate", 0),
-                        ("char", "JoinStartTime", 0),
-                        ("char", "JoinEndTime", 0),
-                        ("WORD", "LVLimit", 0),
-                        ("BYTE", "IsDayReset", 0),
-                        ("BYTE", "ResetType", 0),
-                        ("dict", "SubmitItemAwardInfo", 0),
-                        ("BYTE", "SubmitAwardResetType", 0),
-                        ("WORD", "ActShopType", 0),
-                        ("list", "TemplateIDList", 0),
-                        ("list", "FamilyTemplateIDList", 0),
-                        ),
-
-                "ActBossTrialTemplate":(
-                        ("DWORD", "TemplateID", 1),
-                        ("BYTE", "Rank", 0),
-                        ("list", "AwardItemList", 0),
-                        ("list", "MemAwardItemList", 0),
-                        ("DWORD", "NeedScore", 0),
-                        ("dict", "ScoreAwardEx", 0),
-                        ),
-
-                "ActHorsePetTrain":(
-                        ("DWORD", "CfgID", 1),
-                        ("char", "StartDate", 0),
-                        ("char", "EndDate", 0),
-                        ("char", "JoinStartTime", 0),
-                        ("char", "JoinEndTime", 0),
-                        ("WORD", "LVLimit", 0),
-                        ("WORD", "ActShopType", 0),
-                        ("WORD", "PersonalTemplateID", 0),
-                        ("BYTE", "IsRelationCrossAct", 0),
-                        ),
-
-                "ActHorsePetTrainBillTemp":(
-                        ("DWORD", "TemplateID", 1),
-                        ("BYTE", "Rank", 0),
-                        ("list", "AwardItemList", 0),
-                        ("DWORD", "NeedScore", 0),
-                        ("dict", "ScoreAwardEx", 0),
-                        ),
-
-                "ActGubao":(
-                        ("DWORD", "CfgID", 1),
-                        ("char", "StartDate", 0),
-                        ("char", "EndDate", 0),
-                        ("char", "JoinStartTime", 0),
-                        ("char", "JoinEndTime", 0),
-                        ("WORD", "LVLimit", 0),
-                        ("WORD", "ActShopType", 0),
-                        ("WORD", "PersonalTemplateID", 0),
-                        ("BYTE", "IsRelationCrossAct", 0),
-                        ),
-
-                "ActGubaoBillTemp":(
-                        ("DWORD", "TemplateID", 1),
-                        ("BYTE", "Rank", 0),
-                        ("list", "AwardItemList", 0),
-                        ("DWORD", "NeedScore", 0),
-                        ("dict", "ScoreAwardEx", 0),
-                        ),
-
                 "ActLianqiBillTemp":(
                         ("DWORD", "TemplateID", 1),
                         ("BYTE", "Rank", 0),
@@ -1788,42 +1722,6 @@
                         ("list", "GridWeightItemList", 0),
                         ("list", "LayerAwardItemList", 0),
                         ("list", "LayerWeightItemList", 0),
-                        ),
-
-                "ActXianXiaMJ":(
-                        ("DWORD", "CfgID", 1),
-                        ("char", "StartDate", 0),
-                        ("char", "EndDate", 0),
-                        ("char", "JoinStartTime", 0),
-                        ("char", "JoinEndTime", 0),
-                        ("BYTE", "IsDayReset", 0),
-                        ("WORD", "LVLimit", 0),
-                        ("DWORD", "UseItemID", 0),
-                        ("list", "UseMoneyInfo", 0),
-                        ("BYTE", "TemplateID", 0),
-                        ("WORD", "PersonalTemplateID", 0),
-                        ("WORD", "LotteryAddScore", 0),
-                        ("WORD", "LayerAddScore", 0),
-                        ("BYTE", "IsRelationCrossAct", 0),
-                        ),
-
-                "ActXianXiaMJBillTemp":(
-                        ("DWORD", "TemplateID", 1),
-                        ("BYTE", "Rank", 0),
-                        ("list", "AwardItemList", 0),
-                        ("DWORD", "NeedScore", 0),
-                        ("dict", "ScoreAwardEx", 0),
-                        ),
-
-                "ActXianXiaMJAward":(
-                        ("DWORD", "TemplateID", 1),
-                        ("BYTE", "AwardLibType", 0),
-                        ("list", "AwardItemCountList", 0),
-                        ("list", "UnlockAwardLimitTimesList", 0),
-                        ("list", "AwardLibWeightList", 0),
-                        ("dict", "LibItemInfo", 0),
-                        ("dict", "ItemLayerLimitInfo", 0),
-                        ("dict", "ItemAwardTimesTotalInfo", 0),
                         ),
 
                 "ActGodGift":(
@@ -1848,15 +1746,6 @@
                         ("BYTE", "ChooseItemCount", 0),
                         ("dict", "LibItemInfo", 0),
                         ("list", "NotifyItemNumList", 0),
-                        ),
-
-                "ActHorsePetFeast":(
-                        ("DWORD", "CfgID", 1),
-                        ("char", "StartDate", 0),
-                        ("char", "EndDate", 0),
-                        ("list", "StartTimeList", 0),
-                        ("list", "EndTimeList", 0),
-                        ("WORD", "LVLimit", 0),
                         ),
 
                 "ActBossReborn":(
@@ -2650,6 +2539,35 @@
                         ("DWORD", "LVUPNeedMoney", 0),
                         ("DWORD", "LVUPNeedTime", 0),
                         ("list", "EquipColorRateList", 0),
+                        ("list", "EquipColorRateList1", 0),
+                        ("list", "EquipColorRateList2", 0),
+                        ),
+
+                "GoldRushCamp":(
+                        ("BYTE", "CampID", 1),
+                        ("WORD", "PanningUnlock", 0),
+                        ("list", "MoneyUnlock", 0),
+                        ),
+
+                "GoldRushWorker":(
+                        ("BYTE", "WorkerID", 1),
+                        ("WORD", "PlayerLVUnlock", 0),
+                        ("list", "MoneyUnlock", 0),
+                        ),
+
+                "GoldRushItem":(
+                        ("BYTE", "GoldID", 1),
+                        ("DWORD", "ItemID", 0),
+                        ("BYTE", "ItemLV", 0),
+                        ("DWORD", "ItemCount", 0),
+                        ("DWORD", "RefreshWeight", 0),
+                        ("BYTE", "WorkerMax", 0),
+                        ("BYTE", "NeedSeconds", 0),
+                        ),
+
+                "Robot":(
+                        ("DWORD", "ID", 1),
+                        ("char", "ViewCache", 0),
                         ),
                 }
 
@@ -2699,28 +2617,51 @@
         
     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 GetRelatedHeroID(self): return self.attrTuple[2] # 关联武将ID DWORD
+    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 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
+    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():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetNPCID(self): return self.attrTuple[0] # NPCID DWORD
+    def GetAtkRatio(self): return self.attrTuple[1] # 攻击系数 float
+    def GetDefRatio(self): return self.attrTuple[2] # 防御系数 float
+    def GetMaxHPRatio(self): return self.attrTuple[3] # 生命系数 float
+    def GetStunRateRatio(self): return self.attrTuple[4] # float
+    def GetSuperHitRateRatio(self): return self.attrTuple[5] # float
+    def GetComboRateRatio(self): return self.attrTuple[6] # float
+    def GetMissRateRatio(self): return self.attrTuple[7] # float
+    def GetParryRateRatio(self): return self.attrTuple[8] # float
+    def GetSuckHPPerRatio(self): return self.attrTuple[9] # float
+    def GetStunRateDefRatio(self): return self.attrTuple[10] # float
+    def GetSuperHitRateDefRatio(self): return self.attrTuple[11] # float
+    def GetComboRateDefRatio(self): return self.attrTuple[12] # float
+    def GetMissRateDefRatio(self): return self.attrTuple[13] # float
+    def GetParryRateDefRatio(self): return self.attrTuple[14] # float
+    def GetSuckHPPerDefRatio(self): return self.attrTuple[15] # float
 
 # 技能表
 class IPY_Skill():
@@ -2745,33 +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 GetTriggerParams1(self): return self.attrTuple[21] # 触发参数 list
+    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 GetTriggerParams2(self): return self.attrTuple[26] # 触发参数 list
-    def GetEffectID3(self): return self.attrTuple[27] # 效果ID3 DWORD
-    def GetEffectValues3(self): return self.attrTuple[28] # 效果值列表3 list
-    def GetTriggerWay3(self): return self.attrTuple[29] # 触发方式 BYTE
-    def GetTriggerSrc3(self): return self.attrTuple[30] # 有效来源 BYTE
-    def GetTriggerParams3(self): return self.attrTuple[31] # 触发参数 list
-    def GetCoolDownTime(self): return self.attrTuple[32] # 技能冷却时间 WORD
-    def GetIgnoreStates(self): return self.attrTuple[33] # 无视限制列表 list
-    def GetCurBuffState(self): return self.attrTuple[34] # Buff状态值 BYTE
-    def GetLastTime(self): return self.attrTuple[35] # 持续时间 WORD
-    def GetLayerCnt(self): return self.attrTuple[36] # Buff层数 BYTE
-    def GetLayerMax(self): return self.attrTuple[37] # 最大层数 BYTE
-    def GetBuffRepeat(self): return self.attrTuple[38] # Buff叠加规则 DWORD
-    def GetDieContinue(self): return self.attrTuple[39] # Buff死亡存在 DWORD
-    def GetEnhanceSkillList(self): return self.attrTuple[40] # 触发技能ID列表 list
-    def GetFightPower(self): return self.attrTuple[41] # 技能战斗力 DWORD
-    def GetSkillMotionName(self): return self.attrTuple[42] # 技能动作名 char
+    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():
@@ -2782,17 +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 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
+    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():
@@ -3014,7 +2956,9 @@
     def GetWaveLineupIDList5(self): return self.attrTuple[6] #  波5阵容ID列表,小队1阵容ID|小队2阵容ID|... list
     def GetWaveLineupIDList6(self): return self.attrTuple[7] #  波6阵容ID列表,小队1阵容ID|小队2阵容ID|... list
     def GetBossLineupIDList(self): return self.attrTuple[8] #  Boss波阵容ID列表,小队1阵容ID|小队2阵容ID|... list
-    def GetAwardItemList(self): return self.attrTuple[9] #  过关奖励列表,[[物品ID,个数], ...] list
+    def GetAwardItemList(self): return self.attrTuple[9] #  过关奖励列表,[[物品ID,个数], ...] list
+    def GetNPCLV(self): return self.attrTuple[10] # NPC等级 WORD
+    def GetDifficulty(self): return self.attrTuple[11] # 难度系数 float
 
 # NPC阵容表
 class IPY_NPCLineup():
@@ -3031,7 +2975,9 @@
     def GetPosNPCID5(self): return self.attrTuple[5] # 5号位NPCID DWORD
     def GetPosNPCID6(self): return self.attrTuple[6] # 6号位NPCID DWORD
     def GetPosNPCID7(self): return self.attrTuple[7] # 7号位NPCID DWORD
-    def GetBossID(self): return self.attrTuple[8] #  本阵容的BossID,没有boss时为0 DWORD
+    def GetBossID(self): return self.attrTuple[8] #  本阵容的BossID,没有boss时为0 DWORD
+    def GetSkillIDExList(self): return self.attrTuple[9] #  boss附加技能列表 list
+    def GetSkillExCnt(self): return self.attrTuple[10] # 随机附加技能数,0为所有 BYTE
 
 # 称号表
 class IPY_Dienstgrad():
@@ -3280,11 +3226,9 @@
         
     def GetFuncId(self): return self.attrTuple[0] # 功能标识 DWORD
     def GetLimitLV(self): return self.attrTuple[1] # 开启等级 DWORD
-    def GetLimitMagicWeapon(self): return self.attrTuple[2] # 需要解锁法宝ID DWORD
-    def GetLimiRealmLV(self): return self.attrTuple[3] # 需要境界等级 WORD
-    def GetLimitMissionID(self): return self.attrTuple[4] # 需要完成的任务ID DWORD
-    def GetLimitVIPLV(self): return self.attrTuple[5] # 需要VIP等级 BYTE
-    def GetMailKey(self): return self.attrTuple[6] # 邮件 char
+    def GetLimiRealmLV(self): return self.attrTuple[2] # 需要境界等级 WORD
+    def GetLimitMissionID(self): return self.attrTuple[3] # 需要完成的任务ID DWORD
+    def GetMailKey(self): return self.attrTuple[4] # 邮件 char
 
 # 合成表
 class IPY_ItemCompound():
@@ -3374,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():
@@ -3832,7 +3775,24 @@
     def GetExp(self): return self.attrTuple[1] # 升级所需经验 DWORD
     def GetMaxHP(self): return self.attrTuple[2] # 生命 DWORD
     def GetAtk(self): return self.attrTuple[3] # 攻击 DWORD
-    def GetDef(self): return self.attrTuple[4] # 防御 DWORD
+    def GetDef(self): return self.attrTuple[4] # 防御 DWORD
+    def GetReHeroBreakLV(self): return self.attrTuple[5] # 参考突破等级 BYTE
+    def GetReHeroAwakeLV(self): return self.attrTuple[6] # 参考觉醒等级 BYTE
+    def GetReAtk(self): return self.attrTuple[7] # 参考攻击 DWORD
+    def GetReDef(self): return self.attrTuple[8] # 防御 DWORD
+    def GetReMaxHP(self): return self.attrTuple[9] # 生命 DWORD
+    def GetReStunRate(self): return self.attrTuple[10] # DWORD
+    def GetReSuperHitRate(self): return self.attrTuple[11] # DWORD
+    def GetReComboRate(self): return self.attrTuple[12] # DWORD
+    def GetReMissRate(self): return self.attrTuple[13] # DWORD
+    def GetReParryRate(self): return self.attrTuple[14] # DWORD
+    def GetReSuckHPPer(self): return self.attrTuple[15] # DWORD
+    def GetReStunRateDef(self): return self.attrTuple[16] # DWORD
+    def GetReSuperHitRateDef(self): return self.attrTuple[17] # DWORD
+    def GetReComboRateDef(self): return self.attrTuple[18] # DWORD
+    def GetReMissRateDef(self): return self.attrTuple[19] # DWORD
+    def GetReParryRateDef(self): return self.attrTuple[20] # DWORD
+    def GetReSuckHPPerDef(self): return self.attrTuple[21] # DWORD
 
 # 特殊地图玩家属性公式表
 class IPY_SpecMapPlayerAttrFormat():
@@ -3883,31 +3843,6 @@
     def GetMDef(self): return self.attrTuple[12] #  标准击杀时间/毫秒 DWORD
     def GetFireDef(self): return self.attrTuple[13] #  脱机挂经验计算战力 DWORD
     def GetSP(self): return self.attrTuple[14] #  SP DWORD
-
-# 成长型怪物参数公式表
-class IPY_NPCStrengthen():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetNPCID(self): return self.attrTuple[0] # NPCID DWORD
-    def GetIsStrengthenByPlayerCount(self): return self.attrTuple[1] # 是否根据人数成长 BYTE
-    def GetLVStrengthenMark(self): return self.attrTuple[2] # 等级成长属性公式标记 BYTE
-    def GetLVStrengthenType(self): return self.attrTuple[3] # 等级成长类型, 0-不按等级成长;1-按玩家平均等级;2-按玩家最大等级;3-按世界等级; BYTE
-    def GetCmpNPCBaseLV(self): return self.attrTuple[4] # 是否比较NPC表等级, 是的话取NPC表配置等级与成长等级中较大等级 BYTE
-    def GetHitTime(self): return self.attrTuple[5] # 受击次数 DWORD
-    def GetDefCoefficient(self): return self.attrTuple[6] # 人物防御系数 DWORD
-    def GetAtkCoefficient(self): return self.attrTuple[7] # 人物攻击系数 DWORD
-    def GetAdjustCoefficient(self): return self.attrTuple[8] # 调整系数比例 DWORD
-    def GetAtkInterval(self): return self.attrTuple[9] # 怪物攻击间隔 DWORD
-    def GetHitRate(self): return self.attrTuple[10] # 对人物的命中率 DWORD
-    def GetMissRate(self): return self.attrTuple[11] # 对人物的闪避率 DWORD
-    def GetMonterNum(self): return self.attrTuple[12] # 怪物数 DWORD
-    def GetIceAtkCoefficient(self): return self.attrTuple[13] # 元素攻击比例 DWORD
-    def GetIceDefCoefficient(self): return self.attrTuple[14] # 元素抗性比例 DWORD
-    def GetMaxEnduranceTime(self): return self.attrTuple[15] # 玩家最大承受伤害时间 DWORD
-    def GetFightPowerCoefficient(self): return self.attrTuple[16] # 压制战斗力系数 DWORD
 
 # NPC时间掉血表
 class IPY_NPCTimeLostHP():
@@ -4841,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():
@@ -4866,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():
@@ -5089,128 +5023,6 @@
     def GetNeedItemList(self): return self.attrTuple[4] # 所需物品信息列表 [[物品ID,个数,是否绑定], ...] list
     def GetNeedNotify(self): return self.attrTuple[5] # 是否需要广播 BYTE
 
-# 垃圾分类活动时间表
-class IPY_ActGarbageSorting():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetCfgID(self): return self.attrTuple[0] # 配置ID DWORD
-    def GetStartDate(self): return self.attrTuple[1] # 开启日期 char
-    def GetEndDate(self): return self.attrTuple[2] # 结束日期 char
-    def GetResetType(self): return self.attrTuple[3] # 重置类型,0-0点重置;1-5点重置 BYTE
-    def GetLVLimit(self): return self.attrTuple[4] # 限制等级 WORD
-    def GetCTGTypeEffValue(self): return self.attrTuple[5] # 充值有效类型值 BYTE
-
-# 垃圾分类任务产出表
-class IPY_ActGarbageTask():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetGarbageTasklD(self): return self.attrTuple[0] # 垃圾任务ID DWORD
-    def GetFinishNeedValue(self): return self.attrTuple[1] # 完成所需进度值 DWORD
-    def GetFinishTimeMax(self): return self.attrTuple[2] # 总可完成次数,0不限 DWORD
-    def GetAutoProduce(self): return self.attrTuple[3] # 自动产生垃圾 BYTE
-    def GetProduceGarbageRateList(self): return self.attrTuple[4] # 随机产生垃圾概率饼图 list
-
-# Boss历练活动表
-class IPY_ActBossTrial():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetCfgID(self): return self.attrTuple[0] # 配置ID DWORD
-    def GetStartDate(self): return self.attrTuple[1] # 开启日期 char
-    def GetEndDate(self): return self.attrTuple[2] # 结束日期 char
-    def GetJoinStartTime(self): return self.attrTuple[3] # 参与开始时间点 char
-    def GetJoinEndTime(self): return self.attrTuple[4] # 参与结束时间点 char
-    def GetLVLimit(self): return self.attrTuple[5] # 限制等级 WORD
-    def GetIsDayReset(self): return self.attrTuple[6] # 是否每天重置 BYTE
-    def GetResetType(self): return self.attrTuple[7] # 重置类型,0-0点重置;1-5点重置 BYTE
-    def GetSubmitItemAwardInfo(self): return self.attrTuple[8] # 提交凭证个数对应奖励 dict
-    def GetSubmitAwardResetType(self): return self.attrTuple[9] # 提交凭证每日重置类型,0-跟随活动; 1-0点重置;2-5点重置 BYTE
-    def GetActShopType(self): return self.attrTuple[10] # 开放商店类型,为0时不开放 WORD
-    def GetTemplateIDList(self): return self.attrTuple[11] # 榜单模板编号列表 list
-    def GetFamilyTemplateIDList(self): return self.attrTuple[12] # 仙盟榜单模板编号列表 list
-
-# Boss历练榜单模版表
-class IPY_ActBossTrialTemplate():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetTemplateID(self): return self.attrTuple[0] # 模板编号 DWORD
-    def GetRank(self): return self.attrTuple[1] # 名次 BYTE
-    def GetAwardItemList(self): return self.attrTuple[2] # 奖励物品列表[[物品ID,个数,是否拍品], ...] 仙盟榜时为盟主奖励,如果没有配置,则统一取成员奖励 list
-    def GetMemAwardItemList(self): return self.attrTuple[3] # 仙盟榜成员奖励物品信息列表[[物品ID,个数,是否拍品], ...] list
-    def GetNeedScore(self): return self.attrTuple[4] # 上榜所需积分 DWORD
-    def GetScoreAwardEx(self): return self.attrTuple[5] # 达标积分额外奖励 {积分:[[物品ID,个数,是否拍品], ...], ...} dict
-
-# 骑宠养成活动时间表
-class IPY_ActHorsePetTrain():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetCfgID(self): return self.attrTuple[0] # 配置ID DWORD
-    def GetStartDate(self): return self.attrTuple[1] # 开启日期 char
-    def GetEndDate(self): return self.attrTuple[2] # 结束日期 char
-    def GetJoinStartTime(self): return self.attrTuple[3] # 参与开始时间点 char
-    def GetJoinEndTime(self): return self.attrTuple[4] # 参与结束时间点 char
-    def GetLVLimit(self): return self.attrTuple[5] # 限制等级 WORD
-    def GetActShopType(self): return self.attrTuple[6] # 开放商店类型,为0时不开放 WORD
-    def GetPersonalTemplateID(self): return self.attrTuple[7] # 个人排行模板编号 WORD
-    def GetIsRelationCrossAct(self): return self.attrTuple[8] # 是否关联跨服活动 BYTE
-
-# 骑宠养成榜单模版表
-class IPY_ActHorsePetTrainBillTemp():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetTemplateID(self): return self.attrTuple[0] # 模板编号 DWORD
-    def GetRank(self): return self.attrTuple[1] # 名次 BYTE
-    def GetAwardItemList(self): return self.attrTuple[2] # 奖励物品列表[[物品ID,个数,是否拍品], ...] list
-    def GetNeedScore(self): return self.attrTuple[3] # 上榜所需积分 DWORD
-    def GetScoreAwardEx(self): return self.attrTuple[4] # 达标积分额外奖励 {积分:[[物品ID,个数,是否拍品], ...], ...} dict
-
-# 古宝养成活动时间表
-class IPY_ActGubao():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetCfgID(self): return self.attrTuple[0] # 配置ID DWORD
-    def GetStartDate(self): return self.attrTuple[1] # 开启日期 char
-    def GetEndDate(self): return self.attrTuple[2] # 结束日期 char
-    def GetJoinStartTime(self): return self.attrTuple[3] # 参与开始时间点 char
-    def GetJoinEndTime(self): return self.attrTuple[4] # 参与结束时间点 char
-    def GetLVLimit(self): return self.attrTuple[5] # 限制等级 WORD
-    def GetActShopType(self): return self.attrTuple[6] # 开放商店类型,为0时不开放 WORD
-    def GetPersonalTemplateID(self): return self.attrTuple[7] # 个人排行模板编号 WORD
-    def GetIsRelationCrossAct(self): return self.attrTuple[8] # 是否关联跨服活动 BYTE
-
-# 古宝养成榜单模版表
-class IPY_ActGubaoBillTemp():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetTemplateID(self): return self.attrTuple[0] # 模板编号 DWORD
-    def GetRank(self): return self.attrTuple[1] # 名次 BYTE
-    def GetAwardItemList(self): return self.attrTuple[2] # 奖励物品列表[[物品ID,个数,是否拍品], ...] list
-    def GetNeedScore(self): return self.attrTuple[3] # 上榜所需积分 DWORD
-    def GetScoreAwardEx(self): return self.attrTuple[4] # 达标积分额外奖励 {积分:[[物品ID,个数,是否拍品], ...], ...} dict
-
 # 炼器榜单模版表
 class IPY_ActLianqiBillTemp():
     
@@ -5238,57 +5050,6 @@
     def GetGridWeightItemList(self): return self.attrTuple[4] # 格子物品权重随机库 [[权重,物品ID,个数], ...] list
     def GetLayerAwardItemList(self): return self.attrTuple[5] # 通关该层固定奖励 [[物品ID,个数,是否拍品], ...] list
     def GetLayerWeightItemList(self): return self.attrTuple[6] # 通关该层额外随机奖励 [[权重,物品ID,个数], ...] list
-
-# 仙匣秘境活动时间表
-class IPY_ActXianXiaMJ():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetCfgID(self): return self.attrTuple[0] # 配置ID DWORD
-    def GetStartDate(self): return self.attrTuple[1] # 开启日期 char
-    def GetEndDate(self): return self.attrTuple[2] # 结束日期 char
-    def GetJoinStartTime(self): return self.attrTuple[3] # 参与开始时间点 char
-    def GetJoinEndTime(self): return self.attrTuple[4] # 参与结束时间点 char
-    def GetIsDayReset(self): return self.attrTuple[5] # 是否每天重置 BYTE
-    def GetLVLimit(self): return self.attrTuple[6] # 限制等级 WORD
-    def GetUseItemID(self): return self.attrTuple[7] # 消耗物品ID DWORD
-    def GetUseMoneyInfo(self): return self.attrTuple[8] # 消耗货币信息 list
-    def GetTemplateID(self): return self.attrTuple[9] # 模板ID BYTE
-    def GetPersonalTemplateID(self): return self.attrTuple[10] # 个人排行模板编号 WORD
-    def GetLotteryAddScore(self): return self.attrTuple[11] # 每次抽奖加积分 WORD
-    def GetLayerAddScore(self): return self.attrTuple[12] # 每次跨层加积分 WORD
-    def GetIsRelationCrossAct(self): return self.attrTuple[13] # 是否关联跨服活动 BYTE
-
-# 仙匣秘境榜单模版表
-class IPY_ActXianXiaMJBillTemp():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetTemplateID(self): return self.attrTuple[0] # 模板编号 DWORD
-    def GetRank(self): return self.attrTuple[1] # 名次 BYTE
-    def GetAwardItemList(self): return self.attrTuple[2] # 奖励物品列表[[物品ID,个数,是否拍品], ...] list
-    def GetNeedScore(self): return self.attrTuple[3] # 上榜所需积分 DWORD
-    def GetScoreAwardEx(self): return self.attrTuple[4] # 达标积分额外奖励 {积分:[[物品ID,个数,是否拍品], ...], ...} dict
-
-# 仙匣秘境奖池表
-class IPY_ActXianXiaMJAward():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetTemplateID(self): return self.attrTuple[0] # 奖池模板编号 DWORD
-    def GetAwardLibType(self): return self.attrTuple[1] # 奖励库类型 BYTE
-    def GetAwardItemCountList(self): return self.attrTuple[2] # 层选择个数列表  层1物品数|层2|… list
-    def GetUnlockAwardLimitTimesList(self): return self.attrTuple[3] # 层抽X次后可产出(本层) 层1限制|层2|… list
-    def GetAwardLibWeightList(self): return self.attrTuple[4] # 产出该库外权重 list
-    def GetLibItemInfo(self): return self.attrTuple[5] # 本库物品随机库内权重(先随机库外权重,若产出再随机库内权重) dict
-    def GetItemLayerLimitInfo(self): return self.attrTuple[6] # 物品产出奖池层限制 {物品ID:大于等于X层可产出, ...} dict
-    def GetItemAwardTimesTotalInfo(self): return self.attrTuple[7] # 物品产出次数限制(所有层){物品ID:总产出次数, ...} dict
 
 # 天帝礼包活动时间表
 class IPY_ActGodGift():
@@ -5323,20 +5084,6 @@
     def GetChooseItemCount(self): return self.attrTuple[3] # 选择个数 BYTE
     def GetLibItemInfo(self): return self.attrTuple[4] # 物品编号对应物品信息 {物品编号:[物品ID,个数,是否拍品,可选次数], ...}  0不限次数 dict
     def GetNotifyItemNumList(self): return self.attrTuple[5] # 需要广播的编号列表 list
-
-# 骑宠盛宴活动
-class IPY_ActHorsePetFeast():
-    
-    def __init__(self):
-        self.attrTuple = None
-        return
-        
-    def GetCfgID(self): return self.attrTuple[0] # 配置ID DWORD
-    def GetStartDate(self): return self.attrTuple[1] # 开启日期 char
-    def GetEndDate(self): return self.attrTuple[2] # 结束日期 char
-    def GetStartTimeList(self): return self.attrTuple[3] # 开启时间列表, 支持多个时段 list
-    def GetEndTimeList(self): return self.attrTuple[4] # 结束时间列表, 支持多个时段 list
-    def GetLVLimit(self): return self.attrTuple[5] # 限制等级 WORD
 
 # BOSS复活活动时间表
 class IPY_ActBossReborn():
@@ -6594,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):
@@ -6604,7 +6351,56 @@
     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():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetCampID(self): return self.attrTuple[0] # BYTE
+    def GetPanningUnlock(self): return self.attrTuple[1] # 淘金次数解锁 WORD
+    def GetMoneyUnlock(self): return self.attrTuple[2] # 货币解锁,货币类型|货币值 list
+
+# 淘金监工表
+class IPY_GoldRushWorker():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetWorkerID(self): return self.attrTuple[0] # BYTE
+    def GetPlayerLVUnlock(self): return self.attrTuple[1] # 主公等级解锁 WORD
+    def GetMoneyUnlock(self): return self.attrTuple[2] # 货币解锁,货币类型|货币值 list
+
+# 淘金物品表
+class IPY_GoldRushItem():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetGoldID(self): return self.attrTuple[0] # 淘金ID BYTE
+    def GetItemID(self): return self.attrTuple[1] # 物品ID DWORD
+    def GetItemLV(self): return self.attrTuple[2] # 物品等级 BYTE
+    def GetItemCount(self): return self.attrTuple[3] # 物品个数 DWORD
+    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):
@@ -6665,6 +6461,7 @@
         self.__LoadFileData("DirtyName", onlyCheck)
         self.__LoadFileData("FuncTeamSet", onlyCheck)
         self.__LoadFileData("NPC", onlyCheck)
+        self.__LoadFileData("NPCStronger", onlyCheck)
         self.__LoadFileData("Skill", onlyCheck)
         self.__LoadFileData("Hero", onlyCheck)
         self.__LoadFileData("HeroTalent", onlyCheck)
@@ -6742,7 +6539,6 @@
         self.__LoadFileData("SpecMapPlayerAttrFormat", onlyCheck)
         self.__LoadFileData("GMAttr", onlyCheck)
         self.__LoadFileData("NPCRealmStrengthen", onlyCheck)
-        self.__LoadFileData("NPCStrengthen", onlyCheck)
         self.__LoadFileData("NPCTimeLostHP", onlyCheck)
         self.__LoadFileData("EquipSuitAttr", onlyCheck)
         self.__LoadFileData("WingRefineAttr", onlyCheck)
@@ -6817,22 +6613,10 @@
         self.__LoadFileData("ActFamilyCTGAssistTemp", onlyCheck)
         self.__LoadFileData("ActCollectWords", onlyCheck)
         self.__LoadFileData("CollectWordsExchange", onlyCheck)
-        self.__LoadFileData("ActGarbageSorting", onlyCheck)
-        self.__LoadFileData("ActGarbageTask", onlyCheck)
-        self.__LoadFileData("ActBossTrial", onlyCheck)
-        self.__LoadFileData("ActBossTrialTemplate", onlyCheck)
-        self.__LoadFileData("ActHorsePetTrain", onlyCheck)
-        self.__LoadFileData("ActHorsePetTrainBillTemp", onlyCheck)
-        self.__LoadFileData("ActGubao", onlyCheck)
-        self.__LoadFileData("ActGubaoBillTemp", onlyCheck)
         self.__LoadFileData("ActLianqiBillTemp", onlyCheck)
         self.__LoadFileData("CrossActFamilyGCZSQ", onlyCheck)
-        self.__LoadFileData("ActXianXiaMJ", onlyCheck)
-        self.__LoadFileData("ActXianXiaMJBillTemp", onlyCheck)
-        self.__LoadFileData("ActXianXiaMJAward", onlyCheck)
         self.__LoadFileData("ActGodGift", onlyCheck)
         self.__LoadFileData("ActGodGiftAward", onlyCheck)
-        self.__LoadFileData("ActHorsePetFeast", onlyCheck)
         self.__LoadFileData("ActBossReborn", onlyCheck)
         self.__LoadFileData("BossReborn", onlyCheck)
         self.__LoadFileData("ActRealmPoint", onlyCheck)
@@ -6928,6 +6712,10 @@
         self.__LoadFileData("Xiangong", onlyCheck)
         self.__LoadFileData("TiandaoTree", onlyCheck)
         self.__LoadFileData("TreeLV", onlyCheck)
+        self.__LoadFileData("GoldRushCamp", onlyCheck)
+        self.__LoadFileData("GoldRushWorker", onlyCheck)
+        self.__LoadFileData("GoldRushItem", onlyCheck)
+        self.__LoadFileData("Robot", onlyCheck)
         Log("IPY_DataMgr ReloadOK! onlyCheck=%s" % onlyCheck)
         return
     
@@ -7123,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
@@ -7133,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)
@@ -7166,6 +6961,13 @@
     def GetNPCByIndex(self, index):
         self.CheckLoadData("NPC")
         return self.ipyNPCCache[index]
+
+    def GetNPCStrongerCount(self):
+        self.CheckLoadData("NPCStronger")
+        return self.ipyNPCStrongerLen
+    def GetNPCStrongerByIndex(self, index):
+        self.CheckLoadData("NPCStronger")
+        return self.ipyNPCStrongerCache[index]
 
     def GetSkillCount(self):
         self.CheckLoadData("Skill")
@@ -7706,13 +7508,6 @@
         self.CheckLoadData("NPCRealmStrengthen")
         return self.ipyNPCRealmStrengthenCache[index]
 
-    def GetNPCStrengthenCount(self):
-        self.CheckLoadData("NPCStrengthen")
-        return self.ipyNPCStrengthenLen
-    def GetNPCStrengthenByIndex(self, index):
-        self.CheckLoadData("NPCStrengthen")
-        return self.ipyNPCStrengthenCache[index]
-
     def GetNPCTimeLostHPCount(self):
         self.CheckLoadData("NPCTimeLostHP")
         return self.ipyNPCTimeLostHPLen
@@ -8231,62 +8026,6 @@
         self.CheckLoadData("CollectWordsExchange")
         return self.ipyCollectWordsExchangeCache[index]
 
-    def GetActGarbageSortingCount(self):
-        self.CheckLoadData("ActGarbageSorting")
-        return self.ipyActGarbageSortingLen
-    def GetActGarbageSortingByIndex(self, index):
-        self.CheckLoadData("ActGarbageSorting")
-        return self.ipyActGarbageSortingCache[index]
-
-    def GetActGarbageTaskCount(self):
-        self.CheckLoadData("ActGarbageTask")
-        return self.ipyActGarbageTaskLen
-    def GetActGarbageTaskByIndex(self, index):
-        self.CheckLoadData("ActGarbageTask")
-        return self.ipyActGarbageTaskCache[index]
-
-    def GetActBossTrialCount(self):
-        self.CheckLoadData("ActBossTrial")
-        return self.ipyActBossTrialLen
-    def GetActBossTrialByIndex(self, index):
-        self.CheckLoadData("ActBossTrial")
-        return self.ipyActBossTrialCache[index]
-
-    def GetActBossTrialTemplateCount(self):
-        self.CheckLoadData("ActBossTrialTemplate")
-        return self.ipyActBossTrialTemplateLen
-    def GetActBossTrialTemplateByIndex(self, index):
-        self.CheckLoadData("ActBossTrialTemplate")
-        return self.ipyActBossTrialTemplateCache[index]
-
-    def GetActHorsePetTrainCount(self):
-        self.CheckLoadData("ActHorsePetTrain")
-        return self.ipyActHorsePetTrainLen
-    def GetActHorsePetTrainByIndex(self, index):
-        self.CheckLoadData("ActHorsePetTrain")
-        return self.ipyActHorsePetTrainCache[index]
-
-    def GetActHorsePetTrainBillTempCount(self):
-        self.CheckLoadData("ActHorsePetTrainBillTemp")
-        return self.ipyActHorsePetTrainBillTempLen
-    def GetActHorsePetTrainBillTempByIndex(self, index):
-        self.CheckLoadData("ActHorsePetTrainBillTemp")
-        return self.ipyActHorsePetTrainBillTempCache[index]
-
-    def GetActGubaoCount(self):
-        self.CheckLoadData("ActGubao")
-        return self.ipyActGubaoLen
-    def GetActGubaoByIndex(self, index):
-        self.CheckLoadData("ActGubao")
-        return self.ipyActGubaoCache[index]
-
-    def GetActGubaoBillTempCount(self):
-        self.CheckLoadData("ActGubaoBillTemp")
-        return self.ipyActGubaoBillTempLen
-    def GetActGubaoBillTempByIndex(self, index):
-        self.CheckLoadData("ActGubaoBillTemp")
-        return self.ipyActGubaoBillTempCache[index]
-
     def GetActLianqiBillTempCount(self):
         self.CheckLoadData("ActLianqiBillTemp")
         return self.ipyActLianqiBillTempLen
@@ -8301,27 +8040,6 @@
         self.CheckLoadData("CrossActFamilyGCZSQ")
         return self.ipyCrossActFamilyGCZSQCache[index]
 
-    def GetActXianXiaMJCount(self):
-        self.CheckLoadData("ActXianXiaMJ")
-        return self.ipyActXianXiaMJLen
-    def GetActXianXiaMJByIndex(self, index):
-        self.CheckLoadData("ActXianXiaMJ")
-        return self.ipyActXianXiaMJCache[index]
-
-    def GetActXianXiaMJBillTempCount(self):
-        self.CheckLoadData("ActXianXiaMJBillTemp")
-        return self.ipyActXianXiaMJBillTempLen
-    def GetActXianXiaMJBillTempByIndex(self, index):
-        self.CheckLoadData("ActXianXiaMJBillTemp")
-        return self.ipyActXianXiaMJBillTempCache[index]
-
-    def GetActXianXiaMJAwardCount(self):
-        self.CheckLoadData("ActXianXiaMJAward")
-        return self.ipyActXianXiaMJAwardLen
-    def GetActXianXiaMJAwardByIndex(self, index):
-        self.CheckLoadData("ActXianXiaMJAward")
-        return self.ipyActXianXiaMJAwardCache[index]
-
     def GetActGodGiftCount(self):
         self.CheckLoadData("ActGodGift")
         return self.ipyActGodGiftLen
@@ -8335,13 +8053,6 @@
     def GetActGodGiftAwardByIndex(self, index):
         self.CheckLoadData("ActGodGiftAward")
         return self.ipyActGodGiftAwardCache[index]
-
-    def GetActHorsePetFeastCount(self):
-        self.CheckLoadData("ActHorsePetFeast")
-        return self.ipyActHorsePetFeastLen
-    def GetActHorsePetFeastByIndex(self, index):
-        self.CheckLoadData("ActHorsePetFeast")
-        return self.ipyActHorsePetFeastCache[index]
 
     def GetActBossRebornCount(self):
         self.CheckLoadData("ActBossReborn")
@@ -9007,6 +8718,34 @@
     def GetTreeLVByIndex(self, index):
         self.CheckLoadData("TreeLV")
         return self.ipyTreeLVCache[index]
+
+    def GetGoldRushCampCount(self):
+        self.CheckLoadData("GoldRushCamp")
+        return self.ipyGoldRushCampLen
+    def GetGoldRushCampByIndex(self, index):
+        self.CheckLoadData("GoldRushCamp")
+        return self.ipyGoldRushCampCache[index]
+
+    def GetGoldRushWorkerCount(self):
+        self.CheckLoadData("GoldRushWorker")
+        return self.ipyGoldRushWorkerLen
+    def GetGoldRushWorkerByIndex(self, index):
+        self.CheckLoadData("GoldRushWorker")
+        return self.ipyGoldRushWorkerCache[index]
+
+    def GetGoldRushItemCount(self):
+        self.CheckLoadData("GoldRushItem")
+        return self.ipyGoldRushItemLen
+    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