From dd5714437ff7e132cdc38a6b909b68d94de161bb Mon Sep 17 00:00:00 2001
From: art_yxc <616551813@qq.com>
Date: 星期六, 19 一月 2019 16:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

---
 Maps/Scenes/Map132_Plxj/NavMesh.asset              |    0 
 Maps/Model/Map132_Plxj/Mesh/Plxj_navigation_00.FBX |    0 
 Maps/Model/Map132_Plxj/Mesh/Plxj_navigation_01.FBX |    0 
 Maps/Scenes/Map132_Plxj/NavMesh.asset.meta         |    2 +-
 4 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Maps/Model/Map132_Plxj/Mesh/Plxj_navigation_00.FBX b/Maps/Model/Map132_Plxj/Mesh/Plxj_navigation_00.FBX
index bf6b804..ad467ac 100644
--- a/Maps/Model/Map132_Plxj/Mesh/Plxj_navigation_00.FBX
+++ b/Maps/Model/Map132_Plxj/Mesh/Plxj_navigation_00.FBX
Binary files differ
diff --git a/Maps/Model/Map132_Plxj/Mesh/Plxj_navigation_01.FBX b/Maps/Model/Map132_Plxj/Mesh/Plxj_navigation_01.FBX
index 59df63e..76c25fe 100644
--- a/Maps/Model/Map132_Plxj/Mesh/Plxj_navigation_01.FBX
+++ b/Maps/Model/Map132_Plxj/Mesh/Plxj_navigation_01.FBX
Binary files differ
diff --git a/Maps/Scenes/Map132_Plxj/NavMesh.asset b/Maps/Scenes/Map132_Plxj/NavMesh.asset
index 66d3bc1..85825d1 100644
--- a/Maps/Scenes/Map132_Plxj/NavMesh.asset
+++ b/Maps/Scenes/Map132_Plxj/NavMesh.asset
Binary files differ
diff --git a/Maps/Scenes/Map132_Plxj/NavMesh.asset.meta b/Maps/Scenes/Map132_Plxj/NavMesh.asset.meta
index 687b247..0d21804 100644
--- a/Maps/Scenes/Map132_Plxj/NavMesh.asset.meta
+++ b/Maps/Scenes/Map132_Plxj/NavMesh.asset.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 50b06cc914cb9664eb73acf0785538c3
-timeCreated: 1547547780
+timeCreated: 1547880582
 licenseType: Pro
 NativeFormatImporter:
   mainObjectFileID: 23800000

--
Gitblit v1.8.0