From e4417be43f050655c0b623b4cb52150aaaa8d524 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期一, 12 十一月 2018 19:14:01 +0800
Subject: [PATCH] Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc
index c0ee1d8..e6c4c70 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc
Binary files differ

--
Gitblit v1.8.0