From c7801ca55d18f474be815642073a5e82ce441759 Mon Sep 17 00:00:00 2001
From: cehua_lyf <1251614069@qq.com>
Date: 星期三, 09 一月 2019 17:20:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagStore.txt       |   14 +++++++-------
 CoreServerGroup/GameServer/PySysDB/tagStore.txt |   14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index ac226ef..6febf5b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -352,13 +352,13 @@
 1133	212	0	20
 1134	213	0	2
 1135	213	0	2
-1136	213	0	3
-1137	213	0	3
-1138	213	0	3
-1139	213	0	3
-1140	213	0	3
-1141	213	0	10
-1142	213	0	10
+1136	213	0	10
+1137	213	0	20
+1138	213	0	20
+1139	213	0	20
+1140	213	0	20
+1141	213	0	20
+1142	213	0	20
 1143	214	0	2
 1144	214	0	5
 1145	214	0	5
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 93327a3..7ecb065 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -352,13 +352,13 @@
 1133	212	2	4151	50	1	[]	4151		0	0	0	1	20	1	99	500	0	FlashRushToBuy2	FlashToSnapUp
 1134	213	2	8067	1	0	[]	8067		0	0	0	1	2	1	2388	7870	0	FlashRushToBuy2	FlashToSnapUp
 1135	213	2	5408	3	1	[]	5408		0	0	0	1	2	1	1888	7500	0	FlashRushToBuy2	FlashToSnapUp
-1136	213	2	10973	1	0	[]	0	[[10973,20973]]	0	0	0	1	3	1	688	2340	0	FlashRushToBuy2	FlashToSnapUp
-1137	213	2	10974	1	0	[]	0	[[10974,20974]]	0	0	0	1	3	1	688	2340	0	FlashRushToBuy2	FlashToSnapUp
-1138	213	2	10976	1	0	[]	0	[[10976,20976]]	0	0	0	1	3	1	688	2340	0	FlashRushToBuy2	FlashToSnapUp
-1139	213	2	10977	1	0	[]	0	[[10977,20977]]	0	0	0	1	3	1	688	2340	0	FlashRushToBuy2	FlashToSnapUp
-1140	213	2	10975	1	0	[]	0	[[10975,20975]]	0	0	0	1	3	1	688	2340	0	FlashRushToBuy2	FlashToSnapUp
-1141	213	2	2397	1	1	[]	2397		0	0	0	1	10	1	588	2000	0	FlashRushToBuy2	FlashToSnapUp
-1142	213	2	2389	5	1	[]	2389		0	0	0	1	10	1	188	900	0	FlashRushToBuy2	FlashToSnapUp
+1136	213	2	2397	1	1	[]	2397		0	0	0	1	10	1	588	2000	0	FlashRushToBuy2	FlashToSnapUp
+1137	213	2	103	10	1	[]	103		0	0	0	1	20	1	128	600	0	FlashRushToBuy2	FlashToSnapUp
+1138	213	2	106	10	1	[]	106		0	0	0	1	20	1	138	600	0	FlashRushToBuy2	FlashToSnapUp
+1139	213	2	112	10	1	[]	112		0	0	0	1	20	1	150	600	0	FlashRushToBuy2	FlashToSnapUp
+1140	213	2	912	2	1	[]	912		0	0	0	1	20	1	60	300	0	FlashRushToBuy2	FlashToSnapUp
+1141	213	2	913	1	1	[]	913		0	0	0	1	20	1	98	500	0	FlashRushToBuy2	FlashToSnapUp
+1142	213	2	4694	3	1	[]	4694		0	0	0	1	20	1	60	300	0	FlashRushToBuy2	FlashToSnapUp
 1143	214	2	5409	2	1	[]	5409		0	0	0	1	2	1	6666	25000	0	FlashRushToBuy2	FlashToSnapUp
 1144	214	2	5408	1	1	[]	5408		0	0	0	1	5	1	588	2500	0	FlashRushToBuy2	FlashToSnapUp
 1145	214	2	4607	1	1	[]	4607		0	0	0	1	5	1	388	2000	0	FlashRushToBuy2	FlashToSnapUp

--
Gitblit v1.8.0