From 7032ca9cbb06bb89baeaf4d6396487a4c43baa16 Mon Sep 17 00:00:00 2001
From: cehua_lgq <cehua_lgq@163.com>
Date: 星期一, 26 十一月 2018 21:13:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 6 +++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt | 17 +++++++++++------
db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt | 3 ---
CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt | 27 ++++++++++++++++-----------
5 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
index 238bbf4..70d845e 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
@@ -1,13 +1,18 @@
DataMapID LineID FightPowerMin FightPowerMax LVLimit DayFreeHelpCount
-51010 0 457100 0 155 [5, 1]
-51010 1 869040 0 155 [5, 1]
-51010 2 1997875 0 155 [5, 1]
-51010 3 3541349 0 155 [5, 1]
-51010 4 4697877 0 155 [5, 1]
+51010 0 457100 1997875 155 [5, 1]
+51010 1 869040 3541349 155 [5, 1]
+51010 2 1997875 4697877 155 [5, 1]
+51010 3 3541349 7285497 155 [5, 1]
+51010 4 4697877 11336856 155 [5, 1]
51010 5 7285497 0 155 [5, 1]
-60010 0 10000 0 105 [5, 0]
-60010 1 50000 0 165 [5, 0]
-60010 2 100000 0 200 [5, 0]
-31110 2 10000 0 80 [5, 1]
-31110 5 50000 0 100 [5, 1]
-31110 7 100000 0 150 [5, 1]
+60010 0 349488 0 105 [5, 0]
+60010 1 1097812 0 165 [5, 0]
+60010 2 1997875 0 200 [5, 0]
+31110 2 281011 0 125 [5, 1]
+31110 5 1114154 0 180 [5, 1]
+31110 7 2520808 0 215 [5, 1]
+31110 9 4075186 0 240 [5, 2]
+31110 12 7881199 0 285 [5, 3]
+31110 15 17274907 0 320 [5, 4]
+31110 18 25874924 0 350 [5, 5]
+31110 21 34736689 0 380 [5, 6]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index cd92533..d13dfbc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -108,7 +108,7 @@
#_100 前2座塔，等级碾压
"EVP_1_100" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+min(suppressLV,1)*0.2*dMaxHP+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
#_101 后10座塔，战力压制
- "EVP_1_101" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)+(suppressFightPower*1.0/suppressNPCFightPower*(1+int(min(suppressNPCFightPower/900000.0,3))+int(min(suppressNPCFightPower/20000000.0,1)))*dMaxHP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
+ "EVP_1_101" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)+(suppressFightPower*1.0/suppressNPCFightPower*(1+int(min(suppressNPCFightPower/1000000.0,3))+int(min(suppressNPCFightPower/20000000.0,1)))*dMaxHP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
#BOSS境界压制公式
diff --git a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
index add1162..f96509c 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
@@ -5,9 +5,14 @@
51010 3 3541349 3541349 235 115206 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
51010 4 4697877 4697877 255 151930 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
51010 5 7285497 7285497 275 268582 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-60010 0 10000 10000 105 40000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-60010 1 50000 50000 165 45000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-60010 2 100000 100000 200 50000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-31110 2 10000 10000 80 55000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-31110 5 50000 50000 100 60000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-31110 7 100000 100000 150 65000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+60010 0 349488 349488 105 4817 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+60010 1 1097812 1097812 165 18512 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+60010 2 1997875 1997875 200 42482 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 2 281011 281011 125 2807 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 5 1114154 1114154 180 11978 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 7 2520808 2520808 215 39881 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 9 4075186 4075186 240 85811 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:141}}
+31110 12 7881199 7881199 285 190245 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:142}}
+31110 15 17274907 17274907 320 441027 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:143}}
+31110 18 25874924 25874924 350 768829 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:144}}
+31110 21 34736689 34736689 380 1079908 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:145}}
diff --git a/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt b/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt
index fbff04f..48361b8 100644
--- a/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt
+++ b/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt
@@ -5,9 +5,6 @@
2 150 GetMagicEffect7
2 250 GetMagicEffect8
2 500 GetMagicEffect9
-3 150 GetMagicEffect1
-3 250 GetMagicEffect2
-3 500 GetMagicEffect3
4 150 GetMagicEffect10
4 250 GetMagicEffect11
4 500 GetMagicEffect12
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 6fe2287..f5ab109 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -681,9 +681,9 @@
31401001 2 0 冰霜石精 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 0 0 0 0 0 1 0 0 1 1 1
31403001 2 0 霜冻巨石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 30 2 0 0 0 0 0 1 0 0 198 1 1
31401002 2 0 试炼木人 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1
-31401003 2 0 冰霜毒蝎 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1
-31401004 2 0 顽固之石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 0 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1
-31401005 2 0 虾兵 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 15 2 100 0 0 0 0 1 0 0 180 1 1
+31401003 2 0 冰霜毒蝎 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 1 0 0 180 1 1
+31401004 2 0 顽固之石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 0 2 6 0 0 0 0 0 0 0 0 0 15 2 100 0 0 0 0 1 0 0 180 1 1
+31401005 2 0 虾兵 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1
31401006 2 0 深渊刺客 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1
31401007 2 0 海马勇士 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1
31401008 2 0 花精灵 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 0 2 30 23045 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1
--
Gitblit v1.8.0