From c280ced8be799a899efc78b21cc807d435ab6609 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 10 二月 2026 19:34:03 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端(退出公会时间根据当前是否互通取对应的本服或跨服时间;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |  113 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index ee69cbf..e0fb6cb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -46,6 +46,7 @@
 Def_FamilyCrossState = 'FamilyCrossState' # 本服公会跨服状态, 0-未跨服;1-已跨服
 Def_FamilyTransDataTime = 'FamilyTransDataTime' # 本服公会首次跨服互通数据开始传输时间戳,不为0代表传输数据中
 Def_OSAAwardState = 'OSAAwardState' #开服冲榜活动结算状态
+Def_OperationActID = 'OperationActID_%s_%s' # 运营活动ID的标记,参数(运营活动名, actNum)
 
 #---奇迹, 职业枚举定义---
 (
@@ -198,6 +199,9 @@
 
 Def_Notify_WorldKey_CoupleInfo = "CoupleInfo"  # 伴侣信息
 
+Def_WorldKey_OperationActionState = "State_%s_%s"               #运营活动状态,参数为(运营活动名, actNum)
+Def_WorldKey_OperationActionStateJoin = "StateJoin_%s_%s"       #运营活动可参与状态,参数为(运营活动名, actNum)
+
 #活动类型定义
 ActTypeList = (
 ActType_OpenComm, # 开服及常规运营活动 1
@@ -206,6 +210,11 @@
 ) = range(1, 1 + 3)
 
 #运营活动表名定义
+OperationActionName_Lunhuidian = "ActLunhuidian" # 轮回殿活动
+
+#所有的运营活动列表,默认都支持多活动分组编号的活动名
+OperationActionNameList = [OperationActionName_Lunhuidian]
+
 OperationActionName_ExpRate = "ActExpRate" # 多倍经验活动
 OperationActionName_SpringSale = "ActSpringSale" # 限时特惠活动
 OperationActionName_FlashGiftbag = "ActFlashGiftbag" # 限时礼包活动
@@ -232,58 +241,44 @@
 OperationActionName_BuyCountGift = "ActBuyCountGift" # 购买次数礼包活动
 OperationActionName_FamilyCTGAssist = "ActFamilyCTGAssist" # 仙盟充值协助
 OperationActionName_Yunshi = "ActYunshi" # 运势活动
-OperationActionName_Lunhuidian = "ActLunhuidian" # 轮回殿活动
-#节日活动类型列表 - 该类型无视开服天,日期到了就开启
-FeastOperationActionNameList = [OperationActionName_GrowupBuy,
-                                OperationActionName_FeastLogin,
-                                OperationActionName_FeastWish,
-                                ]
-#所有的运营活动列表,含节日活动
-OperationActionNameList = [OperationActionName_ExpRate, 
-                           OperationActionName_SpringSale, 
-                           OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
-                           OperationActionName_RealmPoint, OperationActionName_FlashSale,
-                           OperationActionName_WishingWell, OperationActionName_TotalRecharge,
-                           OperationActionName_LoginAward, 
-                           OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure,
-                           OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge,
-                           OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
-                           OperationActionName_Turntable,
-                           OperationActionName_GodGift,
-                           OperationActionName_BuyOne,
-                           OperationActionName_ActLoginNew, OperationActionName_ActTask,
-                           OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
-                           OperationActionName_Yunshi,
-                           OperationActionName_Lunhuidian,
-                           ] + FeastOperationActionNameList
-#需要记录开启活动时的世界等级的运营活动
-NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
-                                   OperationActionName_NewFairyCeremony, OperationActionName_FlashSale,
-                                   OperationActionName_TotalRecharge,
-                                   OperationActionName_FlashGiftbag,
-                                   OperationActionName_SpringSale, OperationActionName_LuckyTreasure,
-                                   OperationActionName_DailyGiftbag, OperationActionName_GrowupBuy,
-                                   OperationActionName_Turntable,
-                                   OperationActionName_CollectWords,
-                                   OperationActionName_FeastLogin,
-                                   OperationActionName_FeastWish,
-                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
-                                   OperationActionName_GodGift,
-                                   ]
 
-#支持多活动分组编号的活动名
-MultiActNumOperationActNameList = [OperationActionName_TotalRecharge, OperationActionName_CollectWords,
-                                   OperationActionName_FlashGiftbag,
-                                   OperationActionName_SpringSale, OperationActionName_FlashSale,
-                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
-                                   OperationActionName_Turntable,
-                                   OperationActionName_GodGift,
-                                   OperationActionName_BuyOne,
-                                   OperationActionName_ActLoginNew, OperationActionName_ActTask,
-                                   OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
-                                   OperationActionName_Yunshi,
-                                   OperationActionName_Lunhuidian,
-                                   ]
+##节日活动类型列表 - 该类型无视开服天,日期到了就开启
+#FeastOperationActionNameList = [OperationActionName_GrowupBuy,
+#                                OperationActionName_FeastLogin,
+#                                OperationActionName_FeastWish,
+#                                ]
+##所有的运营活动列表,含节日活动
+#OperationActionNameList = [OperationActionName_ExpRate, 
+#                           OperationActionName_SpringSale, 
+#                           OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
+#                           OperationActionName_RealmPoint, OperationActionName_FlashSale,
+#                           OperationActionName_WishingWell, OperationActionName_TotalRecharge,
+#                           OperationActionName_LoginAward, 
+#                           OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure,
+#                           OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge,
+#                           OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
+#                           OperationActionName_Turntable,
+#                           OperationActionName_GodGift,
+#                           OperationActionName_BuyOne,
+#                           OperationActionName_ActLoginNew, OperationActionName_ActTask,
+#                           OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
+#                           OperationActionName_Yunshi,
+#                           OperationActionName_Lunhuidian,
+#                           ] + FeastOperationActionNameList
+##需要记录开启活动时的世界等级的运营活动
+#NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
+#                                   OperationActionName_NewFairyCeremony, OperationActionName_FlashSale,
+#                                   OperationActionName_TotalRecharge,
+#                                   OperationActionName_FlashGiftbag,
+#                                   OperationActionName_SpringSale, OperationActionName_LuckyTreasure,
+#                                   OperationActionName_DailyGiftbag, OperationActionName_GrowupBuy,
+#                                   OperationActionName_Turntable,
+#                                   OperationActionName_CollectWords,
+#                                   OperationActionName_FeastLogin,
+#                                   OperationActionName_FeastWish,
+#                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
+#                                   OperationActionName_GodGift,
+#                                   ]
 
 #跨服运营活动表名定义
 CrossActName_Lianqi = "CrossActLianqi" # 炼器 - 跨服
@@ -830,13 +825,14 @@
                        Def_GameRecType_PlayerOfflineUnprocessed, # 离线玩家待处理事件,playerID 307
                        Def_GameRecType_ArenaRecord, # 演武场玩家挑战记录,playerID 308
                        Def_GameRecType_BatPreset, # 战斗方案预设额外存储信息,playerID 309
-                       ) = range(300, 1 + 309)
+                       Def_GameRecType_Setting, # 前端自定义存储的设置内容,playerID 310
+                       ) = range(300, 1 + 310)
 #通用信息记录新 - 字典key配置,如果有配置,则可额外按对应记录Value值存储字典,方便快速取值,可配置Value编号 1~8,配空默认 Value1
 Def_GameRecValueKeyDict = {
                            Def_GameRecType_Xiangong:[1],
                            }
 #仅查看自己的记录
