From 1a4857dba236228a63ea90290be8e95f68052d91 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期五, 24 一月 2025 19:06:27 +0800 Subject: [PATCH] 1111 【越南】【英语】【BT】【砍树】增加功能开启触发任务事件; --- ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 141 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 108 insertions(+), 33 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py index 2f5a5c6..940eaee 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" # 跨服战场召集队伍信息 @@ -296,6 +299,8 @@ OperationActionName_FamilyCTGAssist = "ActFamilyCTGAssist" # 仙盟充值协助 OperationActionName_Gubao = "ActGubao" # 古宝养成活动 OperationActionName_HorsePetTrain = "ActHorsePetTrain" # 骑宠养成活动 +OperationActionName_Yunshi = "ActYunshi" # 运势活动 +OperationActionName_Lunhuidian = "ActLunhuidian" # 轮回殿活动 #节日活动类型列表 - 该类型无视开服天,日期到了就开启 FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket, OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy, @@ -318,7 +323,8 @@ OperationActionName_BuyOne, OperationActionName_BossTrial, OperationActionName_ActLoginNew, OperationActionName_ActTask, OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist, - OperationActionName_Gubao, OperationActionName_HorsePetTrain, + OperationActionName_Gubao, OperationActionName_HorsePetTrain, OperationActionName_Yunshi, + OperationActionName_Lunhuidian, ] + FeastOperationActionNameList #需要记录开启活动时的世界等级的运营活动 NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, @@ -345,7 +351,8 @@ OperationActionName_BuyOne, OperationActionName_BossTrial, OperationActionName_ActLoginNew, OperationActionName_ActTask, OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist, - OperationActionName_Gubao, OperationActionName_HorsePetTrain, + OperationActionName_Gubao, OperationActionName_HorsePetTrain, OperationActionName_Yunshi, + OperationActionName_Lunhuidian, ] #跨服运营活动表名定义 @@ -356,10 +363,11 @@ CrossActName_XianXiaMJ = "CrossActXianXiaMJ" # 仙匣秘境 - 跨服 CrossActName_Gubao = "CrossActGubao" # 古宝养成 - 跨服 CrossActName_HorsePetTrain = "CrossActHorsePetTrain" # 骑宠养成 - 跨服 +CrossActName_Lianqi = "CrossActLianqi" # 炼器 - 跨服 #跨服运营活动列表 CrossActNameList = [CrossActName_CTGBillboard, CrossActName_AllRecharge, CrossActName_LuckyCloudBuy, CrossActName_BossTrial, - CrossActName_XianXiaMJ, CrossActName_Gubao, CrossActName_HorsePetTrain] + CrossActName_XianXiaMJ, CrossActName_Gubao, CrossActName_HorsePetTrain, CrossActName_Lianqi] #需要锁定活动分区分配直到活动结束的跨服运营活动,即使热更分区配置,也不会改变正在活动中的分区设定,直到活动结束 CrossActLockServerGroupIDList = [CrossActName_CTGBillboard, CrossActName_AllRecharge] @@ -732,6 +740,34 @@ #法器防御百分比 Def_Effect_FaQiDefPer = 169 +#坐骑幻化生命加成 +Def_Effect_HorseSkinMaxHPPer = 170 # 坐骑幻化生命加成 +#坐骑幻化攻击加成 +Def_Effect_HorseSkinAtkPer = 171 # 坐骑幻化攻击加成 +#坐骑幻化防御加成 +Def_Effect_HorseSkinDefPer = 172 # 坐骑幻化防御加成 + +#称号生命加成 +Def_Effect_TitleMaxHPPer = 173 # 称号生命加成 +#称号攻击加成 +Def_Effect_TitleAtkPer = 174 # 称号攻击加成 +#称号防御加成 +Def_Effect_TitleDefPer = 175 # 称号防御加成 + +#头像生命加成 +Def_Effect_FaceMaxHPPer = 176 # 头像生命加成 +#头像攻击加成 +Def_Effect_FaceAtkPer = 177 # 头像攻击加成 +#头像防御加成 +Def_Effect_FaceDefPer = 178 # 头像防御加成 + +#头像框生命加成 +Def_Effect_FacePicMaxHPPer = 179 # 头像框生命加成 +#头像框攻击加成 +Def_Effect_FacePicAtkPer = 180 # 头像框攻击加成 +#头像框防御加成 +Def_Effect_FacePicDefPer = 181 # 头像框防御加成 + #增加%d物理伤害值,其中a值为伤害值 Def_Effect_AddAtk = 1005 #增加%d魔法伤害值,其中a值为伤害值 @@ -845,7 +881,7 @@ Def_BT_Max, #排行榜最大类型 ) = range(0, 40 + 2) -''' 跨服排行榜类型, 从 150 开始 +''' 跨服排行榜类型, 从 150 开始,最大条数在功能配置表 CrossBillboardSet 配置,没配默认100 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始 跨服榜单表(tagDBCrossBillboard) 本服榜单表(tagDBBillboard) @@ -866,20 +902,9 @@ 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 +) = range(150, 166 + 1) #职业对应战力排行榜类型 JobFightPowerBillboardDict = { @@ -893,6 +918,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] ##---比率--- #百分率 @@ -1146,7 +1174,12 @@ CDBPlayerRefresh_BossFinalHurtPer, # Boss最终输出伤害百分比 264 CDBPlayerRefresh_HorsePetTrainScore, # 骑宠养成积分 265 CDBPlayerRefresh_GubaoTrainScore, # 古宝养成积分 266 -) = range(146, 267) +CDBPlayerRefresh_TiandaoFruit, # 天道果 267 +CDBPlayerRefresh_Tuijinbi, # 推金币次数 268 +CDBPlayerRefresh_PayCoinDay, # 代币时效 269 +CDBPlayerRefresh_XianyuanScore, # 仙缘积分 270 +CDBPlayerRefresh_HuanjinggeScore, # 幻境阁积分 271 +) = range(146, 272) TYPE_Price_Gold_Paper_Money = 5 # 金钱类型,(先用礼券,再用金子) TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来) @@ -1181,6 +1214,10 @@ TYPE_Price_GatherSoul = 44 # 聚魂精华 TYPE_Price_HorsePetTrainScore = 45 # 骑宠养成积分 TYPE_Price_GubaoTrainScore = 46 # 古宝养成积分 +TYPE_Price_TiandaoFruit = 47 # 天道果 +TYPE_Price_Tuijinbi = 48 # 推金币次数 +TYPE_Price_XianyuanScore = 49 # 仙缘积分 +TYPE_Price_HuanjinggeScore = 50 # 幻境阁积分 TYPE_Price_PayCoin = 99 # 代币 #key可用于遍历所有货币,value仅GM相关会用到 @@ -1188,8 +1225,13 @@ 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:"万界积分", 43:"凭证积分", 44:"聚魂精华", 45:"骑宠养成积分", 46:"古宝养成积分", 99:"代币" + 39:"成就积分", 40:"万界积分", 43:"凭证积分", 44:"聚魂精华", 45:"骑宠养成积分", 46:"古宝养成积分", 47:"天道果", 48:"推金币次数", + 49:"仙缘积分", 50:"幻境阁积分", + 99:"代币" } + +#需要记录累计消耗的货币类型 +UseTotalPriceTypeList = [TYPE_Price_TiandaoFruit] #以下是旧的金钱类型 TYPE_Price_Magic_Integral = 101 # 魔方寻宝积分 @@ -1224,6 +1266,10 @@ TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul, TYPE_Price_HorsePetTrainScore:CDBPlayerRefresh_HorsePetTrainScore, TYPE_Price_GubaoTrainScore:CDBPlayerRefresh_GubaoTrainScore, + TYPE_Price_TiandaoFruit:CDBPlayerRefresh_TiandaoFruit, + TYPE_Price_Tuijinbi:CDBPlayerRefresh_Tuijinbi, + TYPE_Price_XianyuanScore:CDBPlayerRefresh_XianyuanScore, + TYPE_Price_HuanjinggeScore:CDBPlayerRefresh_HuanjinggeScore, } # 支持负值的货币及对应0418刷新类型 @@ -1353,17 +1399,33 @@ Def_WorshipTypeList = ( Def_WorshipType_ServerNaming, # 服务器冠名 1 Def_WorshipType_CrossChampionship, # 跨服排位冠军 2 - ) = range(1, 1 + 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_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) + Def_PlayerRecType_OfflineUnprocessed, # 离线未处理的逻辑 4 + ) = range(1, 1 + 4) + +#通用信息记录类型 - 新 从 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 = ( @@ -1468,7 +1530,9 @@ Def_ActionType_FamilyEvent, #记录家族事件12 Def_ActionType_BossTrialSubmit, #boss凭证提交 13 Def_ActionType_FamilyCTGAssist, #仙盟充值协助活动 14 - ) = range(0, 15) + Def_ActionType_FamilyEmblem, #仙盟时效徽章信息 15 + Def_ActionType_Zhenbaoge, #珍宝阁 16 + ) = range(0, 17) # 家族行为事件类型定义; Def_ActionType_FamilyEvent; 存与事件记录Value1 # 通用:time-时间;name-玩家;value1-事件类型 @@ -1565,13 +1629,13 @@ CrossServerMsg_Notify = "Notify" # 提示信息 CrossServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天 CrossServerMsg_ViewPlayerCacheRet = "ViewPlayerCacheRet"# 查看跨服玩家信息结果 +CrossServerMsg_PullPlayerViewCache = "PullPlayerViewCache"# 拉取玩家缓存数据 +CrossServerMsg_PlayerPackDataState = "PlayerPackDataState"# 玩家打包数据同步状态 +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状态 @@ -1611,6 +1675,7 @@ CrossServerMsg_FamilyFlagwarOver = "FamilyFlagwarOver" # 逐鹿万界结算信息 CrossServerMsg_CrossBossTrialFamilyAward = "CrossBossTrialFamilyAward" # 跨服boss历练仙盟奖励结算 CrossServerMsg_Worship = "Worship" # 膜拜信息 +CrossServerMsg_Xiangong = "Xiangong" # 仙宫信息 CrossServerMsg_FuncTeamInfo = "FuncTeamInfo" # 功能队伍信息同步 CrossServerMsg_FuncTeamDel = "FuncTeamDel" # 功能队伍删除同步 CrossServerMsg_FuncTeamList = "FuncTeamList" # 功能队伍列表同步 @@ -1621,10 +1686,11 @@ ClientServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天 ClientServerMsg_GMCMD = "GMCMD" # GM命令 ClientServerMsg_ViewPlayerCache = "ViewPlayerCache" # 查看跨服玩家信息 +ClientServerMsg_PushPlayerCache = "PushPlayerCache" # 推送玩家缓存信息 +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" # 跨服排行榜 - 更新 @@ -1642,6 +1708,7 @@ ClientServerMsg_BattlefieldCallKick = "BattlefieldCallKick" # 跨服战场召集 - 踢出 ClientServerMsg_ActDropSpecItem = "ActDropSpecItem" # 活动特殊掉落 ClientServerMsg_CrossAssist = "CrossAssist" # 跨服协助 +ClientServerMsg_ChampionshipPKOver = "ChampionshipPKOver" # 跨服排位PK结束 ClientServerMsg_ChampionshipOfficialApply = "ChampionshipOfficialApply" # 跨服排位申请官职 ClientServerMsg_ChampionshipOfficialApplyReply = "ChampionshipOfficialApplyReply" # 跨服排位官职申请回应 ClientServerMsg_ChampionshipOfficialKick = "ChampionshipOfficialKick" # 跨服排位辞退下级仙官 @@ -1659,6 +1726,8 @@ ClientServerMsg_QueryFuncTeam = "QueryFuncTeam" # 查询功能队伍 ClientServerMsg_GubaoScore = "GubaoScore" # 古宝养成积分 ClientServerMsg_HorsePetTrainScore = "HorsePetTrainScore" # 骑宠养成积分 +ClientServerMsg_QueryXiangong = "QueryXiangong" # 查看仙宫仙名录 +ClientServerMsg_LianqiScore = "LianqiScore" # 炼器积分 #跨服广播类型定义 CrossNotify_CrossAct = "CrossAct" @@ -1764,7 +1833,7 @@ )=range(5) # 战斗力模块类型 -Def_MFPType_Max = 34 +Def_MFPType_Max = 37 ModuleFightPowerTypeList = ( Def_MFPType_Role, # 角色 0 Def_MFPType_Equip, # 装备(装备本身) 1 @@ -1799,6 +1868,9 @@ 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) @@ -2099,7 +2171,10 @@ SuccType_PassAdventure, #通关冒险 178 SuccType_GatherTheSoulColor, #聚魂激活x品质x个 179 SuccType_GatherTheSoulLV, #聚魂总等级x 180 -) = range(1, 181) +SuccType_MineAreaCnt, #采集福地x次数 181 +SuccType_MineAreaSelfCnt, #采集自己福地x次数 182 +SuccType_MineAreaRobCnt, #采集他人福地x次数 183 +) = range(1, 184) # 节日红包成就类型 FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1) -- Gitblit v1.8.0