From ff605c7a895524d29abd2badfb38ad3f26fa8a1c Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 22 十二月 2018 15:07:52 +0800
Subject: [PATCH] 5303 【后端】【1.4】仙盟宴会传功修改,开始答题时间修改

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |  246 +++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 228 insertions(+), 18 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index b98e29f..28e124a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -151,6 +151,7 @@
                 "Rune":(
                         ("DWORD", "ID", 1),
                         ("list", "AttrType", 0),
+                        ("DWORD", "TowerID", 0),
                         ),
 
                 "EquipWash":(
@@ -188,6 +189,7 @@
                         ("BYTE", "FuncID", 0),
                         ("WORD", "MaxUseCnt", 0),
                         ("WORD", "RecycleMoney", 0),
+                        ("DWORD", "FightPowerEx", 0),
                         ),
 
                 "PetInfo":(
@@ -279,6 +281,7 @@
                         ("DWORD", "RePotionCD", 0),
                         ("DWORD", "AttackEff", 0),
                         ("DWORD", "ReFightPower", 0),
+                        ("DWORD", "IceLodeFightPower", 0),
                         ),
 
                 "GMAttr":(
@@ -295,6 +298,7 @@
                 "NPCStrengthen":(
                         ("DWORD", "NPCID", 1),
                         ("BYTE", "IsStrengthenByPlayerCount", 0),
+                        ("BYTE", "LVStrengthenMark", 0),
                         ("BYTE", "LVStrengthenType", 0),
                         ("BYTE", "CmpNPCBaseLV", 0),
                         ("DWORD", "HitTime", 0),
@@ -436,7 +440,9 @@
                         ("DWORD", "ExtraTimesMWPriID", 0),
                         ("BYTE", "GuardPick", 0),
                         ("WORD", "OfflineTime", 0),
+                        ("WORD", "FBPoint", 0),
                         ("WORD", "HelpPoint", 0),
+                        ("BYTE", "DayHelpCountMax", 0),
                         ),
 
                 "FBLine":(
@@ -457,6 +463,17 @@
                         ("eval", "RefreshNPC", 0),
                         ("eval", "GradeInfo", 0),
                         ("eval", "RewardInfo", 0),
+                        ),
+
+                "FBHelpBattle":(
+                        ("DWORD", "DataMapID", 1),
+                        ("BYTE", "LineID", 1),
+                        ("DWORD", "FightPowerMin", 0),
+                        ("DWORD", "RobotFightPower", 0),
+                        ("WORD", "RobotLV", 0),
+                        ("DWORD", "RobotBaseHurt", 0),
+                        ("WORD", "RobotHPCoefficient", 0),
+                        ("dict", "RobotSkillsDict", 0),
                         ),
 
                 "NPCCustomRefresh":(
@@ -545,6 +562,7 @@
                         ("DWORD", "ActiveMWID", 0),
                         ("list", "ItemAward", 0),
                         ("DWORD", "ActiveSoulID", 0),
+                        ("DWORD", "PowerEx", 0),
                         ),
 
                 "TreasurePrivilege":(
@@ -787,6 +805,7 @@
                         ("dict", "JadeReward", 0),
                         ("DWORD", "CostCopper", 0),
                         ("dict", "CopperReward", 0),
+                        ("list", "JobItemList", 0),
                         ),
 
                 "Chests":(
@@ -869,6 +888,7 @@
                         ("WORD", "GainGoldPrize", 0),
                         ("WORD", "FirstGoldPrize", 0),
                         ("list", "GainItemList", 0),
+                        ("char", "NotifyMark", 0),
                         ),
 
                 "LVAward":(
@@ -987,6 +1007,7 @@
                         ("DWORD", "CfgID", 1),
                         ("WORD", "Multiple", 0),
                         ("WORD", "LVLimit", 0),
+                        ("DWORD", "PointLimit", 0),
                         ),
 
                 "TrialExchange":(
@@ -1058,6 +1079,7 @@
                         ("BYTE", "IsBind", 0),
                         ("DWORD", "Weight", 0),
                         ("DWORD", "Mark", 0),
+                        ("BYTE", "Rare", 0),
                         ),
 
                 "FunctionForecast":(
@@ -1094,6 +1116,44 @@
                         ("BYTE", "Level", 1),
                         ("list", "RefreshNPC", 0),
                         ("dict", "AttrDict", 0),
+                        ),
+
+                "IceLodeStarAward":(
+                        ("BYTE", "Index", 1),
+                        ("BYTE", "Star", 0),
+                        ("list", "LVLimit", 0),
+                        ("list", "ItemList", 0),
+                        ),
+
+                "GodWeaponEffect":(
+                        ("BYTE", "GWType", 0),
+                        ("WORD", "Level", 0),
+                        ("char", "NotifyCode", 0),
+                        ("DWORD", "FightPower", 0),
+                        ("dict", "Attr", 0),
+                        ),
+
+                "GatherSoul":(
+                        ("DWORD", "ItemID", 1),
+                        ("list", "AttrType", 0),
+                        ("BYTE", "SoulGrade", 0),
+                        ),
+
+                "GatherSoulCompound":(
+                        ("DWORD", "TagItemID", 1),
+                        ("WORD", "NeedLV", 0),
+                        ("list", "NeedItem", 0),
+                        ("WORD", "NeedSoulSplinters", 0),
+                        ("WORD", "NeedSoulCore", 0),
+                        ),
+
+                "GatherSoulAttr":(
+                        ("WORD", "AttrType", 1),
+                        ("char", "AttrInfo1", 0),
+                        ("dict", "AttrInfo2", 0),
+                        ("dict", "AttrInfo3", 0),
+                        ("dict", "AttrInfo4", 0),
+                        ("dict", "AttrInfo5", 0),
                         ),
                 }
 
