From e1a7147dc7b7e8f9ba72cfa0065695a8d7c3bac6 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 28 八月 2018 11:52:05 +0800
Subject: [PATCH] fix:2989 【后端】开服特惠由创角开启改为开服时开启

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |  165 +++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 129 insertions(+), 36 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index a6319fb..4d37b82 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -62,6 +62,7 @@
                         ("list", "AttrType", 0),
                         ("list", "AttrNum", 0),
                         ("DWORD", "SkillID", 0),
+                        ("char", "SysMark", 0),
                         ),
 
                 "FuncConfig":(
@@ -124,6 +125,22 @@
                         ("list", "AttrValue", 0),
                         ),
 
+                "Dogz":(
+                        ("BYTE", "DogzID", 1),
+                        ("list", "BaseAttrTypes", 0),
+                        ("list", "BaseAttrValues", 0),
+                        ("list", "HelpBattleSkills", 0),
+                        ("list", "EquipPlaceColorList", 0),
+                        ),
+
+                "DogzEquipPlus":(
+                        ("BYTE", "EquipPlace", 1),
+                        ("BYTE", "PlusLV", 1),
+                        ("list", "PlusAttrTypes", 0),
+                        ("list", "PlusAttrValues", 0),
+                        ("DWORD", "PlusLVUPTotalExp", 0),
+                        ),
+
                 "Rune":(
                         ("DWORD", "ID", 1),
                         ("list", "AttrType", 0),
@@ -169,6 +186,7 @@
                 "PetInfo":(
                         ("DWORD", "ID", 1),
                         ("BYTE", "Quality", 0),
+                        ("char", "UnlockSys", 0),
                         ("DWORD", "UnLockNeedItemID", 0),
                         ("BYTE", "UnLockNeedItemCnt", 0),
                         ("DWORD", "DecomposeExp", 0),
@@ -177,6 +195,7 @@
                         ("WORD", "UseNeedRank", 0),
                         ("list", "SkillID", 0),
                         ("list", "SkillUnLock", 0),
+                        ("list", "SkillUnLockSys", 0),
                         ("DWORD", "InitFightPower", 0),
                         ),
 
@@ -210,6 +229,7 @@
                         ("BYTE", "UseNeedRank", 0),
                         ("BYTE", "Quality", 0),
                         ("DWORD", "InitFightPower", 0),
+                        ("char", "UnlockSys", 0),
                         ),
 
                 "HorseUp":(
@@ -219,6 +239,7 @@
                         ("list", "AttrType", 0),
                         ("list", "AttrValue", 0),
                         ("list", "SkillID", 0),
+                        ("char", "SysMark", 0),
                         ),
 
                 "PlayerLV":(
@@ -506,7 +527,8 @@
                         ("DWORD", "NeedExp", 0),
                         ("dict", "AddAttr", 0),
                         ("list", "UnLockSkill", 0),
-                        ("DWORD", "PrivilegeID", 0),
+                        ("DWORD", "ActiveMWID", 0),
+                        ("list", "ItemAward", 0),
                         ),
 
                 "TreasurePrivilege":(
@@ -516,6 +538,7 @@
                         ("DWORD", "MaxValue", 0),
                         ("dict", "AddAttr", 0),
                         ("list", "ItemAward", 0),
+                        ("list", "SuccessList", 0),
                         ),
 
                 "TreasureSkill":(
@@ -899,21 +922,16 @@
                         ),
 
                 "BossReborn":(
+                        ("BYTE", "TemplateID", 1),
                         ("BYTE", "ID", 1),
                         ("DWORD", "TotalTimes", 0),
                         ("WORD", "SingleTimes", 0),
-                        ("list", "RewardItemID1", 0),
-                        ("list", "RewardItemCnt1", 0),
-                        ("list", "RewardItemID2", 0),
-                        ("list", "RewardItemCnt2", 0),
-                        ("list", "RewardItemID3", 0),
-                        ("list", "RewardItemCnt3", 0),
-                        ("list", "WorldLVList", 0),
+                        ("list", "Reward", 0),
                         ),
 
                 "TrialExchange":(
                         ("DWORD", "ID", 1),
-                        ("DWORD", "ExchangeItemID", 0),
+                        ("list", "ExchangeItemIDList", 0),
                         ("DWORD", "ExchangeItemCount", 0),
                         ("DWORD", "ExchangeItemIsBind", 0),
                         ("DWORD", "CostItemID", 0),
@@ -931,6 +949,14 @@
                         ("DWORD", "Index", 1),
                         ("DWORD", "NeedPoint", 0),
                         ("dict", "Award", 0),
+                        ),
+
+                "MapEventPoint":(
+                        ("DWORD", "MapID", 1),
+                        ("DWORD", "NPCID", 1),
+                        ("WORD", "LowLV", 0),
+                        ("WORD", "HighestLV", 0),
+                        ("DWORD", "Defense", 0),
                         ),
                 }
 
