From a8e0b46434580c120a1796a6d30d2d715e24a44d Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期二, 25 二月 2025 11:16:52 +0800 Subject: [PATCH] 1111 【越南】【英语】【BT】【砍树】增加任务判断X阶装备强化是否全部满级(修复判断bug); --- ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py | 74 ++++++++++++++++++++++++++----------- 1 files changed, 52 insertions(+), 22 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py index 8b88d59..2b69f4f 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py @@ -212,8 +212,9 @@ Def_FamilySetting_LvUpCost, #家族升级需要消耗升级所需资金 Def_FamilySetting_WeekMissionMoneyMax,#每周任务最大可获得仙盟资金 Def_FamilySetting_BossFBCnt, #BOSS副本次数 +Def_FamilySetting_ZhenbaogeWeights, #珍宝阁总权重 Def_FamilySetting_Max, #表长度异常(必须放最后) -) = range(0, 6 + 1) +) = range(0, 7 + 1) FamilySettingDict = { Def_FamilySetting_MaxMemberCnt:'MemberCnt', Def_FamilySetting_MaxHuFaCnt:'DeputyLeaderCnt', @@ -221,6 +222,7 @@ Def_FamilySetting_LvUpCost:'NeedMoney', Def_FamilySetting_WeekMissionMoneyMax:'WeekMissionMoneyMax', Def_FamilySetting_BossFBCnt:'BossFBCnt', + Def_FamilySetting_ZhenbaogeWeights:'ZhenbaogeWeights', } #家族成员接口对应家族配置表索引 @@ -371,6 +373,7 @@ Def_WorldKey_BossIsAlive = 'BossIsAlive_%s' #boss是否活着 Def_WorldKey_IsGameWorldInit = 'IsGameWorldInit' #GameWold是否初始化完成 Def_WorldKey_OperationActionState = "State_%s" #运营活动状态,参数为(运营活动名) +Def_WorldKey_OperationActionStateJoin = "StateJoin_%s" #运营活动可参与状态,参数为(运营活动名) Def_WorldKey_BossRebornNeedPoint = "BossRebornNeedPoint" #boss复活需要总点数 Def_WorldKey_CrossBossIsAlive = 'CrossBossIsAlive_%s_%s' #跨服boss是否活着,参数(zoneID, bossID) Def_WorldKey_GameWorldInitOK = 'GameWorldInitOK' #GameWold是否初始化完成OK @@ -437,6 +440,12 @@ Def_PlayerKey_PrivateTalk = 'PrivateTalk' #追踪密频(1:开启 0:关闭) #--------------------------------------------------------------------- +# GameWorld.GetGameWorld().SendDBLogic(BYTE queryType, DWORD id, char* sData, int nDataLen) +# GameServer请求db逻辑类型,db接受 OnGameServerToDBLogic,回调 RecvDGDBLogicResult +( +gstDBLogic_PlayerPackData, # 请求打包玩家数据 0 +) = range(1) + #GM工具回复值 Def_GMTool_Succeed = 1 Def_GMTool_Fail = 250 @@ -520,6 +529,18 @@ #查询无限制家族的行为类型列表 Def_QueryNoLimit_ActionTypeList = [ShareDefine.Def_ActionType_OfficerModelEquip] #------------------------------------------------------------------------------ +#DBPlayerRecData、DBGameRecData表中UserData数据通用自定义key +Def_RecDataKey_ServerIDList = "ServerIDList" +Def_RecDataKey_PlayerInfo = "PlayerInfo" +Def_RecDataKey_RobValueList = "RobValueList" + +#玩家记录上线需要直接同步给前端的类型 +Def_PlayerRecLoginNotifyList = [ShareDefine.Def_PlayerRecType_PayCoin] + +#玩家记录类型每人限制条数,没有配置的类型不限制,由功能自行控制 +Def_PlayerRecCountDict = { + ShareDefine.Def_PlayerRecType_PayCoin:100, + } #玩家通用信息记录类型保存的条数 UniversalGameRecTypeSaveCnt = { @@ -575,19 +596,19 @@ ShareDefine.Def_BT_Realm : 100, #境界榜 ShareDefine.Def_BT_TotalRecharge : 100, #充值榜 - ShareDefine.Def_BT_Campaign_Plus : 100, #强化战力(开服活动榜) - ShareDefine.Def_BT_Campaign_Horse : 100, #坐骑战力(开服活动榜) - ShareDefine.Def_BT_Campaign_StoneLV : 100, #宝石等级(开服活动榜) - ShareDefine.Def_BT_Campaign_LV : 100, #冲级排行(开服活动榜) - ShareDefine.Def_BT_Campaign_RealmLV : 100, #境界等级(开服活动榜) - ShareDefine.Def_BT_Campaign_FightPower : 100, #战力排行(开服活动榜) - ShareDefine.Def_BT_Campaign_RuneLV : 100, #符印等级(开服活动榜) - ShareDefine.Def_BT_Campaign_GodWeaponLV : 100, #神兵等级(开服活动榜) - ShareDefine.Def_BT_Campaign_Recharge : 100, #累计充值(开服活动榜) - ShareDefine.Def_BT_Campaign_PetLV : 100, #灵宠等级(开服活动榜) - ShareDefine.Def_BT_Campaign_LingGen : 100, #灵根总点(开服活动榜) - ShareDefine.Def_BT_Campaign_StarLV : 100, #升星等级(开服活动榜) - ShareDefine.Def_BT_Campaign_Wash : 100, #洗练战力(开服活动榜) + ShareDefine.Def_BT_Campaign_Plus : 500, #强化战力(开服活动榜) + ShareDefine.Def_BT_Campaign_Horse : 500, #坐骑战力(开服活动榜) + ShareDefine.Def_BT_Campaign_StoneLV : 500, #宝石等级(开服活动榜) + ShareDefine.Def_BT_Campaign_LV : 500, #冲级排行(开服活动榜) + ShareDefine.Def_BT_Campaign_RealmLV : 500, #境界等级(开服活动榜) + ShareDefine.Def_BT_Campaign_FightPower : 500, #战力排行(开服活动榜) + ShareDefine.Def_BT_Campaign_RuneLV : 500, #符印等级(开服活动榜) + ShareDefine.Def_BT_Campaign_GodWeaponLV : 500, #神兵等级(开服活动榜) + ShareDefine.Def_BT_Campaign_Recharge : 500, #累计充值(开服活动榜) + ShareDefine.Def_BT_Campaign_PetLV : 500, #灵宠等级(开服活动榜) + ShareDefine.Def_BT_Campaign_LingGen : 500, #灵根总点(开服活动榜) + ShareDefine.Def_BT_Campaign_StarLV : 500, #升星等级(开服活动榜) + ShareDefine.Def_BT_Campaign_Wash : 500, #洗练战力(开服活动榜) ShareDefine.Def_BT_FCCostGold : 5, #消费排行榜(仙界盛典) ShareDefine.Def_BT_NewFCCostGold : 5, #消费排行榜(仙界盛典) @@ -596,7 +617,14 @@ ShareDefine.Def_BT_CharmTotal : 100, #魅力总榜 ShareDefine.Def_BT_CharmWeek : 100, #魅力周榜 ShareDefine.Def_BT_CharmDay : 100, #魅力日榜 - ShareDefine.Def_BT_BossTrialSubmit : 1000, #boss凭证 (boss历练活动) + ShareDefine.Def_BT_BossTrialSubmit : 200, #boss凭证 (boss历练活动) + ShareDefine.Def_BT_BossTrialSubmitBak : 200, #boss凭证 (boss历练活动 - 上一期) + ShareDefine.Def_BT_BossTrialSubmitFamily : 100, #boss凭证仙盟 (boss历练活动) + ShareDefine.Def_BT_BossTrialSubmitFamilyBak : 100, #boss凭证仙盟 (boss历练活动 - 上一期) + ShareDefine.Def_BT_XianXiaMJScore : 200, #仙匣秘境积分榜 (仙匣秘境活动) + ShareDefine.Def_BT_HorsePetTrainScore : 200, #骑宠养成积分榜 (骑宠养成活动) + ShareDefine.Def_BT_GubaoScore : 200, #古宝养成积分榜 (古宝养成活动) + ShareDefine.Def_BT_AlineInvade : 1000, #异兽入侵 } #排行榜保存类型(和BillboardType匹配), 默认保存, 如果不保存,可配置进去 @@ -641,7 +669,6 @@ Def_PlayerKey_CrossRegisterMap = "CrossRegisterMap" #跨服注册活动地图, dataMapID Def_PlayerKey_MergeRegisterRoomID = "MergeRegisterRoomID" #当前上传数据的roomID Def_PlayerKey_IsLoginToMergeServer = "IsLoginToMergeServer" #是否要登陆跨服服务器 -Def_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching" #是否跨服匹配中 Def_PlayerKey_PlayerFromPID = "PlayerFromPID" #pid @@ -654,8 +681,6 @@ Def_ForbiddenTalk = "ForbiddenTalk" # 禁言 Def_TalkTick = "ForbiddenTalk" # 聊天间隔 - -Def_PlayerKey_ViewCrossPKBillboardTick = "ViewCrossPKBillboardTick_%s_%s" #查询PK排行榜tick,参数(zoneID, seasonID) #主城地图、缥缈宗 Def_FBMapID_MainCity = 10010 @@ -705,13 +730,13 @@ Def_FBMapID_CrossGrasslandXian = 32050 #跨服战场 Def_FBMapID_CrossBattlefield = 32060 +#竞技场战斗 +Def_FBMapID_ArenaBattle = 31290 #情缘副本 Def_FBMapID_Love = 31300 #回合战斗自定义地图ID -TurnFightMapIDList = ( -Def_TFMapID_MineArea, # 福地 1 -) = range(1, 1 + 1) +Def_TFMapID_MineArea = 1 # 福地 1 #需要刷世界BOSS的副本 WorldBossFBMapIDList = [Def_FBMapID_SealDemon, Def_FBMapID_ZhuXianBoss, Def_FBMapID_DemonKing] @@ -725,7 +750,7 @@ Def_FBMapID_CrossDemonKing:"CrossZonePK", Def_FBMapID_CrossGrasslandLing:"CrossZonePK", Def_FBMapID_CrossGrasslandXian:"CrossZonePK", - Def_FBMapID_CrossBattlefield:"CrossZonePK", + Def_FBMapID_CrossBattlefield:"CrossZoneBattlefield", Def_FBMapID_CrossChampionship:"CrossZonePK", } #跨服分区对应地图配置表名 - 仅适用于固定地图及虚拟分线的跨服玩法 @@ -738,6 +763,11 @@ #需要统计副本功能线路ID人数的跨服地图 Def_NeedCountFBFuncLinePlayerCrossMap = [Def_FBMapID_CrossDemonKing] +# 回合战斗目标类型 +TurnBattle_TagType_NPC = 0 +TurnBattle_TagType_Player = 1 +TurnBattle_TagType_Team = 2 + #同系职业枚举 JOB_TYPY_COUNT = 5 ( -- Gitblit v1.8.0