From ffb34f87fe65c84cc9c204371cbbb3a2a0b43ec1 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 19 九月 2018 15:55:26 +0800
Subject: [PATCH] fix:3670 【后端】只有通过合成的双属性才能分解出魔符印融合石

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index e3c2a13..4887c3b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -127,6 +127,7 @@
 Def_Notify_Separator = '+'
 
 #通知地图服务器并设置该字典值
+Def_Notify_WorldKey_InitOpenServerTime = 'InitOpenServerTime'   # 开服时间
 Def_Notify_WorldKey_ServerDay = 'ServerDay'               # 开服天数
 Def_Notify_WorldKey_IsMixServer = 'IsMixServer'           # 是否合服服务器
 Def_Notify_WorldKey_MixServerDay = 'MixServerDay'         # 合服天数
@@ -189,7 +190,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_FamilyKillHorsePetRobBossCnt = 'FamilyKillHorsePetRobBossCnt'   # 仙盟击杀骑宠boss数统计
+Def_Notify_WorldKey_HorsePetRobBossPlayerCount = 'HorsePetRobBossPlayerCount'   # 骑宠争夺活动有效参考人数
 
 Def_Notify_WorldKey_FamilyActivityDayState = "FamilyActivityDayState"  #战盟相关活动今日开启状态, 按位存储代表今日是否开启过
 
@@ -241,18 +243,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)
@@ -775,7 +767,8 @@
 CDBPlayerRefresh_TreasureScore,         # 寻宝积分
 CDBPlayerRefresh_Danjing,               # 丹精
 CDBPlayerRefresh_NPCHurtAddPer,         # 对怪物伤害加成
-) = range(146, 189)
+CDBPlayerRefresh_FinalHurtPer,             # 最终输出伤害百分比
+) = range(146, 190)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -855,6 +848,7 @@
 GameFuncID_DailyQuest = 78      # 日常
 GameFuncID_FreeGoods = 130      # 极品白拿
 GameFuncID_OSSail = 132         # 开服特惠
+GameFuncID_HorsePetRobBoss = 139# 骑宠争夺
 # 以下为暂时无用的
 GameFuncID_GreatMaster = 28     # 大师
 GameFuncID_Truck = 33           # 运镖
@@ -1238,6 +1232,7 @@
 Def_IudetCreateItemLoginDay = 34  # 创建物品时的登录天数
 Def_IudetLastOpenItemLoginDay = 36  # 上一次开启物品时的登录天数
 Def_IudetRuneLV = 38  # 符印等级
+Def_IudetRuneSource = 40  # 符印来源 老号0,默认1,合成2(主要用来区分是否合成获得)
 Def_IudetWingProgressValue = 42 #羽翼精炼值
 Def_IudetCreateTime = 44 # 时效物品的创建时间
 

--
Gitblit v1.8.0