From 400d0e5c7bdfd4703a7681b81ce22dce61e85887 Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期四, 31 一月 2019 12:07:08 +0800
Subject: [PATCH] 1111 春节活动修复

---
 db/PyMongoDataServer/PySysDB/tagActCostRebate.txt       |    2 
 db/PyMongoDataServer/PySysDB/tagActSpringSale.txt       |   18 ++------
 db/PyMongoDataServer/PySysDB/tagStore.txt               |   25 +++++++-----
 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt        |    6 +-
 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt |    2 
 CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt |    8 ----
 db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt    |    6 +-
 CoreServerGroup/GameServer/PySysDB/tagStore.txt         |   25 +++++++-----
 8 files changed, 41 insertions(+), 51 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index dea4021..792d690 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -7,4 +7,4 @@
 6	tast6	[]	[]	2018-12-8	2018-12-8	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
 7	test7	[]	[]	2018-12-9	2018-12-9	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
 8	test8	[]	[]	2018-12-15	2018-12-15	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-9	20190212	[]	[]	2019-2-12	2018-2-13	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+9	20190212	[]	[]	2019-2-12	2019-2-13	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index bedaf44..1801314 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -54,17 +54,9 @@
 53	20190131	[]	[]	2019-1-31	2019-1-31				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 54	20190202	[]	[]	2019-2-2	2019-2-2				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 55	20190203	[]	[]	2019-2-3	2019-2-3				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-56	20190203	[]	[]	2019-2-3	2019-2-3				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-57	20190203	[]	[]	2019-2-3	2019-2-3				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 58	20190204	[]	[]	2019-2-4	2019-2-4				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-59	20190204	[]	[]	2019-2-4	2019-2-4				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 60	20190205	[]	[]	2019-2-5	2019-2-5				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-61	20190205	[]	[]	2019-2-5	2019-2-5				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 62	20190206	[]	[]	2019-2-6	2019-2-6				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-63	20190206	[]	[]	2019-2-6	2019-2-6				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 64	20190207	[]	[]	2019-2-7	2019-2-7				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-65	20190207	[]	[]	2019-2-7	2019-2-7				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 66	20190215	[]	[]	2019-2-15	2019-2-15				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-67	20190215	[]	[]	2019-2-15	2019-2-15				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 68	20190216	[]	[]	2019-2-16	2019-2-16				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-69	20190216	[]	[]	2019-2-16	2019-2-16				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 29d2693..67ce0a7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -229,17 +229,20 @@
 1320	135	0	0
 1321	136	0	0
 1322	137	0	0
-1323	138	0	0
-1324	139	0	0
-1325	140	0	0
-1326	141	0	0
-1327	142	0	0
-1328	143	0	0
-1329	144	0	0
-1330	145	0	0
-1331	146	0	0
-1332	147	0	0
-1333	148	0	0
+1323	137	0	0
+1324	137	0	0
+1325	138	0	0
+1326	138	0	0
+1327	139	0	0
+1328	139	0	0
+1329	140	0	0
+1330	140	0	0
+1332	141	0	0
+1331	141	0	0
+1333	142	0	0
+1334	142	0	0
+1335	143	0	0
+1336	143	0	0
 801	19	0	0
 802	19	0	0
 803	19	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index c7e4afa..8c493d5 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -7,4 +7,4 @@
 6	2018-12-8	2018-12-8	50	0	5
 7	2018-12-9	2018-12-9	50	0	6
 8	2018-12-15	2018-12-15	50	0	7
-9	2019-2-12	2018-2-13	50	0	8
+9	2019-2-12	2019-2-13	50	0	8
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index f9779ae..1a8086f 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -54,17 +54,9 @@
 53	2019-1-31	2019-1-31				110	0	[[135]]	SellMail3	
 54	2019-2-2	2019-2-2				110	0	[[136]]	SellMail3	
 55	2019-2-3	2019-2-3				110	0	[[137]]	SellMail3	
-56	2019-2-3	2019-2-3				110	0	[[138]]	SellMail3	
-57	2019-2-3	2019-2-3				110	0	[[147]]	SellMail3	
-58	2019-2-4	2019-2-4				110	0	[[139]]	SellMail3	
-59	2019-2-4	2019-2-4				110	0	[[140]]	SellMail3	
-60	2019-2-5	2019-2-5				110	0	[[141]]	SellMail3	
-61	2019-2-5	2019-2-5				110	0	[[142]]	SellMail3	
-62	2019-2-6	2019-2-6				110	0	[[143]]	SellMail3	
-63	2019-2-6	2019-2-6				110	0	[[128]]	SellMail3	
+58	2019-2-4	2019-2-4				110	0	[[138]]	SellMail3	
+60	2019-2-5	2019-2-5				110	0	[[139]]	SellMail3	
+62	2019-2-6	2019-2-6				110	0	[[140]]	SellMail3	
 64	2019-2-7	2019-2-7				110	0	[[141]]	SellMail3	
-65	2019-2-7	2019-2-7				110	0	[[148]]	SellMail3	
-66	2019-2-15	2019-2-15				110	0	[[144]]	SellMail3	
-67	2019-2-15	2019-2-15				110	0	[[128]]	SellMail3	
-68	2019-2-16	2019-2-16				110	0	[[145]]	SellMail3	
-69	2019-2-16	2019-2-16				110	0	[[146]]	SellMail3	
+66	2019-2-15	2019-2-15				110	0	[[142]]	SellMail3	
+68	2019-2-16	2019-2-16				110	0	[[143]]	SellMail3	
diff --git a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
index 2e28f0c..ed50d71 100644
--- a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
@@ -27,6 +27,6 @@
 31	2018-12-30	2018-12-30	5	0	16
 32	2019-1-26	2019-1-26	5	0	20
 33	2019-1-27	2019-1-27	5	0	21
