From dc360e6e0431ad840af73bec1ef0dd1f427a55f7 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期五, 28 九月 2018 21:51:42 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

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

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 1f899b3..b1eb882 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -1,3 +1,3 @@
 CfgID	ActMark	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	LimitLV	TemplateID
-1	OpenSever	[]	3	5	1	{0:["BossFHOpen", []]}	{}	110	1
-2	OpenSever	[]	9	11	1	{0:["BossFHOpen", []]}	{}	110	1
+1	OpenSever1	[]	3	5	1	{0:["BossFHOpen", []]}	{}	110	1
+2	OpenSever2	[]	9	11	1	{0:["BossFHOpen", []]}	{}	110	1
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
index 8e54fb5..a2fdeac 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
Binary files differ

--
Gitblit v1.8.0