From f7a063f15f33d5e25b71634d4d6597716e0a360b Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 15 一月 2019 11:06:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt |    3 
 db/PyMongoDataServer/PySysDB/tagStore.txt              |  104 ++++++++++++++-----------
 db/PyMongoDataServer/PySysDB/tagActFlashSale.txt       |    3 
 db/PyMongoDataServer/SysDB/tagChinItem.txt             |   10 +-
 CoreServerGroup/GameServer/PySysDB/tagStore.txt        |   96 +++++++++++++----------
 5 files changed, 119 insertions(+), 97 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
index 5adbdd2..d0e09df 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
@@ -1,6 +1,7 @@
 CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV	IsDayReset	ShopTypeList
-1	OpenServer	[]	[]	5	5	00:00|12:00|16:00|20:00|22:00	1:30|13:30|17:30|21:30|23:30	240	{0:["FlashRushToBuy3",[]]}	[]	[]	100	1	[[200,201,202,203,204]]
+1	OpenServer	[]	[]	5	5	00:00|12:00|16:00|20:00|22:00	1:59|13:59|17:59|21:59|23:59	240	{0:["FlashRushToBuy3",[]]}	[]	[]	100	1	[[200,201,202,203,204]]
 2	New1	[]	[]	2018-11-16	2018-11-16	12:00|16:00|20:00|22:00	13:30|17:30|21:30|23:30	240	{0:["FlashRushToBuy3",[]]}	[]	[]	100	0	[[205,206,207,208]]
 3	December12	[]	[]	2018-12-12	2018-12-12	12:00|16:00|20:00|22:00	13:30|17:30|21:30|23:30	240	{0:["FlashRushToBuy3",[]]}	[]	[]	100	0	[[205,206,207,208]]
 4	December25	[]	[]	2018-12-25	2018-12-25	00:00|12:00|16:00|20:00|22:00	1:30|13:30|17:30|21:30|23:30	240	{0:["FlashRushToBuy3",[]]}	[]	[]	100	0	[[205,206,207,208,209]]
 5	December26	[]	[]	2019-1-16	2019-1-16	00:00|12:00|16:00|20:00|22:00	1:59|13:59|17:59|21:59|23:59	240	{0:["FlashRushToBuy3",[]]}	[]	[]	100	0	[[210,211,212,213,214]]
+6	OpenServer1	[]	[]	11	11	00:00|12:00|16:00|20:00|22:00	1:59|13:59|17:59|21:59|23:59	240	{0:["FlashRushToBuy3",[]]}	[]	[]	100	1	[[215,216,217,218,219]]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index ada9af1..94efc15 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -226,56 +226,36 @@
 905	30	7	0
 906	30	7	0
 909	30	7	0
-1001	200	0	1
-1002	200	0	2
-1003	200	0	3
-1004	200	0	5
-1005	200	0	5
-1006	200	0	5
-1007	200	0	5
-1008	200	0	10
-1009	200	0	10
-1010	200	0	10
-1011	201	0	2
-1012	201	0	5
-1013	201	0	5
-1014	201	0	2
-1015	201	0	5
-1016	201	0	5
-1017	201	0	10
-1018	201	0	20
-1019	201	0	20
-1020	201	0	10
+1001	200	0	2
+1002	200	0	10
+1003	200	0	10
+1004	200	0	10
+1005	200	0	8
+1006	200	0	20
+1011	201	0	4
+1012	201	0	10
+1013	201	0	2
+1014	201	0	5
+1015	201	0	10
+1016	201	0	20
 1021	202	0	2
-1022	202	0	5
+1022	202	0	10
 1023	202	0	5
-1024	202	0	5
-1025	202	0	5
+1024	202	0	6
+1025	202	0	10
 1026	202	0	5
-1027	202	0	10
-1028	202	0	20
-1029	202	0	20
-1030	202	0	10
-1031	203	0	2
-1032	203	0	5
+1031	203	0	4
+1032	203	0	10
 1033	203	0	3
 1034	203	0	3
 1035	203	0	5
-1036	203	0	5
-1037	203	0	5
-1038	203	0	20
-1039	203	0	20
-1040	203	0	10
+1036	203	0	6
 1041	204	0	2
-1042	204	0	5
-1043	204	0	5
-1044	204	0	2
-1045	204	0	3
-1046	204	0	5
-1047	204	0	5
-1048	204	0	10
-1049	204	0	20
-1050	204	0	10
+1042	204	0	10
+1043	204	0	10
+1044	204	0	3
+1045	204	0	8
+1046	204	0	20
 1051	205	0	3
 1052	205	0	2
 1053	205	0	2
