From ac0e60d82a41d51ce63323389b2224ef2200f2dd Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 09 十月 2020 18:14:16 +0800
Subject: [PATCH] 8542 【主干】【长尾】【BT】【后端】组队逻辑优化（支持发送teamID请求加入；支持双方无队伍请求加入，被请求玩家为队长）
---
ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py | 123 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 121 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 6d05c4d..1484ce7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -41,6 +41,11 @@
("char", "Numerical5", 0),
),
+ "CreateRoleLimitServer":(
+ ("list", "LimitServerGroupIDRangeList", 0),
+ ("list", "LimitServerGroupIDList", 0),
+ ),
+
"WorldLV":(
("WORD", "WorldLV", 1),
("DWORD", "OpenServerSecond", 0),
@@ -196,6 +201,7 @@
("DWORD", "StoneNPCID", 0),
("WORD", "RebornPreNotifyTime", 0),
("char", "SourceName", 0),
+ ("BYTE", "CanAssist", 0),
),
"BOSSFirstKill":(
@@ -302,6 +308,15 @@
("list", "NotifyInfoLoop", 0),
("WORD", "LVLimit", 0),
("BYTE", "IsDayReset", 0),
+ ),
+
+ "ActDailyGiftbag":(
+ ("DWORD", "CfgID", 1),
+ ("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
+ ("list", "ServerIDList", 0),
+ ("char", "StartDate", 0),
+ ("char", "EndDate", 0),
),
"ActExpRate":(
@@ -416,6 +431,19 @@
("dict", "NotifyInfoEnd", 0),
("list", "NotifyInfoLoop", 0),
("WORD", "LVLimit", 0),
+ ),
+
+ "ActRechargePrize":(
+ ("DWORD", "CfgID", 1),
+ ("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
+ ("list", "ServerIDList", 0),
+ ("char", "StartDate", 0),
+ ("char", "EndDate", 0),
+ ("dict", "NotifyInfoStart", 0),
+ ("dict", "NotifyInfoEnd", 0),
+ ("list", "NotifyInfoLoop", 0),
+ ("BYTE", "IsDayReset", 0),
),
"ActTotalRecharge":(
@@ -563,6 +591,11 @@
("list", "RankAuctionItem", 0),
),
+ "AssistThanksGift":(
+ ("DWORD", "GiftID", 1),
+ ("BYTE", "AssistAwardCount", 0),
+ ),
+
"FairyDomain":(
("WORD", "ID", 1),
("DWORD", "HourCntPubLimit", 0),
@@ -589,6 +622,17 @@
def GetNumerical3(self): return self.Numerical3 # 数据3
def GetNumerical4(self): return self.Numerical4 # 数据4
def GetNumerical5(self): return self.Numerical5 # 数据5
+
+# 创角限制服务器配置表
+class IPY_CreateRoleLimitServer():
+
+ def __init__(self):
+ self.LimitServerGroupIDRangeList = []
+ self.LimitServerGroupIDList = []
+ return
+
+ def GetLimitServerGroupIDRangeList(self): return self.LimitServerGroupIDRangeList # 限制创角的服务器组ID范围列表
+ def GetLimitServerGroupIDList(self): return self.LimitServerGroupIDList # 限制创角的服务器组ID列表
# 世界等级表格
class IPY_WorldLV():
@@ -907,7 +951,8 @@
self.NoUpdataCnt = 0
self.StoneNPCID = 0
self.RebornPreNotifyTime = 0
- self.SourceName = ""
+ self.SourceName = ""
+ self.CanAssist = 0
return
def GetNPCID(self): return self.NPCID # ID
@@ -918,7 +963,8 @@
def GetNoUpdataCnt(self): return self.NoUpdataCnt # 多少次未更新实时在线数量字段时强制更新
def GetStoneNPCID(self): return self.StoneNPCID # 墓碑NPCID
def GetRebornPreNotifyTime(self): return self.RebornPreNotifyTime # 复活前X秒通知
- def GetSourceName(self): return self.SourceName # BOSS来源
+ def GetSourceName(self): return self.SourceName # BOSS来源
+ def GetCanAssist(self): return self.CanAssist # 是否可协助
# Boss首杀
class IPY_BOSSFirstKill():
@@ -1141,6 +1187,25 @@
def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
def GetLVLimit(self): return self.LVLimit # 限制等级
def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
+
+# 每日礼包表
+class IPY_ActDailyGiftbag():
+
+ def __init__(self):
+ self.CfgID = 0
+ self.ActMark = ""
+ self.PlatformList = []
+ self.ServerIDList = []
+ self.StartDate = ""
+ self.EndDate = ""
+ 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 GetStartDate(self): return self.StartDate # 开启日期
+ def GetEndDate(self): return self.EndDate # 结束日期
# 双倍经验活动表
class IPY_ActExpRate():
@@ -1378,6 +1443,33 @@
def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
def GetLVLimit(self): return self.LVLimit # 限制等级
+
+# 充值返利活动表
+class IPY_ActRechargePrize():
+
+ def __init__(self):
+ self.CfgID = 0
+ self.ActMark = ""
+ self.PlatformList = []
+ self.ServerIDList = []
+ self.StartDate = ""
+ self.EndDate = ""
+ self.NotifyInfoStart = {}
+ self.NotifyInfoEnd = {}
+ self.NotifyInfoLoop = []
+ self.IsDayReset = 0
+ 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 GetStartDate(self): return self.StartDate # 开启日期
+ def GetEndDate(self): return self.EndDate # 结束日期
+ def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
+ def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
+ def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
+ def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
# 累计充值活动表
class IPY_ActTotalRecharge():
@@ -1683,6 +1775,17 @@
def GetWarRank(self): return self.WarRank # 联赛排名
def GetRankAuctionItem(self): return self.RankAuctionItem # 拍品奖励[[拍品ID,个数], ...]
+# 协助感谢礼盒表
+class IPY_AssistThanksGift():
+
+ def __init__(self):
+ self.GiftID = 0
+ self.AssistAwardCount = 0
+ return
+
+ def GetGiftID(self): return self.GiftID # 礼盒物品ID
+ def GetAssistAwardCount(self): return self.AssistAwardCount # 协助奖励每日次数
+
# 缥缈仙域表
class IPY_FairyDomain():
@@ -1722,6 +1825,8 @@
self.ipyConfigEx = {}
self.ipyFuncConfigCache = self.__LoadFileData("FuncConfig", IPY_FuncConfig)
self.ipyFuncConfigLen = len(self.ipyFuncConfigCache)
+ self.ipyCreateRoleLimitServerCache = self.__LoadFileData("CreateRoleLimitServer", IPY_CreateRoleLimitServer)
+ self.ipyCreateRoleLimitServerLen = len(self.ipyCreateRoleLimitServerCache)
self.ipyWorldLVCache = self.__LoadFileData("WorldLV", IPY_WorldLV)
self.ipyWorldLVLen = len(self.ipyWorldLVCache)
self.ipyFamilyCache = self.__LoadFileData("Family", IPY_Family)
@@ -1774,6 +1879,8 @@
self.ipyActSpringSaleLen = len(self.ipyActSpringSaleCache)
self.ipyActFlashGiftbagCache = self.__LoadFileData("ActFlashGiftbag", IPY_ActFlashGiftbag)
self.ipyActFlashGiftbagLen = len(self.ipyActFlashGiftbagCache)
+ self.ipyActDailyGiftbagCache = self.__LoadFileData("ActDailyGiftbag", IPY_ActDailyGiftbag)
+ self.ipyActDailyGiftbagLen = len(self.ipyActDailyGiftbagCache)
self.ipyActExpRateCache = self.__LoadFileData("ActExpRate", IPY_ActExpRate)
self.ipyActExpRateLen = len(self.ipyActExpRateCache)
self.ipyActCostRebateCache = self.__LoadFileData("ActCostRebate", IPY_ActCostRebate)
@@ -1792,6 +1899,8 @@
self.ipyStoreLen = len(self.ipyStoreCache)
self.ipyActWishingWellCache = self.__LoadFileData("ActWishingWell", IPY_ActWishingWell)
self.ipyActWishingWellLen = len(self.ipyActWishingWellCache)
+ self.ipyActRechargePrizeCache = self.__LoadFileData("ActRechargePrize", IPY_ActRechargePrize)
+ self.ipyActRechargePrizeLen = len(self.ipyActRechargePrizeCache)
self.ipyActTotalRechargeCache = self.__LoadFileData("ActTotalRecharge", IPY_ActTotalRecharge)
self.ipyActTotalRechargeLen = len(self.ipyActTotalRechargeCache)
self.ipyCrossZoneCommCache = self.__LoadFileData("CrossZoneComm", IPY_CrossZoneComm)
@@ -1820,6 +1929,8 @@
self.ipyEquipStarUpLen = len(self.ipyEquipStarUpCache)
self.ipyFamilyWarRankAwardCache = self.__LoadFileData("FamilyWarRankAward", IPY_FamilyWarRankAward)
self.ipyFamilyWarRankAwardLen = len(self.ipyFamilyWarRankAwardCache)
+ self.ipyAssistThanksGiftCache = self.__LoadFileData("AssistThanksGift", IPY_AssistThanksGift)
+ self.ipyAssistThanksGiftLen = len(self.ipyAssistThanksGiftCache)
self.ipyFairyDomainCache = self.__LoadFileData("FairyDomain", IPY_FairyDomain)
self.ipyFairyDomainLen = len(self.ipyFairyDomainCache)
Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
@@ -1990,6 +2101,8 @@
def GetFuncConfigCount(self): return self.ipyFuncConfigLen
def GetFuncConfigByIndex(self, index): return self.ipyFuncConfigCache[index]
+ def GetCreateRoleLimitServerCount(self): return self.ipyCreateRoleLimitServerLen
+ def GetCreateRoleLimitServerByIndex(self, index): return self.ipyCreateRoleLimitServerCache[index]
def GetWorldLVCount(self): return self.ipyWorldLVLen
def GetWorldLVByIndex(self, index): return self.ipyWorldLVCache[index]
def GetFamilyCount(self): return self.ipyFamilyLen
@@ -2042,6 +2155,8 @@
def GetActSpringSaleByIndex(self, index): return self.ipyActSpringSaleCache[index]
def GetActFlashGiftbagCount(self): return self.ipyActFlashGiftbagLen
def GetActFlashGiftbagByIndex(self, index): return self.ipyActFlashGiftbagCache[index]
+ def GetActDailyGiftbagCount(self): return self.ipyActDailyGiftbagLen
+ def GetActDailyGiftbagByIndex(self, index): return self.ipyActDailyGiftbagCache[index]
def GetActExpRateCount(self): return self.ipyActExpRateLen
def GetActExpRateByIndex(self, index): return self.ipyActExpRateCache[index]
def GetActCostRebateCount(self): return self.ipyActCostRebateLen
@@ -2060,6 +2175,8 @@
def GetStoreByIndex(self, index): return self.ipyStoreCache[index]
def GetActWishingWellCount(self): return self.ipyActWishingWellLen
def GetActWishingWellByIndex(self, index): return self.ipyActWishingWellCache[index]
+ def GetActRechargePrizeCount(self): return self.ipyActRechargePrizeLen
+ def GetActRechargePrizeByIndex(self, index): return self.ipyActRechargePrizeCache[index]
def GetActTotalRechargeCount(self): return self.ipyActTotalRechargeLen
def GetActTotalRechargeByIndex(self, index): return self.ipyActTotalRechargeCache[index]
def GetCrossZoneCommCount(self): return self.ipyCrossZoneCommLen
@@ -2088,6 +2205,8 @@
def GetEquipStarUpByIndex(self, index): return self.ipyEquipStarUpCache[index]
def GetFamilyWarRankAwardCount(self): return self.ipyFamilyWarRankAwardLen
def GetFamilyWarRankAwardByIndex(self, index): return self.ipyFamilyWarRankAwardCache[index]
+ def GetAssistThanksGiftCount(self): return self.ipyAssistThanksGiftLen
+ def GetAssistThanksGiftByIndex(self, index): return self.ipyAssistThanksGiftCache[index]
def GetFairyDomainCount(self): return self.ipyFairyDomainLen
def GetFairyDomainByIndex(self, index): return self.ipyFairyDomainCache[index]
--
Gitblit v1.8.0