From 2b59c17039cf4bcccc79a714f96ffea659a0e730 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 24 十一月 2021 16:55:39 +0800
Subject: [PATCH] 9341 【BT5】【主干】【后端】情缘系统（增加情缘副本；AB相互提亲优化聘礼ID取较高的; 主干冲突）
---
ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 237 insertions(+), 3 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 6c250f8..9972bfd 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -395,6 +395,46 @@
("list", "NotifyInfoLoop", 0),
),
+ "ActGarbageSorting":(
+ ("DWORD", "CfgID", 1),
+ ("list", "PlatformList", 0),
+ ("list", "ServerGroupIDList", 0),
+ ("BYTE", "ActNum", 0),
+ ("char", "StartDate", 0),
+ ("char", "EndDate", 0),
+ ("dict", "NotifyInfoStart", 0),
+ ("dict", "NotifyInfoEnd", 0),
+ ("list", "NotifyInfoLoop", 0),
+ ("BYTE", "ResetType", 0),
+ ),
+
+ "ActXianXiaMJ":(
+ ("DWORD", "CfgID", 1),
+ ("list", "PlatformList", 0),
+ ("list", "ServerGroupIDList", 0),
+ ("BYTE", "ActNum", 0),
+ ("char", "StartDate", 0),
+ ("char", "EndDate", 0),
+ ("dict", "NotifyInfoStart", 0),
+ ("dict", "NotifyInfoEnd", 0),
+ ("list", "NotifyInfoLoop", 0),
+ ("BYTE", "ResetType", 0),
+ ),
+
+ "ActHorsePetFeast":(
+ ("DWORD", "CfgID", 1),
+ ("list", "PlatformList", 0),
+ ("list", "ServerGroupIDList", 0),
+ ("BYTE", "ActNum", 0),
+ ("char", "StartDate", 0),
+ ("char", "EndDate", 0),
+ ("list", "StartTimeList", 0),
+ ("list", "EndTimeList", 0),
+ ("dict", "NotifyInfoStart", 0),
+ ("dict", "NotifyInfoEnd", 0),
+ ("BYTE", "IsDayReset", 0),
+ ),
+
"ActBossReborn":(
("DWORD", "CfgID", 1),
("list", "ServerGroupIDList", 0),
@@ -532,6 +572,16 @@
("BYTE", "IsDayReset", 0),
),
+ "ActTurntable":(
+ ("DWORD", "CfgID", 1),
+ ("list", "PlatformList", 0),
+ ("list", "ServerGroupIDList", 0),
+ ("BYTE", "ActNum", 0),
+ ("char", "StartDate", 0),
+ ("char", "EndDate", 0),
+ ("BYTE", "IsDayReset", 0),
+ ),
+
"ActManyDayRecharge":(
("DWORD", "CfgID", 1),
("list", "PlatformList", 0),
@@ -582,7 +632,6 @@
"CrossRealmPKDan":(
("BYTE", "DanLV", 1),
("WORD", "LVUpScore", 0),
- ("list", "MatchRange", 0),
("BYTE", "MatchRobotRate", 0),
("BYTE", "MatchRobotRateEx", 0),
),
@@ -657,6 +706,25 @@
("BYTE", "WorldLvNum", 1),
("DWORD", "Rank", 1),
("dict", "Award", 0),
+ ),
+
+ "LoveGift":(
+ ("BYTE", "GiftNum", 1),
+ ("DWORD", "AddCharmSelf", 0),
+ ("DWORD", "AddCharmTag", 0),
+ ("DWORD", "AddIntimacy", 0),
+ ("char", "WorldNotifyKey", 0),
+ ),
+
+ "Marry":(
+ ("BYTE", "BridePriceID", 1),
+ ("BYTE", "CanBuyCount", 0),
+ ("BYTE", "IsDayReset", 0),
+ ("DWORD", "Prosperity", 0),
+ ("WORD", "CandyTimes", 0),
+ ("list", "CandyItemInfo", 0),
+ ("list", "BrideGiftItemInfo", 0),
+ ("char", "WorldNotifyKey", 0),
),
"ActLuckyTreasure":(
@@ -1484,6 +1552,89 @@
def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
+# 垃圾分类活动时间表
+class IPY_ActGarbageSorting():
+
+ def __init__(self):
+ self.CfgID = 0
+ self.PlatformList = []
+ self.ServerGroupIDList = []
+ self.ActNum = 0
+ self.StartDate = ""
+ self.EndDate = ""
+ self.NotifyInfoStart = {}
+ self.NotifyInfoEnd = {}
+ self.NotifyInfoLoop = []
+ self.ResetType = 0
+ return
+
+ def GetCfgID(self): return self.CfgID # 配置ID
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
+ def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
+ def GetActNum(self): return self.ActNum # 活动分组编号, 活动类型 * 10 + 不同界面编号
+ 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 GetResetType(self): return self.ResetType # 重置类型，0-0点重置；1-5点重置
+
+# 仙匣秘境活动时间表
+class IPY_ActXianXiaMJ():
+
+ def __init__(self):
+ self.CfgID = 0
+ self.PlatformList = []
+ self.ServerGroupIDList = []
+ self.ActNum = 0
+ self.StartDate = ""
+ self.EndDate = ""
+ self.NotifyInfoStart = {}
+ self.NotifyInfoEnd = {}
+ self.NotifyInfoLoop = []
+ self.ResetType = 0
+ return
+
+ def GetCfgID(self): return self.CfgID # 配置ID
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
+ def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
+ def GetActNum(self): return self.ActNum # 活动分组编号, 活动类型 * 10 + 不同界面编号
+ 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 GetResetType(self): return self.ResetType # 重置类型，0-0点重置；1-5点重置
+
+# 骑宠盛宴活动
+class IPY_ActHorsePetFeast():
+
+ def __init__(self):
+ self.CfgID = 0
+ self.PlatformList = []
+ self.ServerGroupIDList = []
+ self.ActNum = 0
+ self.StartDate = ""
+ self.EndDate = ""
+ self.StartTimeList = []
+ self.EndTimeList = []
+ self.NotifyInfoStart = {}
+ self.NotifyInfoEnd = {}
+ self.IsDayReset = 0
+ return
+
+ def GetCfgID(self): return self.CfgID # 配置ID
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
+ def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
+ def GetActNum(self): return self.ActNum # 活动分组编号, 活动类型 * 10 + 不同界面编号
+ def GetStartDate(self): return self.StartDate # 开启日期
+ def GetEndDate(self): return self.EndDate # 结束日期
+ def GetStartTimeList(self): return self.StartTimeList # 开启时间列表, 支持多个时段
+ def GetEndTimeList(self): return self.EndTimeList # 结束时间列表, 支持多个时段
+ def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
+ def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
+ def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
+
# BOSS复活活动时间表
class IPY_ActBossReborn():
@@ -1769,6 +1920,27 @@
def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key]
def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
+# 转盘活动表
+class IPY_ActTurntable():
+
+ def __init__(self):
+ self.CfgID = 0
+ self.PlatformList = []
+ self.ServerGroupIDList = []
+ self.ActNum = 0
+ self.StartDate = ""
+ self.EndDate = ""
+ self.IsDayReset = 0
+ return
+
+ def GetCfgID(self): return self.CfgID # 配置ID
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
+ def GetServerGroupIDList(self): return self.ServerGroupIDList # 服务器ID列表
+ def GetActNum(self): return self.ActNum # 活动分组编号, 活动类型 * 10 + 不同界面编号
+ def GetStartDate(self): return self.StartDate # 开启日期
+ def GetEndDate(self): return self.EndDate # 结束日期
+ def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
+
# 多日连充活动表
class IPY_ActManyDayRecharge():
@@ -1874,14 +2046,12 @@
def __init__(self):
self.DanLV = 0
self.LVUpScore = 0
- 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 GetMatchRobotRate(self): return self.MatchRobotRate # 匹配机器人基础概率，百分率
def GetMatchRobotRateEx(self): return self.MatchRobotRateEx # 匹配机器人失败次数附加概率，百分率
@@ -2034,6 +2204,46 @@
def GetWorldLvNum(self): return self.WorldLvNum # 世界等级档
def GetRank(self): return self.Rank # 排名
def GetAward(self): return self.Award # 奖励 {"职业":[[物品ID,个数,是否绑定],...], ...}
+
+# 情缘礼物表
+class IPY_LoveGift():
+
+ def __init__(self):
+ self.GiftNum = 0
+ self.AddCharmSelf = 0
+ self.AddCharmTag = 0
+ self.AddIntimacy = 0
+ self.WorldNotifyKey = ""
+ return
+
+ def GetGiftNum(self): return self.GiftNum # 聘礼ID
+ def GetAddCharmSelf(self): return self.AddCharmSelf # 单个增加自身魅力
+ def GetAddCharmTag(self): return self.AddCharmTag # 单个增加对方魅力
+ def GetAddIntimacy(self): return self.AddIntimacy # 单个增加双方亲密度
+ def GetWorldNotifyKey(self): return self.WorldNotifyKey # 广播key
+
+# 情缘提亲表
+class IPY_Marry():
+
+ def __init__(self):
+ self.BridePriceID = 0
+ self.CanBuyCount = 0
+ self.IsDayReset = 0
+ self.Prosperity = 0
+ self.CandyTimes = 0
+ self.CandyItemInfo = []
+ self.BrideGiftItemInfo = []
+ self.WorldNotifyKey = ""
+ return
+
+ def GetBridePriceID(self): return self.BridePriceID # 聘礼ID
+ def GetCanBuyCount(self): return self.CanBuyCount # 可购买次数
+ def GetIsDayReset(self): return self.IsDayReset # 是否每日重置
+ def GetProsperity(self): return self.Prosperity # 初始繁荣度
+ def GetCandyTimes(self): return self.CandyTimes # 喜糖持续时间秒
+ def GetCandyItemInfo(self): return self.CandyItemInfo # 喜糖物品列表[[物品ID,个数,是否拍品], ...]
+ def GetBrideGiftItemInfo(self): return self.BrideGiftItemInfo # 聘礼物品列表[[物品ID,个数,是否拍品], ...]
+ def GetWorldNotifyKey(self): return self.WorldNotifyKey # 广播key
# 幸运鉴宝活动时间表
class IPY_ActLuckyTreasure():
@@ -2260,6 +2470,12 @@
self.ipyActCostRebateLen = len(self.ipyActCostRebateCache)
self.ipyActCollectWordsCache = self.__LoadFileData("ActCollectWords", IPY_ActCollectWords)
self.ipyActCollectWordsLen = len(self.ipyActCollectWordsCache)
+ self.ipyActGarbageSortingCache = self.__LoadFileData("ActGarbageSorting", IPY_ActGarbageSorting)
+ self.ipyActGarbageSortingLen = len(self.ipyActGarbageSortingCache)
+ self.ipyActXianXiaMJCache = self.__LoadFileData("ActXianXiaMJ", IPY_ActXianXiaMJ)
+ self.ipyActXianXiaMJLen = len(self.ipyActXianXiaMJCache)
+ self.ipyActHorsePetFeastCache = self.__LoadFileData("ActHorsePetFeast", IPY_ActHorsePetFeast)
+ self.ipyActHorsePetFeastLen = len(self.ipyActHorsePetFeastCache)
self.ipyActBossRebornCache = self.__LoadFileData("ActBossReborn", IPY_ActBossReborn)
self.ipyActBossRebornLen = len(self.ipyActBossRebornCache)
self.ipyActFairyCeremonyCache = self.__LoadFileData("ActFairyCeremony", IPY_ActFairyCeremony)
@@ -2282,6 +2498,8 @@
self.ipyActGrowupBuyLen = len(self.ipyActGrowupBuyCache)
self.ipyActSingleRechargeCache = self.__LoadFileData("ActSingleRecharge", IPY_ActSingleRecharge)
self.ipyActSingleRechargeLen = len(self.ipyActSingleRechargeCache)
+ self.ipyActTurntableCache = self.__LoadFileData("ActTurntable", IPY_ActTurntable)
+ self.ipyActTurntableLen = len(self.ipyActTurntableCache)
self.ipyActManyDayRechargeCache = self.__LoadFileData("ActManyDayRecharge", IPY_ActManyDayRecharge)
self.ipyActManyDayRechargeLen = len(self.ipyActManyDayRechargeCache)
self.ipyActTotalRechargeCache = self.__LoadFileData("ActTotalRecharge", IPY_ActTotalRecharge)
@@ -2306,6 +2524,10 @@
self.ipyActNewFairyCeremonyLen = len(self.ipyActNewFairyCeremonyCache)
self.ipyNewUniquenessArriveCache = self.__LoadFileData("NewUniquenessArrive", IPY_NewUniquenessArrive)
self.ipyNewUniquenessArriveLen = len(self.ipyNewUniquenessArriveCache)
+ self.ipyLoveGiftCache = self.__LoadFileData("LoveGift", IPY_LoveGift)
+ self.ipyLoveGiftLen = len(self.ipyLoveGiftCache)
+ self.ipyMarryCache = self.__LoadFileData("Marry", IPY_Marry)
+ self.ipyMarryLen = len(self.ipyMarryCache)
self.ipyActLuckyTreasureCache = self.__LoadFileData("ActLuckyTreasure", IPY_ActLuckyTreasure)
self.ipyActLuckyTreasureLen = len(self.ipyActLuckyTreasureCache)
self.ipyCrossActCTGBillboardCache = self.__LoadFileData("CrossActCTGBillboard", IPY_CrossActCTGBillboard)
@@ -2556,6 +2778,12 @@
def GetActCostRebateByIndex(self, index): return self.ipyActCostRebateCache[index]
def GetActCollectWordsCount(self): return self.ipyActCollectWordsLen
def GetActCollectWordsByIndex(self, index): return self.ipyActCollectWordsCache[index]
+ def GetActGarbageSortingCount(self): return self.ipyActGarbageSortingLen
+ def GetActGarbageSortingByIndex(self, index): return self.ipyActGarbageSortingCache[index]
+ def GetActXianXiaMJCount(self): return self.ipyActXianXiaMJLen
+ def GetActXianXiaMJByIndex(self, index): return self.ipyActXianXiaMJCache[index]
+ def GetActHorsePetFeastCount(self): return self.ipyActHorsePetFeastLen
+ def GetActHorsePetFeastByIndex(self, index): return self.ipyActHorsePetFeastCache[index]
def GetActBossRebornCount(self): return self.ipyActBossRebornLen
def GetActBossRebornByIndex(self, index): return self.ipyActBossRebornCache[index]
def GetActFairyCeremonyCount(self): return self.ipyActFairyCeremonyLen
@@ -2578,6 +2806,8 @@
def GetActGrowupBuyByIndex(self, index): return self.ipyActGrowupBuyCache[index]
def GetActSingleRechargeCount(self): return self.ipyActSingleRechargeLen
def GetActSingleRechargeByIndex(self, index): return self.ipyActSingleRechargeCache[index]
+ def GetActTurntableCount(self): return self.ipyActTurntableLen
+ def GetActTurntableByIndex(self, index): return self.ipyActTurntableCache[index]
def GetActManyDayRechargeCount(self): return self.ipyActManyDayRechargeLen
def GetActManyDayRechargeByIndex(self, index): return self.ipyActManyDayRechargeCache[index]
def GetActTotalRechargeCount(self): return self.ipyActTotalRechargeLen
@@ -2602,6 +2832,10 @@
def GetActNewFairyCeremonyByIndex(self, index): return self.ipyActNewFairyCeremonyCache[index]
def GetNewUniquenessArriveCount(self): return self.ipyNewUniquenessArriveLen
def GetNewUniquenessArriveByIndex(self, index): return self.ipyNewUniquenessArriveCache[index]
+ def GetLoveGiftCount(self): return self.ipyLoveGiftLen
+ def GetLoveGiftByIndex(self, index): return self.ipyLoveGiftCache[index]
+ def GetMarryCount(self): return self.ipyMarryLen
+ def GetMarryByIndex(self, index): return self.ipyMarryCache[index]
def GetActLuckyTreasureCount(self): return self.ipyActLuckyTreasureLen
def GetActLuckyTreasureByIndex(self, index): return self.ipyActLuckyTreasureCache[index]
def GetCrossActCTGBillboardCount(self): return self.ipyCrossActCTGBillboardLen
--
Gitblit v1.8.0