From 388823edfe6308cba6f76ca6dc4f20022c5cb2be Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 30 六月 2025 19:03:50 +0800
Subject: [PATCH] 10431 【英文】看广告获得限时代金券

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   66 +++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 1ef0b75..929b436 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -182,6 +182,9 @@
 Def_Notify_WorldKey_CrossPKSeasonID = "CrossPKSeasonID"  # 本服跨服PK当前赛季
 Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState"  # 本服跨服PK赛季状态 0-关闭,1-开启中
 
+Def_Notify_WorldKey_CrossChampionshipState = "CrossChampionshipState"  # 跨服排位赛状态
+Def_Notify_WorldKey_CrossChampionshipStateError = "CrossChampionshipStateError"  # 跨服排位赛状态是否已经异常
+
 Def_Notify_WorldKey_LuckyCloudBuyInfo = "LuckyCloudBuyInfo"  # 本服幸运云购最新一期信息
 
 Def_Notify_WorldKey_CrossBattlefieldCallTeamInfo = "CrossBattlefieldCallTeamInfo" # 跨服战场召集队伍信息
@@ -360,10 +363,12 @@
 CrossActName_XianXiaMJ = "CrossActXianXiaMJ" # 仙匣秘境 - 跨服
 CrossActName_Gubao = "CrossActGubao" # 古宝养成 - 跨服
 CrossActName_HorsePetTrain = "CrossActHorsePetTrain" # 骑宠养成 - 跨服
+CrossActName_Lianqi = "CrossActLianqi" # 炼器 - 跨服
+CrossActName_FamilyGCZ = "CrossActFamilyGCZ" # 仙盟攻城战
 
 #跨服运营活动列表
 CrossActNameList = [CrossActName_CTGBillboard, CrossActName_AllRecharge, CrossActName_LuckyCloudBuy, CrossActName_BossTrial, 
-                    CrossActName_XianXiaMJ, CrossActName_Gubao, CrossActName_HorsePetTrain]
+                    CrossActName_XianXiaMJ, CrossActName_Gubao, CrossActName_HorsePetTrain, CrossActName_Lianqi, CrossActName_FamilyGCZ]
 #需要锁定活动分区分配直到活动结束的跨服运营活动,即使热更分区配置,也不会改变正在活动中的分区设定,直到活动结束
 CrossActLockServerGroupIDList = [CrossActName_CTGBillboard, CrossActName_AllRecharge]
 
@@ -371,6 +376,7 @@
 ActKey_ID = "ID" # 活动ID,唯一标识的ID,一般是活动开启的time值
 ActKey_State = "State" # 活动状态 0-未开启, >0开启中,也代表当日的第几个时间段
 ActKey_StateJoin = "StateJoin" # 活动某些功能可参与状态 0-还不可参与, >0可参与,一般可参与时该状态等于state
+ActKey_StateError = "StateError" # 按流程走的活动状态是否已异常
 ActKey_CfgID = "CfgID" # 活动表配置ID
 ActKey_ActNum = "ActNum" # 活动分组编号
 ActKey_DayIndex = "DayIndex" # 当前活动天索引,0开始,代表第1天
@@ -877,7 +883,7 @@
     Def_BT_Max, #排行榜最大类型
 ) = range(0, 40 + 2) 
 
-''' 跨服排行榜类型, 从 150 开始
+''' 跨服排行榜类型, 从 150 开始,最大条数在功能配置表 CrossBillboardSet 配置,没配默认100
 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
 跨服榜单表(tagDBCrossBillboard)
 本服榜单表(tagDBBillboard)
@@ -898,20 +904,12 @@
 Def_CBT_XianXiaMJScore, # 仙匣秘境积分 - 个人榜  162
 Def_CBT_GubaoScore, # 古宝养成积分 - 个人榜  163
 Def_CBT_HorsePetTrainScore, # 骑宠养成积分 - 个人榜  164
-) = range(150, 164 + 1)
-
-# 跨服榜单最大数据名次,没有设置的默认100
-CrossBillboard_MaxDataCount = {
-                               Def_CBT_BattlefieldWJoin:1000,
-                               Def_CBT_BattlefieldWCall:1000,
-                               Def_CBT_BattlefieldWScore:1000,
-                               Def_CBT_BattlefieldWScoreLastWeek:1000,
-                               Def_CBT_BossTrialSubmit:1000,
-                               Def_CBT_BossTrialSubmitBak:1000,
-                               Def_CBT_XianXiaMJScore:1000,
-                               Def_CBT_GubaoScore:1000,
-                               Def_CBT_HorsePetTrainScore:1000,
-                               }
+Def_CBT_CrossRealmPK, # 跨服PK竞技场  165
+Def_CBT_LianqiScore, # 炼器积分 - 个人榜  166
+Def_CBT_FamilyGCZScore, # 仙盟攻城战 - 仙盟积分总榜  167 (zoneID, 0)
+Def_CBT_FamilyGCZPlayerHurt, # 仙盟攻城战 - 玩家伤害总榜  168 (zoneID, 0)
+Def_CBT_FamilyGCZRoundHurt, # 仙盟攻城战 - 本轮分组仙盟伤害榜  169 (zoneID, batType*100+groupNum)
+) = range(150, 169 + 1)
 
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -1225,6 +1223,7 @@
 TYPE_Price_Tuijinbi = 48    # 推金币次数
 TYPE_Price_XianyuanScore = 49    # 仙缘积分
 TYPE_Price_HuanjinggeScore = 50    # 幻境阁积分