@@ -377,6 +357,36 @@
 1149	214	0	20
 1150	214	0	20
 1151	214	0	20
+1152	215	0	2
+1153	215	0	10
+1154	215	0	10
+1155	215	0	10
+1156	215	0	10
+1157	215	0	5
+1158	216	0	2
+1159	216	0	10
+1160	216	0	10
+1161	216	0	3
+1162	216	0	10
+1163	216	0	5
+1164	217	0	5
+1165	217	0	15
+1166	217	0	15
+1167	217	0	10
+1168	217	0	10
+1169	217	0	5
+1170	218	0	2
+1171	218	0	10
+1172	218	0	10
+1173	218	0	3
+1174	218	0	15
+1175	218	0	5
+1176	219	0	5
+1177	219	0	5
+1178	219	0	15
+1179	219	0	10
+1180	219	0	15
+1181	219	0	5
 1200	16	0	0
 1201	16	0	0
 1202	16	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
index 5fb14b0..dbcf2a6 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
@@ -1,6 +1,7 @@
 CfgID	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	LimitLV	IsDayReset	ShopTypeList	MailKey	MailItemPrize
-1	5	5	00:00|12:00|16:00|20:00|22:00	1:30|13:30|17:30|21:30|23:30	240	100	1	[[200,201,202,203,204]]	SellMail5	
+1	5	5	00:00|12:00|16:00|20:00|22:00	1:59|13:59|17:59|21:59|23:59	240	100	1	[[200,201,202,203,204]]	SellMail5	
 2	2018-11-16	2018-11-16	12:00|16:00|20:00|22:00	13:30|17:30|21:30|23:30	240	100	0	[[205,206,207,208]]	SellMail5	
 3	2018-12-12	2018-12-12	12:00|16:00|20:00|22:00	13:30|17:30|21:30|23:30	240	100	0	[[205,206,207,208]]	SellMail5	
 4	2018-12-25	2018-12-25	00:00|12:00|16:00|20:00|22:00	1:30|13:30|17:30|21:30|23:30	240	100	0	[[205,206,207,208,209]]	SellMail5	
 5	2019-1-16	2019-1-16	00:00|12:00|16:00|20:00|22:00	1:59|13:59|17:59|21:59|23:59	240	100	0	[[210,211,212,213,214]]	SellMail5	
+6	11	11	00:00|12:00|16:00|20:00|22:00	1:59|13:59|17:59|21:59|23:59	240	100	1	[[215,216,217,218,219]]	SellMail5	
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 97f0580..dc93090 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -226,56 +226,36 @@
 905	30	0	4739	1	1	[]	0		7	0	0	1	0	27	2000	0	0		
 906	30	0	4737	1	1	[]	0		7	0	0	1	0	27	3000	0	0		
 909	30	0	4675	1	1	[]	0		7	0	0	1	0	27	5000	0	0		
