From dc046d2ad3012b6bf9256e0774a36cedbc0b38cd Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 07 十二月 2018 16:01:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4521.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 7 ++++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc | 0
6 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 723b32a..d9d950f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
index a73e82a..859736e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index aa2161d..9a79567 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4521.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4521.pyc
new file mode 100644
index 0000000..4d24899
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4521.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
index dcb7860..145bbc9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 474b715..f665dc3 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -36,8 +36,8 @@
RuneAttr65 (level-1)*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 5_2080|4_1040|3_520|2_312|1_208 0
RuneAttr66 (level-1)*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 5_2280|4_1140|3_570|2_342|1_228 0
RuneAttr11 (level-1)*50 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1 5_1240|4_620|3_310|2_186|1_124 0
-RuneAttr42 (level-1)*600 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 5_1640|4_820|3_410|2_246|1_164 0
-RuneAttr41 (level-1)*400 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 5_960|4_480|3_240|2_144|1_96 0
+RuneAttr42 (level-1)*600 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 5_1480|4_740|3_370|2_222|1_148 0
+RuneAttr41 (level-1)*400 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 5_880|4_440|3_220|2_132|1_88 0
RuneAttr27 (level-1)*25 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 5_964|4_482|3_241|2_145|1_96 0
RuneAttr8 int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20/3) 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 5_623|4_270|3_104|2_63|1_42 0
RuneAttr26 (level-1)*50 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 5_1348|4_674|3_337|2_202|1_135 0
@@ -237,13 +237,14 @@
MunekadoLockLimit 5
ChaosDemonCfg [[(31801001,10)],[(31801004,10)],[(31803001,1)]] [101,102,103,104,105]
ChaosDemonReward {} 5_100|4_90|3_80|2_70|1_60 0*reExp {5:[(2406,1,1),(1141,1,1)],4:[(2407,1,1),(1140,1,1)],3:[(2408,1,1),(1139,1,1)],2:[(2409,1,1),(1138,1,1)],1:[(2410,1,1),(1137,1,1)]}
-ElderBattlefieldCfg {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200} 300 {0:[12,8,20],1:[20,5,20],2:[20,5,20]} [200,600,1200,2000,3200,4800]
+ElderBattlefieldCfg {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200} 300 {0:[12,8,20],1:[20,5,20],2:[20,5,20]} [200,600,1200,2000,3200,4800] 15
ElderBattlefieldPoint 500 500
ElderBattlefieldSys ['AncientBattlefield_2','AncientBattlefield_3','AncientBattlefield_4','AncientBattlefield_5','AncientBattlefield_6'] 20 10
ElderBattlefieldExp {1:'1700*reExp',2:'1800*reExp',3:'1900*reExp',4:'2000*reExp',5:'2200*reExp',6:'2400*reExp'}
ElderBattlefieldRobot 20 {0:31604001,1:31604001,2:31604001} 23100 10 [111,112,113,114,115,116,117,118]
ElderBattlefieldTopAward [[2214,1,1]]
ElderBattlefieldBuff [23001,23002,23003,23004] 31609001 [102,105,106,107,108] 3
+FBRobotCfg {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}}
CornerPresentedMoney 0 1
CreateRoleMap {1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}
SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:10, 10060:10,10070:10,10080:10,10090:10} 350
--
Gitblit v1.8.0