From 68dd06e06c1a4a155884c31403da1155be6f10e8 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 18 四月 2019 17:11:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py | 89 +++++++++++++++++++++++++++++++-------------
1 files changed, 62 insertions(+), 27 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 820e263..6e1fa95 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -61,6 +61,18 @@
("dict", "LimitInfo", 0),
),
+ "AuctionItem":(
+ ("DWORD", "AuctionItemID", 1),
+ ("BYTE", "NoticeSaleMinutes", 0),
+ ("WORD", "FamilySaleMinutes", 0),
+ ("WORD", "WorldSaleMinutes", 0),
+ ("WORD", "BasePrice", 0),
+ ("WORD", "BuyoutPrice", 0),
+ ("WORD", "BiddingAdd", 0),
+ ("BYTE", "NeedWorldNotify", 0),
+ ("BYTE", "Sortpriority", 0),
+ ),
+
"DailyAction":(
("DWORD", "DailyID", 1),
("dict", "OpenTimeDict", 0),
@@ -269,9 +281,8 @@
"ActExpRate":(
("DWORD", "CfgID", 1),
- ("char", "ActMark", 0),
- ("list", "PlatformList", 0),
- ("list", "ServerIDList", 0),
+ ("list", "ServerGroupIDList", 0),
+ ("list", "ServerGroupIDListExcept", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
("list", "StartTimeList", 0),
@@ -298,9 +309,8 @@
"ActBossReborn":(
("DWORD", "CfgID", 1),
- ("char", "ActMark", 0),
- ("list", "PlatformList", 0),
- ("list", "ServerIDList", 0),
+ ("list", "ServerGroupIDList", 0),
+ ("list", "ServerGroupIDListExcept", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
("BYTE", "ResetType", 0),
@@ -371,9 +381,8 @@
"ActWishingWell":(
("DWORD", "CfgID", 1),
- ("char", "ActMark", 0),
- ("list", "PlatformList", 0),
- ("list", "ServerIDList", 0),
+ ("list", "ServerGroupIDList", 0),
+ ("list", "ServerGroupIDListExcept", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
("BYTE", "IsDayReset", 0),
@@ -459,6 +468,7 @@
("BYTE", "ResetType", 0),
("dict", "NotifyInfoStart", 0),
("dict", "NotifyInfoEnd", 0),
+ ("list", "NotifyInfoLoop", 0),
("WORD", "LVLimit", 0),
),
@@ -573,6 +583,31 @@
def GetQueryType(self): return self.QueryType # 查询类型
def GetLimitInfo(self): return self.LimitInfo # 限制条件
+
+# 拍卖物品表
+class IPY_AuctionItem():
+
+ def __init__(self):
+ self.AuctionItemID = 0
+ self.NoticeSaleMinutes = 0
+ self.FamilySaleMinutes = 0
+ self.WorldSaleMinutes = 0
+ self.BasePrice = 0
+ self.BuyoutPrice = 0
+ self.BiddingAdd = 0
+ self.NeedWorldNotify = 0
+ self.Sortpriority = 0
+ return
+
+ def GetAuctionItemID(self): return self.AuctionItemID
+ def GetNoticeSaleMinutes(self): return self.NoticeSaleMinutes # 预告拍卖分钟
+ def GetFamilySaleMinutes(self): return self.FamilySaleMinutes # 仙盟拍卖分钟
+ def GetWorldSaleMinutes(self): return self.WorldSaleMinutes # 全服拍卖分钟
+ def GetBasePrice(self): return self.BasePrice # 起拍价
+ def GetBuyoutPrice(self): return self.BuyoutPrice # 一口价
+ def GetBiddingAdd(self): return self.BiddingAdd # 竞价增加
+ def GetNeedWorldNotify(self): return self.NeedWorldNotify # 是否需要广播
+ def GetSortpriority(self): return self.Sortpriority # 排序优先级归组
# 日常活动表
class IPY_DailyAction():
@@ -1011,9 +1046,8 @@
def __init__(self):
self.CfgID = 0
- self.ActMark = ""
- self.PlatformList = []
- self.ServerIDList = []
+ self.ServerGroupIDList = []
+ self.ServerGroupIDListExcept = []
self.StartDate = ""
self.EndDate = ""
self.StartTimeList = []
@@ -1026,9 +1060,8 @@
return
def GetCfgID(self): return self.CfgID # 配置ID
- def GetActMark(self): return self.ActMark # 活动组标记
- def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
- def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+ def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器组ID列表
+ def GetServerGroupIDListExcept(self): return self.ServerGroupIDListExcept # 排除的服务器组ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
def GetStartTimeList(self): return self.StartTimeList # 开启时间列表, 支持多个时段
@@ -1071,9 +1104,8 @@
def __init__(self):
self.CfgID = 0
- self.ActMark = ""
- self.PlatformList = []
- self.ServerIDList = []
+ self.ServerGroupIDList = []
+ self.ServerGroupIDListExcept = []
self.StartDate = ""
self.EndDate = ""
self.ResetType = 0
@@ -1084,9 +1116,8 @@
return
def GetCfgID(self): return self.CfgID # 配置ID
- def GetActMark(self): return self.ActMark # 活动组标记
- def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
- def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+ def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器组ID列表
+ def GetServerGroupIDListExcept(self): return self.ServerGroupIDListExcept # 排除的服务器组ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
def GetResetType(self): return self.ResetType # 重置类型，0-0点重置；1-5点重置
@@ -1223,9 +1254,8 @@
def __init__(self):
self.CfgID = 0
- self.ActMark = ""
- self.PlatformList = []
- self.ServerIDList = []
+ self.ServerGroupIDList = []
+ self.ServerGroupIDListExcept = []
self.StartDate = ""
self.EndDate = ""
self.IsDayReset = 0
@@ -1237,9 +1267,8 @@
return
def GetCfgID(self): return self.CfgID # 配置ID
- def GetActMark(self): return self.ActMark # 活动组标记
- def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
- def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
+ def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器组ID列表
+ def GetServerGroupIDListExcept(self): return self.ServerGroupIDListExcept # 排除的服务器组ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
@@ -1397,6 +1426,7 @@
self.ResetType = 0
self.NotifyInfoStart = {}
self.NotifyInfoEnd = {}
+ self.NotifyInfoLoop = []
self.LVLimit = 0
return
@@ -1411,6 +1441,7 @@
def GetResetType(self): return self.ResetType # 重置类型，0-0点重置；1-5点重置
def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
+ def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
def GetLVLimit(self): return self.LVLimit # 限制等级
# 节日巡礼活动时间表
@@ -1545,6 +1576,8 @@
self.ipyFamilyLen = len(self.ipyFamilyCache)
self.ipyMarketQueryCache = self.__LoadFileData("MarketQuery", IPY_MarketQuery)
self.ipyMarketQueryLen = len(self.ipyMarketQueryCache)
+ self.ipyAuctionItemCache = self.__LoadFileData("AuctionItem", IPY_AuctionItem)
+ self.ipyAuctionItemLen = len(self.ipyAuctionItemCache)
self.ipyDailyActionCache = self.__LoadFileData("DailyAction", IPY_DailyAction)
self.ipyDailyActionLen = len(self.ipyDailyActionCache)
self.ipyDailyActionCustomCache = self.__LoadFileData("DailyActionCustom", IPY_DailyActionCustom)
@@ -1801,6 +1834,8 @@
def GetFamilyByIndex(self, index): return self.ipyFamilyCache[index]
def GetMarketQueryCount(self): return self.ipyMarketQueryLen
def GetMarketQueryByIndex(self, index): return self.ipyMarketQueryCache[index]
+ def GetAuctionItemCount(self): return self.ipyAuctionItemLen
+ def GetAuctionItemByIndex(self, index): return self.ipyAuctionItemCache[index]
def GetDailyActionCount(self): return self.ipyDailyActionLen
def GetDailyActionByIndex(self, index): return self.ipyDailyActionCache[index]
def GetDailyActionCustomCount(self): return self.ipyDailyActionCustomLen
--
Gitblit v1.8.0