From 3a8d46acaed6c3cc279599835b013f6ff17a0632 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期五, 14 九月 2018 17:34:54 +0800 Subject: [PATCH] 1942 【1.0.15】【主干】队伍在准备阶段时，需要停止自动匹配 --- ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py index 636e825..ed961fe 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py @@ -189,6 +189,8 @@ Def_Notify_WorldKey_BossShuntPlayer = 'BossShuntPlayer' # boss分流玩家信息 Def_Notify_WorldKey_BossShuntDeadLine = 'BossShuntDeadLine' # boss分流线路已死亡的线路 Def_Notify_WorldKey_BossOnlineHeroCnt = 'BossOnlineHeroCnt_%s' # boss刷新时间用的在线人数, 参数为NPCID +Def_Notify_WorldKey_FamilyKillHorsePetRobBossCnt = 'FamilyKillHorsePetRobBossCnt' # 仙盟击杀骑宠boss数统计 +Def_Notify_WorldKey_HorsePetRobBossPlayerCount = 'HorsePetRobBossPlayerCount' # 骑宠争夺活动有效参考人数 Def_Notify_WorldKey_FamilyActivityDayState = "FamilyActivityDayState" #战盟相关活动今日开启状态, 按位存储代表今日是否开启过 @@ -240,18 +242,8 @@ ActKey_ID = "ID" # 活动ID，唯一标识的ID，一般是活动开启的time值 ActKey_State = "State" # 活动状态 0-未开启, >0开启中，也代表当日的第几个时间段 ActKey_CfgID = "CfgID" # 活动表配置ID -ActKey_StartDate = "StartDate" # 开始日期 y-m-d -ActKey_EndDate = "EndDate" # 结束日期 y-m-d -ActKey_LVLimit = "LVLimit" # 限制玩家等级 - -ActKey_AddExpRate = "AddExpRate" # 多倍经验增加的经验倍率 -ActKey_IsDayReset = "IsDayReset" # 消费返利是否每天重置 -ActKey_TemplateID = "TemplateID" # 消费返利今日模板ID -ActKey_TemplateIDList = "TemplateIDList" # 消费返利模板ID列表 -ActKey_ShopTypeList = "ShopTypeList" # 限时特惠商店类型 +ActKey_DayIndex = "DayIndex" # 活动表配置ID ActKey_WorldLV = "WorldLV" # 活动开启时世界等级 -ActKey_GiftbagTypeList = "GiftbagTypeList" # 限时礼包ID列表 -ActKey_RealmPointMulti = "RealmPointMulti" # X倍修行点 #答题类型枚举 Def_Game_ExamTypeList = range(1, 4 + 1) @@ -477,6 +469,8 @@ Def_Effect_WingHPPer = 86 # 翅膀生命百分比 Def_Effect_SuiteBasePer = 87 # 套装基础属性百分比 Def_Effect_PlusBaseAtkPer = 88 # 强化基础攻击百分比 + +Def_Effect_NPCHurtAddPer = 89 # 对怪物伤害加成 #增加%d物理伤害值,其中a值为伤害值 Def_Effect_AddAtk = 1005 @@ -771,7 +765,9 @@ CDBPlayerRefresh_FuncDef, # 功能层防御 185 CDBPlayerRefresh_TreasureScore, # 寻宝积分 CDBPlayerRefresh_Danjing, # 丹精 -) = range(146, 188) +CDBPlayerRefresh_NPCHurtAddPer, # 对怪物伤害加成 +CDBPlayerRefresh_FinalHurtPer, # 最终输出伤害百分比 +) = range(146, 190) TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子） TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来） @@ -851,6 +847,7 @@ GameFuncID_DailyQuest = 78 # 日常 GameFuncID_FreeGoods = 130 # 极品白拿 GameFuncID_OSSail = 132 # 开服特惠 +GameFuncID_HorsePetRobBoss = 139# 骑宠争夺 # 以下为暂时无用的 GameFuncID_GreatMaster = 28 # 大师 GameFuncID_Truck = 33 # 运镖 @@ -1606,7 +1603,8 @@ SuccType_IceLode, #通关冰晶矿脉成就125 SuccType_RefineStoveColor, #炼制X品质丹药X枚126 SuccType_UseStoveBylv, #使用X品丹药X枚127 -) = range(1, 128) +SuccType_QueenRelicsEx, #通关娲皇遗迹128 +) = range(1, 129) -- Gitblit v1.8.0