From 540fa0572be76e01bc39411f5a44b4b2e50a3d00 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 19 十一月 2018 21:12:02 +0800
Subject: [PATCH] Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2

---
 CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index 210b7b8..7bff72e 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -2,3 +2,5 @@
 1	kaifu1	[]	[]	3	4	1	0	{0:["XYCOpen", []]}	{}	[]	110
 2	kaifu2	[]	[]	7	8	1	0	{0:["XYCOpen", []]}	{}	[]	110
 3	ceshi1	[]	[]	2018-11-16	2018-11-18	1	0	{0:["XYCOpen", []]}	{}	[]	110
+4	yunying1	[]	[]	2018-11-23	2018-11-24	1	0	{0:["XYCOpen", []]}	{}	[]	110
+5	yunying2	[]	[]	2018-11-26	2018-11-26	1	0	{0:["XYCOpen", []]}	{}	[]	110

--
Gitblit v1.8.0