-1001	200	2	2348	1	1	[]	2348		0	0	0	1	1	1	688	2430	0	FlashRushToBuy2	FlashToSnapUp
-1002	200	2	2326	3	1	[]	2326		0	0	0	1	2	1	188	720	0	FlashRushToBuy2	FlashToSnapUp
-1003	200	2	2319	3	1	[]	2319		0	0	0	1	3	1	128	375	0	FlashRushToBuy2	FlashToSnapUp
-1004	200	2	2213	60	1	[]	2213		0	0	0	1	5	1	188	750	0	FlashRushToBuy2	FlashToSnapUp
-1005	200	2	913	1	1	[]	4010		0	0	0	1	5	1	88	500	0	FlashRushToBuy2	FlashToSnapUp
-1006	200	2	4010	4	1	[]	913		0	0	0	1	5	1	80	320	0	FlashRushToBuy2	FlashToSnapUp
-1007	200	2	1128	1	1	[]	1128		0	0	0	1	5	1	68	250	0	FlashRushToBuy2	FlashToSnapUp
-1008	200	2	4151	40	1	[]	4151		0	0	0	1	10	1	58	400	0	FlashRushToBuy2	FlashToSnapUp
-1009	200	2	181	40	1	[]	181		0	0	0	1	10	1	58	400	0	FlashRushToBuy2	FlashToSnapUp
-1010	200	2	5701	1	1	[]	5701		0	0	0	1	10	1	100	125	0	FlashRushToBuy2	FlashToSnapUp
-1011	201	2	2348	1	1	[]	2348		0	0	0	1	2	1	688	2430	0	FlashRushToBuy2	FlashToSnapUp
-1012	201	2	2319	3	1	[]	2319		0	0	0	1	5	1	128	375	0	FlashRushToBuy2	FlashToSnapUp
-1013	201	2	2213	120	1	[]	2213		0	0	0	1	5	1	500	1500	0	FlashRushToBuy2	FlashToSnapUp
-1014	201	2	4606	2	1	[]	4606		0	0	0	1	2	1	600	2000	0	FlashRushToBuy2	FlashToSnapUp
-1015	201	2	1503	2	1	[]	1503		0	0	0	1	5	1	20	100	0	FlashRushToBuy2	FlashToSnapUp
-1016	201	2	4007	3	1	[]	4007		0	0	0	1	5	1	60	240	0	FlashRushToBuy2	FlashToSnapUp
-1017	201	2	4622	5	1	[]	4622		0	0	0	1	10	1	88	400	0	FlashRushToBuy2	FlashToSnapUp
-1018	201	2	4151	40	1	[]	4151		0	0	0	1	20	1	58	400	0	FlashRushToBuy2	FlashToSnapUp
-1019	201	2	4685	4	1	[]	4685		0	0	0	1	20	1	38	120	0	FlashRushToBuy2	FlashToSnapUp
-1020	201	2	5701	1	1	[]	5701		0	0	0	1	10	1	100	125	0	FlashRushToBuy2	FlashToSnapUp
+1001	200	2	2348	1	1	[]	2348		0	0	0	1	2	1	688	2430	0	FlashRushToBuy2	FlashToSnapUp
+1002	200	2	5701	1	1	[]	2326		0	0	0	1	10	1	100	125	0	FlashRushToBuy2	FlashToSnapUp
+1003	200	2	2213	60	1	[]	2319		0	0	0	2	10	1	188	750	0	FlashRushToBuy2	FlashToSnapUp
+1004	200	2	4010	4	1	[]	2213		0	0	0	2	10	1	80	320	0	FlashRushToBuy2	FlashToSnapUp
+1005	200	2	1128	1	1	[]	4010		0	0	0	2	8	1	68	250	0	FlashRushToBuy2	FlashToSnapUp
+1006	200	2	4151	40	1	[]	913		0	0	0	4	20	1	58	400	0	FlashRushToBuy2	FlashToSnapUp
+1011	201	2	2348	1	1	[]	2348		0	0	0	2	4	1	688	2430	0	FlashRushToBuy2	FlashToSnapUp
+1012	201	2	5701	1	1	[]	2319		0	0	0	1	10	1	100	125	0	FlashRushToBuy2	FlashToSnapUp
+1013	201	2	4606	2	1	[]	2213		0	0	0	1	2	1	600	2000	0	FlashRushToBuy2	FlashToSnapUp
+1014	201	2	2213	120	1	[]	4606		0	0	0	1	5	1	500	1500	0	FlashRushToBuy2	FlashToSnapUp
+1015	201	2	4007	3	1	[]	1503		0	0	0	2	10	1	60	240	0	FlashRushToBuy2	FlashToSnapUp
+1016	201	2	181	40	1	[]	4007		0	0	0	4	20	1	58	400	0	FlashRushToBuy2	FlashToSnapUp
 1021	202	2	2348	1	1	[]	2348		0	0	0	1	2	1	688	2430	0	FlashRushToBuy2	FlashToSnapUp