@@ -992,7 +1018,8 @@
         self.Exp = 0
         self.AttrType = []
         self.AttrNum = []
-        self.SkillID = 0
+        self.SkillID = 0
+        self.SysMark = ""
         return
         
     def GetType(self): return self.Type # 神兵类型
@@ -1000,7 +1027,8 @@
     def GetExp(self): return self.Exp
     def GetAttrType(self): return self.AttrType # 属性类型
     def GetAttrNum(self): return self.AttrNum # 属性值
-    def GetSkillID(self): return self.SkillID # 激活技能ID
+    def GetSkillID(self): return self.SkillID # 激活技能ID
+    def GetSysMark(self): return self.SysMark # 系统提示
 
 # 功能配置表格
 class IPY_FuncConfig():
@@ -1129,6 +1157,40 @@
     def GetAttrType(self): return self.AttrType # 属性类型
     def GetAttrValue(self): return self.AttrValue # 属性值
 
+# 神兽表
+class IPY_Dogz():
+    
+    def __init__(self):
+        self.DogzID = 0
+        self.BaseAttrTypes = []
+        self.BaseAttrValues = []
+        self.HelpBattleSkills = []
+        self.EquipPlaceColorList = []
+        return
+        
+    def GetDogzID(self): return self.DogzID # 神兽ID
+    def GetBaseAttrTypes(self): return self.BaseAttrTypes # 基础属性类型列表
+    def GetBaseAttrValues(self): return self.BaseAttrValues # 基础属性值列表
+    def GetHelpBattleSkills(self): return self.HelpBattleSkills # 助战技能ID列表
+    def GetEquipPlaceColorList(self): return self.EquipPlaceColorList # 穿戴装备颜色限制
+
+# 神兽强化表
+class IPY_DogzEquipPlus():
+    
+    def __init__(self):
+        self.EquipPlace = 0
+        self.PlusLV = 0
+        self.PlusAttrTypes = []
+        self.PlusAttrValues = []
+        self.PlusLVUPTotalExp = 0
+        return
+        
+    def GetEquipPlace(self): return self.EquipPlace # 装备位
+    def GetPlusLV(self): return self.PlusLV # 强化等级
+    def GetPlusAttrTypes(self): return self.PlusAttrTypes # 强化属性类型列表
+    def GetPlusAttrValues(self): return self.PlusAttrValues # 强化属性值列表
+    def GetPlusLVUPTotalExp(self): return self.PlusLVUPTotalExp # 升级所需累计熟练度总值
+
 # 符印表
 class IPY_Rune():
     
@@ -1223,6 +1285,7 @@
     def __init__(self):
         self.ID = 0
         self.Quality = 0
+        self.UnlockSys = ""
         self.UnLockNeedItemID = 0
         self.UnLockNeedItemCnt = 0
         self.DecomposeExp = 0
@@ -1231,11 +1294,13 @@
         self.UseNeedRank = 0
         self.SkillID = []
         self.SkillUnLock = []
+        self.SkillUnLockSys = []
         self.InitFightPower = 0
         return
         
     def GetID(self): return self.ID # 灵兽NPCID
     def GetQuality(self): return self.Quality # 品质
+    def GetUnlockSys(self): return self.UnlockSys # 解锁广播提示
     def GetUnLockNeedItemID(self): return self.UnLockNeedItemID # 解锁灵兽物品ID
     def GetUnLockNeedItemCnt(self): return self.UnLockNeedItemCnt # 解锁所需物品数量
     def GetDecomposeExp(self): return self.DecomposeExp # 分解单个解锁物品可获得升阶经验
@@ -1244,6 +1309,7 @@
     def GetUseNeedRank(self): return self.UseNeedRank # 多少阶可切换外观
     def GetSkillID(self): return self.SkillID # 灵兽技能ID
     def GetSkillUnLock(self): return self.SkillUnLock # 灵兽技能解锁需要阶数
+    def GetSkillUnLockSys(self): return self.SkillUnLockSys # 灵兽技能解锁提示
     def GetInitFightPower(self): return self.InitFightPower # 初始战力
 
 # 装备分解属性表
@@ -1301,7 +1367,8 @@
         self.MaxLV = 0
         self.UseNeedRank = 0
         self.Quality = 0
-        self.InitFightPower = 0
+        self.InitFightPower = 0
+        self.UnlockSys = ""
         return
         
     def GetHorseID(self): return self.HorseID # 坐骑编号ID
@@ -1312,7 +1379,8 @@
     def GetMaxLV(self): return self.MaxLV # 坐骑最高等级
     def GetUseNeedRank(self): return self.UseNeedRank # 多少阶可切换外观
     def GetQuality(self): return self.Quality # 坐骑品质
