From bd034645bd97150420e6381eae50c56ceb73ecdd Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 10 十二月 2018 21:18:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagStore.txt       |    4 ++--
 db/PyMongoDataServer/PySysDB/tagChestsAward.txt |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 37bd6be..f2f79ca 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -199,9 +199,9 @@
 4008			4011_5									
 4009			4011_5									
 2412				[[5000,[3503,1]],[10000,[3513,1]]]	1							
-2413			101_6|102_4|103_1									
-2414			104_4|105_4									
-2415			110_5|111_5									
+2413			101_6|102_3|103_1									
+2414			104_6|105_3|106_1									
+2415			110_6|111_3|112_1									
 2416			181_20									
 2417			181_200									
 2418			102_18									
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 0a2d3ee..30ba43b 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -14,8 +14,8 @@
 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	3	0	1	99	0	0		
 16	1	0	2413	1	1	[]	0		7	0	110	2	0	1	60	0	0		
-17	1	0	2414	1	1	[]	0		7	0	250	2	0	1	70	0	0		
-18	1	0	2415	1	1	[]	0		7	0	320	2	0	1	175	0	0		
+17	1	0	2414	1	1	[]	0		7	0	250	2	0	1	60	0	0		
+18	1	0	2415	1	1	[]	0		7	0	320	2	0	1	60	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		

--
Gitblit v1.8.0