From 977f8e6aa1c585a93e54b120eb5ffa995d7b1a27 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 09 十一月 2018 15:23:03 +0800
Subject: [PATCH] 2685 还原天赋的召唤兽公式

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

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index 5f2b893..a7c55a2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -87,8 +87,6 @@
 	"EVE_1"	:"max(aMaxAtk-dDef,1)",
 	"PetVE_1":"max(((aMinAtk + aMaxAtk)/2.0-dDef)*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0),(aMinAtk+aMaxAtk)/2.0*0.05 + (aMinAtk+aMaxAtk)/2.0*0.1*rand)",
 	"PetVP_1":"max(max((aMinAtk+aMaxAtk)/2.0-dDef,0)*atkSkillPer*(1+aDamagePer/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand)",
-	"EVP_1_10":"int(max(((max((aMinAtk+aMaxAtk)/2.0,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
-
 
 	#世界小怪等级压制公式
 	"EVP_1_2"	:"max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV*min(max((aMinAtk+aMaxAtk)/2.0-dDef,0)+max(suppressLV-20,0),1))-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(min(suppressLV,1)*min(max((aMaxAtk+aMinAtk)/2.0-dDef,0),1)*aMaxAtk+aFinalHurt+suppressValueFP*dMaxHP-dFinalHurtReduce, 0)+min(suppressLV,1)*atkSkillValue*0.2+atkSkillValue*0.8)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05)",
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 7745301..ef81221 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -329,8 +329,8 @@
 50105021	4	10002	变羊	1	0	3	3	3	1	0	0	3	3	3	0	0	0	0	0	0	0	0	3	3	0	0	2	6	23031	0	0	0	0	0	0	0	0	15	2	3	3	0	0	0	1	0	0	102	0	1
 50105022	3	0	道元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	55932	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
 50105023	3	0	剑元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	0	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
-50105024	7	0	火元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	10	3000	1	1	0	100	0	10	50949	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
-50105025	7	0	水元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	10	3000	1	1	0	100	0	10	55949	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
+50105024	7	0	火元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	50949	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
+50105025	7	0	水元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	55949	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
 50107001	3	0	召唤元素	1	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	100	0	10	0	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
 50107002	3	10002	治疗图腾	65	0	727	757	16	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	432	46	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	6395	0	0	0	0	0	0	0	62	1	1
 50108001	14	0	遗失物资(大)	1	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	0	0	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	0	0	0	0	214	0	1

--
Gitblit v1.8.0