-1022	202	2	2326	3	1	[]	2326		0	0	0	1	5	1	188	720	0	FlashRushToBuy2	FlashToSnapUp
-1023	202	2	4681	1	1	[]	4681		0	0	0	1	5	1	50	250	0	FlashRushToBuy2	FlashToSnapUp
-1024	202	2	1128	1	1	[]	1128		0	0	0	1	5	1	68	250	0	FlashRushToBuy2	FlashToSnapUp
-1025	202	2	5410	3	1	[]	5410		0	0	0	1	5	1	50	150	0	FlashRushToBuy2	FlashToSnapUp
-1026	202	2	4010	4	1	[]	4010		0	0	0	1	5	1	80	320	0	FlashRushToBuy2	FlashToSnapUp
-1027	202	2	5303	200	1	[]	5303		0	0	0	1	10	1	58	200	0	FlashRushToBuy2	FlashToSnapUp
-1028	202	2	181	40	1	[]	181		0	0	0	1	20	1	58	400	0	FlashRushToBuy2	FlashToSnapUp
-1029	202	2	4304	20	1	[]	4304		0	0	0	1	20	1	18	100	0	FlashRushToBuy2	FlashToSnapUp
-1030	202	2	5701	1	1	[]	5701		0	0	0	1	10	1	100	125	0	FlashRushToBuy2	FlashToSnapUp
-1031	203	2	2348	1	1	[]	2348		0	0	0	1	2	1	688	2430	0	FlashRushToBuy2	FlashToSnapUp
-1032	203	2	2319	3	1	[]	2319		0	0	0	1	5	1	128	375	0	FlashRushToBuy2	FlashToSnapUp
-1033	203	2	7002	1	0	[]	7002		0	0	0	1	3	1	680	1800	0	FlashRushToBuy2	FlashToSnapUp
+1022	202	2	5701	1	1	[]	2326		0	0	0	1	10	1	100	125	0	FlashRushToBuy2	FlashToSnapUp
+1023	202	2	1128	1	1	[]	4681		0	0	0	1	5	1	68	250	0	FlashRushToBuy2	FlashToSnapUp
+1024	202	2	5410	3	1	[]	1128		0	0	0	2	6	1	50	150	0	FlashRushToBuy2	FlashToSnapUp
+1025	202	2	4010	4	1	[]	5410		0	0	0	2	10	1	80	320	0	FlashRushToBuy2	FlashToSnapUp
+1026	202	2	2213	60	1	[]	4010		0	0	0	1	5	1	188	750	0	FlashRushToBuy2	FlashToSnapUp
+1031	203	2	2348	1	1	[]	2348		0	0	0	2	4	1	688	2430	0	FlashRushToBuy2	FlashToSnapUp
+1032	203	2	5701	1	1	[]	2319		0	0	0	1	10	1	100	125	0	FlashRushToBuy2	FlashToSnapUp
+1033	203	2	8055	1	0	[]	7002		0	0	0	1	3	1	680	1800	0	FlashRushToBuy2	FlashToSnapUp
 1034	203	2	5006	2	1	[]	5006		0	0	0	1	3	1	50	100	0	FlashRushToBuy2	FlashToSnapUp
 1035	203	2	5202	10	1	[]	5202		0	0	0	1	5	1	388	500	0	FlashRushToBuy2	FlashToSnapUp
-1036	203	2	5410	3	1	[]	5410		0	0	0	1	5	1	50	150	0	FlashRushToBuy2	FlashToSnapUp
-1037	203	2	4007	3	1	[]	4007		0	0	0	1	5	1	60	240	0	FlashRushToBuy2	FlashToSnapUp
-1038	203	2	4151	40	1	[]	4151		0	0	0	1	20	1	58	400	0	FlashRushToBuy2	FlashToSnapUp
-1039	203	2	4304	20	1	[]	4304		0	0	0	1	20	1	18	100	0	FlashRushToBuy2	FlashToSnapUp
-1040	203	2	5701	1	1	[]	5701		0	0	0	1	10	1	100	125	0	FlashRushToBuy2	FlashToSnapUp
+1036	203	2	5410	3	1	[]	5410		0	0	0	2	6	1	50	150	0	FlashRushToBuy2	FlashToSnapUp
 1041	204	2	2348	1	1	[]	2348		0	0	0	1	2	1	688	2430	0	FlashRushToBuy2	FlashToSnapUp