@@ -1347,11 +1407,13 @@
     
     def __init__(self):
         self.ID = 0
-        self.AttrType = []
+        self.AttrType = []
+        self.TowerID = 0
         return
         
     def GetID(self): return self.ID # 编号ID
-    def GetAttrType(self): return self.AttrType # 全身强化激活属性类型
+    def GetAttrType(self): return self.AttrType # 属性类型
+    def GetTowerID(self): return self.TowerID # 解锁符印塔编号
 
 # 洗练表
 class IPY_EquipWash():
@@ -1422,13 +1484,15 @@
         self.ID = 0
         self.FuncID = 0
         self.MaxUseCnt = 0
-        self.RecycleMoney = 0
+        self.RecycleMoney = 0
+        self.FightPowerEx = 0
         return
         
     def GetID(self): return self.ID # 物品ID
     def GetFuncID(self): return self.FuncID # 所属功能ID
     def GetMaxUseCnt(self): return self.MaxUseCnt # 最大可使用数量
-    def GetRecycleMoney(self): return self.RecycleMoney # 回收货币值
+    def GetRecycleMoney(self): return self.RecycleMoney # 回收货币值
+    def GetFightPowerEx(self): return self.FightPowerEx # 附加战斗力
 
 # 灵兽表
 class IPY_PetInfo():
@@ -1586,7 +1650,8 @@
         self.RePotionReply = 0
         self.RePotionCD = 0
         self.AttackEff = 0
-        self.ReFightPower = 0
+        self.ReFightPower = 0
+        self.IceLodeFightPower = 0
         return
         
     def GetLV(self): return self.LV # 玩家等级
@@ -1617,7 +1682,8 @@
     def GetRePotionReply(self): return self.RePotionReply # 血瓶恢复量
     def GetRePotionCD(self): return self.RePotionCD # 血瓶CD
     def GetAttackEff(self): return self.AttackEff # 挂机效率
-    def GetReFightPower(self): return self.ReFightPower # 战斗力
+    def GetReFightPower(self): return self.ReFightPower # 战斗力
+    def GetIceLodeFightPower(self): return self.IceLodeFightPower # 冰晶矿脉扫荡战斗力
 
 # GM测试属性表
 class IPY_GMAttr():
