From ad158391ff62df48198a5411e5950e578dc3c43c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 11 四月 2019 14:42:21 +0800
Subject: [PATCH] 6459 【后端】【2.0】缥缈仙域开发单(可进入跨服妖王地图支持分区,增加竞争归属逻辑)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |  438 ++++++++++++++++++++++++++----------------------------
 1 files changed, 211 insertions(+), 227 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index ed5d401..a241056 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -41,6 +41,14 @@
                         ("list", "Skills", 0),
                         ),
 
+                "RolePoint":(
+                        ("BYTE", "AttrID", 1),
+                        ("dict", "AddAttrInfoPerPoint", 0),
+                        ("BYTE", "PointQualityAttrID", 0),
+                        ("list", "PointQualityAttrValueList", 0),
+                        ("list", "PointQualityIntervalList", 0),
+                        ),
+
                 "Realm":(
                         ("WORD", "Lv", 1),
                         ("DWORD", "NeedLV", 0),
@@ -49,6 +57,9 @@
                         ("list", "AddAttrType", 0),
                         ("list", "AddAttrNum", 0),
                         ("DWORD", "BossID", 0),
+                        ("DWORD", "BuffID", 0),
+                        ("DWORD", "ExpRate", 0),
+                        ("DWORD", "ExpLimit", 0),
                         ),
 
                 "GodWeapon":(
@@ -111,12 +122,6 @@
                         ("BYTE", "Type", 1),
                         ("BYTE", "Star", 1),
                         ("WORD", "LevelMax", 0),
-                        ),
-
-                "ItemPlusSumAttr":(
-                        ("WORD", "PlusCntNeed", 1),
-                        ("list", "AttrType", 0),
-                        ("list", "AttrValue", 0),
                         ),
 
                 "RoleEquipStars":(
@@ -195,13 +200,6 @@
                         ("DWORD", "CostItemID", 0),
                         ("BYTE", "CostItemCount", 0),
                         ("list", "GoldWashCostList", 0),
-                        ),
-
-                "EquipWashSpec":(
-                        ("BYTE", "WashTypeNeed", 1),
-                        ("BYTE", "WashLVNeed", 1),
-                        ("list", "AddAttrType", 0),
-                        ("list", "AddAttrValue", 0),
                         ),
 
                 "AttrFruit":(
@@ -408,10 +406,10 @@
                         ("BYTE", "PieRateDoCnt", 0),
                         ("dict", "IndepRateDrop", 0),
                         ("BYTE", "IndepRateDoCnt", 0),
-                        ("dict", "IndepRateMaxDropCount", 0),
-                        ("dict", "EquipStarInfo", 0),
-                        ("list", "KillCountDropEquipEx", 0),
-                        ("list", "KillCountDropEquipEx2", 0),
+                        ("dict", "EquipColorMaxDropCount", 0),
+                        ("dict", "EquipColorSuitInfo", 0),
+                        ("dict", "EquipPartKeyRateInfo", 0),
+                        ("dict", "KillCountDropEquipPub", 0),
                         ("dict", "ItemIDDropRate", 0),
                         ("dict", "ItemIDMaxDropCount", 0),
                         ("dict", "ItemKeyDropRate", 0),
@@ -421,8 +419,10 @@
                         ("WORD", "DropMoneyRate", 0),
                         ("WORD", "DropMoneyMin", 0),
                         ("WORD", "DropMoneyMax", 0),
-                        ("list", "KillCountDrop", 0),
+                        ("dict", "KillCountDropPub", 0),
+                        ("list", "KillCountDropPri", 0),
                         ("list", "PriItemIDDrop", 0),
+                        ("BYTE", "AucionItemCanSell", 0),
                         ),
 
                 "RuneTower":(
@@ -461,7 +461,6 @@
                         ("DWORD", "MapID", 0),
                         ("WORD", "LVLimitMin", 0),
                         ("WORD", "LVLimitMax", 0),
-                        ("BYTE", "JobRankLimit", 0),
                         ("DWORD", "TicketID", 0),
                         ("list", "TicketCostCnt", 0),
                         ("WORD", "TicketPrice", 0),
@@ -502,6 +501,10 @@
                 "DailyAction":(
                         ("DWORD", "DailyID", 1),
                         ("DWORD", "DayTimes", 0),
+                        ("DWORD", "DayBuyTimes", 0),
+                        ("DWORD", "BuyNeedMoney", 0),
+                        ("DWORD", "DayItemAddTimes", 0),
+                        ("DWORD", "DayItemID", 0),
                         ("BYTE", "DayResetType", 0),
                         ("DWORD", "WeekTimes", 0),
                         ("BYTE", "WeekResetType", 0),
@@ -510,46 +513,20 @@
                 "EquipGSParam":(
                         ("BYTE", "ClassLV", 1),
                         ("BYTE", "EquipColor", 1),
-                        ("BYTE", "EquipQualityLV", 1),
-                        ("DWORD", "AtkPerC", 0),
-                        ("DWORD", "DamagePerC", 0),
-                        ("DWORD", "SuperHitRateC", 0),
+                        ("BYTE", "IsSuit", 1),
+                        ("DWORD", "BaseEquipMaxHPAddPerC", 0),
+                        ("DWORD", "BaseEquipAtkAddPerC", 0),
+                        ("DWORD", "SuperHitC", 0),
                         ("DWORD", "SuperHitPerC", 0),
-                        ("DWORD", "DamReducePerC", 0),
-                        ("DWORD", "MaxHPPerC", 0),
-                        ("DWORD", "DefPerC", 0),
                         ("DWORD", "LuckyHitRateC", 0),
-                        ("DWORD", "PetDamPerC", 0),
+                        ("DWORD", "LuckyHitRateReduceC", 0),
+                        ("DWORD", "LuckPerC", 0),
                         ("DWORD", "PerLVAtkC", 0),
-                        ("DWORD", "MissRateC", 0),
-                        ("DWORD", "HitRateC", 0),
-                        ("DWORD", "DamBackPerC", 0),
                         ("DWORD", "PerLVMaxHPC", 0),
-                        ("DWORD", "DropEquipPerC", 0),
                         ("DWORD", "DropMoneyPerC", 0),
-                        ("DWORD", "IgnoreDefRateReduceC", 0),
-                        ("DWORD", "DamChanceDefC", 0),
                         ("DWORD", "SuperHitReduceC", 0),
-                        ("DWORD", "SkillAtkRateC", 0),
-                        ("DWORD", "SpeedPerC", 0),
-                        ("DWORD", "AtkSpeedC", 0),
-                        ("DWORD", "SkillAtkRateReduceC", 0),
                         ("DWORD", "HitC", 0),
                         ("DWORD", "MissC", 0),
-                        ("DWORD", "SkillAddPer1C", 0),
-                        ("DWORD", "SkillAddPer2C", 0),
-                        ("DWORD", "SkillAddPer3C", 0),
-                        ("DWORD", "SkillAddPer4C", 0),
-                        ("DWORD", "SkillAddPer5C", 0),
-                        ("DWORD", "SkillAddPer6C", 0),
-                        ("DWORD", "SkillAddPer7C", 0),
-                        ("DWORD", "SkillReducePer1C", 0),
-                        ("DWORD", "SkillReducePer2C", 0),
-                        ("DWORD", "SkillReducePer3C", 0),
-                        ("DWORD", "SkillReducePer4C", 0),
-                        ("DWORD", "SkillReducePer5C", 0),
-                        ("DWORD", "SkillReducePer6C", 0),
-                        ("DWORD", "SkillReducePer7C", 0),
                         ),
 
                 "Success":(
@@ -571,9 +548,9 @@
                         ("DWORD", "ID", 1),
                         ("BYTE", "TreasureType", 0),
                         ("DWORD", "PreTreasure", 0),
-                        ("list", "SuccID", 0),
-                        ("list", "Potentials", 0),
-                        ("list", "SkillPower", 0),
+                        ("DWORD", "FBMapID", 0),
+                        ("DWORD", "FBLineID", 0),
+                        ("DWORD", "NeedLV", 0),
                         ("dict", "NeedItem", 0),
                         ),
 
@@ -583,20 +560,7 @@
                         ("DWORD", "NeedExp", 0),
                         ("dict", "AddAttr", 0),
                         ("list", "UnLockSkill", 0),
-                        ("DWORD", "ActiveMWID", 0),
-                        ("list", "ItemAward", 0),
-                        ("DWORD", "ActiveSoulID", 0),
                         ("DWORD", "PowerEx", 0),
-                        ),
-
-                "TreasurePrivilege":(
-                        ("DWORD", "PrivilegeID", 1),
-                        ("eval", "EffectValue", 0),
-                        ("DWORD", "SingleValue", 0),
-                        ("DWORD", "MaxValue", 0),
-                        ("dict", "AddAttr", 0),
-                        ("list", "ItemAward", 0),
-                        ("list", "SuccessList", 0),
                         ),
 
                 "ContineSignAward":(
@@ -1399,13 +1363,42 @@
                 "FamilyBossAward":(
                         ("list", "WorldLV", 0),
                         ("list", "Rank", 0),
-                        ("list", "Award", 0),
+                        ("list", "Award1", 0),
+                        ("dict", "Award2", 0),
                         ),
 
                 "ItemWashMax":(
                         ("BYTE", "Type", 1),
                         ("BYTE", "Star", 1),
                         ("WORD", "LevelMax", 0),
+                        ),
+
+                "HorsePetBossAward":(
+                        ("BYTE", "LineID", 1),
+                        ("list", "WorldLV", 0),
+                        ("list", "Rank", 0),
+                        ("list", "Award1", 0),
+                        ("dict", "Award2", 0),
+                        ),
+
+                "FairyDomain":(
+                        ("WORD", "ID", 1),
+                        ("BYTE", "EventType", 0),
+                        ("DWORD", "MapID", 0),
+                        ("BYTE", "LineID", 0),
+                        ("DWORD", "BossID", 0),
+                        ("BYTE", "CostEnergy", 0),
+                        ("BYTE", "NeedAlchemyLV", 0),
+                        ("DWORD", "Weight", 0),
+                        ),
+
+                "FairyAdventures":(
+                        ("WORD", "ID", 1),
+                        ("DWORD", "OpenServerDay", 0),
+                        ("BYTE", "EventID", 0),
+                        ("list", "Condition", 0),
+                        ("list", "GearAward", 0),
+                        ("list", "BasicAward", 0),
                         ),
                 }
 
@@ -1429,6 +1422,23 @@
     def GetLightAttribute(self): return self.LightAttribute # 点亮属性值
     def GetSkills(self): return self.Skills # 被动技能
 
+# 灵根表
+class IPY_RolePoint():
+    
+    def __init__(self):
+        self.AttrID = 0
+        self.AddAttrInfoPerPoint = {}
+        self.PointQualityAttrID = 0
+        self.PointQualityAttrValueList = []
+        self.PointQualityIntervalList = []
+        return
+        
+    def GetAttrID(self): return self.AttrID # 属性ID
+    def GetAddAttrInfoPerPoint(self): return self.AddAttrInfoPerPoint # 每点增加属性信息
+    def GetPointQualityAttrID(self): return self.PointQualityAttrID # 点数品质进阶增加属性ID
+    def GetPointQualityAttrValueList(self): return self.PointQualityAttrValueList # 点数品质进阶增加属性值列表
+    def GetPointQualityIntervalList(self): return self.PointQualityIntervalList # 点数品质进阶属性点区间列表
+
 # 境界表
 class IPY_Realm():
     
@@ -1439,7 +1449,10 @@
         self.NeedItemCnt = 0
         self.AddAttrType = []
         self.AddAttrNum = []
-        self.BossID = 0
+        self.BossID = 0
+        self.BuffID = 0
+        self.ExpRate = 0
+        self.ExpLimit = 0
         return
         
     def GetLv(self): return self.Lv # 境界等级
@@ -1448,7 +1461,10 @@
     def GetNeedItemCnt(self): return self.NeedItemCnt # 消耗的道具数量
     def GetAddAttrType(self): return self.AddAttrType # 境界加成属性类型
     def GetAddAttrNum(self): return self.AddAttrNum # 境界加成属性值
-    def GetBossID(self): return self.BossID # 渡劫bossid
+    def GetBossID(self): return self.BossID # 渡劫bossid
+    def GetBuffID(self): return self.BuffID # 给全服在线玩家增加buff
+    def GetExpRate(self): return self.ExpRate # 修为池经验速率
+    def GetExpLimit(self): return self.ExpLimit # 修为池经验上限
 
 # 神兵表
 class IPY_GodWeapon():
@@ -1579,19 +1595,6 @@
     def GetType(self): return self.Type # 按装备位对应类型查找
     def GetStar(self): return self.Star #  装备星数
     def GetLevelMax(self): return self.LevelMax # 强化等级上限
-
-# 装备全身强化属性
-class IPY_ItemPlusSumAttr():
-    
-    def __init__(self):
-        self.PlusCntNeed = 0
-        self.AttrType = []
-        self.AttrValue = []
-        return
-        
-    def GetPlusCntNeed(self): return self.PlusCntNeed # 全身强化等级
-    def GetAttrType(self): return self.AttrType # 全身强化激活属性类型
-    def GetAttrValue(self): return self.AttrValue # 全身强化激活属性值
 
 # 装备全身星数属性
 class IPY_RoleEquipStars():
@@ -1757,21 +1760,6 @@
     def GetCostItemID(self): return self.CostItemID #  固定消耗物品ID
     def GetCostItemCount(self): return self.CostItemCount #  固定消耗物品个数
     def GetGoldWashCostList(self): return self.GoldWashCostList #  仙玉洗练条数对应消耗
-
-# 洗练特殊属性表
-class IPY_EquipWashSpec():
-    
-    def __init__(self):
-        self.WashTypeNeed = 0
-        self.WashLVNeed = 0
-        self.AddAttrType = []
-        self.AddAttrValue = []
-        return
-        
-    def GetWashTypeNeed(self): return self.WashTypeNeed #  所需装备归组类型
-    def GetWashLVNeed(self): return self.WashLVNeed #  所需洗练等级
-    def GetAddAttrType(self): return self.AddAttrType # 激活加成属性类型
-    def GetAddAttrValue(self): return self.AddAttrValue # 激活加成属性值
 
 # 属性果实表
 class IPY_AttrFruit():
@@ -2189,10 +2177,10 @@
         self.PieRateDoCnt = 0
         self.IndepRateDrop = {}
         self.IndepRateDoCnt = 0
-        self.IndepRateMaxDropCount = {}
-        self.EquipStarInfo = {}
-        self.KillCountDropEquipEx = []
-        self.KillCountDropEquipEx2 = []
+        self.EquipColorMaxDropCount = {}
+        self.EquipColorSuitInfo = {}
+        self.EquipPartKeyRateInfo = {}
+        self.KillCountDropEquipPub = {}
         self.ItemIDDropRate = {}
         self.ItemIDMaxDropCount = {}
         self.ItemKeyDropRate = {}
@@ -2202,8 +2190,10 @@
         self.DropMoneyRate = 0
         self.DropMoneyMin = 0
         self.DropMoneyMax = 0
-        self.KillCountDrop = []
-        self.PriItemIDDrop = []
+        self.KillCountDropPub = {}
+        self.KillCountDropPri = []
+        self.PriItemIDDrop = []
+        self.AucionItemCanSell = 0
         return
         
     def GetNPCID(self): return self.NPCID # NPCID
@@ -2211,14 +2201,14 @@
     def GetMaxDropLV(self): return self.MaxDropLV # 最大可掉落的玩家等级, 不影响世界等级
     def GetCanDropRatePlus(self): return self.CanDropRatePlus # 额外提升掉率的是否有效
     def GetIsDropJobSelf(self): return self.IsDropJobSelf # 是否只掉落本职业
-    def GetPieRateDrop(self): return self.PieRateDrop # 饼图概率掉落信息 [(概率,0),(概率,(阶,颜色,部位集合key)),...]
+    def GetPieRateDrop(self): return self.PieRateDrop # 饼图概率掉落信息 [(概率,0),(概率,(阶,颜色)),...]
     def GetPieRateDoCnt(self): return self.PieRateDoCnt # 饼图概率执行次数
-    def GetIndepRateDrop(self): return self.IndepRateDrop # 独立概率掉落信息 {(阶,颜色,部位集合key):概率,...}
+    def GetIndepRateDrop(self): return self.IndepRateDrop # 独立概率掉落信息 {(阶,颜色):概率,...}
     def GetIndepRateDoCnt(self): return self.IndepRateDoCnt # 独立概率执行次数
-    def GetIndepRateMaxDropCount(self): return self.IndepRateMaxDropCount # 独立概率装备颜色最大掉落物品数 {颜色:上限数量,...}
-    def GetEquipStarInfo(self): return self.EquipStarInfo # 装备颜色对应星级产出规则 {颜色:[(概率, 星级),...], ...}
-    def GetKillCountDropEquipEx(self): return self.KillCountDropEquipEx # 第x次击杀附加必掉装备 [次数,阶,颜色,[(概率,星级),...],部位集合key]
-    def GetKillCountDropEquipEx2(self): return self.KillCountDropEquipEx2 # 前x次击杀附加必掉装备 [次数,阶,颜色,[(概率,星级),...],部位集合key]
+    def GetEquipColorMaxDropCount(self): return self.EquipColorMaxDropCount # 装备颜色最大掉落物品数 {颜色:上限数量,...}
+    def GetEquipColorSuitInfo(self): return self.EquipColorSuitInfo # 装备颜色对应套装概率 {颜色:套装概率, ...}
+    def GetEquipPartKeyRateInfo(self): return self.EquipPartKeyRateInfo # 装备部位集合信息 {(颜色,是否套装):部位集合key, ...}
+    def GetKillCountDropEquipPub(self): return self.KillCountDropEquipPub # 第x次击杀附加必掉装备 {次数:[阶,颜色,是否套装,部位集合key], ...}
     def GetItemIDDropRate(self): return self.ItemIDDropRate # 指定物品ID掉率信息 {物品ID:概率, ...}
     def GetItemIDMaxDropCount(self): return self.ItemIDMaxDropCount # 指定物品ID最大掉落个数,没配默认1次 {物品ID:随机次数,...}
     def GetItemKeyDropRate(self): return self.ItemKeyDropRate # 物品ID集合Key概率, 随机一个, 优先级低 {物品ID集合key:概率, ...}
@@ -2228,8 +2218,10 @@
     def GetDropMoneyRate(self): return self.DropMoneyRate # 掉落金币概率
     def GetDropMoneyMin(self): return self.DropMoneyMin # 掉落金币最小值
     def GetDropMoneyMax(self): return self.DropMoneyMax # 掉落金币最大值
-    def GetKillCountDrop(self): return self.KillCountDrop # 击杀次数必掉,防止版本变更重复掉,只支持一次机会 [击杀次数,是否直接放入背包,[物品ID,...]]
-    def GetPriItemIDDrop(self): return self.PriItemIDDrop # 所有归属者私有掉落物品ID列表,每人一份,默认绑定,没有职业区分[物品ID, ...]
+    def GetKillCountDropPub(self): return self.KillCountDropPub # 击杀次数必掉(公共){击杀次数:[[物品ID, ...], [随机物品ID, ...]], ...}
+    def GetKillCountDropPri(self): return self.KillCountDropPri # 击杀次数必掉(私有)[击杀次数,[物品ID,...],是否直接放入背包]
+    def GetPriItemIDDrop(self): return self.PriItemIDDrop # 所有归属者私有掉落物品ID列表,每人一份,默认绑定,没有职业区分[物品ID, ...]
+    def GetAucionItemCanSell(self): return self.AucionItemCanSell # 掉落拍品可否上架集市
 
 # 符印塔表
 class IPY_RuneTower():
@@ -2302,7 +2294,6 @@
         self.MapID = 0
         self.LVLimitMin = 0
         self.LVLimitMax = 0
-        self.JobRankLimit = 0
         self.TicketID = 0
         self.TicketCostCnt = []
         self.TicketPrice = 0
@@ -2321,7 +2312,6 @@
     def GetMapID(self): return self.MapID # 场景地图ID
     def GetLVLimitMin(self): return self.LVLimitMin # 最低等级限制, 0为不限制
     def GetLVLimitMax(self): return self.LVLimitMax # 最高等级限制, 0为不限制
-    def GetJobRankLimit(self): return self.JobRankLimit # 所需职业阶
     def GetTicketID(self): return self.TicketID # 门票ID
     def GetTicketCostCnt(self): return self.TicketCostCnt # 门票消耗数信息
     def GetTicketPrice(self): return self.TicketPrice # 门票单价(不能用钱抵的配0)
@@ -2390,6 +2380,10 @@
     def __init__(self):
         self.DailyID = 0
         self.DayTimes = 0
+        self.DayBuyTimes = 0
+        self.BuyNeedMoney = 0
+        self.DayItemAddTimes = 0
+        self.DayItemID = 0
         self.DayResetType = 0
         self.WeekTimes = 0
         self.WeekResetType = 0
@@ -2397,6 +2391,10 @@
         
     def GetDailyID(self): return self.DailyID # 活动ID
     def GetDayTimes(self): return self.DayTimes # 每日次数, 0为不限制
+    def GetDayBuyTimes(self): return self.DayBuyTimes # 每日可购买次数
+    def GetBuyNeedMoney(self): return self.BuyNeedMoney # 购买次数需要仙玉
+    def GetDayItemAddTimes(self): return self.DayItemAddTimes # 每日可用物品增加次数
+    def GetDayItemID(self): return self.DayItemID # 增加次数的物品ID
     def GetDayResetType(self): return self.DayResetType # 每日次数重置类型; 0-不重置,1-0点,2-5点
     def GetWeekTimes(self): return self.WeekTimes # 每周次数, 0为不限制
     def GetWeekResetType(self): return self.WeekResetType # 每周次数重置类型; 0-不重置,1-0点,2-5点
@@ -2407,90 +2405,38 @@
     def __init__(self):
         self.ClassLV = 0
         self.EquipColor = 0
-        self.EquipQualityLV = 0
-        self.AtkPerC = 0
-        self.DamagePerC = 0
-        self.SuperHitRateC = 0
+        self.IsSuit = 0
+        self.BaseEquipMaxHPAddPerC = 0
+        self.BaseEquipAtkAddPerC = 0
+        self.SuperHitC = 0
         self.SuperHitPerC = 0
-        self.DamReducePerC = 0
-        self.MaxHPPerC = 0
-        self.DefPerC = 0
         self.LuckyHitRateC = 0
-        self.PetDamPerC = 0
+        self.LuckyHitRateReduceC = 0
+        self.LuckPerC = 0
         self.PerLVAtkC = 0
-        self.MissRateC = 0
-        self.HitRateC = 0
-        self.DamBackPerC = 0
         self.PerLVMaxHPC = 0
-        self.DropEquipPerC = 0
         self.DropMoneyPerC = 0
-        self.IgnoreDefRateReduceC = 0
-        self.DamChanceDefC = 0
         self.SuperHitReduceC = 0
-        self.SkillAtkRateC = 0
-        self.SpeedPerC = 0
-        self.AtkSpeedC = 0
-        self.SkillAtkRateReduceC = 0
         self.HitC = 0
-        self.MissC = 0
-        self.SkillAddPer1C = 0
-        self.SkillAddPer2C = 0
-        self.SkillAddPer3C = 0
-        self.SkillAddPer4C = 0
-        self.SkillAddPer5C = 0
-        self.SkillAddPer6C = 0
-        self.SkillAddPer7C = 0
-        self.SkillReducePer1C = 0
-        self.SkillReducePer2C = 0
-        self.SkillReducePer3C = 0
-        self.SkillReducePer4C = 0
-        self.SkillReducePer5C = 0
-        self.SkillReducePer6C = 0
-        self.SkillReducePer7C = 0
+        self.MissC = 0
         return
         
     def GetClassLV(self): return self.ClassLV #  装备阶级
     def GetEquipColor(self): return self.EquipColor #  装备颜色
-    def GetEquipQualityLV(self): return self.EquipQualityLV #  装备星级
-    def GetAtkPerC(self): return self.AtkPerC #  攻击百分比系数
-    def GetDamagePerC(self): return self.DamagePerC #  增加伤害系数
-    def GetSuperHitRateC(self): return self.SuperHitRateC #  暴击率系数
+    def GetIsSuit(self): return self.IsSuit #  是否套装
+    def GetBaseEquipMaxHPAddPerC(self): return self.BaseEquipMaxHPAddPerC #  基础防具生命百分比系数
+    def GetBaseEquipAtkAddPerC(self): return self.BaseEquipAtkAddPerC #  基础武器攻击百分比系数
+    def GetSuperHitC(self): return self.SuperHitC #  暴击值系数
     def GetSuperHitPerC(self): return self.SuperHitPerC #  暴击值百分比系数
-    def GetDamReducePerC(self): return self.DamReducePerC #  减少伤害系数
-    def GetMaxHPPerC(self): return self.MaxHPPerC #  生命上限百分比系数
-    def GetDefPerC(self): return self.DefPerC #  防御力百分比系数
     def GetLuckyHitRateC(self): return self.LuckyHitRateC #  会心一击率系数
-    def GetPetDamPerC(self): return self.PetDamPerC #  灵宠伤害增加百分比系数
+    def GetLuckyHitRateReduceC(self): return self.LuckyHitRateReduceC #  会心一击抗性系数
+    def GetLuckPerC(self): return self.LuckPerC #  气运百分比系数
     def GetPerLVAtkC(self): return self.PerLVAtkC #  每级增加攻击力系数
-    def GetMissRateC(self): return self.MissRateC #  闪避值百分比系数
-    def GetHitRateC(self): return self.HitRateC #  命中力百分比系数
-    def GetDamBackPerC(self): return self.DamBackPerC #  伤害反射百分比系数
     def GetPerLVMaxHPC(self): return self.PerLVMaxHPC #  每级增加生命值系数
-    def GetDropEquipPerC(self): return self.DropEquipPerC #  增加装备掉落几率系数
     def GetDropMoneyPerC(self): return self.DropMoneyPerC #  增加掉落金币量百分比系数
-    def GetIgnoreDefRateReduceC(self): return self.IgnoreDefRateReduceC #  无视防御抗性百分比系数
-    def GetDamChanceDefC(self): return self.DamChanceDefC #  抵御百分比系数
     def GetSuperHitReduceC(self): return self.SuperHitReduceC #  暴击抗性百分比系数
-    def GetSkillAtkRateC(self): return self.SkillAtkRateC #  技能伤害百分比系数
-    def GetSpeedPerC(self): return self.SpeedPerC #  移动速度百分比系数
-    def GetAtkSpeedC(self): return self.AtkSpeedC #  攻击速度系数
-    def GetSkillAtkRateReduceC(self): return self.SkillAtkRateReduceC #  技能减伤百分比系数
     def GetHitC(self): return self.HitC #  命中系数
-    def GetMissC(self): return self.MissC #  闪避系数
-    def GetSkillAddPer1C(self): return self.SkillAddPer1C #  技能伤害增强1系数
-    def GetSkillAddPer2C(self): return self.SkillAddPer2C #  技能伤害增强2系数
-    def GetSkillAddPer3C(self): return self.SkillAddPer3C #  技能伤害增强3系数
-    def GetSkillAddPer4C(self): return self.SkillAddPer4C #  技能伤害增强4系数
-    def GetSkillAddPer5C(self): return self.SkillAddPer5C #  技能伤害增强5系数
-    def GetSkillAddPer6C(self): return self.SkillAddPer6C #  技能伤害增强6系数
-    def GetSkillAddPer7C(self): return self.SkillAddPer7C #  技能伤害增强7系数
-    def GetSkillReducePer1C(self): return self.SkillReducePer1C #  受到技能伤害减少1系数
-    def GetSkillReducePer2C(self): return self.SkillReducePer2C #  受到技能伤害减少2系数
-    def GetSkillReducePer3C(self): return self.SkillReducePer3C #  受到技能伤害减少3系数
-    def GetSkillReducePer4C(self): return self.SkillReducePer4C #  受到技能伤害减少4系数
-    def GetSkillReducePer5C(self): return self.SkillReducePer5C #  受到技能伤害减少5系数
-    def GetSkillReducePer6C(self): return self.SkillReducePer6C #  受到技能伤害减少6系数
-    def GetSkillReducePer7C(self): return self.SkillReducePer7C #  受到技能伤害减少7系数
+    def GetMissC(self): return self.MissC #  闪避系数
 
 # 成就表
 class IPY_Success():
@@ -2530,18 +2476,18 @@
         self.ID = 0
         self.TreasureType = 0
         self.PreTreasure = 0
-        self.SuccID = []
-        self.Potentials = []
-        self.SkillPower = []
+        self.FBMapID = 0
+        self.FBLineID = 0
+        self.NeedLV = 0
         self.NeedItem = {}
         return
         
     def GetID(self): return self.ID # ID
     def GetTreasureType(self): return self.TreasureType # 法宝类型
     def GetPreTreasure(self): return self.PreTreasure # 前置法宝
-    def GetSuccID(self): return self.SuccID # 成就ID
-    def GetPotentials(self): return self.Potentials # 技能潜力升级
-    def GetSkillPower(self): return self.SkillPower # 技能解锁战力
+    def GetFBMapID(self): return self.FBMapID # 副本ID
+    def GetFBLineID(self): return self.FBLineID # 副本线路ID
+    def GetNeedLV(self): return self.NeedLV # 需要等级
     def GetNeedItem(self): return self.NeedItem # 需要消耗物品
 
 # 法宝升级表
@@ -2553,9 +2499,6 @@
         self.NeedExp = 0
         self.AddAttr = {}
         self.UnLockSkill = []
-        self.ActiveMWID = 0
-        self.ItemAward = []
-        self.ActiveSoulID = 0
         self.PowerEx = 0
         return
         
@@ -2564,31 +2507,7 @@
     def GetNeedExp(self): return self.NeedExp # 需要经验
     def GetAddAttr(self): return self.AddAttr # 属性
     def GetUnLockSkill(self): return self.UnLockSkill # 解锁的技能
-    def GetActiveMWID(self): return self.ActiveMWID # 激活法宝ID
-    def GetItemAward(self): return self.ItemAward # 物品奖励[itemID,cnt,isbind]
-    def GetActiveSoulID(self): return self.ActiveSoulID # 激活魂ID
     def GetPowerEx(self): return self.PowerEx # 额外固定战力
-
-# 法宝特权表
-class IPY_TreasurePrivilege():
-    
-    def __init__(self):
-        self.PrivilegeID = 0
-        self.EffectValue = 0
-        self.SingleValue = 0
-        self.MaxValue = 0
-        self.AddAttr = {}
-        self.ItemAward = []
-        self.SuccessList = []
-        return
-        
-    def GetPrivilegeID(self): return self.PrivilegeID # 特权ID
-    def GetEffectValue(self): return self.EffectValue # 特殊效果
-    def GetSingleValue(self): return self.SingleValue # 进度
-    def GetMaxValue(self): return self.MaxValue # 最大进度
-    def GetAddAttr(self): return self.AddAttr # 属性
-    def GetItemAward(self): return self.ItemAward # 物品奖励
-    def GetSuccessList(self): return self.SuccessList # 需要完成成就
 
 # 连续签到奖励表
 class IPY_ContineSignAward():
@@ -4283,12 +4202,14 @@
     def __init__(self):
         self.WorldLV = []
         self.Rank = []
-        self.Award = []
+        self.Award1 = []
+        self.Award2 = {}
         return
         
     def GetWorldLV(self): return self.WorldLV # 世界等级
     def GetRank(self): return self.Rank # 排名
-    def GetAward(self): return self.Award # 奖励 [[独立概率万分率,[物品ID,数量,拍品分组]],..]
+    def GetAward1(self): return self.Award1 # 奖励 [[独立概率万分率,[物品ID,数量,是否拍品]],..]
+    def GetAward2(self): return self.Award2 # 饼图奖励{随机次数:[(概率,[物品ID,数量,是否拍品]),..]}
 
 # 装备洗练等级上限
 class IPY_ItemWashMax():
@@ -4302,6 +4223,65 @@
     def GetType(self): return self.Type # 按装备位对应类型查找
     def GetStar(self): return self.Star #  装备星数
     def GetLevelMax(self): return self.LevelMax # 洗练等级上限
+
+# 骑宠Boss奖励表
+class IPY_HorsePetBossAward():
+    
+    def __init__(self):
+        self.LineID = 0
+        self.WorldLV = []
+        self.Rank = []
+        self.Award1 = []
+        self.Award2 = {}
+        return
+        
+    def GetLineID(self): return self.LineID #  线路ID
+    def GetWorldLV(self): return self.WorldLV # 世界等级
+    def GetRank(self): return self.Rank # 排名
+    def GetAward1(self): return self.Award1 # 奖励 [[独立概率万分率,[物品ID,数量,是否拍品]],..]
+    def GetAward2(self): return self.Award2 # 饼图奖励{随机次数:[(概率,[物品ID,数量,是否拍品]),..]}
+
+# 缥缈仙域表
+class IPY_FairyDomain():
+    
+    def __init__(self):
+        self.ID = 0
+        self.EventType = 0
+        self.MapID = 0
+        self.LineID = 0
+        self.BossID = 0
+        self.CostEnergy = 0
+        self.NeedAlchemyLV = 0
+        self.Weight = 0
+        return
+        
+    def GetID(self): return self.ID # 事件编号
+    def GetEventType(self): return self.EventType # 事件类型
+    def GetMapID(self): return self.MapID # 副本id
+    def GetLineID(self): return self.LineID # 副本线路id
+    def GetBossID(self): return self.BossID # 副本BossID
+    def GetCostEnergy(self): return self.CostEnergy # 消耗体力
+    def GetNeedAlchemyLV(self): return self.NeedAlchemyLV # 出现的炼丹等级要求
+    def GetWeight(self): return self.Weight # 权重
+
+# 缥缈奇遇表
+class IPY_FairyAdventures():
+    
+    def __init__(self):
+        self.ID = 0
+        self.OpenServerDay = 0
+        self.EventID = 0
+        self.Condition = []
+        self.GearAward = []
+        self.BasicAward = []
+        return
+        
+    def GetID(self): return self.ID # 唯一ID
+    def GetOpenServerDay(self): return self.OpenServerDay # 开服天
+    def GetEventID(self): return self.EventID # 事件编号
+    def GetCondition(self): return self.Condition # 条件
+    def GetGearAward(self): return self.GearAward # 档位奖励
+    def GetBasicAward(self): return self.BasicAward # 保底奖励
 
 
 def Log(msg, playerID=0, par=0):
@@ -4329,6 +4309,8 @@
         self.ipyConfigEx = {}
         self.ipyDienstgradCache = self.__LoadFileData("Dienstgrad", IPY_Dienstgrad)
         self.ipyDienstgradLen = len(self.ipyDienstgradCache)
+        self.ipyRolePointCache = self.__LoadFileData("RolePoint", IPY_RolePoint)
+        self.ipyRolePointLen = len(self.ipyRolePointCache)
         self.ipyRealmCache = self.__LoadFileData("Realm", IPY_Realm)
         self.ipyRealmLen = len(self.ipyRealmCache)
         self.ipyGodWeaponCache = self.__LoadFileData("GodWeapon", IPY_GodWeapon)
@@ -4343,8 +4325,6 @@
         self.ipyItemPlusLen = len(self.ipyItemPlusCache)
         self.ipyItemPlusMaxCache = self.__LoadFileData("ItemPlusMax", IPY_ItemPlusMax)
         self.ipyItemPlusMaxLen = len(self.ipyItemPlusMaxCache)
-        self.ipyItemPlusSumAttrCache = self.__LoadFileData("ItemPlusSumAttr", IPY_ItemPlusSumAttr)
-        self.ipyItemPlusSumAttrLen = len(self.ipyItemPlusSumAttrCache)
         self.ipyRoleEquipStarsCache = self.__LoadFileData("RoleEquipStars", IPY_RoleEquipStars)
         self.ipyRoleEquipStarsLen = len(self.ipyRoleEquipStarsCache)
         self.ipyEquipLegendAttrCountCache = self.__LoadFileData("EquipLegendAttrCount", IPY_EquipLegendAttrCount)
@@ -4363,8 +4343,6 @@
         self.ipyRuneLen = len(self.ipyRuneCache)
         self.ipyEquipWashCache = self.__LoadFileData("EquipWash", IPY_EquipWash)
         self.ipyEquipWashLen = len(self.ipyEquipWashCache)
-        self.ipyEquipWashSpecCache = self.__LoadFileData("EquipWashSpec", IPY_EquipWashSpec)
-        self.ipyEquipWashSpecLen = len(self.ipyEquipWashSpecCache)
         self.ipyAttrFruitCache = self.__LoadFileData("AttrFruit", IPY_AttrFruit)
         self.ipyAttrFruitLen = len(self.ipyAttrFruitCache)
         self.ipyPetInfoCache = self.__LoadFileData("PetInfo", IPY_PetInfo)
@@ -4417,8 +4395,6 @@
         self.ipyTreasureLen = len(self.ipyTreasureCache)
         self.ipyTreasureUpCache = self.__LoadFileData("TreasureUp", IPY_TreasureUp)
         self.ipyTreasureUpLen = len(self.ipyTreasureUpCache)
-        self.ipyTreasurePrivilegeCache = self.__LoadFileData("TreasurePrivilege", IPY_TreasurePrivilege)
-        self.ipyTreasurePrivilegeLen = len(self.ipyTreasurePrivilegeCache)
         self.ipyContineSignAwardCache = self.__LoadFileData("ContineSignAward", IPY_ContineSignAward)
         self.ipyContineSignAwardLen = len(self.ipyContineSignAwardCache)
         self.ipySignAwardCache = self.__LoadFileData("SignAward", IPY_SignAward)
@@ -4609,6 +4585,12 @@
         self.ipyFamilyBossAwardLen = len(self.ipyFamilyBossAwardCache)
         self.ipyItemWashMaxCache = self.__LoadFileData("ItemWashMax", IPY_ItemWashMax)
         self.ipyItemWashMaxLen = len(self.ipyItemWashMaxCache)
+        self.ipyHorsePetBossAwardCache = self.__LoadFileData("HorsePetBossAward", IPY_HorsePetBossAward)
+        self.ipyHorsePetBossAwardLen = len(self.ipyHorsePetBossAwardCache)
+        self.ipyFairyDomainCache = self.__LoadFileData("FairyDomain", IPY_FairyDomain)
+        self.ipyFairyDomainLen = len(self.ipyFairyDomainCache)
+        self.ipyFairyAdventuresCache = self.__LoadFileData("FairyAdventures", IPY_FairyAdventures)
+        self.ipyFairyAdventuresLen = len(self.ipyFairyAdventuresCache)
         Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
         Log("IPY_DataMgr InitOK!")
         return
@@ -4777,6 +4759,8 @@
     
     def GetDienstgradCount(self): return self.ipyDienstgradLen
     def GetDienstgradByIndex(self, index): return self.ipyDienstgradCache[index]
+    def GetRolePointCount(self): return self.ipyRolePointLen
+    def GetRolePointByIndex(self, index): return self.ipyRolePointCache[index]
     def GetRealmCount(self): return self.ipyRealmLen
     def GetRealmByIndex(self, index): return self.ipyRealmCache[index]
     def GetGodWeaponCount(self): return self.ipyGodWeaponLen
@@ -4791,8 +4775,6 @@
     def GetItemPlusByIndex(self, index): return self.ipyItemPlusCache[index]
     def GetItemPlusMaxCount(self): return self.ipyItemPlusMaxLen
     def GetItemPlusMaxByIndex(self, index): return self.ipyItemPlusMaxCache[index]
-    def GetItemPlusSumAttrCount(self): return self.ipyItemPlusSumAttrLen
-    def GetItemPlusSumAttrByIndex(self, index): return self.ipyItemPlusSumAttrCache[index]
     def GetRoleEquipStarsCount(self): return self.ipyRoleEquipStarsLen
     def GetRoleEquipStarsByIndex(self, index): return self.ipyRoleEquipStarsCache[index]
     def GetEquipLegendAttrCountCount(self): return self.ipyEquipLegendAttrCountLen
@@ -4811,8 +4793,6 @@
     def GetRuneByIndex(self, index): return self.ipyRuneCache[index]
     def GetEquipWashCount(self): return self.ipyEquipWashLen
     def GetEquipWashByIndex(self, index): return self.ipyEquipWashCache[index]
-    def GetEquipWashSpecCount(self): return self.ipyEquipWashSpecLen
-    def GetEquipWashSpecByIndex(self, index): return self.ipyEquipWashSpecCache[index]
     def GetAttrFruitCount(self): return self.ipyAttrFruitLen
     def GetAttrFruitByIndex(self, index): return self.ipyAttrFruitCache[index]
     def GetPetInfoCount(self): return self.ipyPetInfoLen
@@ -4865,8 +4845,6 @@
     def GetTreasureByIndex(self, index): return self.ipyTreasureCache[index]
     def GetTreasureUpCount(self): return self.ipyTreasureUpLen
     def GetTreasureUpByIndex(self, index): return self.ipyTreasureUpCache[index]
-    def GetTreasurePrivilegeCount(self): return self.ipyTreasurePrivilegeLen
-    def GetTreasurePrivilegeByIndex(self, index): return self.ipyTreasurePrivilegeCache[index]
     def GetContineSignAwardCount(self): return self.ipyContineSignAwardLen
     def GetContineSignAwardByIndex(self, index): return self.ipyContineSignAwardCache[index]
     def GetSignAwardCount(self): return self.ipySignAwardLen
@@ -5057,6 +5035,12 @@
     def GetFamilyBossAwardByIndex(self, index): return self.ipyFamilyBossAwardCache[index]
     def GetItemWashMaxCount(self): return self.ipyItemWashMaxLen
     def GetItemWashMaxByIndex(self, index): return self.ipyItemWashMaxCache[index]
+    def GetHorsePetBossAwardCount(self): return self.ipyHorsePetBossAwardLen
+    def GetHorsePetBossAwardByIndex(self, index): return self.ipyHorsePetBossAwardCache[index]
+    def GetFairyDomainCount(self): return self.ipyFairyDomainLen
+    def GetFairyDomainByIndex(self, index): return self.ipyFairyDomainCache[index]
+    def GetFairyAdventuresCount(self): return self.ipyFairyAdventuresLen
+    def GetFairyAdventuresByIndex(self, index): return self.ipyFairyAdventuresCache[index]
 
 IPYData = IPY_DataMgr()
 def IPY_Data(): return IPYData

--
Gitblit v1.8.0