From f7d8e69013640673a67db5c957329f07a6136313 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期一, 26 十一月 2018 22:52:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index dacc767..c9933c1 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -35,14 +35,14 @@
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] [5,180,10]
-31140 0 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[101,31401002,3,12]] [(4151,2,2),(1143,1,1)]
-31140 1 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[101,31401003,6,24],[102,31403002,1,1]] [(4151,2,2),(1143,1,1)]
-31140 2 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[103,31401004,6,12],[104,31403003,1,1]] [(4151,2,2),(1143,1,1)]
-31140 3 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[105,31401005,6,24],[104,31403004,1,1]] [(4151,2,2),(1143,1,1)]
-31140 4 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[106,31401006,6,12],[104,31403005,1,1]] [(4151,2,2),(1143,1,1)]
-31140 5 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[105,31401007,6,24],[104,31403006,1,1]] [(4151,2,2),(1143,1,1)]
-31140 6 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[101,31401008,4,4],[102,31403007,1,1]] [(4151,2,2),(1143,1,1)]
-31140 7 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[103,31401009,6,12],[104,31403008,1,1]] [(4151,2,2),(1143,1,1)]
+31140 0 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[101,31401002,12,3]] [(5303,5,1),(5412,1,1)]
+31140 1 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[101,31401003,24,6],[102,31403002,1,1]] [(5303,5,1),(5412,1,1)]
+31140 2 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[103,31401004,12,6],[104,31403003,1,1]] [(5303,5,1),(5412,1,1)]
+31140 3 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[105,31401005,24,6],[104,31403004,1,1]] [(5303,5,1),(5412,1,1)]
+31140 4 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[106,31401006,12,6],[104,31403005,1,1]] [(5303,5,1),(5412,1,1)]
+31140 5 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[105,31401007,24,6],[104,31403006,1,1]] [(5303,5,1),(5412,1,1)]
+31140 6 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[101,31401008,4,1],[102,31403007,1,1]] [(5303,5,1),(5412,1,1)]
+31140 7 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[103,31401009,12,6],[104,31403008,1,1]] [(5303,5,1),(5412,1,1)]
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] [5,600,15, [340,260,200,150]]
@@ -55,19 +55,19 @@
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] [3,1800,15,101]
-51010 0 51010 155 500 0 0 0 0 0 0 0 [24,20,3] [5,360,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [135,33,33,33,33] [793536, [141,45]]
-51010 1 51010 155 500 0 0 0 0 0 0 0 [70,19,3] [5,360,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [135,33,33,33,33] [831840, [141,36], [142,6]]
-51010 2 51010 155 500 0 0 0 0 0 0 0 [126,9,3] [5,360,10] [{5101031:1, 5101032:1}] [150,38,38,38,38] [1017600, [141,13], [142,18], [143,5]]
-51010 3 51010 155 500 0 0 0 0 0 0 0 [30,62,3] [5,360,10] [{5101041:0, 5101042:1}] [150,38,38,38,38] [1169280, [142,24], [143,8]]
-51010 4 51010 155 500 0 0 0 0 0 0 0 [84,63,3] [5,360,10] [{5101051:1, 5101052:0}] [150,38,38,38,38] [1404720, [142,9], [143,15], [144,6]]
-51010 5 51010 155 500 0 0 0 0 0 0 0 [137,73,3] [5,360,10] [{5101061:0,5101063:0, 5101064:0, 5101065:0, 5101062:1}] [150,38,38,38,38] [1666080, [143,18], [144,9]]
-51010 6 51010 155 500 0 0 0 0 0 0 0 [14,114,3] [5,360,10] [{5101071:1, 5101072:0}] [150,38,38,38,38] [1953360, [144,15]]
-51010 7 51010 155 500 0 0 0 0 0 0 0 [71,111,3] [5,360,10] [{5101081:1}] [150,38,38,38,38] [2265840, [153,15]]
-60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [5,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] [5,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] [5,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]] 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]]}
+51010 0 51010 155 500 0 0 0 0 0 0 0 [24,20,3] [3,360,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [60,30,30,30,30] [793536, [141,45]]
+51010 1 51010 155 500 0 0 0 0 0 0 0 [70,19,3] [3,360,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [60,30,30,30,30] [831840, [141,36], [142,6]]
+51010 2 51010 155 500 0 0 0 0 0 0 0 [126,9,3] [3,360,10] [{5101031:1, 5101032:1}] [60,30,30,30,30] [1017600, [141,13], [142,18], [143,5]]
+51010 3 51010 155 500 0 0 0 0 0 0 0 [30,62,3] [3,360,10] [{5101041:0, 5101042:1}] [60,30,30,30,30] [1169280, [142,24], [143,8]]
+51010 4 51010 155 500 0 0 0 0 0 0 0 [84,63,3] [3,360,10] [{5101051:1, 5101052:0}] [60,30,30,30,30] [1404720, [142,9], [143,15], [144,6]]
+51010 5 51010 155 500 0 0 0 0 0 0 0 [137,73,3] [3,360,10] [{5101061:0,5101063:0, 5101064:0, 5101065:0, 5101062:1}] [60,30,30,30,30] [1666080, [143,18], [144,9]]
+51010 6 51010 155 500 0 0 0 0 0 0 0 [14,114,3] [3,360,10] [{5101071:1, 5101072:0}] [60,30,30,30,30] [1953360, [144,15]]
+51010 7 51010 155 500 0 0 0 0 0 0 0 [71,111,3] [3,360,10] [{5101081:1}] [60,30,30,30,30] [2265840, [153,15]]
+60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [3,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] [3,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] [3,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 230 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 231 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]
@@ -92,5 +92,5 @@
52010 19 52010 455 0 0 0 0 0 0 0 0 [17,19,8] 10
31130 0 31130 0 500 0 0 0 0 0 0 0 [29,12] [3,180,10,10] 101
31110 0 31110 80 500 0 0 0 0 0 0 0 [19,13,3] [3, 180, 10, [210, 180, 150, 120], [51,13]] 101
-31110 1 31110 80 500 0 0 0 0 0 0 0 [59,13,3] [5, 180, 10, [360, 245, 185, 125], [51,13]] 102
+31110 1 31110 80 500 0 0 0 0 0 0 0 [59,13,3] [3, 180, 10, [360, 245, 185, 125], [51,13]] 102
31210 0 31210 0 500 0 0 0 0 0 0 0 [12,6,3] [10, 3600, 60, [1800, 900, 600, 300]] [101,30903001]
--
Gitblit v1.8.0