From 6b9579a63726c3b0d37cb3e9b4453cfd7f17b5d1 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 19 十二月 2018 16:29:04 +0800
Subject: [PATCH] Merge branch 'master' into Cross_Server
---
ProjectSettings/EditorBuildSettings.asset | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index d577724..f93f455 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -54,6 +54,9 @@
path: Assets/Art/Maps/Scenes/Map103_Bzjec.unity
guid: a3abe460b3baa2d4e8ceb965fdbded65
- enabled: 1
+ path: Assets/Art/Maps/Scenes/Map134_Yams.unity
+ guid: 00000000000000000000000000000000
+ - enabled: 1
path: Assets/Art/Maps/Scenes/Map007_Jyzk.unity
guid: 1522caa409cd02d49be4e23766345ea4
- enabled: 1
--
Gitblit v1.8.0