From 8ae8c725fcb6187350e458b2e762e84fca1d00cb Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Fri, 30 Oct 2020 11:26:37 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
ProjectSettings/EditorBuildSettings.asset | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index ddd2c5d..66d1b51 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -9,12 +9,12 @@
path: Assets/Scenes/TestTalkingData.unity
guid: 415e09a546f94cf4b883227ff1be6086
- enabled: 1
- path: Assets/Scenes/MainManuScene.unity
- guid: 520ddc4fdac3ea246b57984ad40aea6c
- - enabled: 1
path: Assets/Scenes/LoadingScene.unity
guid: 587e6361681b8c54f92c0bc9bbfa2cb7
- enabled: 1
+ path: Assets/Scenes/MainManuScene.unity
+ guid: 520ddc4fdac3ea246b57984ad40aea6c
+ - enabled: 1
path: Assets/Scenes/Levels/Battle/GemBattle.unity
guid: 31be1c7e41e144742a462aa0c605346c
- enabled: 1
--
Gitblit v1.9.1