From c619d87ac65024d5b186c446aac47c40230a1fa4 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期四, 06 十二月 2018 10:25:23 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagCTG.txt | 8 ++++---- db/PyMongoDataServer/PySysDB/tagStore.txt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/db/PyMongoDataServer/PySysDB/tagCTG.txt b/db/PyMongoDataServer/PySysDB/tagCTG.txt index e68b64f..bb96a29 100644 --- a/db/PyMongoDataServer/PySysDB/tagCTG.txt +++ b/db/PyMongoDataServer/PySysDB/tagCTG.txt @@ -10,8 +10,8 @@ 109 0 30000 5888 0 [] 110 0 10 1 0 [] 111 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]] Bargaingift1 -112 1 0 0 0 [[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]] Bargaingift2 -113 1 0 0 0 [[255,1,1],[196,1,1],[181,80,1],[913,1,1]] Bargaingift3 +112 1 0 0 0 [[4208,1,1],[4151,25,1],[5,1,1],[913,1,1]] Bargaingift2 +113 1 0 0 0 [[255,1,1],[196,1,1],[181,50,1],[913,1,1]] Bargaingift3 2 0 60 6 0 [] 201 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]] 202 0 60 6 0 [] @@ -25,5 +25,5 @@ 210 0 1 0 0 [] 211 0 1 0 0 [] 212 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]] Bargaingift1 -213 1 0 0 0 [[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]] Bargaingift2 -214 1 0 0 0 [[255,1,1],[196,1,1],[181,80,1],[913,1,1]] Bargaingift3 +213 1 0 0 0 [[4208,1,1],[4151,25,1],[5,1,1],[913,1,1]] Bargaingift2 +214 1 0 0 0 [[255,1,1],[196,1,1],[181,50,1],[913,1,1]] Bargaingift3 diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt index 87050e2..7635f6a 100644 --- a/db/PyMongoDataServer/PySysDB/tagStore.txt +++ b/db/PyMongoDataServer/PySysDB/tagStore.txt @@ -258,8 +258,8 @@ 1056 16 0 3513 1 1 [[3503,1,1]] 4681 0 0 58 1 0 1 18 180 86400 1057 16 0 4151 20 1 [] 4151 0 0 65 1 0 1 18 200 86400 1058 16 0 181 20 1 [] 181 0 0 80 1 0 1 18 200 86400 -1059 16 0 101 20 1 [] 101 0 0 110 1 0 1 28 200 86400 -1060 16 0 4334 1 1 [] 4334 0 0 115 1 0 1 18 100 86400 +1059 16 0 101 50 1 [] 101 0 0 110 1 0 1 18 100 86400 +1060 16 0 4304 20 1 [] 4304 0 0 115 1 0 1 18 100 86400 1061 16 0 142 100 1 [[29,5000000,1]] 142 0 0 155 1 0 1 18 175 86400 1062 16 0 5303 200 1 [[5412,5,1]] 5303 0 0 180 1 0 1 28 225 86400 1063 16 0 2205 1 1 [] 2205 0 0 200 1 0 1 18 200 86400 -- Gitblit v1.8.0