From 532f2c72e9d7d0765056d1e17f7c91a5378917fe Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期四, 08 十一月 2018 15:41:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 61 +++++++++++++++---------------
1 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 9552825..f8772ae 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -2,39 +2,40 @@
31010 0 31010 110 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
31020 0 31020 0 0 0 0 0 0 0 0 0 [49,71] 12
31020 1 31030 0 0 0 0 0 0 0 0 0 [55,14] 12
+31020 2 31330 0 0 0 0 0 0 0 0 0 [55,14] 12
31040 0 31040 0 0 0 0 0 0 0 0 0 [59,19] [1,5,300,10] [[201,30102001,5,15,500,0,0],[202,30102002,4,8,100,0,0],[203,30102003,1,2,100,0,0]]
31040 1 31040 0 0 0 0 0 0 0 0 0 [60,54] [0,5,300,10] [[210,30102004,1,1,1,1,0]]
31040 2 31040 0 0 0 0 0 0 0 0 0 [60,54] [0,5,300,10] [[210,30102005,1,1,1,1,0]]
31040 3 31040 0 0 0 0 0 0 0 0 0 [60,54] [0,5,300,10] [[210,30102008,1,1,1,1,0], [204,30102007,10,10,10,10,0]]
31040 4 31040 0 0 0 0 0 0 0 0 0 [60,54] [0,5,300,10] [[204,30102009,3,9,100,9,3], [205,30102010,3,9,100,9,3], [206,30102011,2,4,10,9,3]]
31040 5 31040 0 0 0 0 0 0 0 0 0 [18,44] [0,5,300,10] [[207,30102012,3,50,500,20,4]]
-41110 0 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,5,300,10] [[101,30902001,1,1,1,1,0]]
-41110 1 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,5,300,10] [[101,31103001,1,1,1,1,0]]
-41110 2 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,5,300,10] [[101,31103002,1,1,1,1,0]]
-41110 3 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,5,300,10] [[101,31103003,1,1,1,1,0]]
-41110 4 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,5,300,10] [[101,31103004,1,1,1,1,0]]
-41110 5 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,5,300,10] [[101,31103005,1,1,1,1,0]]
-41110 6 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,5,300,10] [[101,31103006,1,1,1,1,0]]
-41110 7 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,5,300,10] [[101,31103007,1,1,1,1,0]]
-41110 8 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,5,300,10] [[101,31103008,1,1,1,1,0]]
-41110 9 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203001,1,1,1,1,0]]
-41110 10 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203002,1,1,1,1,0]]
-41110 11 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203003,1,1,1,1,0]]
-41110 12 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203004,1,1,1,1,0]]
-41110 13 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203005,1,1,1,1,0]]
-41110 14 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203006,1,1,1,1,0]]
-41110 15 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203007,1,1,1,1,0]]
-41110 16 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203008,1,1,1,1,0]]
-41110 17 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203009,1,1,1,1,0]]
-41110 18 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203010,1,1,1,1,0]]
-41110 19 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203011,1,1,1,1,0]]
-41110 20 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203012,1,1,1,1,1]]
-41110 21 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203013,1,1,1,1,1]]
-41110 22 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203014,1,1,1,1,1]]
-41110 23 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,5,300,10] [[101,31103010,1,1,1,1,0]]
-41110 24 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,5,300,10] [[101,31103011,1,1,1,1,0]]
-31080 0 31080 82 500 0 4001 1 30 0 0 0 [20,18] [10,180,10]
-31140 0 31140 180 500 0 4004 1 20 330 956 1 [16,14] [5,300,30,10] [[101,31401001,42,12],[102,31403001,7,2]]
+41110 0 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,3,300,10] [[101,30902001,1,1,1,1,0]]
+41110 1 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,3,300,10] [[101,31103001,1,1,1,1,0]]
+41110 2 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,3,300,10] [[101,31103002,1,1,1,1,0]]
+41110 3 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,3,300,10] [[101,31103003,1,1,1,1,0]]
+41110 4 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,3,300,10] [[101,31103004,1,1,1,1,0]]
+41110 5 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,3,300,10] [[101,31103005,1,1,1,1,0]]
+41110 6 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,3,300,10] [[101,31103006,1,1,1,1,0]]
+41110 7 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,3,300,10] [[101,31103007,1,1,1,1,0]]
+41110 8 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,3,300,10] [[101,31103008,1,1,1,1,0]]
+41110 9 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203001,1,1,1,1,0]]
+41110 10 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203002,1,1,1,1,0]]
+41110 11 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203003,1,1,1,1,0]]
+41110 12 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203004,1,1,1,1,0]]
+41110 13 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203005,1,1,1,1,0]]
+41110 14 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203006,1,1,1,1,0]]
+41110 15 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203007,1,1,1,1,0]]
+41110 16 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203008,1,1,1,1,0]]
+41110 17 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203009,1,1,1,1,0]]
+41110 18 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203010,1,1,1,1,0]]
+41110 19 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203011,1,1,1,1,0]]
+41110 20 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203012,1,1,1,1,1]]
+41110 21 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203013,1,1,1,1,1]]
+41110 22 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,3,300,10] [[102,31203014,1,1,1,1,1]]
+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]]
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]]
@@ -58,9 +59,9 @@
60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [10,1800,30,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
60010 1 60010 165 500 0 0 0 0 0 0 0 [208,24] [10,1800,30,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [10,1800,30,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
-31160 0 31160 110 250 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311601,311603] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
-31160 1 31160 251 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311604,311605] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
-31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311606,311607] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
+31160 0 31160 110 250 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311601,311603] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
+31160 1 31160 251 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311604,311605] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
+31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311606,311607] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
31250 0 31250 0 0 0 0 0 0 0 0 0 [30,18] [0,300,10] [312501,312502,312503] [0,4235]
52010 0 52020 20 0 0 0 0 0 0 0 0 [17,19,8] 10 [520101,520102,520103,520104]
52010 1 52020 40 0 0 0 0 0 0 0 0 [17,19,8] 10 [520105,520106,520107,520108]
--
Gitblit v1.8.0