From e0a5413902002d830146b8da4cc4069277979f8e Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 04 三月 2019 14:13:01 +0800
Subject: [PATCH] 6307 【后端】【2.0】多套装备开发单(洗炼)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |  292 +++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 205 insertions(+), 87 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 933fd8c..c794290 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -316,19 +316,12 @@
                         ),
 
                 "EquipSuitAttr":(
-                        ("BYTE", "GroupType", 1),
-                        ("BYTE", "SuiteType", 1),
-                        ("WORD", "SuiteLV", 1),
-                        ("BYTE", "Job", 1),
-                        ("BYTE", "Count1", 0),
-                        ("list", "AttrType1", 0),
-                        ("list", "AttrValue1", 0),
-                        ("BYTE", "Count2", 0),
-                        ("list", "AttrType2", 0),
-                        ("list", "AttrValue2", 0),
-                        ("BYTE", "Count3", 0),
-                        ("list", "AttrType3", 0),
-                        ("list", "AttrValue3", 0),
+                        ("WORD", "SuiteID", 1),
+                        ("BYTE", "SuiteCnt", 0),
+                        ("BYTE", "Star", 0),
+                        ("dict", "AttrInfo", 0),
+                        ("DWORD", "SkillID", 0),
+                        ("BYTE", "IsNotify", 0),
                         ),
 
                 "EquipSuitCompound":(
@@ -595,16 +588,6 @@
                         ("list", "SuccessList", 0),
                         ),
 
-                "TreasureSkill":(
-                        ("BYTE", "SkillUpType", 1),
-                        ("BYTE", "SkillLV", 1),
-                        ("DWORD", "NeedPoint", 0),
-                        ("WORD", "InitRate", 0),
-                        ("list", "NeedItemID", 0),
-                        ("list", "NeedItemCnt", 0),
-                        ("list", "MaxRate", 0),
-                        ),
-
                 "ContineSignAward":(
                         ("BYTE", "ContineDay", 1),
                         ("list", "ItemID", 0),
@@ -637,6 +620,10 @@
                         ("list", "LegendAttrValue", 0),
                         ("list", "OutOfPrintAttr", 0),
                         ("list", "OutOfPrintAttrValue", 0),
+                        ),
+
+                "AuctionItem":(
+                        ("DWORD", "AuctionItemID", 1),
                         ),
 
                 "VipPrivilege":(
@@ -691,7 +678,7 @@
                         ("WORD", "AdvanceMinutes", 0),
                         ("WORD", "LVLimit", 0),
                         ("BYTE", "IsDayReset", 0),
-                        ("list", "ShopTypeList", 0),
+                        ("dict", "ShopTypeList", 0),
                         ("char", "MailKey", 0),
                         ("list", "MailItemPrize", 0),
                         ),
@@ -982,7 +969,7 @@
                         ("WORD", "AdvanceMinutes", 0),
                         ("WORD", "LVLimit", 0),
                         ("BYTE", "IsDayReset", 0),
-                        ("list", "GiftbagTypeList", 0),
+                        ("dict", "GiftbagTypeList", 0),
                         ("char", "MailKey", 0),
                         ("list", "MailItemPrize", 0),
                         ),
@@ -1016,7 +1003,7 @@
                         ("DWORD", "TemplateID", 1),
                         ("DWORD", "NeedCostGold", 0),
                         ("BYTE", "AwardIndex", 0),
-                        ("list", "AwardItemList", 0),
+                        ("dict", "AwardItemList", 0),
                         ("char", "NotifyKey", 0),
                         ),
 
@@ -1034,7 +1021,7 @@
                         ("BYTE", "ID", 1),
                         ("DWORD", "TotalTimes", 0),
                         ("WORD", "SingleTimes", 0),
