From 000cf441771078c5bbe60ebc6173e7df5360e54e Mon Sep 17 00:00:00 2001 From: hch <305670599@qq.com> Date: 星期二, 04 九月 2018 14:39:47 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py index e538065..6a98a8e 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py @@ -152,6 +152,7 @@ Def_Notify_WorldKey_LastDropTime = "LastDropTime_%s" # 全局物品上次掉落时间, 参数(itemID) Def_Notify_WorldKey_DropNPCKilledCnt = "DropNPCKilledCnt_%s" # 全局物品绑定的NPC击杀次数, 参数(itemID) +Def_Notify_WorldKey_NPCKilledCount = "NPCKilledCount_%s" # 全局NPC被击杀次数, 参数(npcID) Def_Notify_WorldKey_WorldAverageLv = "WorldAverageLv" #世界等级 Def_Notify_WorldKey_YdayLoginCnt= 'YdayLoginCnt' # 昨天总在线人数 @@ -161,6 +162,8 @@ Def_Notify_WorldKey_ChampionFamilyID = "ChampionFamilyID" # 仙盟联赛上次冠军仙盟ID Def_Notify_WorldKey_FamilyBossOpenCount = "FamilyBossOpenCount" # 仙盟boss开启次数 + +Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo" # 仙盟宴会数据 Def_Notify_WorldKey_MergeBoss = "Merge_Boss" # 跨服boss @@ -1466,9 +1469,10 @@ DailyActionID_XXX12, # 废弃12 DailyActionID_Tower, # 符印塔 DailyActionID_MagicWeapon, # 法宝集魂 -DailyActionID_FBHelp, # 助战副本 +DailyActionID_FBHelp, # 助战副本 15 DailyActionID_BOSSHome, # BOSS之家 -) = range(1, 16 + 1) +DailyActionID_FamilyRobBoss, # 仙盟抢boss +) = range(1, 17 + 1) @@ -1708,4 +1712,13 @@ FamilyActive_War, #仙盟联赛 FamilyActive_HelpDujie, #同盟护法 FamilyActive_SWRH, #守卫人皇 -) = range(1,6+1) \ No newline at end of file +) = range(1,6+1) + + +# BOSS 功能标识区分 对应KillBossCntLimit，主要根据击杀类型不同区分 +( +Def_Boss_Func_World, # 世界BOSS +Def_Boss_Func_Home, # BOSS之家 +Def_Boss_Func_Dogz, # 神兽功能BOSS +) = range(3) + -- Gitblit v1.8.0