From 5056a86830b7c1a93f01984516c7afc4763b7036 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期二, 21 八月 2018 11:36:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

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

diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index c9abe57..109558e 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -78,27 +78,27 @@
 531	12	0	4315	1	1	[]	0		0	0	0	0	25	800	0	0	ShopBuyBroadcast_2
 532	12	0	4320	1	1	[]	0		0	0	0	0	25	800	0	0	ShopBuyBroadcast_2
 533	12	0	4335	1	1	[]	0		0	0	0	0	25	1600	0	0	ShopBuyBroadcast_2
-534	12	0	4395	1	1	[]	0		0	0	200	0	25	800	0	0	ShopBuyBroadcast_2
-535	12	0	4385	1	1	[]	0		0	0	240	0	25	800	0	0	ShopBuyBroadcast_2
-536	12	0	4365	1	1	[]	0		0	0	260	0	25	800	0	0	ShopBuyBroadcast_2
-537	12	0	4355	1	1	[]	0		0	0	300	0	25	800	0	0	ShopBuyBroadcast_2
-538	12	0	4350	1	1	[]	0		0	0	330	0	25	800	0	0	ShopBuyBroadcast_2
-539	12	0	4360	1	1	[]	0		0	0	360	0	25	800	0	0	ShopBuyBroadcast_2
-540	12	0	4390	1	1	[]	0		0	0	400	0	25	800	0	0	ShopBuyBroadcast_2
-541	12	0	4380	1	1	[]	0		0	0	400	0	25	800	0	0	ShopBuyBroadcast_2
-542	12	0	4375	1	1	[]	0		0	0	400	0	25	800	0	0	ShopBuyBroadcast_2
+534	12	0	4395	1	1	[]	0		0	0	0	0	25	800	0	0	ShopBuyBroadcast_2
+535	12	0	4385	1	1	[]	0		0	0	0	0	25	800	0	0	ShopBuyBroadcast_2
+536	12	0	4365	1	1	[]	0		0	0	0	0	25	800	0	0	ShopBuyBroadcast_2
+537	12	0	4355	1	1	[]	0		0	0	0	0	25	800	0	0	ShopBuyBroadcast_2
+538	12	0	4350	1	1	[]	0		0	0	0	0	25	800	0	0	ShopBuyBroadcast_2
+539	12	0	4360	1	1	[]	0		0	0	0	0	25	800	0	0	ShopBuyBroadcast_2
+540	12	0	4390	1	1	[]	0		0	0	0	0	25	800	0	0	ShopBuyBroadcast_2
+541	12	0	4380	1	1	[]	0		0	0	0	0	25	800	0	0	ShopBuyBroadcast_2
+542	12	0	4375	1	1	[]	0		0	0	0	0	25	800	0	0	ShopBuyBroadcast_2
 543	12	0	4314	1	1	[]	0		0	0	0	0	25	120	0	0	ShopBuyBroadcast_2
 544	12	0	4319	1	1	[]	0		0	0	0	0	25	120	0	0	ShopBuyBroadcast_2
 545	12	0	4334	1	1	[]	0		0	0	0	0	25	240	0	0	ShopBuyBroadcast_2
-546	12	0	4394	1	1	[]	0		0	0	200	0	25	120	0	0	ShopBuyBroadcast_2
-547	12	0	4384	1	1	[]	0		0	0	240	0	25	120	0	0	ShopBuyBroadcast_2
-548	12	0	4364	1	1	[]	0		0	0	260	0	25	120	0	0	ShopBuyBroadcast_2
-549	12	0	4354	1	1	[]	0		0	0	300	0	25	120	0	0	ShopBuyBroadcast_2
-550	12	0	4349	1	1	[]	0		0	0	330	0	25	120	0	0	ShopBuyBroadcast_2
-551	12	0	4359	1	1	[]	0		0	0	360	0	25	120	0	0	ShopBuyBroadcast_2
-552	12	0	4389	1	1	[]	0		0	0	400	0	25	120	0	0	ShopBuyBroadcast_2
-553	12	0	4379	1	1	[]	0		0	0	400	0	25	120	0	0	ShopBuyBroadcast_2
-554	12	0	4374	1	1	[]	0		0	0	400	0	25	120	0	0	ShopBuyBroadcast_2
+546	12	0	4394	1	1	[]	0		0	0	0	0	25	120	0	0	ShopBuyBroadcast_2
+547	12	0	4384	1	1	[]	0		0	0	0	0	25	120	0	0	ShopBuyBroadcast_2
+548	12	0	4364	1	1	[]	0		0	0	0	0	25	120	0	0	ShopBuyBroadcast_2
+549	12	0	4354	1	1	[]	0		0	0	0	0	25	120	0	0	ShopBuyBroadcast_2
+550	12	0	4349	1	1	[]	0		0	0	0	0	25	120	0	0	ShopBuyBroadcast_2
+551	12	0	4359	1	1	[]	0		0	0	0	0	25	120	0	0	ShopBuyBroadcast_2
+552	12	0	4389	1	1	[]	0		0	0	0	0	25	120	0	0	ShopBuyBroadcast_2
+553	12	0	4379	1	1	[]	0		0	0	0	0	25	120	0	0	ShopBuyBroadcast_2
+554	12	0	4374	1	1	[]	0		0	0	0	0	25	120	0	0	ShopBuyBroadcast_2
 561	13	0	4606	1	0	[]	0		0	0	0	0	25	5000	0	0	ShopBuyBroadcast_2
 562	13	0	4608	1	0	[]	0		0	0	0	0	25	5000	0	0	ShopBuyBroadcast_2
 563	13	0	912	1	0	[]	0		0	0	0	0	25	100	0	0	ShopBuyBroadcast_2

--
Gitblit v1.8.0