-                        ("list", "Reward", 0),
+                        ("dict", "Reward", 0),
                         ),
 
                 "ActRealmPoint":(
@@ -1169,6 +1156,7 @@
 
                 "CrossRealmPKDan":(
                         ("BYTE", "DanLV", 1),
+                        ("WORD", "LVUpScore", 0),
                         ),
 
                 "CrossRealmPKDanAward":(
@@ -1281,7 +1269,7 @@
                         ("BYTE", "ActionType", 0),
                         ("DWORD", "TotalTimes", 0),
                         ("WORD", "SingleTimes", 0),
-                        ("list", "Reward", 0),
+                        ("char", "Reward", 0),
                         ),
 
                 "ZhuXianSuitAttr":(
@@ -1352,6 +1340,49 @@
                         ("BYTE", "ShareSoneLV", 1),
                         ("list", "AttrIDList", 0),
                         ("list", "AttrValueList", 0),
+                        ),
+
+                "ActLuckyTreasure":(
+                        ("DWORD", "CfgID", 1),
+                        ("char", "StartDate", 0),
+                        ("char", "EndDate", 0),
+                        ("BYTE", "ResetType", 0),
+                        ("WORD", "LVLimit", 0),
+                        ("BYTE", "TemplateID", 0),
+                        ("WORD", "LuckyPoint", 0),
+                        ),
+
+                "LuckyTreasureTemplate":(
+                        ("BYTE", "TemplateID", 1),
+                        ("list", "WorldLVLimit", 0),
+                        ("DWORD", "ItemID", 0),
+                        ("WORD", "ItemCnt", 0),
+                        ("BYTE", "IsBind", 0),
+                        ("DWORD", "Weight", 0),
+                        ),
+
+                "MysteryShop":(
+                        ("list", "LVRange", 0),
+                        ("DWORD", "GoodsID", 0),
+                        ),
+
+                "EquipPlaceIndexMap":(
+                        ("DWORD", "GridIndex", 0),
+                        ("DWORD", "ClassLV", 1),
+                        ("DWORD", "EquipPlace", 1),
+                        ),
+
+                "EquipStarUp":(
+                        ("BYTE", "ClassLV", 1),
+                        ("BYTE", "EquipPlace", 1),
+                        ("BYTE", "Star", 1),
+                        ("list", "CostEquipPlace", 0),
+                        ("list", "CostEquipColor", 0),
+                        ("BYTE", "CostEquipCnt", 0),
+                        ("BYTE", "SuitTotalRate", 0),
+                        ("dict", "CostItemDict", 0),
+                        ("dict", "StarAttrInfo", 0),
+                        ("dict", "BaseAttrInfo", 0),
                         ),
                 }
 
@@ -1951,34 +1982,20 @@
 class IPY_EquipSuitAttr():
     
     def __init__(self):
-        self.GroupType = 0
-        self.SuiteType = 0
-        self.SuiteLV = 0
-        self.Job = 0
-        self.Count1 = 0
-        self.AttrType1 = []
-        self.AttrValue1 = []
-        self.Count2 = 0
-        self.AttrType2 = []
-        self.AttrValue2 = []
-        self.Count3 = 0
-        self.AttrType3 = []
-        self.AttrValue3 = []
+        self.SuiteID = 0
+        self.SuiteCnt = 0
+        self.Star = 0
+        self.AttrInfo = {}
+        self.SkillID = 0
+        self.IsNotify = 0
         return
         
