From 30fcf6adeb9ed6add266bc416b5e595a0ee7ae4a Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 06 十二月 2018 09:59:40 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc | 0
db/PyMongoDataServer/PySysDB/tagStore.txt | 12 ++++++------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 44 ++++++++++++++++++++++----------------------
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc
index b0c49d8..cdca011 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 9106b32..6b93813 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -24,28 +24,28 @@
RuneUnlock 0|204|304|404|504|604|704|804 8_100 8_120 9 0
RuneDoubleInlayCnt 101_1|908_2|1008_3|1108_4|1208_5|1308_6|1408_7|1508_8|1608_9
RunePackageNum 200 0 0 0 0
-RuneAttr7 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) 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 0 0
-RuneAttr6 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) 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 0 0
-RuneAttr44 1300+level*200 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 0 0
-RuneAttr45 1300+level*200 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 0 0
-RuneAttr46 1000+level*100 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1 0 0
-RuneAttr35 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*0.7/5)*5 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 0 0
-RuneAttr36 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*0.7/3/5)*5 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 0 0
-RuneAttr63 1500+level*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 0 0
-RuneAttr64 (1500+level*500)*1.3 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 0 0
-RuneAttr65 1500+level*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 0 0
-RuneAttr66 1500+level*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 0 0
-RuneAttr11 1000+level*50 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1 0 0
-RuneAttr42 level*600 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 0 0
-RuneAttr41 level*400 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 0 0
-RuneAttr27 (150+level*50)/2 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 0 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 0 0
-RuneAttr26 150+level*50 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 0 0
-RuneAttr15 500+level*20 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1 0 0
-RuneAttr14 160+level*40 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1 0 0
-RuneAttr17 200+level*50 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1 0 0
-RuneAttr28 160+level*40 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1 0 0
-RuneAttr29 150+level*30 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1 0 0
+RuneAttr7 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) 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr6 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) 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr44 1300+level*200 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr45 1300+level*200 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr46 1000+level*100 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr35 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*0.7/5)*5 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr36 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*0.7/3/5)*5 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr63 1500+level*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr64 (1500+level*500)*1.3 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr65 1500+level*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr66 1500+level*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr11 1000+level*50 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr42 level*600 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr41 level*400 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr27 (150+level*50)/2 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 1_1|2_2|3_3|4_4|5_5 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 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr26 150+level*50 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1.5 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr15 500+level*20 1_0.3|2_0.45|3_0.6|4_0.75|5_1 1 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr14 160+level*40 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr17 200+level*50 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr28 160+level*40 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1 1_1|2_2|3_3|4_4|5_5 0
+RuneAttr29 150+level*30 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1 1_1|2_2|3_3|4_4|5_5 0
RuneExp int(4000000*(0.02*((level-1)/49.0)+0.08*pow(((level-1)/49.0),2)+0.2*pow(((level-1)/49.0),3)+0.3*pow(((level-1)/49.0),4)+0.4*pow(((level-1)/49.0),5)))-int(4000000*(0.02*((max((level-2),0))/49.0)+0.08*pow(((max((level-2),0))/49.0),2)+0.2*pow(((max((level-2),0))/49.0),3)+0.3*pow(((max((level-2),0))/49.0),4)+0.4*pow(((max((level-2),0))/49.0),5))) 1_0.5|2_0.7|3_0.8|4_0.9|5_1 1.6 1_100|2_300|3_3000|4_15000|5_30000 0
RuneMaxLV 1_10|2_20|3_30|4_40|5_50 0 0 0 0
RuneAwardCntRate {(101,1608):[(6000,2),(8000,3),(10000,4)],(1701,3208):[(6000,2),(8000,3),(10000,4)]} {(101,1608):[(6000,0),(9000,1),(10000,2)],(1701,3208):[(6000,0),(9000,1),(10000,2)]} 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 2bf98aa..87050e2 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -13,9 +13,9 @@
13 1 0 4741 1 1 [] 0 7 1 125 1 0 1 30 0 0
14 1 0 2389 1 1 [] 0 7 0 260 2 0 1 100 0 0
15 1 0 1129 1 1 [] 0 7 3 110 3 0 1 99 0 0
-16 1 0 2413 1 1 [] 0 7 0 110 2 0 1 90 0 0
-17 1 0 2414 1 1 [] 0 7 0 250 2 0 1 150 0 0
-18 1 0 2415 1 1 [] 0 7 0 320 2 0 1 200 0 0
+16 1 0 2413 1 1 [] 0 7 0 110 2 0 1 60 0 0
+17 1 0 2414 1 1 [] 0 7 0 250 2 0 1 70 0 0
+18 1 0 2415 1 1 [] 0 7 0 320 2 0 1 175 0 0
51 2 0 3796 1 0 [] 0 0 0 0 0 0 1 280 0 0
52 2 0 3797 1 0 [] 0 0 0 0 0 0 1 280 0 0
53 2 0 4101 1 0 [] 0 0 0 0 0 0 1 380 0 0
@@ -49,9 +49,9 @@
114 3 0 4219 1 1 [] 0 0 0 122 1 0 1 258 0 0
115 3 0 261 1 1 [] 0 0 0 132 1 0 1 258 0 0
116 3 0 5412 1 0 [] 0 0 0 180 0 0 1 5 0 0
-117 3 0 101 1 0 [] 0 0 0 0 0 0 1 10 0 0
-118 3 0 104 1 0 [] 0 0 0 0 0 0 1 15 0 0
-119 3 0 110 1 0 [] 0 0 0 0 0 0 1 25 0 0
+117 3 0 101 1 0 [] 0 0 0 0 0 0 1 2 0 0
+118 3 0 104 1 0 [] 0 0 0 0 0 0 1 5 0 0
+119 3 0 110 1 0 [] 0 0 0 0 0 0 1 10 0 0
151 4 0 181 1 1 [] 0 0 0 0 0 0 2 10 0 0
152 4 0 952 1 1 [] 0 0 0 0 0 0 2 25 0 0
153 4 0 4101 1 1 [] 0 0 0 0 0 0 2 688 0 0
--
Gitblit v1.8.0