From 22349866372ce1b603b8eebcf5d43e7772ac0ddb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 20 九月 2018 14:41:25 +0800
Subject: [PATCH] 3660 【后端】后台新增聊天黑名单功能

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 671c1f7..7d3d686 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -260,8 +260,9 @@
 Def_ItemID_GoldPaper = 30               # 直接给绑玉
 Def_ItemID_RealmPoint = 24               # 直接给修行点
 Def_ItemID_BossReborn = 21               # 直接给boss复活点
+Def_ItemID_Ysog = 4306               # 直接给符印融合石
 Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, Def_ItemID_GoldPaper, 
-                           Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn]
+                           Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog]
 #---------------------------------------------------------------------
 #写死的物品类型都放这边
 Def_ItemType_All = -1             #所有类型
@@ -1140,7 +1141,7 @@
 ) = range(2)
 
 #陷阱出生后, 不攻击时间
-Def_Trap_Born_Idle_Time = 2000
+Def_Trap_Born_Idle_Time = 500
 
 #技能--------------------------------------------
 #恶名初始点
@@ -3579,10 +3580,12 @@
 
 #限时特惠活动
 Def_PDict_SpringSaleID = "SpringSaleID"  # 玩家身上的限时特惠活动ID,唯一标识,取活动开始日期time
+Def_PDict_SpringSaleMailState = "SpringSaleMailState"  # 玩家身上的活动更新提醒邮件状态
 
 #限时礼包活动
 Def_PDict_FlashGiftbagID = "FlashGiftbagID"  # 玩家身上的限时礼包活动ID,唯一标识,取活动开始日期time
 Def_PDict_FlashGiftbagBuyCount = "FlashGiftbagBuyCount_%s"  # 限时礼包已购买次数,参数(礼包ID)
+Def_PDict_FlashGiftbagMailState = "FlashGiftbagMailState"  # 玩家身上的活动更新提醒邮件状态
 
 #BOSS复活
 Def_PDict_BossRebornID = "BossRebornID"  # 玩家身上的BOSS复活活动ID,唯一标识,取活动开始日期time值
@@ -3771,6 +3774,7 @@
 Def_PDict_AlchemyCount = "AlchemyCount_%s" #特殊炼丹次数产出设定已累计次数, 参数(配方ID)
 Def_PDict_AlchemyCountSpec = "AlchemyCountSpec_%s" #特殊炼丹次数产出设定已累计次数, 参数(配方ID)
 Def_PDict_AlchemyOutputCount = "AlchemyOutputCount_%s" #炼丹特殊产出物品已产出次数,参数(物品ID)
+Def_PDict_AlchemyPrayCnt = "AlchemyPrayCnt" #炼丹祈福次数
 
 Def_PDict_GFPassiveIndex = "GFP_%s_%s"   # 被动功法 页数-索引
 Def_PDict_GFPassivePage = "GFPPage"   # 被动功法选中页数
@@ -4296,7 +4300,8 @@
 TriggerType_AttackOverPassive, # 攻击(对敌技能)后被动技能被触发在其他被动效果处理后调用,触发顺序原因 47
 TriggerType_Buff_BeAttackSubLayer,  # BUFF类:被攻击减buff层,0消失 48
 TriggerType_OneDamage,   # 伤害降低到1点 49
-) = range(1, 50)
+TriggerType_LuckyHit, # 会心一击时增加会心伤害百分比 50
+) = range(1, 51)
 
 
 # NPC功能类型定义
@@ -4432,6 +4437,7 @@
 Def_Cost_FreeGoods, # 极品白拿
 Def_Cost_DogzEquipPlus, # 神兽装备强化
 Def_Cost_RuneHole, # 符印孔解锁
+Def_Cost_AlchemyPray, # 丹药祈福
 #-----------以下为暂时没用的,先不删除,如有新增消费点则放在这些之前------------
 Def_Cost_RefreshArrestTask, # 刷新悬赏任务
 Def_Cost_OffLineExp, # 兑换离线经验
@@ -4453,7 +4459,7 @@
 Def_Cost_Trade, # 交易
 Def_Cost_Rename, # 改名
 Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 54)
+) = range(2000, 2000 + 55)
 
 Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
 
@@ -4535,6 +4541,7 @@
 Def_Cost_FreeGoods:"FreeGoods",
 Def_Cost_DogzEquipPlus:"DogzEquipPlus",
 Def_Cost_RuneHole:"RuneHole",
+Def_Cost_AlchemyPray:"AlchemyPray",
 }
 ## -----------------------------------------------------
 

--
Gitblit v1.8.0