@@ -1648,6 +1714,7 @@
     def __init__(self):
         self.NPCID = 0
         self.IsStrengthenByPlayerCount = 0
+        self.LVStrengthenMark = 0
         self.LVStrengthenType = 0
         self.CmpNPCBaseLV = 0
         self.HitTime = 0
@@ -1666,6 +1733,7 @@
         
     def GetNPCID(self): return self.NPCID # NPCID
     def GetIsStrengthenByPlayerCount(self): return self.IsStrengthenByPlayerCount # 是否根据人数成长
+    def GetLVStrengthenMark(self): return self.LVStrengthenMark # 等级成长属性公式标记
     def GetLVStrengthenType(self): return self.LVStrengthenType # 等级成长类型, 0-不按等级成长;1-按玩家平均等级;2-按玩家最大等级;3-按世界等级;
     def GetCmpNPCBaseLV(self): return self.CmpNPCBaseLV # 是否比较NPC表等级, 是的话取NPC表配置等级与成长等级中较大等级
     def GetHitTime(self): return self.HitTime # 受击次数
@@ -1930,7 +1998,9 @@
         self.ExtraTimesMWPriID = 0
         self.GuardPick = 0
         self.OfflineTime = 0
-        self.HelpPoint = 0
+        self.FBPoint = 0
+        self.HelpPoint = 0
+        self.DayHelpCountMax = 0
         return
         
     def GetDataMapID(self): return self.DataMapID # 数据地图ID
@@ -1944,7 +2014,9 @@
     def GetExtraTimesMWPriID(self): return self.ExtraTimesMWPriID # 额外次数法宝权限ID
     def GetGuardPick(self): return self.GuardPick # 该地图守护是否能拾取
     def GetOfflineTime(self): return self.OfflineTime # 离线多久退出副本(秒)
-    def GetHelpPoint(self): return self.HelpPoint # 助战积分(0代表不可助战)
+    def GetFBPoint(self): return self.FBPoint # 副本过关仙缘币
+    def GetHelpPoint(self): return self.HelpPoint # 助战仙缘币(0代表不可助战)
+    def GetDayHelpCountMax(self): return self.DayHelpCountMax # 每日手动助战获得仙缘币次数(非镜像)
 
 # 副本功能线路表
 class IPY_FBLine():
@@ -1986,6 +2058,29 @@
     def GetRefreshNPC(self): return self.RefreshNPC # 标试点刷怪配置
     def GetGradeInfo(self): return self.GradeInfo # 评级规则
     def GetRewardInfo(self): return self.RewardInfo # 奖励信息
+
+# 副本助战表
+class IPY_FBHelpBattle():
+    
+    def __init__(self):
+        self.DataMapID = 0
+        self.LineID = 0
+        self.FightPowerMin = 0
+        self.RobotFightPower = 0
+        self.RobotLV = 0
+        self.RobotBaseHurt = 0
+        self.RobotHPCoefficient = 0
+        self.RobotSkillsDict = {}
+        return
+        
+    def GetDataMapID(self): return self.DataMapID # 数据地图ID
+    def GetLineID(self): return self.LineID # 功能线路ID
+    def GetFightPowerMin(self): return self.FightPowerMin # 助战最低战力,也是副本保底战力
+    def GetRobotFightPower(self): return self.RobotFightPower # 助战NPC战力
+    def GetRobotLV(self): return self.RobotLV # 助战NPC等级
+    def GetRobotBaseHurt(self): return self.RobotBaseHurt # 助战NPC保底伤害
+    def GetRobotHPCoefficient(self): return self.RobotHPCoefficient # 助战NPC生命系数
+    def GetRobotSkillsDict(self): return self.RobotSkillsDict # 助战NPC技能, {"职业":[技能列表], ...}
 
 # 副本刷怪标识点表
 class IPY_NPCCustomRefresh():
@@ -2157,7 +2252,8 @@
         self.UnLockSkill = []
         self.ActiveMWID = 0
         self.ItemAward = []