-    def GetGroupType(self): return self.GroupType # 套装组合类型
-    def GetSuiteType(self): return self.SuiteType # 套装类型
-    def GetSuiteLV(self): return self.SuiteLV # 套装等级
-    def GetJob(self): return self.Job # 职业
-    def GetCount1(self): return self.Count1 # 阶段1所需数量
-    def GetAttrType1(self): return self.AttrType1 # 阶段1属性类型
-    def GetAttrValue1(self): return self.AttrValue1 # 阶段1属性值
-    def GetCount2(self): return self.Count2 # 阶段2所需数量
-    def GetAttrType2(self): return self.AttrType2 # 阶段2属性类型
-    def GetAttrValue2(self): return self.AttrValue2 # 阶段2属性值
-    def GetCount3(self): return self.Count3 # 阶段2所需数量
-    def GetAttrType3(self): return self.AttrType3 # 阶段2属性类型
-    def GetAttrValue3(self): return self.AttrValue3 # 阶段2属性值
+    def GetSuiteID(self): return self.SuiteID # 套装ID
+    def GetSuiteCnt(self): return self.SuiteCnt # 套装件数
+    def GetStar(self): return self.Star # 星数
+    def GetAttrInfo(self): return self.AttrInfo # 属性
+    def GetSkillID(self): return self.SkillID # 技能ID
+    def GetIsNotify(self): return self.IsNotify # 是否广播
 
 # 套装合成表
 class IPY_EquipSuitCompound():
@@ -2525,27 +2542,6 @@
     def GetItemAward(self): return self.ItemAward # 物品奖励
     def GetSuccessList(self): return self.SuccessList # 需要完成成就
 
-# 法宝技能升级表
-class IPY_TreasureSkill():
-    
-    def __init__(self):
-        self.SkillUpType = 0
-        self.SkillLV = 0
-        self.NeedPoint = 0
-        self.InitRate = 0
-        self.NeedItemID = []
-        self.NeedItemCnt = []
-        self.MaxRate = []
-        return
-        
-    def GetSkillUpType(self): return self.SkillUpType # 技能升级类型
-    def GetSkillLV(self): return self.SkillLV # 技能等级
-    def GetNeedPoint(self): return self.NeedPoint # 升到当前级消耗天石精华
-    def GetInitRate(self): return self.InitRate # 初始概率
-    def GetNeedItemID(self): return self.NeedItemID # 升到当前级溶彩石ID
-    def GetNeedItemCnt(self): return self.NeedItemCnt # 升到当前级溶彩石数量
-    def GetMaxRate(self): return self.MaxRate # 升到当前级概率
-
 # 连续签到奖励表
 class IPY_ContineSignAward():
     
@@ -2617,6 +2613,15 @@
     def GetLegendAttrValue(self): return self.LegendAttrValue # 传奇属性值
     def GetOutOfPrintAttr(self): return self.OutOfPrintAttr # 绝版属性ID
     def GetOutOfPrintAttrValue(self): return self.OutOfPrintAttrValue # 绝版属性最大值
+
+# 拍卖物品表
+class IPY_AuctionItem():
+    
+    def __init__(self):
+        self.AuctionItemID = 0
+        return
+        
+    def GetAuctionItemID(self): return self.AuctionItemID
 
 # VIP特权表
 class IPY_VipPrivilege():
@@ -2718,7 +2723,7 @@
         self.AdvanceMinutes = 0
         self.LVLimit = 0
         self.IsDayReset = 0
-        self.ShopTypeList = []
+        self.ShopTypeList = {}
         self.MailKey = ""
         self.MailItemPrize = []
         return
@@ -3334,7 +3339,7 @@
         self.AdvanceMinutes = 0
         self.LVLimit = 0
         self.IsDayReset = 0
-        self.GiftbagTypeList = []
+        self.GiftbagTypeList = {}
         self.MailKey = ""
         self.MailItemPrize = []
         return
@@ -3411,14 +3416,14 @@
         self.TemplateID = 0
         self.NeedCostGold = 0
         self.AwardIndex = 0
-        self.AwardItemList = []
+        self.AwardItemList = {}
         self.NotifyKey = ""
         return
         
     def GetTemplateID(self): return self.TemplateID # 模板ID
     def GetNeedCostGold(self): return self.NeedCostGold # 需要消费仙玉数
     def GetAwardIndex(self): return self.AwardIndex # 返利奖励索引0~31,同个模板中不重复
