From 7d1500d7db15ac6e3365a7367cf087a9b1996864 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 14 十二月 2018 15:52:23 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc           |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.pyc  |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc |    0 
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index cfa85b3..4403ae7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.pyc
index 48823e6..790c83c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc
index 709d4a7..ee812e1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc
Binary files differ

--
Gitblit v1.8.0