-1042	204	2	2326	3	1	[]	2326		0	0	0	1	5	1	188	720	0	FlashRushToBuy2	FlashToSnapUp
-1043	204	2	2213	120	1	[]	2213		0	0	0	1	5	1	500	1500	0	FlashRushToBuy2	FlashToSnapUp
-1044	204	2	4606	2	1	[]	4606		0	0	0	1	2	1	600	2000	0	FlashRushToBuy2	FlashToSnapUp
-1045	204	2	4680	1	1	[]	4680		0	0	0	1	3	1	200	750	0	FlashRushToBuy2	FlashToSnapUp
-1046	204	2	1128	1	1	[]	1128		0	0	0	1	5	1	68	250	0	FlashRushToBuy2	FlashToSnapUp
-1047	204	2	4010	4	1	[]	4010		0	0	0	1	5	1	80	320	0	FlashRushToBuy2	FlashToSnapUp
-1048	204	2	5303	200	1	[]	5303		0	0	0	1	10	1	58	200	0	FlashRushToBuy2	FlashToSnapUp
-1049	204	2	181	40	1	[]	181		0	0	0	1	20	1	58	400	0	FlashRushToBuy2	FlashToSnapUp
-1050	204	2	5701	1	1	[]	5701		0	0	0	1	10	1	100	125	0	FlashRushToBuy2	FlashToSnapUp
+1042	204	2	5701	1	1	[]	2326		0	0	0	1	10	1	100	125	0	FlashRushToBuy2	FlashToSnapUp
+1043	204	2	2213	120	1	[]	2213		0	0	0	2	10	1	500	1500	0	FlashRushToBuy2	FlashToSnapUp
+1044	204	2	4680	1	1	[]	4606		0	0	0	1	3	1	200	750	0	FlashRushToBuy2	FlashToSnapUp
+1045	204	2	1128	1	1	[]	4680		0	0	0	2	8	1	68	250	0	FlashRushToBuy2	FlashToSnapUp
+1046	204	2	2346	1	1	[]	1128		0	0	0	5	20	1	88	270	0	FlashRushToBuy2	FlashToSnapUp
 1051	205	2	5408	1	1	[]	5408		0	0	0	1	3	1	588	2500	0	FlashRushToBuy2	FlashToSnapUp
 1052	205	2	4607	2	1	[]	4607		0	0	0	1	2	1	688	4000	0	FlashRushToBuy2	FlashToSnapUp
 1053	205	2	953	1	1	[]	953		0	0	0	1	2	1	100	500	0	FlashRushToBuy2	FlashToSnapUp
@@ -377,11 +357,41 @@
 1149	214	2	112	10	1	[]	112		0	0	0	1	20	1	150	600	0	FlashRushToBuy2	FlashToSnapUp
 1150	214	2	912	2	1	[]	912		0	0	0	1	20	1	60	300	0	FlashRushToBuy2	FlashToSnapUp
 1151	214	2	2213	50	1	[]	2213		0	0	0	1	20	1	120	625	0	FlashRushToBuy2	FlashToSnapUp
