From a92b22667c5c3fb2844a69603e2a2eea284c9f26 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 25 五月 2019 15:36:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index ae44945..4c2fa49 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -70,6 +70,7 @@
("WORD", "BuyoutPrice", 0),
("WORD", "BiddingAdd", 0),
("BYTE", "NeedWorldNotify", 0),
+ ("BYTE", "Sortpriority", 0),
),
"DailyAction":(
@@ -518,6 +519,12 @@
("list", "NotifyInfoLoop", 0),
("WORD", "LVLimit", 0),
),
+
+ "FairyDomain":(
+ ("WORD", "ID", 1),
+ ("DWORD", "HourCntPubLimit", 0),
+ ("DWORD", "DayCntPubLimit", 0),
+ ),
}
@@ -594,7 +601,8 @@
self.BasePrice = 0
self.BuyoutPrice = 0
self.BiddingAdd = 0
- self.NeedWorldNotify = 0
+ self.NeedWorldNotify = 0
+ self.Sortpriority = 0
return
def GetAuctionItemID(self): return self.AuctionItemID
@@ -604,7 +612,8 @@
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 GetNeedWorldNotify(self): return self.NeedWorldNotify # 是否需要广播
+ def GetSortpriority(self): return self.Sortpriority # 排序优先级归组
# 日常活动表
class IPY_DailyAction():
@@ -1540,6 +1549,19 @@
def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
def GetLVLimit(self): return self.LVLimit # 限制等级
+
+# 缥缈仙域表
+class IPY_FairyDomain():
+
+ def __init__(self):
+ self.ID = 0
+ self.HourCntPubLimit = 0
+ self.DayCntPubLimit = 0
+ return
+
+ def GetID(self): return self.ID # 事件编号
+ def GetHourCntPubLimit(self): return self.HourCntPubLimit # 全服每小时次数限制
+ def GetDayCntPubLimit(self): return self.DayCntPubLimit # 全服每天次数限制
def Log(msg, playerID=0, par=0):
@@ -1657,6 +1679,8 @@
self.ipyNewUniquenessArriveLen = len(self.ipyNewUniquenessArriveCache)
self.ipyActLuckyTreasureCache = self.__LoadFileData("ActLuckyTreasure", IPY_ActLuckyTreasure)
self.ipyActLuckyTreasureLen = len(self.ipyActLuckyTreasureCache)
+ self.ipyFairyDomainCache = self.__LoadFileData("FairyDomain", IPY_FairyDomain)
+ self.ipyFairyDomainLen = len(self.ipyFairyDomainCache)
Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
Log("IPY_DataMgr InitOK!")
return
@@ -1915,6 +1939,8 @@
def GetNewUniquenessArriveByIndex(self, index): return self.ipyNewUniquenessArriveCache[index]
def GetActLuckyTreasureCount(self): return self.ipyActLuckyTreasureLen
def GetActLuckyTreasureByIndex(self, index): return self.ipyActLuckyTreasureCache[index]
+ def GetFairyDomainCount(self): return self.ipyFairyDomainLen
+ def GetFairyDomainByIndex(self, index): return self.ipyFairyDomainCache[index]
IPYData = IPY_DataMgr()
def IPY_Data(): return IPYData
--
Gitblit v1.8.0