From 4e9c3ac3f1f7c164b5548805956b6dd553e97454 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 08 八月 2019 18:25:33 +0800
Subject: [PATCH] 0312 装备分解漏了手套

---
 ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py |   80 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 4c2fa49..b4d2e6f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -73,6 +73,20 @@
                         ("BYTE", "Sortpriority", 0),
                         ),
 
+                "AuctionSystemItem":(
+                        ("DWORD", "CfgID", 1),
+                        ("char", "StartDate", 0),
+                        ("char", "EndDate", 0),
+                        ("char", "StartTime", 0),
+                        ("char", "EndTime", 0),
+                        ("BYTE", "AuctionCount", 0),
+                        ("list", "RandMinuteRange", 0),
+                        ("list", "ItemCountWeightList", 0),
+                        ("list", "AddRandSecondRange", 0),
+                        ("list", "AuctionItemWeightList", 0),
+                        ("list", "RandMailKeyList", 0),
+                        ),
+
                 "DailyAction":(
                         ("DWORD", "DailyID", 1),
                         ("dict", "OpenTimeDict", 0),
@@ -432,6 +446,8 @@
                         ("BYTE", "DanLV", 1),
                         ("WORD", "LVUpScore", 0),
                         ("list", "MatchRange", 0),
+                        ("BYTE", "MatchRobotRate", 0),
+                        ("BYTE", "MatchRobotRateEx", 0),
                         ),
 
                 "CrossPenglaiZoneMap":(
@@ -518,6 +534,12 @@
                         ("dict", "NotifyInfoEnd", 0),
                         ("list", "NotifyInfoLoop", 0),
                         ("WORD", "LVLimit", 0),
+                        ),
+
+                "FamilyWarRankAward":(
+                        ("WORD", "WarWorldLV", 1),
+                        ("BYTE", "WarRank", 0),
+                        ("list", "RankAuctionItem", 0),
                         ),
 
                 "FairyDomain":(
@@ -614,6 +636,35 @@
     def GetBiddingAdd(self): return self.BiddingAdd # 竞价增加
     def GetNeedWorldNotify(self): return self.NeedWorldNotify # 是否需要广播
     def GetSortpriority(self): return self.Sortpriority # 排序优先级归组
+
+# 拍卖行系统拍品表
+class IPY_AuctionSystemItem():
+    
+    def __init__(self):
+        self.CfgID = 0
+        self.StartDate = ""
+        self.EndDate = ""
+        self.StartTime = ""
+        self.EndTime = ""
+        self.AuctionCount = 0
+        self.RandMinuteRange = []
+        self.ItemCountWeightList = []
+        self.AddRandSecondRange = []
+        self.AuctionItemWeightList = []
+        self.RandMailKeyList = []
+        return
+        
+    def GetCfgID(self): return self.CfgID
+    def GetStartDate(self): return self.StartDate # 开启日期
+    def GetEndDate(self): return self.EndDate # 结束日期
+    def GetStartTime(self): return self.StartTime # 开启时间
+    def GetEndTime(self): return self.EndTime # 结束时间
+    def GetAuctionCount(self): return self.AuctionCount # 上架次数
+    def GetRandMinuteRange(self): return self.RandMinuteRange # 上架随机间隔分钟下限|上限
+    def GetItemCountWeightList(self): return self.ItemCountWeightList # 上架随机件数权重列表, [[权重, 件数], ...]
+    def GetAddRandSecondRange(self): return self.AddRandSecondRange # 每件拍品随机间隔上架秒数 上限|下限
+    def GetAuctionItemWeightList(self): return self.AuctionItemWeightList # 上架物品随机权重, [[权重, 物品ID],[权重, [阶,颜色,部位集合,是否套装,星级]] ...]
+    def GetRandMailKeyList(self): return self.RandMailKeyList # 上架随机邮件列表,有配置时上架的时候在线玩家会收到一封上架邮件提醒
 
 # 日常活动表
 class IPY_DailyAction():
@@ -1364,12 +1415,16 @@
     def __init__(self):
         self.DanLV = 0
         self.LVUpScore = 0
-        self.MatchRange = []
+        self.MatchRange = []
+        self.MatchRobotRate = 0
+        self.MatchRobotRateEx = 0
         return
         
     def GetDanLV(self): return self.DanLV # 段位等级
     def GetLVUpScore(self): return self.LVUpScore # 升段位所需积分
-    def GetMatchRange(self): return self.MatchRange # 可匹配到的玩家段位区间 [从段位A, 到段位B],配[]代表只匹配本段位的
+    def GetMatchRange(self): return self.MatchRange # 可匹配到的玩家段位区间 [从段位A, 到段位B],配[]代表只匹配本段位的
+    def GetMatchRobotRate(self): return self.MatchRobotRate # 匹配机器人基础概率,百分率
+    def GetMatchRobotRateEx(self): return self.MatchRobotRateEx # 匹配机器人失败次数附加概率,百分率
 
 # 跨服Boss蓬莱仙境分区地图表
 class IPY_CrossPenglaiZoneMap():
@@ -1550,6 +1605,19 @@
     def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
     def GetLVLimit(self): return self.LVLimit # 限制等级
 
+# 仙盟联赛排名奖励表
+class IPY_FamilyWarRankAward():
+    
+    def __init__(self):
+        self.WarWorldLV = 0
+        self.WarRank = 0
+        self.RankAuctionItem = []
+        return
+        
+    def GetWarWorldLV(self): return self.WarWorldLV # 联赛世界等级
+    def GetWarRank(self): return self.WarRank # 联赛排名
+    def GetRankAuctionItem(self): return self.RankAuctionItem # 拍品奖励[[拍品ID,个数], ...]
+
 # 缥缈仙域表
 class IPY_FairyDomain():
     
@@ -1597,6 +1665,8 @@
         self.ipyMarketQueryLen = len(self.ipyMarketQueryCache)
         self.ipyAuctionItemCache = self.__LoadFileData("AuctionItem", IPY_AuctionItem)
         self.ipyAuctionItemLen = len(self.ipyAuctionItemCache)
+        self.ipyAuctionSystemItemCache = self.__LoadFileData("AuctionSystemItem", IPY_AuctionSystemItem)
+        self.ipyAuctionSystemItemLen = len(self.ipyAuctionSystemItemCache)
         self.ipyDailyActionCache = self.__LoadFileData("DailyAction", IPY_DailyAction)
         self.ipyDailyActionLen = len(self.ipyDailyActionCache)
         self.ipyDailyActionCustomCache = self.__LoadFileData("DailyActionCustom", IPY_DailyActionCustom)
@@ -1679,6 +1749,8 @@
         self.ipyNewUniquenessArriveLen = len(self.ipyNewUniquenessArriveCache)
         self.ipyActLuckyTreasureCache = self.__LoadFileData("ActLuckyTreasure", IPY_ActLuckyTreasure)
         self.ipyActLuckyTreasureLen = len(self.ipyActLuckyTreasureCache)
+        self.ipyFamilyWarRankAwardCache = self.__LoadFileData("FamilyWarRankAward", IPY_FamilyWarRankAward)
+        self.ipyFamilyWarRankAwardLen = len(self.ipyFamilyWarRankAwardCache)
         self.ipyFairyDomainCache = self.__LoadFileData("FairyDomain", IPY_FairyDomain)
         self.ipyFairyDomainLen = len(self.ipyFairyDomainCache)
         Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
@@ -1857,6 +1929,8 @@
     def GetMarketQueryByIndex(self, index): return self.ipyMarketQueryCache[index]
     def GetAuctionItemCount(self): return self.ipyAuctionItemLen
     def GetAuctionItemByIndex(self, index): return self.ipyAuctionItemCache[index]
+    def GetAuctionSystemItemCount(self): return self.ipyAuctionSystemItemLen
+    def GetAuctionSystemItemByIndex(self, index): return self.ipyAuctionSystemItemCache[index]
     def GetDailyActionCount(self): return self.ipyDailyActionLen
     def GetDailyActionByIndex(self, index): return self.ipyDailyActionCache[index]
     def GetDailyActionCustomCount(self): return self.ipyDailyActionCustomLen
@@ -1939,6 +2013,8 @@
     def GetNewUniquenessArriveByIndex(self, index): return self.ipyNewUniquenessArriveCache[index]
     def GetActLuckyTreasureCount(self): return self.ipyActLuckyTreasureLen
     def GetActLuckyTreasureByIndex(self, index): return self.ipyActLuckyTreasureCache[index]
+    def GetFamilyWarRankAwardCount(self): return self.ipyFamilyWarRankAwardLen
+    def GetFamilyWarRankAwardByIndex(self, index): return self.ipyFamilyWarRankAwardCache[index]
     def GetFairyDomainCount(self): return self.ipyFairyDomainLen
     def GetFairyDomainByIndex(self, index): return self.ipyFairyDomainCache[index]
 

--
Gitblit v1.8.0