From dbdac05546e47dd02381204f4f56e10f601f3c29 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Wed, 25 Nov 2020 16:15:47 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scenes/Levels/Battle/Endless2D.unity | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Assets/Scenes/Levels/Battle/Endless2D.unity b/Assets/Scenes/Levels/Battle/Endless2D.unity
index d582906..a585216 100644
--- a/Assets/Scenes/Levels/Battle/Endless2D.unity
+++ b/Assets/Scenes/Levels/Battle/Endless2D.unity
@@ -3995,7 +3995,7 @@
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
- m_Bits: 4294967295
+ m_Bits: 524087
--- !u!114 &849284129
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4070,6 +4070,11 @@
propertyPath: m_Name
value: BottomCanvas
objectReference: {fileID: 0}
+ - target: {fileID: 4623057512704841786, guid: 29da21b318f42054db30c52123aa4dbf,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 4623057512704841790, guid: 29da21b318f42054db30c52123aa4dbf,
type: 3}
propertyPath: m_LocalPosition.x
--
Gitblit v1.9.1