From e58a11b68c724d3c05daad923fbac4c1cba77d0f Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 18 九月 2018 11:29:44 +0800
Subject: [PATCH] fix:3604 【后端】潜力0级时增加战力 3609 【后端】法宝之魂改为由各个法宝单独觉醒,取消激活条件

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index f40c664..67440f3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -705,6 +705,7 @@
 Def_SkillID_DropOwnerBuff = 20040   # 掉落归属buff
 Def_SkillID_PetSignDay = 47111   # 灵宠签到属性技能, 单次签到的加成
 Def_SkillID_LFZ = 47100   # 龙凤镯技能(打怪概率经验加成)
+Def_SkillID_HorsePetRobBossKillCntBuff = 21020   # 骑宠的怨念buff
 
 
 Def_SkillID_FamilyWar_CWinBuff = 22101 # 仙盟联赛 - 连胜buff, 由连胜次数决定等级
@@ -3578,10 +3579,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值
@@ -3770,6 +3773,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"   # 被动功法选中页数
@@ -4295,7 +4299,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功能类型定义
@@ -4430,6 +4435,8 @@
 Def_Cost_GameServer, # GameServer 30
 Def_Cost_FreeGoods, # 极品白拿
 Def_Cost_DogzEquipPlus, # 神兽装备强化
+Def_Cost_RuneHole, # 符印孔解锁
+Def_Cost_AlchemyPray, # 丹药祈福
 #-----------以下为暂时没用的,先不删除,如有新增消费点则放在这些之前------------
 Def_Cost_RefreshArrestTask, # 刷新悬赏任务
 Def_Cost_OffLineExp, # 兑换离线经验
@@ -4451,7 +4458,7 @@
 Def_Cost_Trade, # 交易
 Def_Cost_Rename, # 改名
 Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 53)
+) = range(2000, 2000 + 55)
 
 Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
 
@@ -4532,6 +4539,8 @@
 Def_Cost_FamilyRedPacket:"FamilyRedPacket",
 Def_Cost_FreeGoods:"FreeGoods",
 Def_Cost_DogzEquipPlus:"DogzEquipPlus",
+Def_Cost_RuneHole:"RuneHole",
+Def_Cost_AlchemyPray:"AlchemyPray",
 }
 ## -----------------------------------------------------
 
@@ -4824,7 +4833,8 @@
 VIPPrivilege_BoursePwd,    #26 VIP被动技能孔——VIP4专属被动技能孔
 VIPPrivilege_BOSSHomeKillLimit,    #27 BOSS之家疲劳值上限
 VIPPrivilege_FMTDouble,    #28 封魔坛双倍击杀
-) = range(1, 29)
+VIPPrivilege_29,    #29 娲皇遗迹购买次数 - 副本总表统一处理
+) = range(1, 30)
 
 
 (

--
Gitblit v1.8.0