From 97cbea04b641f367c24096e69dfe058baf80b150 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 05 十二月 2018 15:42:59 +0800
Subject: [PATCH] 5242 【后端】【1.3.100】仙盟宴会答题修改为只能在宴会地图内才能答题

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |  168 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 154 insertions(+), 14 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index fc6cd29..87f794c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -188,6 +188,7 @@
                         ("BYTE", "FuncID", 0),
                         ("WORD", "MaxUseCnt", 0),
                         ("WORD", "RecycleMoney", 0),
+                        ("DWORD", "FightPowerEx", 0),
                         ),
 
                 "PetInfo":(
@@ -279,6 +280,7 @@
                         ("DWORD", "RePotionCD", 0),
                         ("DWORD", "AttackEff", 0),
                         ("DWORD", "ReFightPower", 0),
+                        ("DWORD", "IceLodeFightPower", 0),
                         ),
 
                 "GMAttr":(
@@ -436,7 +438,9 @@
                         ("DWORD", "ExtraTimesMWPriID", 0),
                         ("BYTE", "GuardPick", 0),
                         ("WORD", "OfflineTime", 0),
+                        ("WORD", "FBPoint", 0),
                         ("WORD", "HelpPoint", 0),
+                        ("BYTE", "DayHelpCountMax", 0),
                         ),
 
                 "FBLine":(
@@ -457,6 +461,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 +560,7 @@
                         ("DWORD", "ActiveMWID", 0),
                         ("list", "ItemAward", 0),
                         ("DWORD", "ActiveSoulID", 0),
+                        ("DWORD", "PowerEx", 0),
                         ),
 
                 "TreasurePrivilege":(
@@ -869,6 +885,7 @@
                         ("WORD", "GainGoldPrize", 0),
                         ("WORD", "FirstGoldPrize", 0),
                         ("list", "GainItemList", 0),
+                        ("char", "NotifyMark", 0),
                         ),
 
                 "LVAward":(
@@ -987,6 +1004,7 @@
                         ("DWORD", "CfgID", 1),
                         ("WORD", "Multiple", 0),
                         ("WORD", "LVLimit", 0),
+                        ("DWORD", "PointLimit", 0),
                         ),
 
                 "TrialExchange":(
@@ -1058,6 +1076,7 @@
                         ("BYTE", "IsBind", 0),
                         ("DWORD", "Weight", 0),
                         ("DWORD", "Mark", 0),
+                        ("BYTE", "Rare", 0),
                         ),
 
                 "FunctionForecast":(
@@ -1086,6 +1105,27 @@
                         ("BYTE", "AwardIndex", 0),
                         ("dict", "AwardItem", 0),
                         ("char", "NotifyKey", 0),
+                        ),
+
+                "MagicWeaponFB":(
+                        ("DWORD", "MWID", 1),
+                        ("BYTE", "LineID", 0),
+                        ("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),
                         ),
                 }
 
@@ -1414,13 +1454,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():
@@ -1578,7 +1620,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 # 玩家等级
@@ -1609,7 +1652,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():
@@ -1922,7 +1966,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
@@ -1936,7 +1982,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():
@@ -1978,6 +2026,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():
@@ -2149,7 +2220,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
@@ -2159,7 +2231,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():
@@ -2834,7 +2907,8 @@
         self.GainGold = 0
         self.GainGoldPrize = 0
         self.FirstGoldPrize = 0
-        self.GainItemList = []
+        self.GainItemList = []
+        self.NotifyMark = ""
         return
         
     def GetRecordID(self): return self.RecordID # 记录ID
@@ -2842,7 +2916,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():
@@ -3086,12 +3161,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():
@@ -3231,7 +3308,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
@@ -3241,7 +3319,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():
@@ -3302,6 +3381,51 @@
     def GetAwardIndex(self): return self.AwardIndex # 返利奖励索引0~31,同个模板中不重复
     def GetAwardItem(self): return self.AwardItem # 返利物品信息列表 {职业:[(物品ID,个数,是否绑定),...]}
     def GetNotifyKey(self): return self.NotifyKey # 全服广播key,默认两个参数(玩家名, 档位额度)
+
+# 法宝副本表
+class IPY_MagicWeaponFB():
+    
+    def __init__(self):
+        self.MWID = 0
+        self.LineID = 0
+        self.Level = 0
+        self.RefreshNPC = []
+        self.AttrDict = {}
+        return
+        
+    def GetMWID(self): return self.MWID # 法宝ID
+    def GetLineID(self): return self.LineID # 副本功能线路ID
+    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 = ""
+        return
+        
+    def GetGWType(self): return self.GWType # 神兵类型
+    def GetLevel(self): return self.Level # 神兵等级
+    def GetNotifyCode(self): return self.NotifyCode # 广播
 
 
 def Log(msg, playerID=0, par=0):
@@ -3397,6 +3521,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)
@@ -3529,6 +3655,12 @@
         self.ipyActTotalRechargeLen = len(self.ipyActTotalRechargeCache)
         self.ipyTotalRechargeTemplateCache = self.__LoadFileData("TotalRechargeTemplate", IPY_TotalRechargeTemplate)
         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)
         Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
         Log("IPY_DataMgr InitOK!")
         return
@@ -3765,6 +3897,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
@@ -3897,6 +4031,12 @@
     def GetActTotalRechargeByIndex(self, index): return self.ipyActTotalRechargeCache[index]
     def GetTotalRechargeTemplateCount(self): return self.ipyTotalRechargeTemplateLen
     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]
 
 IPYData = IPY_DataMgr()
 def IPY_Data(): return IPYData

--
Gitblit v1.8.0