+TYPE_Price_PayCoinDay = 98    # 代币时效,每日过天重置
 TYPE_Price_PayCoin = 99    # 代币
 
 #key可用于遍历所有货币,value仅GM相关会用到
@@ -1234,7 +1233,7 @@
                  29:"聚魂碎片", 30:"核心环", 31:"功能特权令", 32:"环保值", 33:"GM令", 34:"古神币", 35:"功德点", 
                  39:"成就积分", 40:"万界积分", 43:"凭证积分", 44:"聚魂精华", 45:"骑宠养成积分", 46:"古宝养成积分", 47:"天道果", 48:"推金币次数", 
                  49:"仙缘积分", 50:"幻境阁积分",
-                 99:"代币"
+                 98:"代币时效", 99:"代币"
                  }
 
 #需要记录累计消耗的货币类型
@@ -1277,6 +1276,7 @@
                            TYPE_Price_Tuijinbi:CDBPlayerRefresh_Tuijinbi,
                            TYPE_Price_XianyuanScore:CDBPlayerRefresh_XianyuanScore,
                            TYPE_Price_HuanjinggeScore:CDBPlayerRefresh_HuanjinggeScore,
+                           TYPE_Price_PayCoinDay:CDBPlayerRefresh_PayCoinDay,
                            }
 
 # 支持负值的货币及对应0418刷新类型
@@ -1410,11 +1410,12 @@
                        Def_WorshipType_CrossXianXiaMJ, # 跨服秘境寻宝 4
                        Def_WorshipType_CrossHorsePetTrain, # 跨服骑宠养成 5
                        Def_WorshipType_CrossGubaoTrain, # 跨服古宝养成 6
-                       ) = range(1, 1 + 6)
+                       Def_WorshipType_FamilyGCZ, # 仙盟攻城战 7
+                       ) = range(1, 1 + 7)
 
 #跨服膜拜类型
 Def_WorshipTypeCross = [Def_WorshipType_CrossChampionship, Def_WorshipType_CrossBossTrial, Def_WorshipType_CrossXianXiaMJ, 
-                        Def_WorshipType_CrossHorsePetTrain, Def_WorshipType_CrossGubaoTrain,
+                        Def_WorshipType_CrossHorsePetTrain, Def_WorshipType_CrossGubaoTrain, Def_WorshipType_FamilyGCZ,
                         ]
 
 #玩家记录类型
@@ -1422,12 +1423,19 @@
                          Def_PlayerRecType_WorshipPlayer, # 被膜拜的玩家 1
                          Def_PlayerRecType_WorshipDaily, # 玩家每日膜拜记录 2
                          Def_PlayerRecType_PayCoin, # 代币记录 3