-34	2019-2-9	2019-2-10	5	0	22
-35	2019-2-14	2019-2-14	5	0	23
-36	2019-2-17	2019-2-18	5	0	24
+34	2019-2-9	2019-2-10	5	0	24
+35	2019-2-14	2019-2-14	5	0	25
+36	2019-2-17	2019-2-18	5	0	26
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index e06e443..0eb90ea 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -67,6 +67,6 @@
 5	66	200	1	[(2445,1,1)]	2445	LimitGift3
 4	67	150	1	[(913,1,1),(4694,10,1)]	913	LimitGift3
 2	68	35	1	[(912,1,1),(4694,4,1)]	912	LimitGift3
-8	69	400	1	[(226,1,1),(181,25,1)]	4223	LimitGift3
-5	70	180	1	[(4228,1,1),(4151,25,1)]	5800	LimitGift3
-5	71	150	1	[(5809,1,1),(5810,1,1),(5811,1,1)]	5800	LimitGift3
+8	69	400	1	[(226,1,1),(181,25,1)]	226	LimitGift3
+5	70	180	1	[(4228,1,1),(4151,25,1)]	4228	LimitGift3
+5	71	150	1	[(5809,1,1),(5810,1,1),(5811,1,1)]	5809	LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index f8338e0..80d0287 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -229,17 +229,20 @@
 1320	135	1	912	1	1	[[1128,1,1]]	912		0	0	0	1	0	1	88	350	0	LimitGift6	
 1321	136	1	110	50	1	[[112,25,1]]	110		0	0	0	1	0	1	388	1600	0	LimitGift6	
 1322	137	1	913	1	1	[[4694,3,1]]	913		0	0	0	1	0	1	188	800	0	LimitGift6	
-1323	138	1	2453	1	1	[]	2453		0	0	0	1	0	1	388	1000	0	LimitGift7	
-1324	139	1	4306	1920	1	[]	4306		0	0	0	1	0	1	388	1920	0	LimitGift6	
-1325	140	1	2445	1	1	[]	2445		0	0	0	1	0	1	688	2000	0	LimitGift7	
-1326	141	1	912	1	1	[[4694,2,1]]	912		0	0	0	1	0	1	88	350	0	LimitGift6	
-1327	142	1	913	1	1	[[4694,10,1]]	913		0	0	0	1	0	1	388	1500	0	LimitGift7	
-1328	143	1	4608	1	1	[[2213,25,1]]	4608		0	0	0	1	0	1	188	812	0	LimitGift6	
-1329	144	1	2213	30	1	[]	2213		0	0	0	1	0	1	88	375	0	LimitGift6	
-1330	145	1	912	2	1	[[2213,10,1]]	912		0	0	0	1	0	1	88	425	0	LimitGift6	
-1331	146	1	2450	1	1	[]	2450		0	0	0	1	0	1	1588	6000	0	LimitGift6	
-1332	147	1	2487	1	1	[]	2487		0	0	0	1	0	1	688	1200	0	LimitGift6	
-1333	148	1	5413	40	1	[]	5413		0	0	0	1	0	1	688	1200	0	LimitGift6	
+1323	137	1	2453	1	1	[]	2453		0	0	0	1	0	1	388	1000	0	LimitGift7	
+1324	137	1	2487	1	1	[]	2487		0	0	0	1	0	1	688	1200	0	LimitGift8	
+1325	138	1	4306	1920	1	[]	4306		0	0	0	1	0	1	388	1920	0	LimitGift6	
+1326	138		2445	1	1	[]	2445		0	0	0	1	0	1	688	2000	0	LimitGift7	
+1327	139	1	912	1	1	[[4694,2,1]]	912		0	0	0	1	0	1	88	350	0	LimitGift6	
+1328	139	1	913	1	1	[[4694,10,1]]	913		0	0	0	1	0	1	388	1500	0	LimitGift7	
+1329	140	1	4608	1	1	[[2213,25,1]]	4608		0	0	0	1	0	1	188	812	0	LimitGift6	
+1330	140	1	4606	1	1	[[2213,50,1]]	4606		0	0	0	1	0	1	388	1625	0	LimitGift7	
+1332	141	1	2213	30	1	[]	2213		0	0	0	1	0	1	88	375	0	LimitGift6	
+1331	141	1	4606	1	1	[[2213,50,1]]	4606		0	0	0	1	0	1	388	1625	0	LimitGift7	
+1333	142	1	912	2	1	[[2213,10,1]]	912		0	0	0	1	0	1	88	425	0	LimitGift6	
+1334	142	1	2450	1	1	[]	2450		0	0	0	1	0	1	1588	6000	0	LimitGift7	
+1335	143	1	912	1	1	[[4694,2,1]]	912		0	0	0	1	0	1	88	350	0	LimitGift6	
+1336	143	1	5413	40	1	[]	5413		0	0	0	1	0	1	688	1200	0	LimitGift7	
 801	19	0	2391	1	0	[]	0		0	0	0	0	0	1	60	0	0		
 802	19	0	2393	1	0	[]	0		0	0	0	0	0	1	60	0	0		
 803	19	0	2395	1	0	[]	0		0	0	0	0	0	1	60	0	0		

--
Gitblit v1.8.0