From 0a986d7e6e45ade96bf45e6381edbeb96d83b0cb Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 21 二月 2019 16:59:20 +0800
Subject: [PATCH] Merge branch '1.6' of http://192.168.0.87:10010/r/snxx_server into 1.6

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                         |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.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 e852d26..bea3ff5 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/Item/ChItem.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
index 19bd569..15013b7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.pyc
new file mode 100644
index 0000000..7906e51
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.pyc
Binary files differ

--
Gitblit v1.8.0