-    def GetAwardItemList(self): return self.AwardItemList # 返利物品信息列表 [(物品ID,个数,是否绑定),...]
+    def GetAwardItemList(self): return self.AwardItemList # 返利物品信息列表 {世界等级范围:[({职业:物品ID,..},个数,是否绑定), ...]}
     def GetNotifyKey(self): return self.NotifyKey # 全服广播key,默认两个参数(玩家名, 档位额度)
 
 # BOSS复活活动时间表
@@ -3448,7 +3453,7 @@
         self.ID = 0
         self.TotalTimes = 0
         self.SingleTimes = 0
-        self.Reward = []
+        self.Reward = {}
         return
         
     def GetTemplateID(self): return self.TemplateID # 模板ID
@@ -3737,10 +3742,12 @@
 class IPY_CrossRealmPKDan():
     
     def __init__(self):
-        self.DanLV = 0
+        self.DanLV = 0
+        self.LVUpScore = 0
         return
         
-    def GetDanLV(self): return self.DanLV # 段位等级
+    def GetDanLV(self): return self.DanLV # 段位等级
+    def GetLVUpScore(self): return self.LVUpScore # 升段位所需积分
 
 # 跨服竞技场段位奖励表
 class IPY_CrossRealmPKDanAward():
@@ -3973,7 +3980,7 @@
         self.ActionType = 0
         self.TotalTimes = 0
         self.SingleTimes = 0
-        self.Reward = []
+        self.Reward = ""
         return
         
     def GetTemplateID(self): return self.TemplateID # 模板ID
@@ -4130,6 +4137,97 @@
     def GetShareSoneLV(self): return self.ShareSoneLV # 共鸣等级
     def GetAttrIDList(self): return self.AttrIDList # 属性ID列表
     def GetAttrValueList(self): return self.AttrValueList # 属性值列表
+
+# 幸运鉴宝活动时间表
+class IPY_ActLuckyTreasure():
+    
+    def __init__(self):
+        self.CfgID = 0
+        self.StartDate = ""
+        self.EndDate = ""
+        self.ResetType = 0
+        self.LVLimit = 0
+        self.TemplateID = 0
+        self.LuckyPoint = 0
+        return
+        
+    def GetCfgID(self): return self.CfgID # 配置ID
+    def GetStartDate(self): return self.StartDate # 开启日期
+    def GetEndDate(self): return self.EndDate # 结束日期
+    def GetResetType(self): return self.ResetType # 重置类型,0-0点重置;1-5点重置
+    def GetLVLimit(self): return self.LVLimit # 限制等级
+    def GetTemplateID(self): return self.TemplateID # 模板编号
+    def GetLuckyPoint(self): return self.LuckyPoint # 总幸运值
+
+# 幸运鉴宝库模板表
+class IPY_LuckyTreasureTemplate():
+    
+    def __init__(self):
+        self.TemplateID = 0
+        self.WorldLVLimit = []
+        self.ItemID = 0
+        self.ItemCnt = 0
+        self.IsBind = 0
+        self.Weight = 0
+        return
+        
+    def GetTemplateID(self): return self.TemplateID # 模板ID
+    def GetWorldLVLimit(self): return self.WorldLVLimit # 世界等级范围
+    def GetItemID(self): return self.ItemID # 物品ID
+    def GetItemCnt(self): return self.ItemCnt # 物品数量
+    def GetIsBind(self): return self.IsBind # 是否绑定
+    def GetWeight(self): return self.Weight # 权重
+
+# 神秘商店表
+class IPY_MysteryShop():
+    
+    def __init__(self):
+        self.LVRange = []
+        self.GoodsID = 0
+        return
+        
+    def GetLVRange(self): return self.LVRange # 等级范围
+    def GetGoodsID(self): return self.GoodsID # 商城表ID
+
+# 装备位背包索引映射表
+class IPY_EquipPlaceIndexMap():
+    
+    def __init__(self):
+        self.GridIndex = 0
+        self.ClassLV = 0
+        self.EquipPlace = 0
+        return
+        
+    def GetGridIndex(self): return self.GridIndex # 背包格子索引
+    def GetClassLV(self): return self.ClassLV # 阶级(物品表LV字段)
+    def GetEquipPlace(self): return self.EquipPlace # 装备位(物品表EquipPlace字段)
+
+# 装备升星表
+class IPY_EquipStarUp():
+    
+    def __init__(self):
+        self.ClassLV = 0
+        self.EquipPlace = 0
+        self.Star = 0
+        self.CostEquipPlace = []
+        self.CostEquipColor = []
+        self.CostEquipCnt = 0
+        self.SuitTotalRate = 0
+        self.CostItemDict = {}
+        self.StarAttrInfo = {}
+        self.BaseAttrInfo = {}
+        return
+        
+    def GetClassLV(self): return self.ClassLV # 阶级
+    def GetEquipPlace(self): return self.EquipPlace # 装备位
+    def GetStar(self): return self.Star # 星数
+    def GetCostEquipPlace(self): return self.CostEquipPlace # 可用装备部位
+    def GetCostEquipColor(self): return self.CostEquipColor # 可用装备品质
+    def GetCostEquipCnt(self): return self.CostEquipCnt # 装备数量
+    def GetSuitTotalRate(self): return self.SuitTotalRate # 全套装加成概率(非套50%)
+    def GetCostItemDict(self): return self.CostItemDict # 特殊材料
+    def GetStarAttrInfo(self): return self.StarAttrInfo # 星级属性
+    def GetBaseAttrInfo(self): return self.BaseAttrInfo # 基础属性增加
 
 
 def Log(msg, playerID=0, par=0):