+1152	215	2	2439	1	1	[]	5408		0	0	0	1	2	1	488	1000	0	FlashRushToBuy2	FlashToSnapUp
+1153	215	2	5700	2	1	[]	4607		0	0	0	2	10	1	288	500	0	FlashRushToBuy2	FlashToSnapUp
+1154	215	2	2213	60	1	[]	4606		0	0	0	2	10	1	188	750	0	FlashRushToBuy2	FlashToSnapUp
+1155	215	2	1128	1	1	[]	4608		0	0	0	2	10	1	68	250	0	FlashRushToBuy2	FlashToSnapUp
+1156	215	2	4007	3	1	[]	4610		0	0	0	2	10	1	60	240	0	FlashRushToBuy2	FlashToSnapUp
+1157	215	2	8354	50	1	[]	2213		0	0	0	1	5	1	288	1000	0	FlashRushToBuy2	FlashToSnapUp
+1158	216	2	2439	1	1	[]	2439		0	0	0	1	2	1	488	1000	0	FlashRushToBuy2	FlashToSnapUp
+1159	216	2	5700	2	1	[]	5700		0	0	0	2	10	1	288	500	0	FlashRushToBuy2	FlashToSnapUp
+1160	216	2	2213	60	1	[]	2213		0	0	0	2	10	1	188	750	0	FlashRushToBuy2	FlashToSnapUp
+1161	216	2	4680	1	1	[]	4680		0	0	0	1	3	1	200	750	0	FlashRushToBuy2	FlashToSnapUp
+1162	216	2	4010	4	1	[]	4010		0	0	0	2	10	1	80	320	0	FlashRushToBuy2	FlashToSnapUp
+1163	216	2	8354	50	1	[]	8354		0	0	0	1	5	1	288	1000	0	FlashRushToBuy2	FlashToSnapUp
+1164	217	2	2390	1	1	[]	2390		0	0	0	1	5	1	188	600	0	FlashRushToBuy2	FlashToSnapUp
+1165	217	2	913	1	1	[]	913		0	0	0	3	15	1	88	500	0	FlashRushToBuy2	FlashToSnapUp
+1166	217	2	5410	3	1	[]	5410		0	0	0	3	15	1	50	150	0	FlashRushToBuy2	FlashToSnapUp
+1167	217	2	1128	1	1	[]	1128		0	0	0	2	10	1	68	250	0	FlashRushToBuy2	FlashToSnapUp
+1168	217	2	4007	3	1	[]	4007		0	0	0	2	10	1	60	240	0	FlashRushToBuy2	FlashToSnapUp
+1169	217	2	8354	50	1	[]	8354		0	0	0	1	5	1	288	1000	0	FlashRushToBuy2	FlashToSnapUp
+1170	218	2	2439	1	1	[]	2439		0	0	0	1	2	1	488	1000	0	FlashRushToBuy2	FlashToSnapUp
+1171	218	2	5700	2	1	[]	5700		0	0	0	2	10	1	288	500	0	FlashRushToBuy2	FlashToSnapUp
+1172	218	2	2213	60	1	[]	2213		0	0	0	2	10	1	188	750	0	FlashRushToBuy2	FlashToSnapUp
+1173	218	2	4680	1	1	[]	4680		0	0	0	1	3	1	200	750	0	FlashRushToBuy2	FlashToSnapUp
+1174	218	2	4010	4	1	[]	4010		0	0	0	3	15	1	80	320	0	FlashRushToBuy2	FlashToSnapUp
+1175	218	2	8354	50	1	[]	8354		0	0	0	1	5	1	288	1000	0	FlashRushToBuy2	FlashToSnapUp
+1176	219	2	2390	1	1	[]	2390		0	0	0	1	5	1	188	600	0	FlashRushToBuy2	FlashToSnapUp
+1177	219	2	912	3	1	[]	912		0	0	0	1	5	1	88	450	0	FlashRushToBuy2	FlashToSnapUp
+1178	219	2	5410	3	1	[]	5410		0	0	0	3	15	1	50	150	0	FlashRushToBuy2	FlashToSnapUp
+1179	219	2	1128	1	1	[]	1128		0	0	0	2	10	1	68	250	0	FlashRushToBuy2	FlashToSnapUp
+1180	219	2	4007	3	1	[]	4007		0	0	0	3	15	1	60	240	0	FlashRushToBuy2	FlashToSnapUp
+1181	219	2	8354	50	1	[]	8354		0	0	0	1	5	1	288	1000	0	FlashRushToBuy2	FlashToSnapUp
 1200	16	0	3513	1	1	[[3503,1,1]]	4681		0	0	58	1	0	1	18	180	86400		
 1201	16	0	4151	20	1	[]	4151		0	0	65	1	0	1	18	200	86400		
 1202	16	0	181	20	1	[]	181		0	0	80	1	0	1	18	200	86400		
 1203	16	0	2438	1	1	[]	2438		0	0	110	1	0	1	18	100	86400		
-1204	16	0	4304	1	1	[]	4304		0	0	115	1	0	1	18	150	86400		
+1204	16	0	4304	30	1	[]	4304		0	0	115	1	0	1	18	150	86400		
 1205	16	0	142	100	1	[[29,5000000,1]]	142		0	0	155	1	0	1	18	175	86400		
 1206	16	0	143	100	1	[]	143		0	0	170	1	0	1	18	200	86400		
 1207	16	0	2205	1	1	[]	2205		0	0	200	1	0	1	18	200	86400		
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index f1fd902..4f879d5 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -630,13 +630,13 @@
 2430	1	0	高级神兽祝福宝箱	81	0	0	0	0	999	260	1	1	0	1	0	0	1	0	0	1	150	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2431	1	0	灵宠丹超值礼包	81	0	0	0	0	999	260	1	1	0	1	0	0	1	0	0	1	150	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2432	1	0	神兽紫装礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-2433	1	0	红2幸运草礼包1	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-2434	1	0	红2幸运草礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-2435	1	0	洗炼必增礼包1	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2433	1	0	红2幸运草超值礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2434	1	0	红2合成幸运草礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2435	1	0	洗炼必增超值礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2436	1	0	洗炼必增礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-2437	1	0	生命神兵石礼包1	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2437	1	0	生命神兵石超值礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2438	1	0	生命神兵石礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-2439	1	0	神兽橙装自选箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2439	1	0	神兽橙装超值宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3501	1	0	1级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	10	0	10	0	0	0	1	225	1	1	3502	6	600	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3502	1	0	2级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	30	0	10	0	0	0	1	225	1	2	3503	6	840	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3503	1	0	3级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	90	0	20	0	0	0	1	225	1	3	3504	6	1080	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0