From 84f9abc7067dde4e6b504a1ba2e9f0600a6de46b Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 12 三月 2019 20:58:56 +0800
Subject: [PATCH] 4042 【后端】【2.0】邮件包含附件时不能删除邮件 -  服务端添加防范

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |   11 ++++++++---
 1 files changed, 8 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 c84ca76..0eea719 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -214,6 +214,7 @@
 Def_Notify_WorldKey_LoginAwardEndDate = 'LoginAwardEndDate_%s'   # 登录领取奖励结束时间,参数为活动类型
 
 Def_Notify_WorldKey_RedPacketOutput = 'RedPacketOutput'  # 红包产出信息
+Def_Notify_WorldKey_HurtLog = 'HurtLog'  # 战斗伤害日志
 
 #运营活动表名定义
 OperationActionName_ExpRate = "ActExpRate" # 多倍经验活动
@@ -658,7 +659,8 @@
 # 3 紫色
 # 4 橙色
 # 5 红色
-# 6 粉色#===============================================================================
+# 6 粉色
+#===============================================================================
 Def_Item_Color_White = 1     #白
 Def_Item_Color_Blue = 2      #蓝
 Def_Item_Color_Purple = 3    #紫
@@ -1293,6 +1295,8 @@
 Def_IudetCreateTime = 44 # 时效物品的创建时间
 Def_IudetGatherSoulLV = 46  # 聚魂等级
 Def_IudetExpireTime = 48 # 时效物品指定有效时间,时间单位由时效类型决定
+Def_IudetAuctionItemCreateTime = 50 # 拍品创建时间
+
 # 200~300 宠物数据用
 Def_IudetPet_NPCID = 200  # npcID
 Def_IudetPet_ClassLV = 202  # 阶级
@@ -1534,8 +1538,9 @@
 DailyActionID_IceLode, # 冰晶矿脉
 DailyActionID_HelpBattleCheckIn, # 助战登记  20
 DailyActionID_CrossReamPK, # 跨服PK  21
-DailyActionID_ZhuXianBoss, # 诛仙BOSS  22
-) = range(1, 22 + 1)
+DailyActionID_FamilyBoss1, # 仙盟BOSS第一场  22
+DailyActionID_FamilyBoss2, # 仙盟BOSS第二场  23
+) = range(1, 23 + 1)
 
 
 

--
Gitblit v1.8.0