From 609e16921fd14b577cb7e4f56777a839b408b311 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 20 八月 2018 20:13:04 +0800
Subject: [PATCH] Merge commit '444a48bf8875c1c4295871d48eee7433ac700734'
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 3be3baa..0f70343 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -230,7 +230,7 @@
OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
OperationActionName_RealmPoint]
#需要记录开启活动时的世界等级的运营活动
-NeedWorldLVOperationActNameList = [OperationActionName_BossReborn, OperationActionName_FairyCeremony]
+NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony]
#活动信息字典key定义
ActKey_ID = "ID" # 活动ID，唯一标识的ID，一般是活动开启的time值
@@ -921,8 +921,8 @@
Def_UniversalGameRecType_LVAwardRecord, #玩家等级奖励记录 3
Def_UniversalGameRecType_LimitFBOpenRecord,#限时副本开启时间记录4
Def_UniversalGameRecType_DujieHelpCntRecord, # 渡劫副本护法次数5
- Def_UniversalGameRecType_6,
- Def_UniversalGameRecType_7,
+ Def_UniversalGameRecType_TodayPlayerLVInfo, #今日活跃玩家等级信息6
+ Def_UniversalGameRecType_YesterdayPlayerLVInfo,#昨日活跃玩家等级信息7
Def_UniversalGameRecType_8,
Def_UniversalGameRecType_9,
Def_UniversalGameRecType_10,
@@ -1296,7 +1296,7 @@
)=range(5)
# 战斗力模块类型
-Def_MFPType_Max = 23
+Def_MFPType_Max = 24
ModuleFightPowerTypeList = (
Def_MFPType_Role, # 角色 0
Def_MFPType_Equip, # 装备(基本装备位) 1
@@ -1318,6 +1318,7 @@
Def_MFPType_MagicWeapon3, # 仙族法宝 17
Def_MFPType_PetSoul, # 灵宠魂石 18
Def_MFPType_HorseSoul, # 坐骑魂石 19
+Def_MFPType_MagicWeaponSoul, # 法宝之魂 20
Def_MFPType_Other, # 其他
#以下暂时没用到，改时再处理
@@ -1462,7 +1463,7 @@
DailyActionID_TowerSD, # 符印塔扫荡
DailyActionID_XXX12, # 废弃12
DailyActionID_Tower, # 符印塔
-DailyActionID_MagicWeapon, # 觉醒法宝
+DailyActionID_MagicWeapon, # 法宝集魂
DailyActionID_FBHelp, # 助战副本
DailyActionID_BOSSHome, # BOSS之家
) = range(1, 16 + 1)
--
Gitblit v1.8.0