From 623442b524137821ea6abb1b429660a9a107b364 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 31 一月 2019 19:27:01 +0800
Subject: [PATCH] 6118 【后端】【1.5.200】新增技能效果-- 宠物技能-宠物主人受到暴击伤害时触发技能 - 效果填写错误

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 6b79d94..bd11a02 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -518,6 +518,11 @@
 Def_Effect_SkillReducePer6 = 114 # 受到技能伤害减少6
 Def_Effect_SkillReducePer7 = 115 # 受到技能伤害减少7
 
+Def_Effect_ZXWeaponAttrPer = 116 # 诛仙剑1属性加成百分比
+Def_Effect_LXWeaponAttrPer = 117 # 诛仙剑2属性加成百分比
+Def_Effect_XXWeaponAttrPer = 118 # 诛仙剑3属性加成百分比
+Def_Effect_JXWeaponAttrPer = 119 # 诛仙剑4属性加成百分比
+
 #增加%d物理伤害值,其中a值为伤害值
 Def_Effect_AddAtk = 1005
 #增加%d魔法伤害值,其中a值为伤害值
@@ -1738,6 +1743,8 @@
                               SuccType_EquipSuit,SuccType_Collect,SuccType_DogzBattle,
                               SuccType_UseItem,SuccType_FamilyTechLV,
                               SuccType_GetSpecialItem,SuccType_GetMagicWeapon,SuccType_FBEncourage,SuccType_XBXZ,
+                              SuccType_FeastRedPack_KillSpecificNPC,SuccType_FeastRedPack_KillBoss,
+                              SuccType_FeastRedPack_EnterMap, SuccType_FeastRedPack_FBSweep,
                               ]
 #传进来的条件满足配置的条件列表中的一个就行的成就类型
 ContainSuccessTypeList = [SuccType_CompoundItemEx, SuccType_PickUpItem, SuccType_MWSkillUp]
@@ -1871,4 +1878,8 @@
 RedPackType_FeastSucc = 33 # 节日成就红包
 # 节日红包类型
 FeastRedPackType = [RedPackType_FeastSysBig, RedPackType_FeastSysSmall, RedPackType_FeastSucc]
+# 需要限制服务器最大红包数的红包类型 {统计个数编号:[红包类型, ...], ...}
+RedPackMaxCountDict = {1:[RedPackType_OpenServer],
+                       2:[RedPackType_FeastSucc],
+                       }
 

--
Gitblit v1.8.0