-                         ) = range(1, 1 + 3)
+                         Def_PlayerRecType_OfflineUnprocessed, # 离线未处理的逻辑 4
+                         Def_PlayerRecType_MineAreaRecord, # 福地其他记录信息 5
+                         ) = range(1, 1 + 5)
 
 #通用信息记录类型 - 新 从 300 开始,原通用记录类型最大到255
 Def_GameRecTypeList = (
                        Def_GameRecType_Xiangong, # 仙宫记录 300
-                       ) = range(300, 1 + 300)
+                       Def_GameRecType_FamilyDelSyncCross, # 仙盟删除同步跨服状态本服记录, familyID 301
+                       Def_GameRecType_FamilyGCZMgr, # 仙盟攻城战公共管理信息记录, zoneID 302
+                       Def_GameRecType_FamilyGCZJoinFamily, # 仙盟攻城战参与仙盟信息, zoneID 303
+                       Def_GameRecType_FamilyGCZJoinMember, # 仙盟攻城战参与成员信息, zoneID 304
+                       Def_GameRecType_FamilyGCZCityWall, # 仙盟攻城战城池信息, zoneID 305
+                       ) = range(300, 1 + 305)
 #通用信息记录新 - 字典key配置,如果有配置,则可额外按对应记录Value值存储字典,方便快速取值,可配置Value编号 1~8,配空默认 Value1
 Def_GameRecValueKeyDict = {
                            Def_GameRecType_Xiangong:[1],
@@ -1632,6 +1640,7 @@
 CrossServerMsg_CrossServerState = "CrossServerState"    # 跨服服务器状态变更
 CrossServerMsg_PlayerLoginout = "PlayerLoginout"        # 玩家上下线状态同步
 CrossServerMsg_ExitCrossServer = "ExitCrossServer"      # 退出跨服服务器
+CrossServerMsg_SendFakePack = "SendFakePack"            # 给子服玩家发送封包
 CrossServerMsg_Notify = "Notify"                        # 提示信息
 CrossServerMsg_ChatCrossWorld = "ChatCrossWorld"        # 跨服世界聊天
 CrossServerMsg_ViewPlayerCacheRet = "ViewPlayerCacheRet"# 查看跨服玩家信息结果
@@ -1640,12 +1649,8 @@
 CrossServerMsg_PullPlayerPackData = "PullPlayerPackData"# 拉取玩家打包数据
 CrossServerMsg_PushPlayerPackData = "PushPlayerPackData"# 推送玩家打包数据
 CrossServerMsg_PKMatchReqRet = "PKMatchReqRet"          # 跨服PK匹配请求结果
-CrossServerMsg_PKMatchResult = "PKMatchResult"          # 跨服PK匹配结果
-CrossServerMsg_PKReadyOKRoomList = "PKReadyOKRoomList"  # 跨服PK已准备好的房间列表
-CrossServerMsg_PKTimeoutRoomList = "PKTimeoutRoomList"  # 跨服PK已超时的房间列表
 CrossServerMsg_PKOverInfo = "PKOverInfo"                # 跨服PK结果
 CrossServerMsg_PKSeasonInfo = "PKSeasonInfo"            # 跨服PK赛季信息
-CrossServerMsg_PKSyncBillboard = "PKSyncBillboard"      # 跨服PK同步排行榜 
 CrossServerMsg_SyncBillboard = "SyncBillboard"          # 跨服同步排行榜 
 CrossServerMsg_CrossBossInfo = "CrossBossInfo"          # 跨服Boss信息
 CrossServerMsg_CrossBossState = "CrossBossState"        # 跨服Boss状态
@@ -1689,6 +1694,8 @@
 CrossServerMsg_FuncTeamInfo = "FuncTeamInfo"  # 功能队伍信息同步
 CrossServerMsg_FuncTeamDel = "FuncTeamDel"  # 功能队伍删除同步
 CrossServerMsg_FuncTeamList = "FuncTeamList"  # 功能队伍列表同步
+CrossServerMsg_FamilyDelRet = "FamilyDelRet"  # 仙盟删除结果
+CrossServerMsg_FamilyGCZ = "FamilyGCZ"  # 仙盟攻城战
 
 # 子服发送跨服信息定义
 ClientServerMsg_ServerInitOK = "ServerInitOK"           # 子服启动成功
@@ -1700,9 +1707,7 @@
 ClientServerMsg_PullOtherPlayerPackData = "PullOtherPlayerPackData"   # 拉其他服玩家打包数据
 ClientServerMsg_PlayerPackData = "PlayerPackData"       # 玩家打包数据同步
 ClientServerMsg_PKMatch = "PKMatch"                     # 跨服PK匹配
-ClientServerMsg_PKRobotOver = "PKRobotOver"             # 跨服PK机器人结算
-ClientServerMsg_PKCancel = "PKCancel"                   # 跨服PK取消匹配
-ClientServerMsg_PKPrepareOK = "PKPrepareOK"             # 跨服PK准备完毕
+ClientServerMsg_PKOver = "PKOver"                       # 跨服PK结算
 ClientServerMsg_PKBillboard = "PKBillboard"             # 跨服PK排行榜
 ClientServerMsg_QueryBillboard = "QueryBillboard"       # 跨服排行榜 - 查询、同步等
 ClientServerMsg_UpdateBillboard = "UpdateBillboard"     # 跨服排行榜 - 更新
@@ -1720,6 +1725,7 @@
 ClientServerMsg_BattlefieldCallKick = "BattlefieldCallKick"   # 跨服战场召集 - 踢出
 ClientServerMsg_ActDropSpecItem = "ActDropSpecItem"     # 活动特殊掉落
 ClientServerMsg_CrossAssist = "CrossAssist"             # 跨服协助
+ClientServerMsg_ChampionshipPKOver = "ChampionshipPKOver" # 跨服排位PK结束
 ClientServerMsg_ChampionshipOfficialApply = "ChampionshipOfficialApply" # 跨服排位申请官职
 ClientServerMsg_ChampionshipOfficialApplyReply = "ChampionshipOfficialApplyReply" # 跨服排位官职申请回应
 ClientServerMsg_ChampionshipOfficialKick = "ChampionshipOfficialKick" # 跨服排位辞退下级仙官
@@ -1738,6 +1744,10 @@
 ClientServerMsg_GubaoScore = "GubaoScore" # 古宝养成积分
 ClientServerMsg_HorsePetTrainScore = "HorsePetTrainScore" # 骑宠养成积分
 ClientServerMsg_QueryXiangong = "QueryXiangong" # 查看仙宫仙名录
+ClientServerMsg_LianqiScore = "LianqiScore" # 炼器积分
+ClientServerMsg_SyncFamilyInfo = "SyncFamilyInfo" # 仙盟信息同步
+ClientServerMsg_QueryCrossFamily = "QueryCrossFamily" # 查询跨服仙盟
+ClientServerMsg_FamilyGCZ = "FamilyGCZ" # 仙盟攻城战
 
 #跨服广播类型定义
 CrossNotify_CrossAct = "CrossAct"

--
Gitblit v1.8.0