From b365f3a53e63f9ff275c87c730b273ae56d6d40a Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期五, 09 十一月 2018 14:17:18 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt | 10 +++++----- db/PyMongoDataServer/PySysDB/tagCTG.txt | 28 ++++++++++++++-------------- db/PyMongoDataServer/PySysDB/tagStore.txt | 1 + db/PyMongoDataServer/PySysDB/tagFBLine.txt | 14 +++++++------- CoreServerGroup/GameServer/PySysDB/tagStore.txt | 1 + 5 files changed, 28 insertions(+), 26 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt index de6c012..45f5312 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt @@ -12,6 +12,7 @@ 12 1 7 0 13 1 7 0 14 1 7 0 +15 1 7 0 51 2 0 0 52 2 0 0 53 2 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagCTG.txt b/db/PyMongoDataServer/PySysDB/tagCTG.txt index cf2e6b3..9df8e72 100644 --- a/db/PyMongoDataServer/PySysDB/tagCTG.txt +++ b/db/PyMongoDataServer/PySysDB/tagCTG.txt @@ -1,23 +1,23 @@ RecordID DailyBuyCount GainGold GainGoldPaper FirstGoldPaperPrize GainItemList 101 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]] -102 0 100 0 100 [] -103 0 300 0 300 [] -104 0 980 60 980 [] -105 0 1280 108 1280 [] -106 0 1980 198 1980 [] -107 0 3280 388 3280 [] -108 0 6480 888 6480 [] +102 0 100 10 100 [] +103 0 300 30 300 [] +104 0 980 100 980 [] +105 0 1280 138 1280 [] +106 0 1980 248 1980 [] +107 0 3280 468 3280 [] +108 0 6480 1088 6480 [] 109 0 30000 5888 30000 [] 110 0 10 1 0 [] 2 0 60 0 0 [] 201 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]] -202 0 60 0 60 [] -203 0 300 0 300 [] -204 0 980 60 980 [] -205 0 1280 108 1280 [] -206 0 1980 198 1980 [] -207 0 3280 388 3280 [] -208 0 6480 888 6480 [] +202 0 60 6 60 [] +203 0 300 30 300 [] +204 0 980 100 980 [] +205 0 1280 138 1280 [] +206 0 1980 248 1980 [] +207 0 3280 468 3280 [] +208 0 6480 1088 6480 [] 209 0 30000 5888 30000 [] 210 0 1 0 0 [] 211 0 1 0 0 [] diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt index f8772ae..14e1da1 100644 --- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt +++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt @@ -35,16 +35,16 @@ 41110 23 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,3,300,10] [[101,31103010,1,1,1,1,0]] 41110 24 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,3,300,10] [[101,31103011,1,1,1,1,0]] 31080 0 31080 82 500 0 0 0 0 0 0 0 [20,18] [10,180,10] -31140 0 31140 180 500 0 0 0 0 330 956 1 [16,14] [5,300,30,10] [[101,31401001,42,12],[102,31403001,7,2]] +31140 0 31140 180 500 0 0 0 0 330 0 0 [16,14] [5,300,30,10] [[101,31401001,42,12],[102,31403001,7,2]] 31150 0 31150 0 0 0 4007 1|2|2|3|3|4 80 0 0 0 [132,45] [30,12] 31170 0 31170 110 0 0 0 0 0 0 0 0 [76,15] [(26,33000,33000)] 31180 0 31180 110 500 0 0 0 0 0 0 0 [112,24] [10,600,15, [340,260,200,150]] -31190 0 31190 60 500 0 0 0 0 250 956 1 [24,3] [5,480,10,5,15] [[(101,30201000,2),(102,30201010,1),(105,30201020,1),(103,30201000,2)], [(104,30203000,1)]] [(4151,2,2),(1143,1,1)] -31190 1 31190 100 500 0 0 0 0 250 956 1 [24,3] [5,480,10,5,15] [[(101,30201001,2),(102,30201011,1),(105,30201021,1),(103,30201001,2)], [(104,30203001,1)]] [(4151,3,4),(1142,1,1)] -31190 2 31190 140 500 0 0 0 0 250 956 1 [24,3] [5,480,10,5,15] [[(101,30201002,2),(102,30201012,1),(105,30201022,1),(103,30201002,2)], [(104,30203002,1)]] [(4151,5,6),(1142,1,1)] -31190 3 31190 200 500 0 0 0 0 250 956 1 [24,3] [5,480,10,5,15] [[(101,30201003,2),(102,30201013,1),(105,30201023,1),(103,30201003,2)], [(104,30203003,1)]] [(4151,7,8),(1142,1,1)] -31190 4 31190 250 500 0 0 0 0 250 956 1 [24,3] [5,480,10,5,15] [[(101,30201004,2),(102,30201014,1),(105,30201024,1),(103,30201004,2)], [(104,30203004,1)]] [(4151,9,10),(1142,1,1)] -31190 5 31190 300 500 0 0 0 0 250 956 1 [24,3] [5,480,10,5,15] [[(101,30201005,2),(102,30201015,1),(105,30201025,1),(103,30201005,2)], [(104,30203005,1)]] [(4151,12,13),(1142,1,1)] +31190 0 31190 60 500 0 0 0 0 250 0 0 [24,3] [5,480,10,5,15] [[(101,30201000,2),(102,30201010,1),(105,30201020,1),(103,30201000,2)], [(104,30203000,1)]] [(4151,2,2),(1143,1,1)] +31190 1 31190 100 500 0 0 0 0 250 0 0 [24,3] [5,480,10,5,15] [[(101,30201001,2),(102,30201011,1),(105,30201021,1),(103,30201001,2)], [(104,30203001,1)]] [(4151,3,4),(1142,1,1)] +31190 2 31190 140 500 0 0 0 0 250 0 0 [24,3] [5,480,10,5,15] [[(101,30201002,2),(102,30201012,1),(105,30201022,1),(103,30201002,2)], [(104,30203002,1)]] [(4151,5,6),(1142,1,1)] +31190 3 31190 200 500 0 0 0 0 250 0 0 [24,3] [5,480,10,5,15] [[(101,30201003,2),(102,30201013,1),(105,30201023,1),(103,30201003,2)], [(104,30203003,1)]] [(4151,7,8),(1142,1,1)] +31190 4 31190 250 500 0 0 0 0 250 0 0 [24,3] [5,480,10,5,15] [[(101,30201004,2),(102,30201014,1),(105,30201024,1),(103,30201004,2)], [(104,30203004,1)]] [(4151,9,10),(1142,1,1)] +31190 5 31190 300 500 0 0 0 0 250 0 0 [24,3] [5,480,10,5,15] [[(101,30201005,2),(102,30201015,1),(105,30201025,1),(103,30201005,2)], [(104,30203005,1)]] [(4151,12,13),(1142,1,1)] 31220 0 31220 110 0 0 0 0 0 0 0 0 [12,23] 31230 0 31230 0 0 0 0 0 0 0 0 0 [12,6] [900,[30,20,10,9,8,7,6,5,4,3,2,1]] 31240 0 31240 0 0 0 4010 2 80 0 0 0 [32,16] [5,1800,15,101] diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt index c64fa36..90d7fe5 100644 --- a/db/PyMongoDataServer/PySysDB/tagStore.txt +++ b/db/PyMongoDataServer/PySysDB/tagStore.txt @@ -12,6 +12,7 @@ 12 1 0 2325 1 1 [] 0 7 0 110 1 0 2 0 0 0 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 1 0 1 150 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 diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt index 11a2f4c..d254a2f 100644 --- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt +++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt @@ -6,27 +6,27 @@ 5 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 6 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 7 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 -8 0 0 0 0 0 0 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 +8 0 0 0 0 0 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 9 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -11 0 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 +11 0 0 0 0 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 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 1 2 3 3 4 4 4 4 9 10 11 12 12 -16 0 0 1 1 2 2 3 3 4 4 5 5 6 6 6 6 +16 0 0 1 1 1 2 2 2 3 3 4 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 19 0 0 1 1 3 3 5 5 7 7 9 11 11 13 13 15 20 0 0 0 0 1 1 1 2 2 2 2 3 3 3 3 3 -21 1 1 1 2 2 3 3 3 3 3 3 3 3 3 3 3 +21 1 1 1 1 2 2 3 3 3 3 3 3 3 3 3 3 22 0 0 0 0 0 1 1 1 1 1 2 2 2 2 2 2 23 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 24 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 25 2 3 4 5 6 7 8 10 12 14 16 18 20 22 24 25 26 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 27 0 0 1 2 2 3 3 4 4 4 4 5 5 5 5 5 -28 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +28 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 29 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 30 0 1 1 2 2 3 5 7 10 12 15 15 15 15 15 15 31 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -- Gitblit v1.8.0