-        self.ActiveSoulID = 0
+        self.ActiveSoulID = 0
+        self.PowerEx = 0
         return
         
     def GetMWID(self): return self.MWID # 法宝ID
@@ -2167,7 +2263,8 @@
     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 GetActiveSoulID(self): return self.ActiveSoulID # 激活魂ID
+    def GetPowerEx(self): return self.PowerEx # 额外固定战力
 
 # 法宝特权表
 class IPY_TreasurePrivilege():
@@ -2666,7 +2763,8 @@
         self.VipCostJade = 0
         self.JadeReward = {}
         self.CostCopper = 0
-        self.CopperReward = {}
+        self.CopperReward = {}
+        self.JobItemList = []
         return
         
     def GetID(self): return self.ID # ID
@@ -2676,7 +2774,8 @@
     def GetVipCostJade(self): return self.VipCostJade # 绑玉找回VIP次数找回价格
     def GetJadeReward(self): return self.JadeReward # 绑玉找回奖励
     def GetCostCopper(self): return self.CostCopper # 铜钱找回铜钱消耗
-    def GetCopperReward(self): return self.CopperReward # 铜钱找回奖励
+    def GetCopperReward(self): return self.CopperReward # 铜钱找回奖励
+    def GetJobItemList(self): return self.JobItemList # 职业物品列表
 
 # 宝箱表开启
 class IPY_Chests():
@@ -2842,7 +2941,8 @@
         self.GainGold = 0
         self.GainGoldPrize = 0
         self.FirstGoldPrize = 0
-        self.GainItemList = []
+        self.GainItemList = []
+        self.NotifyMark = ""
         return
         
     def GetRecordID(self): return self.RecordID # 记录ID
@@ -2850,7 +2950,8 @@
     def GetGainGold(self): return self.GainGold # 获得仙玉数
     def GetGainGoldPrize(self): return self.GainGoldPrize # 赠送仙玉数
     def GetFirstGoldPrize(self): return self.FirstGoldPrize # 首次充值该档位赠送仙玉
-    def GetGainItemList(self): return self.GainItemList # 获得物品列表[[物品ID,个数,是否绑定], ...]
+    def GetGainItemList(self): return self.GainItemList # 获得物品列表[[物品ID,个数,是否绑定], ...]
+    def GetNotifyMark(self): return self.NotifyMark # 广播提示
 
 # 等级奖励表
 class IPY_LVAward():
@@ -3094,12 +3195,14 @@
     def __init__(self):
         self.CfgID = 0
         self.Multiple = 0
-        self.LVLimit = 0
+        self.LVLimit = 0
+        self.PointLimit = 0
         return
         
     def GetCfgID(self): return self.CfgID # 配置ID
     def GetMultiple(self): return self.Multiple # 倍数
-    def GetLVLimit(self): return self.LVLimit # 限制等级
+    def GetLVLimit(self): return self.LVLimit # 限制等级
+    def GetPointLimit(self): return self.PointLimit # 限制额外修行点
 
 # 宗门试炼兑换表
 class IPY_TrialExchange():
@@ -3239,7 +3342,8 @@
         self.ItemCnt = 0
         self.IsBind = 0
         self.Weight = 0
-        self.Mark = 0
+        self.Mark = 0
+        self.Rare = 0
         return
         
     def GetTemplateID(self): return self.TemplateID # 模板ID
@@ -3249,7 +3353,8 @@
     def GetItemCnt(self): return self.ItemCnt # 物品数量
     def GetIsBind(self): return self.IsBind # 是否绑定
     def GetWeight(self): return self.Weight # 权重
-    def GetMark(self): return self.Mark # 排序用标识
+    def GetMark(self): return self.Mark # 排序用标识
+    def GetRare(self): return self.Rare # 珍稀值
 
 # 功能预告表
 class IPY_FunctionForecast():
@@ -3327,6 +3432,87 @@
     def GetLevel(self): return self.Level # 关卡
     def GetRefreshNPC(self): return self.RefreshNPC # 刷怪配置
     def GetAttrDict(self): return self.AttrDict # 属性
