From b96c7d427afe310d43f098e56baab1ade5d38941 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期二, 04 十二月 2018 10:50:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc                                          |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc   |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc |    0 
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index 4fe462a..032729a 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/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
index e1d1a48..524e12d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
index dfb95bd..4f1fd13 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
Binary files differ

--
Gitblit v1.8.0