From 02997c04b2de6c5a5c6ab7ec9ea9e66e128b497f Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期一, 08 十月 2018 17:11:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc |    0 
 CoreServerGroup/GameServer/Script/GM/Commands/Bossall.pyc          |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip      |    0 
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/Bossall.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/Bossall.pyc
index ec76548..ef4d574 100644
--- a/CoreServerGroup/GameServer/Script/GM/Commands/Bossall.pyc
+++ b/CoreServerGroup/GameServer/Script/GM/Commands/Bossall.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index 2aa78bc..4fe462a 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index f365c81..d267d86 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ

--
Gitblit v1.8.0