+
+# 冰晶矿脉星级奖励表
+class IPY_IceLodeStarAward():
+    
+    def __init__(self):
+        self.Index = 0
+        self.Star = 0
+        self.LVLimit = []
+        self.ItemList = []
+        return
+        
+    def GetIndex(self): return self.Index # 奖励索引
+    def GetStar(self): return self.Star # 星数
+    def GetLVLimit(self): return self.LVLimit # 等级范围
+    def GetItemList(self): return self.ItemList # 奖励
+
+# 神兵特效表
+class IPY_GodWeaponEffect():
+    
+    def __init__(self):
+        self.GWType = 0
+        self.Level = 0
+        self.NotifyCode = ""
+        self.FightPower = 0
+        self.Attr = {}
+        return
+        
+    def GetGWType(self): return self.GWType # 神兵类型
+    def GetLevel(self): return self.Level # 神兵等级
+    def GetNotifyCode(self): return self.NotifyCode # 广播
+    def GetFightPower(self): return self.FightPower # 增加战力
+    def GetAttr(self): return self.Attr # 属性加成
+
+# 聚魂表
+class IPY_GatherSoul():
+    
+    def __init__(self):
+        self.ItemID = 0
+        self.AttrType = []
+        self.SoulGrade = 0
+        return
+        
+    def GetItemID(self): return self.ItemID # 物品ID
+    def GetAttrType(self): return self.AttrType # 属性类型
+    def GetSoulGrade(self): return self.SoulGrade # 魂阶段
+
+# 聚魂合成表
+class IPY_GatherSoulCompound():
+    
+    def __init__(self):
+        self.TagItemID = 0
+        self.NeedLV = 0
+        self.NeedItem = []
+        self.NeedSoulSplinters = 0
+        self.NeedSoulCore = 0
+        return
+        
+    def GetTagItemID(self): return self.TagItemID # 合成的物品ID
+    def GetNeedLV(self): return self.NeedLV # 需要的玩家等级
+    def GetNeedItem(self): return self.NeedItem # 需要的物品ID
+    def GetNeedSoulSplinters(self): return self.NeedSoulSplinters # 需要的聚魂碎片
+    def GetNeedSoulCore(self): return self.NeedSoulCore # 需要的核心环
+
+# 聚魂属性表
+class IPY_GatherSoulAttr():
+    
+    def __init__(self):
+        self.AttrType = 0
+        self.AttrInfo1 = ""
+        self.AttrInfo2 = {}
+        self.AttrInfo3 = {}
+        self.AttrInfo4 = {}
+        self.AttrInfo5 = {}
+        return
+        
+    def GetAttrType(self): return self.AttrType # 属性类型
+    def GetAttrInfo1(self): return self.AttrInfo1 # 基础属性-参数聚魂等级level
+    def GetAttrInfo2(self): return self.AttrInfo2 # 品质系数(品质_系数|…)
+    def GetAttrInfo3(self): return self.AttrInfo3 # 多属性系数
+    def GetAttrInfo4(self): return self.AttrInfo4 # 初始属性(品质_属性值|…)
+    def GetAttrInfo5(self): return self.AttrInfo5 # 阶段系数
 
 
 def Log(msg, playerID=0, par=0):
@@ -3422,6 +3608,8 @@
         self.ipyFBFuncLen = len(self.ipyFBFuncCache)
         self.ipyFBLineCache = self.__LoadFileData("FBLine", IPY_FBLine)
         self.ipyFBLineLen = len(self.ipyFBLineCache)
+        self.ipyFBHelpBattleCache = self.__LoadFileData("FBHelpBattle", IPY_FBHelpBattle)
+        self.ipyFBHelpBattleLen = len(self.ipyFBHelpBattleCache)
         self.ipyNPCCustomRefreshCache = self.__LoadFileData("NPCCustomRefresh", IPY_NPCCustomRefresh)
         self.ipyNPCCustomRefreshLen = len(self.ipyNPCCustomRefreshCache)
         self.ipyDailyActionCache = self.__LoadFileData("DailyAction", IPY_DailyAction)
