From 38ed135a72f9d4f35c6979b815aaa084e12f441f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 27 九月 2024 18:39:59 +0800
Subject: [PATCH] 1111 登录事件1100汇报ClientVersion增加url编码；
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 163 insertions(+), 11 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 6f8cbb3..14f2c78 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -185,6 +185,9 @@
Def_Notify_WorldKey_LuckyCloudBuyInfo = "LuckyCloudBuyInfo" # 本服幸运云购最新一期信息
Def_Notify_WorldKey_CrossBattlefieldCallTeamInfo = "CrossBattlefieldCallTeamInfo" # 跨服战场召集队伍信息
+Def_Notify_WorldKey_CrossBattlefieldSysCallBuyInfo = "CrossBattlefieldSysCallBuyInfo" # 跨服战场系统场次购买召集信息
+
+Def_Notify_WorldKey_FuncTeamMemIDInfo = "FuncTeamMemIDInfo" # 功能队伍成员ID信息
CrossChampionshipState_Guess8 = 80 #8强竞猜
CrossChampionshipState_Group64 = 641 #64强分组
@@ -290,6 +293,9 @@
OperationActionName_ActLoginNew = "ActLoginNew" # 登录活动-新
OperationActionName_ActTask = "ActTask" # 活动任务
OperationActionName_BuyCountGift = "ActBuyCountGift" # 购买次数礼包活动
+OperationActionName_FamilyCTGAssist = "ActFamilyCTGAssist" # 仙盟充值协助
+OperationActionName_Gubao = "ActGubao" # 古宝养成活动
+OperationActionName_HorsePetTrain = "ActHorsePetTrain" # 骑宠养成活动
#节日活动类型列表 - 该类型无视开服天，日期到了就开启
FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
@@ -311,7 +317,8 @@
OperationActionName_XianXiaMJ, OperationActionName_GodGift,
OperationActionName_BuyOne, OperationActionName_BossTrial,
OperationActionName_ActLoginNew, OperationActionName_ActTask,
- OperationActionName_BuyCountGift,
+ OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
+ OperationActionName_Gubao, OperationActionName_HorsePetTrain,
] + FeastOperationActionNameList
#需要记录开启活动时的世界等级的运营活动
NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell,
@@ -337,22 +344,29 @@
OperationActionName_XianXiaMJ, OperationActionName_GodGift,
OperationActionName_BuyOne, OperationActionName_BossTrial,
OperationActionName_ActLoginNew, OperationActionName_ActTask,
- OperationActionName_BuyCountGift,
+ OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
+ OperationActionName_Gubao, OperationActionName_HorsePetTrain,
]
#跨服运营活动表名定义
CrossActName_CTGBillboard = "CrossActCTGBillboard" # 充值排行榜
CrossActName_AllRecharge = "CrossActAllRecharge" # 全民充值
CrossActName_LuckyCloudBuy = "CrossActLuckyCloudBuy" # 幸运云购
+CrossActName_BossTrial = "CrossActBossTrial" # Boss历练 - 跨服
+CrossActName_XianXiaMJ = "CrossActXianXiaMJ" # 仙匣秘境 - 跨服
+CrossActName_Gubao = "CrossActGubao" # 古宝养成 - 跨服
+CrossActName_HorsePetTrain = "CrossActHorsePetTrain" # 骑宠养成 - 跨服
#跨服运营活动列表
-CrossActNameList = [CrossActName_CTGBillboard, CrossActName_AllRecharge, CrossActName_LuckyCloudBuy]
+CrossActNameList = [CrossActName_CTGBillboard, CrossActName_AllRecharge, CrossActName_LuckyCloudBuy, CrossActName_BossTrial,
+ CrossActName_XianXiaMJ, CrossActName_Gubao, CrossActName_HorsePetTrain]
#需要锁定活动分区分配直到活动结束的跨服运营活动，即使热更分区配置，也不会改变正在活动中的分区设定，直到活动结束
CrossActLockServerGroupIDList = [CrossActName_CTGBillboard, CrossActName_AllRecharge]
#活动信息字典key定义
ActKey_ID = "ID" # 活动ID，唯一标识的ID，一般是活动开启的time值
ActKey_State = "State" # 活动状态 0-未开启, >0开启中，也代表当日的第几个时间段
+ActKey_StateJoin = "StateJoin" # 活动某些功能可参与状态 0-还不可参与, >0可参与，一般可参与时该状态等于state
ActKey_CfgID = "CfgID" # 活动表配置ID
ActKey_ActNum = "ActNum" # 活动分组编号
ActKey_DayIndex = "DayIndex" # 当前活动天索引，0开始，代表第1天
@@ -364,6 +378,13 @@
ActKey_ServerIDRangeList = "ServerIDRangeList" # 活动服务器ID范围信息
ActKey_IpyDataInfo = "IpyDataInfo" # 活动对应 IpyData 信息
ActKey_DBInfo = "DBInfo" # 保存db的历史活动信息
+
+#活动参与状态
+(
+ActStateJoin_None, # 参与前或未开启 0
+ActStateJoin_Start, # 开启参与中 1
+ActStateJoin_End, # 参与结束，仅有配置参与时间段的活动有该状态 2
+) = range(3)
#答题类型枚举
Def_Game_ExamTypeList = range(1, 4 + 1)
@@ -702,6 +723,15 @@
Def_Effect_FamilyWarAtkPer = 164 # 仙盟联赛攻击加成
Def_Effect_FamilySitExpPer = 165 # 仙盟打坐经验加成
+Def_Effect_BossFinalHurtPer = 166 # Boss最终伤害万分率
+
+#法器生命百分比
+Def_Effect_FaQiMaxHPPer = 167
+#法器攻击百分比
+Def_Effect_FaQiAtkPer = 168
+#法器防御百分比
+Def_Effect_FaQiDefPer = 169
+
#增加%d物理伤害值,其中a值为伤害值
Def_Effect_AddAtk = 1005
#增加%d魔法伤害值,其中a值为伤害值
@@ -806,9 +836,14 @@
Def_BT_BossTrialSubmit, #提交boss凭证榜 (boss历练活动)
Def_BT_AlineInvade, #异兽入侵
Def_BT_BossTrialSubmitBak, #提交boss凭证榜 (boss历练活动 - 上一期) 35
+ Def_BT_BossTrialSubmitFamily, #提交boss凭证仙盟榜 (boss历练活动)
+ Def_BT_BossTrialSubmitFamilyBak, #提交boss凭证仙盟榜 (boss历练活动 - 上一期)
+ Def_BT_XianXiaMJScore, #仙匣秘境积分榜 (仙匣秘境活动)
+ Def_BT_GubaoScore, #古宝养成积分榜 (古宝养成活动)
+ Def_BT_HorsePetTrainScore, #骑宠养成积分榜 (骑宠养成活动) 40
Def_BT_Max, #排行榜最大类型
-) = range(0, 35 + 2)
+) = range(0, 40 + 2)
''' 跨服排行榜类型, 从 150 开始
与本服榜单存储的是不一样的数据库表格，理论上类型可以和本服榜单类型重复，为了做下区分防误导，跨服榜单从 150 开始
@@ -824,7 +859,27 @@
Def_CBT_YaomoBossHurt, # 跨服妖魔boss最新一次伤血排名 155
Def_CBT_FamilyFlagwar, # 逐鹿万界 - 单场榜 156
Def_CBT_FamilyFlagwarWeek, # 逐鹿万界 - 周总榜 157
-) = range(150, 157 + 1)
+Def_CBT_BossTrialSubmit, # boss凭证 - 个人榜 158
+Def_CBT_BossTrialSubmitBak, # boss凭证 - 个人榜 上一期 159
+Def_CBT_BossTrialSubmitFamily, # boss凭证 - 仙盟榜 160
+Def_CBT_BossTrialSubmitFamilyBak, # boss凭证 - 仙盟榜 上一期 161
+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,
+ }
#职业对应战力排行榜类型
JobFightPowerBillboardDict = {
@@ -838,6 +893,9 @@
Def_BT_LV, Def_BT_FightPower_Horse, Def_BT_FightPower_Pet, Def_BT_TrialTower, Def_BT_OffLineEfficient,
Def_BT_SkyTower, Def_BT_CharmTotal, Def_BT_CharmWeek, Def_BT_CharmDay
]
+
+#仙盟榜单类型
+FamilyBillboardList = [Def_BT_BossTrialSubmitFamily, Def_BT_BossTrialSubmitFamilyBak]
##---比率---
#百分率
@@ -1073,7 +1131,26 @@
CDBPlayerRefresh_BTGMYuE, # BTGM余额 246
CDBPlayerRefresh_SuccessScore, # 成就积分 247
CDBPlayerRefresh_FamilyFlagWarPoint, # 成就积分 248
-) = range(146, 249)
+CDBPlayerRefresh_ComboDefRate, # 抗连击概率 249
+CDBPlayerRefresh_AtkBackRate, # 反击概率 250
+CDBPlayerRefresh_AtkBackDefRate, # 抗反击概率 251
+CDBPlayerRefresh_SuckHPPer, # 吸血比率 252
+CDBPlayerRefresh_SuckHPDefPer, # 抗吸血比率 253
+CDBPlayerRefresh_Xiantao, # 仙桃 254
+CDBPlayerRefresh_CurePer, # 强化治疗 255
+CDBPlayerRefresh_CureDefPer, # 弱化治疗 256
+CDBPlayerRefresh_PetStrengthenPer, # 强化灵兽 257
+CDBPlayerRefresh_PetWeakenPer, # 弱化灵兽 258
+CDBPlayerRefresh_SuperHitHurtPer, # 强化暴伤 259
+CDBPlayerRefresh_SuperHitHurtDefPer, # 弱化暴伤 260
+CDBPlayerRefresh_Lingyu, # 灵玉 261
+CDBPlayerRefresh_BossTrial, # 凭证积分 262
+CDBPlayerRefresh_GatherSoul, # 聚魂精华 263
+CDBPlayerRefresh_BossFinalHurtPer, # Boss最终输出伤害百分比 264
+CDBPlayerRefresh_HorsePetTrainScore, # 骑宠养成积分 265
+CDBPlayerRefresh_GubaoTrainScore, # 古宝养成积分 266
+CDBPlayerRefresh_TiandaoFruit, # 天道果 267
+) = range(146, 268)
TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）
@@ -1103,6 +1180,12 @@
TYPE_Price_SuccessSocre = 39 # 成就积分
TYPE_Price_FamilyFlagWarPoint = 40 # 万界积分
TYPE_Price_Xiantao = 41 # 仙桃
+TYPE_Price_Lingyu = 42 # 灵玉
+TYPE_Price_BossTrial = 43 # boss历练凭证积分
+TYPE_Price_GatherSoul = 44 # 聚魂精华
+TYPE_Price_HorsePetTrainScore = 45 # 骑宠养成积分
+TYPE_Price_GubaoTrainScore = 46 # 古宝养成积分
+TYPE_Price_TiandaoFruit = 47 # 天道果
TYPE_Price_PayCoin = 99 # 代币
#key可用于遍历所有货币，value仅GM相关会用到
@@ -1110,8 +1193,11 @@
1:"仙玉", 2:"绑玉", 3:"铜钱", 6:"战盟贡献度", 10:"战盟仓库积分", 13:"境界修行点", 14:"符印融合石", 15:"仙盟活跃令",
16:"助战积分", 18:"荣誉", 19:"Boss积分", 23:"符印精华", 24:"符印碎片", 25:"寻宝积分", 26:"集市额度", 27:"丹精", 28:"魂尘",
29:"聚魂碎片", 30:"核心环", 31:"功能特权令", 32:"环保值", 33:"GM令", 34:"古神币", 35:"功德点",
- 39:"成就积分", 40:"万界积分", 99:"代币"
+ 39:"成就积分", 40:"万界积分", 43:"凭证积分", 44:"聚魂精华", 45:"骑宠养成积分", 46:"古宝养成积分", 47:"天道果", 99:"代币"
}
+
+#需要记录累计消耗的货币类型
+UseTotalPriceTypeList = [TYPE_Price_TiandaoFruit]
#以下是旧的金钱类型
TYPE_Price_Magic_Integral = 101 # 魔方寻宝积分
@@ -1142,6 +1228,11 @@
TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
TYPE_Price_SuccessSocre:CDBPlayerRefresh_SuccessScore,
TYPE_Price_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,
+ TYPE_Price_BossTrial:CDBPlayerRefresh_BossTrial,
+ TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul,
+ TYPE_Price_HorsePetTrainScore:CDBPlayerRefresh_HorsePetTrainScore,
+ TYPE_Price_GubaoTrainScore:CDBPlayerRefresh_GubaoTrainScore,
+ TYPE_Price_TiandaoFruit:CDBPlayerRefresh_TiandaoFruit,
}
# 支持负值的货币及对应0418刷新类型
@@ -1185,11 +1276,13 @@
GameFuncID_LittleHelper = 146 # 小助手
GameFuncID_TJG = 147 # 脱机挂
GameFuncID_SuperGift = 150 # 超值礼包
+GameFuncID_CrossRealmPK = 157 # 跨服天梯
GameFuncID_PenglaiBoss = 162 # 蓬莱仙境
GameFuncID_ZhuXianBoss = 163 # 诛仙BOSS
GameFuncID_Arena = 195 # 竞技场
GameFuncID_FaQi = 199 # 法器
GameFuncID_LianTi = 207 # 炼体
+GameFuncID_CrossBattlefield = 208 # 跨服古神战场
GameFuncID_Championship = 210 # 排位
GameFuncID_MineArea = 227 # 福地
GameFuncID_Guaji = 228 # 挂机
@@ -1265,7 +1358,38 @@
Def_Weapon_Dual_Hands, # 双持(左右手可互换)
) = range(3)
-#玩家通用信息记录类型
+#膜拜类型
+Def_WorshipTypeList = (
+ Def_WorshipType_ServerNaming, # 服务器冠名 1
+ Def_WorshipType_CrossChampionship, # 跨服排位冠军 2
+ Def_WorshipType_CrossBossTrial, # 跨服boss凭证 3
+ Def_WorshipType_CrossXianXiaMJ, # 跨服秘境寻宝 4
+ Def_WorshipType_CrossHorsePetTrain, # 跨服骑宠养成 5
+ Def_WorshipType_CrossGubaoTrain, # 跨服古宝养成 6
+ ) = range(1, 1 + 6)
+
+#跨服膜拜类型
+Def_WorshipTypeCross = [Def_WorshipType_CrossChampionship, Def_WorshipType_CrossBossTrial, Def_WorshipType_CrossXianXiaMJ,
+ Def_WorshipType_CrossHorsePetTrain, Def_WorshipType_CrossGubaoTrain,
+ ]
+
+#玩家记录类型
+Def_PlayerRecTypeList = (
+ Def_PlayerRecType_WorshipPlayer, # 被膜拜的玩家 1
+ Def_PlayerRecType_WorshipDaily, # 玩家每日膜拜记录 2
+ Def_PlayerRecType_PayCoin, # 代币记录 3
+ ) = range(1, 1 + 3)
+
+#通用信息记录类型 - 新 从 300 开始，原通用记录类型最大到255
+Def_GameRecTypeList = (
+ Def_GameRecType_Xiangong, # 仙宫记录 300
+ ) = range(300, 1 + 300)
+#通用信息记录新 - 字典key配置，如果有配置，则可额外按对应记录Value值存储字典，方便快速取值，可配置Value编号 1~8，配空默认 Value1
+Def_GameRecValueKeyDict = {
+ Def_GameRecType_Xiangong:[1],
+ }
+
+#通用信息记录类型
Def_UniversalGameRecTypeList = (
Def_UniversalGameRecType_XMZZPKInfoRecord, # 仙魔之争信息记录0
Def_UniversalGameRecType_HijackTruck, # 劫镖1
@@ -1366,7 +1490,10 @@
Def_ActionType_XXX10, #10
Def_ActionType_OfficerModelEquip, #记录家族有职位的成员模型装备信息11
Def_ActionType_FamilyEvent, #记录家族事件12
- ) = range(0, 13)
+ Def_ActionType_BossTrialSubmit, #boss凭证提交 13
+ Def_ActionType_FamilyCTGAssist, #仙盟充值协助活动 14
+ Def_ActionType_FamilyEmblem, #仙盟时效徽章信息 15
+ ) = range(0, 16)
# 家族行为事件类型定义; Def_ActionType_FamilyEvent; 存与事件记录Value1
# 通用：time-时间；name-玩家；value1-事件类型
@@ -1458,6 +1585,7 @@
# 跨服服务器发送子服信息定义
CrossServerMsg_CrossServerState = "CrossServerState" # 跨服服务器状态变更
+CrossServerMsg_PlayerLoginout = "PlayerLoginout" # 玩家上下线状态同步
CrossServerMsg_ExitCrossServer = "ExitCrossServer" # 退出跨服服务器
CrossServerMsg_Notify = "Notify" # 提示信息
CrossServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天
@@ -1506,9 +1634,16 @@
CrossServerMsg_CrossDailyActionState = "CrossDailyActionState" # 跨服日常任务状态信息
CrossServerMsg_CrossYaomoBossHurtInfo = "CrossYaomoBossHurtInfo" # 跨服妖魔boss玩家伤害信息
CrossServerMsg_FamilyFlagwarOver = "FamilyFlagwarOver" # 逐鹿万界结算信息
+CrossServerMsg_CrossBossTrialFamilyAward = "CrossBossTrialFamilyAward" # 跨服boss历练仙盟奖励结算
+CrossServerMsg_Worship = "Worship" # 膜拜信息
+CrossServerMsg_Xiangong = "Xiangong" # 仙宫信息
+CrossServerMsg_FuncTeamInfo = "FuncTeamInfo" # 功能队伍信息同步
+CrossServerMsg_FuncTeamDel = "FuncTeamDel" # 功能队伍删除同步
+CrossServerMsg_FuncTeamList = "FuncTeamList" # 功能队伍列表同步
# 子服发送跨服信息定义
ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
+ClientServerMsg_PlayerLoginout = "PlayerLoginout" # 玩家上下线状态同步
ClientServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天
ClientServerMsg_GMCMD = "GMCMD" # GM命令
ClientServerMsg_ViewPlayerCache = "ViewPlayerCache" # 查看跨服玩家信息
@@ -1542,6 +1677,15 @@
ClientServerMsg_ChampionshipWorship = "ChampionshipWorship" # 跨服排位膜拜
ClientServerMsg_ActAllRechargeValue = "ActAllRechargeValue" # 跨服全民充值额度
ClientServerMsg_CrossYaomoBossHurtAward = "CrossYaomoBossHurtAward" # 跨服妖魔boss玩家伤害领奖
+ClientServerMsg_BossTrialSubmit = "BossTrialSubmit" # boss凭证提交
+ClientServerMsg_XianXiaMJScore = "XianXiaMJScore" # 仙匣秘境积分
+ClientServerMsg_CreateFuncTeam = "CreateFuncTeam" # 创建功能队伍
+ClientServerMsg_ChangeFuncTeam = "ChangeFuncTeam" # 修改功能队伍
+ClientServerMsg_FuncTeamMemOP = "FuncTeamMemOP" # 功能队伍成员操作
+ClientServerMsg_QueryFuncTeam = "QueryFuncTeam" # 查询功能队伍
+ClientServerMsg_GubaoScore = "GubaoScore" # 古宝养成积分
+ClientServerMsg_HorsePetTrainScore = "HorsePetTrainScore" # 骑宠养成积分
+ClientServerMsg_QueryXiangong = "QueryXiangong" # 查看仙宫仙名录
#跨服广播类型定义
CrossNotify_CrossAct = "CrossAct"
@@ -1647,7 +1791,7 @@
)=range(5)
# 战斗力模块类型
-Def_MFPType_Max = 33
+Def_MFPType_Max = 37
ModuleFightPowerTypeList = (
Def_MFPType_Role, # 角色 0
Def_MFPType_Equip, # 装备(装备本身) 1
@@ -1681,6 +1825,10 @@
Def_MFPType_Gubao, # 古宝 29
Def_MFPType_Shentong, # 神通 30
Def_MFPType_FamilyZhenfa, # 阵法 31
+Def_MFPType_GatherTheSoul, # 聚魂新 32
+Def_MFPType_Face, # 头像 33
+Def_MFPType_FacePic, # 头像框 34
+Def_MFPType_ChatBox, # 气泡框 35
Def_MFPType_Other, # 其他
) = range(Def_MFPType_Max)
@@ -1978,7 +2126,10 @@
SuccType_EquipWashTotal, # 全身洗炼总等级X级 175
SuccType_CrossPK, # 跨服PK x次 176
SuccType_FamilyZhenfaExp, # 仙盟阵法捐献累计经验 177
-) = range(1, 178)
+SuccType_PassAdventure, #通关冒险 178
+SuccType_GatherTheSoulColor, #聚魂激活x品质x个 179
+SuccType_GatherTheSoulLV, #聚魂总等级x 180
+) = range(1, 181)
# 节日红包成就类型
FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
@@ -2012,6 +2163,7 @@
SuccType_EquipStarClass:[0], # 阶不向下适配
SuccType_EquipStoneClass:[0], # 阶不向下适配
SuccType_EquipWashClass:[0], # 阶不向下适配
+ SuccType_GatherTheSoulColor:[0], # 品质不向下适配
}
#传进来的条件满足配置的条件列表中的一个就行的成就类型
--
Gitblit v1.8.0