-Def_ViewGameRecSelfList = [Def_GameRecType_ArenaRecord, Def_GameRecType_BatPreset]
+Def_ViewGameRecSelfList = [Def_GameRecType_ArenaRecord, Def_GameRecType_BatPreset, Def_GameRecType_Setting]
 
 #UserData不使用json的记录类型
 UserDataNOJsonRecTypeList = []
@@ -1045,25 +1041,30 @@
 C2S_FamilyDataRet = "C2S_FamilyDataRet"                 # 公会首次跨服互通时同步数据结果回复
 C2S_FamilyMapPlayer = "C2S_FamilyMapPlayer"             # 给公会玩家处理地图服务器逻辑
 C2S_FamilyPyPackRet = "C2S_FamilyPyPackRet"             # 公会功能玩家请求包处理结束回包,一般用于重置请求cd等
+C2S_GMDebugAnswer = "C2S_GMDebugAnswer"                 # 发给玩家的DebugAnswer
 C2S_NotifyCode = "C2S_NotifyCode"                       # 给玩家发送信息提示
 C2S_CostPlayerResources = "C2S_CostPlayerResources"     # 扣除玩家资源,货币、物品等
 C2S_GivePlayerResources = "C2S_GivePlayerResources"     # 奖励玩家资源,货币、物品等
 C2S_SetPlayerNomalDict = "C2S_SetPlayerNomalDict"       # 设置玩家字典值
 C2S_SendPlayerMail = "C2S_SendPlayerMail"               # 发送玩家个人邮件
+C2S_TaofaMemContrib = "C2S_TaofaMemContrib"             # 讨伐成员贡献信息
 
 # 游戏服  -> 跨服
 S2C_OnlineState = "S2C_OnlineState"                     # 玩家在线状态同步
 S2C_PlayerBaseInfo = "S2C_PlayerBaseInfo"               # 玩家基础信息同步
 S2C_FamilyData = "S2C_FamilyData"                       # 公会首次跨服互通时同步数据
 S2C_FamilyPyPack = "S2C_FamilyPyPack"                   # 公会功能玩家请求包
-S2C_GMCMD = "S2C_GMCMD"                                 # GM命令
 
-# 其他
+# 游戏服  -> 任意服务器
+S2S_ViewTagFamily = "S2S_ViewTagFamily"                 # 查看目标公会
+S2S_ViewTagPlayer = "S2S_ViewTagPlayer"                 # 查看目标玩家
+
+# 任意服务器 -> 战斗服务器
 S2B_BattleRequest = "S2B_BattleRequest"                 # 战斗请求
 B2S_BattleResult = "B2S_BattleResult"                   # 战斗结果
 
 # Debug日志不输出通讯数据明细的类型,debug模式下看,一些纯数据类的可不输出通讯数据明细
-NoLogDataSSMsgTypes = [S2B_BattleRequest, B2S_BattleResult, S2C_FamilyData, C2S_SendFakePack]
+NoLogDataSSMsgTypes = [S2B_BattleRequest, B2S_BattleResult, S2C_FamilyData, C2S_SendFakePack, S2C_FamilyPyPack]
 
 # 跨服服务器发送子服信息定义
 CrossServerMsg_CrossServerState = "CrossServerState"    # 跨服服务器状态变更

--
Gitblit v1.8.0