-    def GetInitFightPower(self): return self.InitFightPower # 初始战力
+    def GetInitFightPower(self): return self.InitFightPower # 初始战力
+    def GetUnlockSys(self): return self.UnlockSys # 解锁广播提示
 
 # 坐骑升级表
 class IPY_HorseUp():
@@ -1323,7 +1391,8 @@
         self.NeedExp = 0
         self.AttrType = []
         self.AttrValue = []
-        self.SkillID = []
+        self.SkillID = []
+        self.SysMark = ""
         return
         
     def GetHorseID(self): return self.HorseID # 坐骑编号ID
@@ -1331,7 +1400,8 @@
     def GetNeedExp(self): return self.NeedExp # 升级所需经验
     def GetAttrType(self): return self.AttrType # 激活加成属性类型
     def GetAttrValue(self): return self.AttrValue # 激活加成属性值
-    def GetSkillID(self): return self.SkillID # 可获得的技能ID
+    def GetSkillID(self): return self.SkillID # 可获得的技能ID
+    def GetSysMark(self): return self.SysMark # 广播提示
 
 # 玩家等级表
 class IPY_PlayerLV():
@@ -1918,7 +1988,8 @@
         self.NeedExp = 0
         self.AddAttr = {}
         self.UnLockSkill = []
-        self.PrivilegeID = 0
+        self.ActiveMWID = 0
+        self.ItemAward = []
         return
         
     def GetMWID(self): return self.MWID # 法宝ID
@@ -1926,7 +1997,8 @@
     def GetNeedExp(self): return self.NeedExp # 需要经验
     def GetAddAttr(self): return self.AddAttr # 属性
     def GetUnLockSkill(self): return self.UnLockSkill # 解锁的技能
-    def GetPrivilegeID(self): return self.PrivilegeID # 特权ID
+    def GetActiveMWID(self): return self.ActiveMWID # 激活法宝ID
+    def GetItemAward(self): return self.ItemAward # 物品奖励[itemID,cnt,isbind]
 
 # 法宝特权表
 class IPY_TreasurePrivilege():
@@ -1937,7 +2009,8 @@
         self.SingleValue = 0
         self.MaxValue = 0
         self.AddAttr = {}
-        self.ItemAward = []
+        self.ItemAward = []
+        self.SuccessList = []
         return
         
     def GetPrivilegeID(self): return self.PrivilegeID # 特权ID
@@ -1945,7 +2018,8 @@
     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 GetItemAward(self): return self.ItemAward # 物品奖励
+    def GetSuccessList(self): return self.SuccessList # 需要完成成就
 
 # 法宝技能升级表
 class IPY_TreasureSkill():
@@ -2753,35 +2827,25 @@
 class IPY_BossReborn():
     
     def __init__(self):
+        self.TemplateID = 0
         self.ID = 0
         self.TotalTimes = 0
         self.SingleTimes = 0
-        self.RewardItemID1 = []
-        self.RewardItemCnt1 = []
-        self.RewardItemID2 = []
-        self.RewardItemCnt2 = []
-        self.RewardItemID3 = []
-        self.RewardItemCnt3 = []
-        self.WorldLVList = []
+        self.Reward = []
         return
         
-    def GetID(self): return self.ID # ID
+    def GetTemplateID(self): return self.TemplateID # 模板ID
+    def GetID(self): return self.ID # 活动条目ID
     def GetTotalTimes(self): return self.TotalTimes # 可完成的总次数,0表示不限次数
     def GetSingleTimes(self): return self.SingleTimes # 单次领奖需要的次数
-    def GetRewardItemID1(self): return self.RewardItemID1 # 奖励物品ID1
-    def GetRewardItemCnt1(self): return self.RewardItemCnt1 # 奖励物品数量1
-    def GetRewardItemID2(self): return self.RewardItemID2 # 奖励物品ID2
-    def GetRewardItemCnt2(self): return self.RewardItemCnt2 # 奖励物品数量2
-    def GetRewardItemID3(self): return self.RewardItemID3 # 奖励物品ID3
-    def GetRewardItemCnt3(self): return self.RewardItemCnt3 # 奖励物品数量3
-    def GetWorldLVList(self): return self.WorldLVList # 世界等级
+    def GetReward(self): return self.Reward # 奖励物品ID1
 
 # 宗门试炼兑换表
 class IPY_TrialExchange():
     
     def __init__(self):
         self.ID = 0
-        self.ExchangeItemID = 0
+        self.ExchangeItemIDList = []
         self.ExchangeItemCount = 0
         self.ExchangeItemIsBind = 0
         self.CostItemID = 0