@@ -3556,6 +3744,16 @@
         self.ipyTotalRechargeTemplateLen = len(self.ipyTotalRechargeTemplateCache)
         self.ipyMagicWeaponFBCache = self.__LoadFileData("MagicWeaponFB", IPY_MagicWeaponFB)
         self.ipyMagicWeaponFBLen = len(self.ipyMagicWeaponFBCache)
+        self.ipyIceLodeStarAwardCache = self.__LoadFileData("IceLodeStarAward", IPY_IceLodeStarAward)
+        self.ipyIceLodeStarAwardLen = len(self.ipyIceLodeStarAwardCache)
+        self.ipyGodWeaponEffectCache = self.__LoadFileData("GodWeaponEffect", IPY_GodWeaponEffect)
+        self.ipyGodWeaponEffectLen = len(self.ipyGodWeaponEffectCache)
+        self.ipyGatherSoulCache = self.__LoadFileData("GatherSoul", IPY_GatherSoul)
+        self.ipyGatherSoulLen = len(self.ipyGatherSoulCache)
+        self.ipyGatherSoulCompoundCache = self.__LoadFileData("GatherSoulCompound", IPY_GatherSoulCompound)
+        self.ipyGatherSoulCompoundLen = len(self.ipyGatherSoulCompoundCache)
+        self.ipyGatherSoulAttrCache = self.__LoadFileData("GatherSoulAttr", IPY_GatherSoulAttr)
+        self.ipyGatherSoulAttrLen = len(self.ipyGatherSoulAttrCache)
         Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
         Log("IPY_DataMgr InitOK!")
         return
@@ -3792,6 +3990,8 @@
     def GetFBFuncByIndex(self, index): return self.ipyFBFuncCache[index]
     def GetFBLineCount(self): return self.ipyFBLineLen
     def GetFBLineByIndex(self, index): return self.ipyFBLineCache[index]
+    def GetFBHelpBattleCount(self): return self.ipyFBHelpBattleLen
+    def GetFBHelpBattleByIndex(self, index): return self.ipyFBHelpBattleCache[index]
     def GetNPCCustomRefreshCount(self): return self.ipyNPCCustomRefreshLen
     def GetNPCCustomRefreshByIndex(self, index): return self.ipyNPCCustomRefreshCache[index]
     def GetDailyActionCount(self): return self.ipyDailyActionLen
@@ -3926,6 +4126,16 @@
     def GetTotalRechargeTemplateByIndex(self, index): return self.ipyTotalRechargeTemplateCache[index]
     def GetMagicWeaponFBCount(self): return self.ipyMagicWeaponFBLen
     def GetMagicWeaponFBByIndex(self, index): return self.ipyMagicWeaponFBCache[index]
+    def GetIceLodeStarAwardCount(self): return self.ipyIceLodeStarAwardLen
+    def GetIceLodeStarAwardByIndex(self, index): return self.ipyIceLodeStarAwardCache[index]
+    def GetGodWeaponEffectCount(self): return self.ipyGodWeaponEffectLen
+    def GetGodWeaponEffectByIndex(self, index): return self.ipyGodWeaponEffectCache[index]
+    def GetGatherSoulCount(self): return self.ipyGatherSoulLen
+    def GetGatherSoulByIndex(self, index): return self.ipyGatherSoulCache[index]
+    def GetGatherSoulCompoundCount(self): return self.ipyGatherSoulCompoundLen
+    def GetGatherSoulCompoundByIndex(self, index): return self.ipyGatherSoulCompoundCache[index]
+    def GetGatherSoulAttrCount(self): return self.ipyGatherSoulAttrLen
+    def GetGatherSoulAttrByIndex(self, index): return self.ipyGatherSoulAttrCache[index]
 
 IPYData = IPY_DataMgr()
 def IPY_Data(): return IPYData

--
Gitblit v1.8.0