@@ -4241,8 +4339,6 @@
         self.ipyTreasureUpLen = len(self.ipyTreasureUpCache)
         self.ipyTreasurePrivilegeCache = self.__LoadFileData("TreasurePrivilege", IPY_TreasurePrivilege)
         self.ipyTreasurePrivilegeLen = len(self.ipyTreasurePrivilegeCache)
-        self.ipyTreasureSkillCache = self.__LoadFileData("TreasureSkill", IPY_TreasureSkill)
-        self.ipyTreasureSkillLen = len(self.ipyTreasureSkillCache)
         self.ipyContineSignAwardCache = self.__LoadFileData("ContineSignAward", IPY_ContineSignAward)
         self.ipyContineSignAwardLen = len(self.ipyContineSignAwardCache)
         self.ipySignAwardCache = self.__LoadFileData("SignAward", IPY_SignAward)
@@ -4251,6 +4347,8 @@
         self.ipyVIPAwardLen = len(self.ipyVIPAwardCache)
         self.ipyAppointItemCache = self.__LoadFileData("AppointItem", IPY_AppointItem)
         self.ipyAppointItemLen = len(self.ipyAppointItemCache)
+        self.ipyAuctionItemCache = self.__LoadFileData("AuctionItem", IPY_AuctionItem)
+        self.ipyAuctionItemLen = len(self.ipyAuctionItemCache)
         self.ipyVipPrivilegeCache = self.__LoadFileData("VipPrivilege", IPY_VipPrivilege)
         self.ipyVipPrivilegeLen = len(self.ipyVipPrivilegeCache)
         self.ipyStoreCache = self.__LoadFileData("Store", IPY_Store)
@@ -4417,6 +4515,16 @@
         self.ipyNewAllPeoplePartyAwardLen = len(self.ipyNewAllPeoplePartyAwardCache)
         self.ipyZhuXianStoneAttrCache = self.__LoadFileData("ZhuXianStoneAttr", IPY_ZhuXianStoneAttr)
         self.ipyZhuXianStoneAttrLen = len(self.ipyZhuXianStoneAttrCache)