@@ -2789,7 +2853,7 @@
         return
         
     def GetID(self): return self.ID # 兑换ID
-    def GetExchangeItemID(self): return self.ExchangeItemID # 兑换物品ID
+    def GetExchangeItemIDList(self): return self.ExchangeItemIDList # 兑换物品ID
     def GetExchangeItemCount(self): return self.ExchangeItemCount # 兑换物品个数
     def GetExchangeItemIsBind(self): return self.ExchangeItemIsBind # 兑换物品是否绑定
     def GetCostItemID(self): return self.CostItemID # 消耗物品ID
@@ -2822,6 +2886,23 @@
     def GetIndex(self): return self.Index # 索引
     def GetNeedPoint(self): return self.NeedPoint # 需要点数
     def GetAward(self): return self.Award # 奖励 {"职业":[[物品ID,个数,是否绑定],...], ...}
+
+# 地图NPC配置表-挂机点
+class IPY_MapEventPoint():
+    
+    def __init__(self):
+        self.MapID = 0
+        self.NPCID = 0
+        self.LowLV = 0
+        self.HighestLV = 0
+        self.Defense = 0
+        return
+        
+    def GetMapID(self): return self.MapID
+    def GetNPCID(self): return self.NPCID
+    def GetLowLV(self): return self.LowLV #  推荐最低等级
+    def GetHighestLV(self): return self.HighestLV #  推荐最高等级
+    def GetDefense(self): return self.Defense #  推荐防御
 
 
 def Log(msg, playerID=0, par=0):
@@ -2867,6 +2948,10 @@
         self.ipyItemPlusSumAttrLen = len(self.ipyItemPlusSumAttrCache)
         self.ipyRoleEquipStarsCache = self.__LoadFileData("RoleEquipStars", IPY_RoleEquipStars)
         self.ipyRoleEquipStarsLen = len(self.ipyRoleEquipStarsCache)
+        self.ipyDogzCache = self.__LoadFileData("Dogz", IPY_Dogz)
+        self.ipyDogzLen = len(self.ipyDogzCache)
+        self.ipyDogzEquipPlusCache = self.__LoadFileData("DogzEquipPlus", IPY_DogzEquipPlus)
+        self.ipyDogzEquipPlusLen = len(self.ipyDogzEquipPlusCache)
         self.ipyRuneCache = self.__LoadFileData("Rune", IPY_Rune)
         self.ipyRuneLen = len(self.ipyRuneCache)
         self.ipyEquipWashCache = self.__LoadFileData("EquipWash", IPY_EquipWash)
@@ -3019,6 +3104,8 @@
         self.ipyAllPeoplePartyLen = len(self.ipyAllPeoplePartyCache)
         self.ipyAllPeoplePartyAwardCache = self.__LoadFileData("AllPeoplePartyAward", IPY_AllPeoplePartyAward)
         self.ipyAllPeoplePartyAwardLen = len(self.ipyAllPeoplePartyAwardCache)
+        self.ipyMapEventPointCache = self.__LoadFileData("MapEventPoint", IPY_MapEventPoint)
+        self.ipyMapEventPointLen = len(self.ipyMapEventPointCache)
         Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
         Log("IPY_DataMgr InitOK!")
         return
@@ -3201,6 +3288,10 @@
     def GetItemPlusSumAttrByIndex(self, index): return self.ipyItemPlusSumAttrCache[index]
     def GetRoleEquipStarsCount(self): return self.ipyRoleEquipStarsLen
     def GetRoleEquipStarsByIndex(self, index): return self.ipyRoleEquipStarsCache[index]
+    def GetDogzCount(self): return self.ipyDogzLen
+    def GetDogzByIndex(self, index): return self.ipyDogzCache[index]
+    def GetDogzEquipPlusCount(self): return self.ipyDogzEquipPlusLen
+    def GetDogzEquipPlusByIndex(self, index): return self.ipyDogzEquipPlusCache[index]
     def GetRuneCount(self): return self.ipyRuneLen
     def GetRuneByIndex(self, index): return self.ipyRuneCache[index]
     def GetEquipWashCount(self): return self.ipyEquipWashLen
@@ -3353,6 +3444,8 @@
     def GetAllPeoplePartyByIndex(self, index): return self.ipyAllPeoplePartyCache[index]
     def GetAllPeoplePartyAwardCount(self): return self.ipyAllPeoplePartyAwardLen
     def GetAllPeoplePartyAwardByIndex(self, index): return self.ipyAllPeoplePartyAwardCache[index]
+    def GetMapEventPointCount(self): return self.ipyMapEventPointLen
+    def GetMapEventPointByIndex(self, index): return self.ipyMapEventPointCache[index]
 
 IPYData = IPY_DataMgr()
 def IPY_Data(): return IPYData

--
Gitblit v1.8.0