From 011d721d97ce3ca1a78e8a21dcdf12e8d1e3dbb6 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期三, 19 十二月 2018 15:13:21 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt | 2 db/PyMongoDataServer/PySysDB/tagGatherSoul.txt | 225 ++++++++++++++++++--------------------------- CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt | 2 db/PyMongoDataServer/PySysDB/tagGatherSoulAttr.txt | 33 +++--- 4 files changed, 108 insertions(+), 154 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt index 4fbe501..7fe1122 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt @@ -13,7 +13,7 @@ 12 0 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 13 3 4 5 6 10 11 12 15 16 17 20 20 22 24 26 28 14 2 3 4 5 8 9 10 13 14 15 20 16 18 20 22 24 -15 0 0 0 2 3 4 4 5 6 7 8 9 10 11 12 12 +15 1 1 1 2 3 4 4 5 6 7 8 9 10 11 12 12 16 0 0 1 1 1 2 2 2 3 3 3 5 6 6 6 6 17 1 1 2 2 3 3 4 4 4 4 4 4 4 4 4 4 18 0 0 0 0 1 1 2 2 2 2 2 2 2 2 2 2 diff --git a/db/PyMongoDataServer/PySysDB/tagGatherSoul.txt b/db/PyMongoDataServer/PySysDB/tagGatherSoul.txt index c86ae0c..c3de01d 100644 --- a/db/PyMongoDataServer/PySysDB/tagGatherSoul.txt +++ b/db/PyMongoDataServer/PySysDB/tagGatherSoul.txt @@ -1,139 +1,94 @@ ID AttrType soulStage -7201 7 0 -7202 7 0 -7203 7 0 -7204 7 0 -7205 7 0 -7206 6 0 -7207 6 0 -7208 6 0 -7209 6 0 -7210 6 0 -7211 46 0 -7212 46 0 -7213 46 0 -7214 46 0 -7215 46 0 -7216 63 0 -7217 63 0 -7218 63 0 -7219 63 0 -7220 63 0 -7221 64 0 -7222 64 0 -7223 64 0 -7224 64 0 -7225 64 0 -7226 65 0 -7227 65 0 -7228 65 0 -7229 65 0 -7230 65 0 -7231 66 0 -7232 66 0 -7233 66 0 -7234 66 0 -7235 66 0 -7236 42 0 -7237 42 0 -7238 42 0 -7239 42 0 -7240 42 0 -7241 41 0 -7242 41 0 -7243 41 0 -7244 41 0 -7245 41 0 -7246 27 0 -7247 27 0 -7248 27 0 -7249 27 0 -7250 27 0 -7251 8 0 -7252 8 0 -7253 8 0 -7254 8 0 -7255 8 0 -7256 26 0 -7257 26 0 -7258 26 0 -7259 26 0 -7260 26 0 -7261 26|46 0 -7262 26|46 0 -7263 26|46 0 -7264 26|46 0 -7265 26|46 0 -7266 8|66 0 -7267 8|66 0 -7268 8|66 0 -7269 8|66 0 -7270 8|66 0 -7271 7|41 0 -7272 7|41 0 -7273 7|41 0 -7274 7|41 0 -7275 7|41 0 -7276 6|42 0 -7277 6|42 0 -7278 6|42 0 -7279 6|42 0 -7280 6|42 0 -7281 64|65 0 -7282 64|65 0 -7283 64|65 0 -7284 64|65 0 -7285 64|65 0 -7286 11 0 -7287 11 0 -7288 11 0 -7289 11 0 -7290 11 0 -7291 11|15 0 -7292 11|15 0 -7293 11|15 0 -7294 11|15 0 -7295 11|15 0 -7296 14 0 -7297 14 0 -7298 14 0 -7299 14 0 -7300 14 0 -7301 17 0 -7302 17 0 -7303 17 0 -7304 17 0 -7305 17 0 -7306 28 0 -7307 28 0 -7308 28 0 -7309 28 0 -7310 28 0 -7311 29 0 -7312 29 0 -7313 29 0 -7314 29 0 -7315 29 0 -7316 27|14 0 -7317 27|14 0 -7318 27|14 0 -7319 27|14 0 -7320 27|14 0 -7321 64|17 0 -7322 64|17 0 -7323 64|17 0 -7324 64|17 0 -7325 64|17 0 -7326 63|28 0 -7327 63|28 0 -7328 63|28 0 -7329 63|28 0 -7330 63|28 0 -7331 65|29 0 -7332 65|29 0 -7333 65|29 0 -7334 65|29 0 -7335 65|29 0 +7201 6 0 +7202 6 0 +7203 6 0 +7204 6 0 +7205 6 0 +7206 7 0 +7207 7 0 +7208 7 0 +7209 7 0 +7210 7 0 +7211 8 0 +7212 8 0 +7213 8 0 +7214 8 0 +7215 8 0 +7216 46 0 +7217 46 0 +7218 46 0 +7219 46 0 +7220 46 0 +7221 42 0 +7222 42 0 +7223 42 0 +7224 42 0 +7225 42 0 +7226 41 0 +7227 41 0 +7228 41 0 +7229 41 0 +7230 41 0 +7231 43 0 +7232 43 0 +7233 43 0 +7234 43 0 +7235 43 0 +7236 26 0 +7237 26 0 +7238 26 0 +7239 26 0 +7240 26 0 +7241 27 0 +7242 27 0 +7243 27 0 +7244 27 0 +7245 27 0 +7246 35 0 +7247 35 0 +7248 35 0 +7249 35 0 +7250 35 0 +7251 36 0 +7252 36 0 +7253 36 0 +7254 36 0 +7255 36 0 +7256 32 0 +7257 32 0 +7258 32 0 +7259 32 0 +7260 32 0 +7261 6|42 0 +7262 6|42 0 +7263 6|42 0 +7264 6|42 0 +7265 6|42 0 +7266 7|41 0 +7267 7|41 0 +7268 7|41 0 +7269 7|41 0 +7270 7|41 0 +7271 8|43 0 +7272 8|43 0 +7273 8|43 0 +7274 8|43 0 +7275 8|43 0 +7276 46|32 0 +7277 46|32 0 +7278 46|32 0 +7279 46|32 0 +7280 46|32 0 +7281 35|36 0 +7282 35|36 0 +7283 35|36 0 +7284 35|36 0 +7285 35|36 0 +7286 26|27 0 +7287 26|27 0 +7288 26|27 0 +7289 26|27 0 +7290 26|27 0 7106 2 0 7107 2 0 7108 2 0 diff --git a/db/PyMongoDataServer/PySysDB/tagGatherSoulAttr.txt b/db/PyMongoDataServer/PySysDB/tagGatherSoulAttr.txt index efb41ec..a9beff2 100644 --- a/db/PyMongoDataServer/PySysDB/tagGatherSoulAttr.txt +++ b/db/PyMongoDataServer/PySysDB/tagGatherSoulAttr.txt @@ -1,18 +1,17 @@ AttrType AttrInfo1 AttrInfo2 AttrInfo3 AttrInfo4 AttrInfo5 -7 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 2_1.5|3_1.6|4_1.7 5_725|4_238|3_25|2_15|1_10 0_1.5|1_1.6 -6 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 2_1.5|3_1.6|4_1.8 5_14459|4_4722|3_480|2_288|1_192 0_1.5|1_1.7 -46 (level-1)*100 1_0.3|2_0.45|3_0.6|4_0.75|5_1 2_1.5|3_1.6|4_1.9 5_1200|4_600|3_300|2_180|1_120 0_1.5|1_1.8 -63 (level-1)*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_2800|4_1400|3_700|2_420|1_280 0_1.5|1_1.9 -64 (level-1)*500*1.3 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_3520|4_1760|3_880|2_528|1_352 0_1.5|1_1.10 -65 (level-1)*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_2080|4_1040|3_520|2_312|1_208 0_1.5|1_1.11 -66 (level-1)*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_2280|4_1140|3_570|2_342|1_228 0_1.5|1_1.12 -42 (level-1)*600 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_1480|4_740|3_370|2_222|1_148 0_1.5|1_1.13 -41 (level-1)*400 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_880|4_440|3_220|2_132|1_88 0_1.5|1_1.14 -27 (level-1)*25 1_0.3|2_0.45|3_0.6|4_0.75|5_1 2_1.5|3_1.6|4_1.9 5_964|4_482|3_241|2_145|1_96 0_1.5|1_1.15 -8 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 2_1.5|3_1.6|4_1.9 5_623|4_270|3_104|2_63|1_42 0_1.5|1_1.16 -26 (level-1)*50 1_0.3|2_0.45|3_0.6|4_0.75|5_1 2_1.5|3_1.6|4_1.9 5_1348|4_674|3_337|2_202|1_135 0_1.5|1_1.17 -11 (level-1)*20 1_0.3|2_0.45|3_0.6|4_0.75|5_1 2_1.5|3_1.6|4_1.9 5_520|4_260|3_130|2_78|1_52 0_1.5|1_1.18 -14 (level-1)*40 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_640|4_320|3_160|2_96|1_64 0_1.5|1_1.19 -17 (level-1)*50 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_440|4_220|3_110|2_66|1_44 0_1.5|1_1.20 -28 (level-1)*40 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_240|4_120|3_60|2_36|1_24 0_1.5|1_1.21 -29 (level-1)*30 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_280|4_140|3_70|2_42|1_28 0_1.5|1_1.22 +6 (level-1)*100 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.7 5_725|4_238|3_25|2_15|1_10 0_1.5|1_1.6 +7 (level-1)*100 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.8 5_14459|4_4722|3_480|2_288|1_192 0_1.5|1_1.7 +8 (level-1)*100 1_0.3|2_0.45|3_0.6|4_0.75|5_1 2_1.5|3_1.6|4_1.9 5_1200|4_600|3_300|2_180|1_120 0_1.5|1_1.8 +46 (level-1)*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_2800|4_1400|3_700|2_420|1_280 0_1.5|1_1.9 +42 (level-1)*500*1.3 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_3520|4_1760|3_880|2_528|1_352 0_1.5|1_1.10 +41 (level-1)*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_2080|4_1040|3_520|2_312|1_208 0_1.5|1_1.11 +43 (level-1)*500 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_2280|4_1140|3_570|2_342|1_228 0_1.5|1_1.12 +26 (level-1)*600 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_1480|4_740|3_370|2_222|1_148 0_1.5|1_1.13 +27 (level-1)*400 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_880|4_440|3_220|2_132|1_88 0_1.5|1_1.14 +35 (level-1)*25 1_0.3|2_0.45|3_0.6|4_0.75|5_1 2_1.5|3_1.6|4_1.9 5_964|4_482|3_241|2_145|1_96 0_1.5|1_1.15 +36 (level-1)*100 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_623|4_270|3_104|2_63|1_42 0_1.5|1_1.16 +32 (level-1)*50 1_0.3|2_0.45|3_0.6|4_0.75|5_1 2_1.5|3_1.6|4_1.9 5_1348|4_674|3_337|2_202|1_135 0_1.5|1_1.17 +2 (level-1)*20 1_0.3|2_0.45|3_0.6|4_0.75|5_1 2_1.5|3_1.6|4_1.9 5_520|4_260|3_130|2_78|1_52 0_1.5|1_1.18 +3 (level-1)*40 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_640|4_320|3_160|2_96|1_64 0_1.5|1_1.19 +4 (level-1)*50 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_440|4_220|3_110|2_66|1_44 0_1.5|1_1.20 +5 (level-1)*40 1_0.2|2_0.3|3_0.5|4_0.7|5_1 2_1.5|3_1.6|4_1.9 5_240|4_120|3_60|2_36|1_24 0_1.5|1_1.21 diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt index 4fbe501..7fe1122 100644 --- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt +++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt @@ -13,7 +13,7 @@ 12 0 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 13 3 4 5 6 10 11 12 15 16 17 20 20 22 24 26 28 14 2 3 4 5 8 9 10 13 14 15 20 16 18 20 22 24 -15 0 0 0 2 3 4 4 5 6 7 8 9 10 11 12 12 +15 1 1 1 2 3 4 4 5 6 7 8 9 10 11 12 12 16 0 0 1 1 1 2 2 2 3 3 3 5 6 6 6 6 17 1 1 2 2 3 3 4 4 4 4 4 4 4 4 4 4 18 0 0 0 0 1 1 2 2 2 2 2 2 2 2 2 2 -- Gitblit v1.8.0