+        self.ipyActLuckyTreasureCache = self.__LoadFileData("ActLuckyTreasure", IPY_ActLuckyTreasure)
+        self.ipyActLuckyTreasureLen = len(self.ipyActLuckyTreasureCache)
+        self.ipyLuckyTreasureTemplateCache = self.__LoadFileData("LuckyTreasureTemplate", IPY_LuckyTreasureTemplate)
+        self.ipyLuckyTreasureTemplateLen = len(self.ipyLuckyTreasureTemplateCache)
+        self.ipyMysteryShopCache = self.__LoadFileData("MysteryShop", IPY_MysteryShop)
+        self.ipyMysteryShopLen = len(self.ipyMysteryShopCache)
+        self.ipyEquipPlaceIndexMapCache = self.__LoadFileData("EquipPlaceIndexMap", IPY_EquipPlaceIndexMap)
+        self.ipyEquipPlaceIndexMapLen = len(self.ipyEquipPlaceIndexMapCache)
+        self.ipyEquipStarUpCache = self.__LoadFileData("EquipStarUp", IPY_EquipStarUp)
+        self.ipyEquipStarUpLen = len(self.ipyEquipStarUpCache)
         Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
         Log("IPY_DataMgr InitOK!")
         return
@@ -4669,8 +4777,6 @@
     def GetTreasureUpByIndex(self, index): return self.ipyTreasureUpCache[index]
     def GetTreasurePrivilegeCount(self): return self.ipyTreasurePrivilegeLen
     def GetTreasurePrivilegeByIndex(self, index): return self.ipyTreasurePrivilegeCache[index]
-    def GetTreasureSkillCount(self): return self.ipyTreasureSkillLen
-    def GetTreasureSkillByIndex(self, index): return self.ipyTreasureSkillCache[index]
     def GetContineSignAwardCount(self): return self.ipyContineSignAwardLen
     def GetContineSignAwardByIndex(self, index): return self.ipyContineSignAwardCache[index]
     def GetSignAwardCount(self): return self.ipySignAwardLen
@@ -4679,6 +4785,8 @@
     def GetVIPAwardByIndex(self, index): return self.ipyVIPAwardCache[index]
     def GetAppointItemCount(self): return self.ipyAppointItemLen
     def GetAppointItemByIndex(self, index): return self.ipyAppointItemCache[index]
+    def GetAuctionItemCount(self): return self.ipyAuctionItemLen
+    def GetAuctionItemByIndex(self, index): return self.ipyAuctionItemCache[index]
     def GetVipPrivilegeCount(self): return self.ipyVipPrivilegeLen
     def GetVipPrivilegeByIndex(self, index): return self.ipyVipPrivilegeCache[index]
     def GetStoreCount(self): return self.ipyStoreLen
@@ -4845,6 +4953,16 @@
     def GetNewAllPeoplePartyAwardByIndex(self, index): return self.ipyNewAllPeoplePartyAwardCache[index]
     def GetZhuXianStoneAttrCount(self): return self.ipyZhuXianStoneAttrLen
     def GetZhuXianStoneAttrByIndex(self, index): return self.ipyZhuXianStoneAttrCache[index]
+    def GetActLuckyTreasureCount(self): return self.ipyActLuckyTreasureLen
+    def GetActLuckyTreasureByIndex(self, index): return self.ipyActLuckyTreasureCache[index]
+    def GetLuckyTreasureTemplateCount(self): return self.ipyLuckyTreasureTemplateLen
+    def GetLuckyTreasureTemplateByIndex(self, index): return self.ipyLuckyTreasureTemplateCache[index]
+    def GetMysteryShopCount(self): return self.ipyMysteryShopLen
+    def GetMysteryShopByIndex(self, index): return self.ipyMysteryShopCache[index]
+    def GetEquipPlaceIndexMapCount(self): return self.ipyEquipPlaceIndexMapLen
+    def GetEquipPlaceIndexMapByIndex(self, index): return self.ipyEquipPlaceIndexMapCache[index]
+    def GetEquipStarUpCount(self): return self.ipyEquipStarUpLen
+    def GetEquipStarUpByIndex(self, index): return self.ipyEquipStarUpCache[index]
 
 IPYData = IPY_DataMgr()
 def IPY_Data(): return IPYData

--
Gitblit v1.8.0