From b2d6afbf83fcc08f5371abb16cfbc4d892029f41 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 30 十月 2018 10:00:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt                            |    2 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.pyc |    0 
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index bae91cb..a4c2973 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -1,2 +1,2 @@
 CfgID	ActMark	ServerIDList	StartDate	EndDate	IsDayReset	ResetType	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV
-1	test1	[]	2018-10-1	2018-10-3	1	1	{0:["BossFHOpen", []]}	{}	[]	110
+1	test1	[]	2018-10-1	2018-10-3	1	1	{0:["XYCOpen", []]}	{}	[]	110
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.pyc
index 5821877..70fc237 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.pyc
Binary files differ

--
Gitblit v1.8.0