From c6b784e82f6a5df48e3d1b4c1c8e0b65279e7917 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期一, 07 一月 2019 21:12:06 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt | 2 +- 3 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt index 6b5f9e9..c2aef3f 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt @@ -4,4 +4,4 @@ Map135_Llxg 32013 跨服竞技场4 32013 0 0 0 50 1 Map135_Llxg 32014 跨服竞技场5 32014 0 0 0 50 1 Map132_Plxj 32020 跨服BOSS 32020 0 0 0 50 1 -Map132_Plxj 32021 跨服BOSS 32021 0 0 0 50 1 \ No newline at end of file +Map132_Plxj 32021 跨服BOSS 32020 0 0 0 50 1 \ No newline at end of file diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc index 2ab703f..af3cecd 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc index be6b0fe..d4876b4 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc Binary files differ -- Gitblit v1.8.0