From 9015f73a077268596b226b86a9cb9e34f603109c Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 23 十一月 2018 10:05:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt |    4 ++--
 db/PyMongoDataServer/PySysDB/tagActWishingWell.txt       |    4 ++--
 db/PyMongoDataServer/SysDB/tagChinItem.txt               |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index f25524c..6fedbd4 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -1,3 +1,3 @@
 CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	IsDayReset	ResetType	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV
-1	kaifu1	[]	[]	3	4	1	0	{0:["XYCOpen", []]}	{}	[]	110
-2	kaifu2	[]	[]	7	8	1	0	{0:["XYCOpen", []]}	{}	[]	110
+1	kaifu1	[]	[]	2	3	1	0	{0:["XYCOpen", []]}	{}	[]	110
+2	kaifu2	[]	[]	6	7	1	0	{0:["XYCOpen", []]}	{}	[]	110
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index f01c258..5d4b46a 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -1,3 +1,3 @@
 CfgID	StartDate	EndDate	IsDayReset	ResetType	LimitLV	TemplateID
-1	3	4	1	0	110	1
-2	7	8	1	0	110	1
+1	2	3	1	0	110	1
+2	6	7	1	0	110	1
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 4117350..2f3fc30 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -199,8 +199,8 @@
 979	1	0	钻石充值卡	80	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	3000	0	50	0	1	0	0	228	300	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
 980	1	0	白金充值卡	80	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1000	0	50	0	1	0	0	228	100	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
 981	1	0	黄金充值卡	80	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	500	0	50	0	1	0	0	228	50	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
-982	1	0	极品寻宝令	15	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	248	0	50	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
-983	1	0	符印寻宝令	15	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	30	0	50	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
+982	1	0	极品寻宝令	16	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	248	0	50	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
+983	1	0	符印寻宝令	16	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	30	0	50	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
 984	1	0	中型等级经验丹	13	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	3	0	50	0	1	0	0	215	1000	400	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
 985	1	0	VIP体验卡	80	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	1	0	50	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	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 986	1	0	经验祈愿符	15	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	20	0	50	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

--
Gitblit v1.8.0