From 0855d41bdb06c1a36465bd679f39ff3535ffbb76 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期六, 11 八月 2018 14:44:41 +0800
Subject: [PATCH] 2392主干-境界怪物属性增加境界头衔和境界压制

---
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                                      |   16 ++++++++--------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt |    4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index 9109c1b..16cd553 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -68,8 +68,8 @@
 	"SuppressValueLV_1":"(min(max(suppressLV-10,0),10)*0.01+min(max(suppressLV-15,0),5)*0.03+min(max(suppressLV-20,0),5)*0.05+min(max(suppressLV-25,0),5)*0.07+max(suppressLV-30,0)*0.1)",
 	"SuppressValueFP_0":"min(max(suppressFightPower*1.0/suppressNPCFightPower-0,0),0.05)*5+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.05,0),0.15)*8+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.2,0),1)*10",
 	"SuppressValueFP_1":"min(max(suppressFightPower*1.0/suppressNPCFightPower-0,0),0.05)*5+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.05,0),0.15)*8+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.2,0),1)*10",
-	"PVPSuppressValueRealm":"min(5000, 10000+max(suppressRealm,-6)*1000)",
-	"PVESuppressValueRealm":"min(5000, 10000+max(suppressRealm,-6)*1000)",
+	"PVPSuppressValueRealm":"max(5000, 10000+max(suppressRealm,-6)*1000)",
+	"PVESuppressValueRealm":"max(5000, 10000+max(suppressRealm,-6)*1000)",
 	
 	
 	"PVP_1"	:"int(SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))- dDef*(1-max(aIgnoreDefRate - dIgnoreDefRateReduce,0)/10000.0),0))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+ (aSuperHit*max(1-dSuperHitReduce/10000.0,0) if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+max(aSkillAtkRate-dSkillAtkRateReduce,0)/10000.0)*(1+(aDamagePer+aDamagePerPVP)/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamagePerPVPReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index e830f5b..7a1a597 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -1424,10 +1424,10 @@
 50907	混元决	50907	1	1	2	2	0	7	0	0	0	0	0	0	0	15000	0	0	0	0	0	4026	5000	0	14	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	27230	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 50908	甘露回春	50908	1	1	2	2	0	20	0	0	0	0	10	0	0	5000	0	0	0	0	0	65	2000	1	0	116	8000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	30979	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 50909	神火护身	50909	1	1	2	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	808	1000	20000	50939	4023	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	35041	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-50910	元素召唤	50910	1	1	2	2	0	7	0	0	16	6	10	6	0	60000	0	0	0	0	0	1060	50105002	0	0	1013	10000	0	0	4004	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	65142	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-50911	森罗万象 	50911	1	1	2	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4004	2000	0	0	4513	500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	40174	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-50912	斩杀	50912	1	1	2	2	0	7	3	0	0	0	0	0	0	0	0	0	0	0	0	4002	1500	5000	0	4027	2000	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	48037	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-50913	起死回生	50913	1	1	2	2	0	18	0	0	0	0	41	10	0	100000	0	0	0	0	0	4012	7	0	0	4028	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	50947	0	0	0	0	0	0	0	0	0	0	2	56001	0	0	0	3	511	511	3	4	0	0	0	0	0	0
+50910	元素召唤	50910	1	1	2	2	0	7	0	0	16	6	10	6	0	60000	0	0	0	0	0	1060	50105002	0	0	1013	10000	0	0	4004	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	40174	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+50911	森罗万象 	50911	1	1	2	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4004	2000	0	0	4513	500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	48037	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+50912	斩杀	50912	1	1	2	2	0	7	3	0	0	0	0	0	0	0	0	0	0	0	0	4002	1500	5000	0	4027	2000	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	56001	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+50913	起死回生	50913	1	1	2	2	0	18	0	0	0	0	41	10	0	100000	0	0	0	0	0	4012	7	0	0	4028	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	50947	0	0	0	0	0	0	0	0	0	0	2	65142	0	0	0	3	511	511	3	4	0	0	0	0	0	0
 50932	元素减少攻防	50932	1	1	0	0	0	6	3	0	0	0	41	10	0	0	0	0	0	0	0	13	3000	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 50939	剩余护盾爆炸	50939	1	1	2	0	0	1	0	0	2	3	40	0	0	0	0	0	0	0	0	0	0	0	0	4023	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50947	起死回生回血	50947	1	1	0	0	0	2	0	0	8	1	10	0	0	0	0	0	0	0	0	1000	1500	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0
@@ -2196,10 +2196,10 @@
 55907	混元决	55907	1	1	4	2	0	7	0	0	0	0	0	0	0	15000	0	0	0	0	0	4026	5000	0	14	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	27230	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 55908	甘露回春	55908	1	1	4	2	0	20	0	0	0	0	10	0	0	5000	0	0	0	0	0	65	2000	1	0	116	8000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	30979	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 55909	神火护身	55909	1	1	4	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	808	1000	20000	50939	4023	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	35041	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-55910	元素召唤	55910	1	1	4	2	0	7	0	0	16	6	10	6	0	60000	0	0	0	0	0	1060	50105003	0	0	4004	10000	0	0	1013	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	65142	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-55911	森罗万象 	55911	1	1	4	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4004	2000	0	0	4513	500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	40174	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-55912	斩杀	55912	1	1	4	2	0	7	3	0	0	0	0	0	0	0	0	0	0	0	0	4002	1500	5000	0	4027	2000	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	48037	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-55913	起死回生	55913	1	1	4	2	0	18	0	0	0	0	41	10	0	100000	0	0	0	0	0	4012	7	0	0	4028	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	50947	0	0	0	0	0	0	0	0	0	0	2	56001	0	0	0	3	511	511	3	4	0	0	0	0	0	0
+55910	元素召唤	55910	1	1	4	2	0	7	0	0	16	6	10	6	0	60000	0	0	0	0	0	1060	50105003	0	0	4004	10000	0	0	1013	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	40174	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+55911	森罗万象 	55911	1	1	4	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4004	2000	0	0	4513	500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	48037	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+55912	斩杀	55912	1	1	4	2	0	7	3	0	0	0	0	0	0	0	0	0	0	0	0	4002	1500	5000	0	4027	2000	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	56001	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+55913	起死回生	55913	1	1	4	2	0	18	0	0	0	0	41	10	0	100000	0	0	0	0	0	4012	7	0	0	4028	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	50947	0	0	0	0	0	0	0	0	0	0	2	65142	0	0	0	3	511	511	3	4	0	0	0	0	0	0
 55932	定身	55932	1	1	0	0	0	14	3	0	0	0	41	10	0	0	0	0	0	0	0	4012	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	507	507	4	8	0	0	0	0	0	0
 55939	剩余护盾爆炸	55939	1	1	4	0	0	1	0	0	2	3	40	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 55947	起死回生回血	55947	1	1	0	0	0	2	0	0	8	1	10	0	0	0	0	0	0	0	0	1000	1500	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0

--
Gitblit v1.8.0