From 43b02080ab4a8ab8f8eed5d812fd4c267615b178 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 22 十月 2018 21:42:22 +0800
Subject: [PATCH] Merge branch '1.1.0' of http://192.168.0.87:10010/r/snxx_server into 1.1.0

---
 db/PyMongoDataServer/PySysDB/tagStore.txt |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index b1fea56..869b60e 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -122,16 +122,16 @@
 702	15	0	4185	1	1	[]	4185		0	0	106	1	0	1	288	800	1	OpenTakePreferential2	
 703	15	0	2343	1	1	[]	0		0	0	106	1	0	1	88	380	2	OpenTakePreferential1	
 704	15	0	2344	1	1	[]	2344		0	0	106	1	0	1	288	1000	2	OpenTakePreferential2	
-705	15	0	800	1	1	[]	800		0	0	106	1	0	1	88	240	3	OpenTakePreferential1	
-706	15	0	801	1	1	[[913,1,1]]	801		0	0	106	1	0	1	288	700	3	OpenTakePreferential2	
-707	15	0	3514	1	1	[[3504,1,1]]	0		0	0	106	1	0	1	88	360	4	OpenTakePreferential1	
-708	15	0	3515	1	1	[[3505,1,1]]	3514		0	0	106	1	0	1	288	1080	4	OpenTakePreferential2	
-709	15	0	912	1	1	[[18,1,1]]	912		0	0	106	1	0	1	88	250	5	OpenTakePreferential1	
-710	15	0	913	1	1	[[15,1,1]]	913		0	0	106	1	0	1	388	888	5	OpenTakePreferential2	
-711	15	0	2213	20	1	[]	0		0	0	106	1	0	1	88	250	6	OpenTakePreferential1	
-712	15	0	1128	1	1	[[2213,60,1]]	1128		0	0	106	1	0	1	388	1000	6	OpenTakePreferential2	
-713	15	0	852	1	1	[]	0		0	0	106	1	0	1	188	388	7	OpenTakePreferential1	
-714	15	0	4606	1	1	[[4608,2,1]]	4606		0	0	106	1	0	1	688	2000	7	OpenTakePreferential2	
+705	15	0	9	1	1	[[142,300,1]]	142		0	0	106	1	0	1	188	750	3	OpenTakePreferential1	
+706	15	0	6	2	1	[[913,2,1]]	913		0	0	106	1	0	1	488	1800	3	OpenTakePreferential2	
+707	15	0	3514	2	1	[[3504,2,1]]	3514		0	0	106	1	0	1	288	1080	4	OpenTakePreferential1	
+708	15	0	3515	2	1	[[3505,2,1]]	3515		0	0	106	1	0	1	688	3240	4	OpenTakePreferential2	
+709	15	0	912	1	1	[[30,588,1]]	30		0	0	106	1	0	1	188	738	5	OpenTakePreferential1	
+710	15	0	913	1	1	[[30,1588,1]]	30		0	0	106	1	0	1	588	2088	5	OpenTakePreferential2	
+711	15	0	2213	60	1	[[4610,1,1]]	4610		0	0	106	1	0	1	188	950	6	OpenTakePreferential1	
+712	15	0	2213	140	1	[[1128,1,1]]	1128		0	0	106	1	0	1	588	2000	6	OpenTakePreferential2	
+713	15	0	30	588	1	[[912,1,1]]	30		0	0	106	1	0	1	188	738	7	OpenTakePreferential1	
+714	15	0	4606	2	1	[[4608,2,1]]	4606		0	0	106	1	0	1	688	3000	7	OpenTakePreferential2	
 751	16	1	15	1	1	[]	15		0	0	0	1	0	1	188	500	0	LimitGift6	
 752	17	1	4151	60	1	[]	4151		0	0	0	1	0	1	188	600	0	LimitGift6	
 753	18	1	181	40	1	[]	181		0	0	0	1	0	1	188	600	0	LimitGift6	

--
Gitblit v1.8.0