From a60069cdfa821d675137138c016e761d32ae4ac2 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期六, 22 十二月 2018 11:16:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc | 0
5 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
index 2acef0e..056d205 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
@@ -14,7 +14,7 @@
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 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
+16 0 0 1 1 1 2 3 3 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 0 0 0 0 0 0 0 0 0 0 0 0
19 0 0 1 1 3 3 5 5 7 7 9 11 11 13 13 15
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc
index c376ae0..654190a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index e0cece2..1f034a0 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -189,7 +189,7 @@
2402 0 [[1600,[10853,1]],[3200,[10854,1]],[4800,[10855,1]],[6400,[10856,1]],[8000,[10857,1]],[8400,[10873,1]],[8800,[10874,1]],[9200,[10875,1]],[9600,[10876,1]],[10000,[10877,1]]] 1 [[10853,20853,30853],[10854,20854,30854],[10855,20855,30855],[10856,20856,30856],[10857,20857,30857],[10873,20873,30873],[10874,20874,30874],[10875,20875,30875],[10876,20876,30876],[10877,20877,30877]] [10853,20853,30853,10854,20854,30854,10855,20855,30855,10856,20856,30856,10857,20857,30857,10873,20873,30873,10874,20874,30874,10875,20875,30875,10876,20876,30876,10877,20877,30877]
2403 0 [[1600,[10953,1]],[3200,[10954,1]],[4800,[10955,1]],[6400,[10956,1]],[8000,[10957,1]],[8400,[10973,1]],[8800,[10974,1]],[9200,[10975,1]],[9600,[10976,1]],[10000,[10977,1]]] 1 [[10953,20953,30953],[10954,20954,30954],[10955,20955,30955],[10956,20956,30956],[10957,20957,30957],[10973,20973,30973],[10974,20974,30974],[10975,20975,30975],[10976,20976,30976],[10977,20977,30977]] [10953,20953,30953,10954,20954,30954,10955,20955,30955,10956,20956,30956,10957,20957,30957,10973,20973,30973,10974,20974,30974,10975,20975,30975,10976,20976,30976,10977,20977,30977]
2404 [[5000,[5410,1]],[7500,[5410,2]],[10000,[5411,1]]] 1 [5411]
-2405 [[1800,[5410,2]],[3000,[5410,3]],[9000,[5411,1]],[10000,[5411,2]]] 1 [5411]
+2405 [[5000,[5410,2]],[7500,[5410,3]],[9500,[5411,1]],[10000,[5411,2]]] 1 [5411]
2406 4611_6|4612_6|4613_6|4614_6|4615_6 [[10000,[4622,1]]] 1 [4622]
2407 4611_6|4612_6|4613_6|4614_6|4615_6 [[10000,[4622,1]]] [[5000,0],[10000,1]] [4622]
2408 4611_6|4612_6|4613_6|4614_6|4615_6 [[10000,[4622,1]]] [[7000,0],[10000,1]] [4622]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index b3c99ec..fe28362 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -325,5 +325,5 @@
CrossRealmPKFB [30, 3, 60,30,10] [[15,20,20,15,0], [33,25,25,33,0]] 2
GatherSoulHole 0_300|1_300|2_305|3_310|4_315|5_320|6_330 0_62|1_62|2_62|3_62|4_62|5_62|6_63
GatherSoulMaxLevel 1_50|2_50|3_50|4_50|5_50
-GatherSoulLevelUp 2960210*(0+0.3*((level-1)/49.0)+0.35*pow((level-1)/49.0,2)+0.25*pow((level-1)/49.0,3)+0.1*pow((level-1)/49.0,4)) 1_0.5|2_0.65|3_0.8|4_0.9|5_1 1_1|2_1.8|3_2.7|4_3.6 1_100|2_200|3_300|4_400|5_500 0_1|1_1.2
+GatherSoulLevelUp 2960210*(0+0.3*((level-1)/49.0)+0.35*pow((level-1)/49.0,2)+0.25*pow((level-1)/49.0,3)+0.1*pow((level-1)/49.0,4)) {"62":{"1":0.5,"2":0.65,"3":0.8,"4":0.9,"5":1},"63":{"1":0.5,"2":0.7,"3":0.8,"4":0.9,"5":1}} 1_1|2_1.8|3_2.7|4_3.6 1_100|2_200|3_300|4_400|5_500 0_1|1_1.2
GatherSoulPackCount 150
diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
index 2acef0e..056d205 100644
--- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
@@ -14,7 +14,7 @@
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 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
+16 0 0 1 1 1 2 3 3 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 0 0 0 0 0 0 0 0 0 0 0 0
19 0 0 1 1 3 3 5 5 7 7 9 11 11 13 13 15
--
Gitblit v1.8.0