From e1a9ed955b247e4cc4615e8700b0ea34d7683224 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Tue, 15 Dec 2020 17:19:48 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/Scenes/Loading.unity |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/Scenes/Loading.unity b/Assets/Scenes/Loading.unity
index b94f9e8..f14c417 100644
--- a/Assets/Scenes/Loading.unity
+++ b/Assets/Scenes/Loading.unity
@@ -201341,7 +201341,7 @@
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1826197576
 RectTransform:
   m_ObjectHideFlags: 0
@@ -235455,7 +235455,7 @@
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2022232295
 RectTransform:
   m_ObjectHideFlags: 0

--
Gitblit v1.9.1