From 18f96c9313bf24d2296e615f44fc0ca005f2e872 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 12 Nov 2020 16:05:44 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Resources/UI/Final/FinalPanel.prefab | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Assets/Resources/UI/Final/FinalPanel.prefab b/Assets/Resources/UI/Final/FinalPanel.prefab
index f84662b..cc64355 100644
--- a/Assets/Resources/UI/Final/FinalPanel.prefab
+++ b/Assets/Resources/UI/Final/FinalPanel.prefab
@@ -294,6 +294,8 @@
rank_icon_0: {fileID: 21300000, guid: 8a601bd3e6cea2648bda74cc5d41890e, type: 3}
rank_icon_1: {fileID: 21300000, guid: 84dda34663c79e645897598a6ab9f925, type: 3}
rank_icon_2: {fileID: 21300000, guid: 8728e3959d828724c83a5c407bb53443, type: 3}
+ endlessGameScene: Endless
+ loadingScene: LoadingScene
--- !u!1 &2453499008035776559
GameObject:
m_ObjectHideFlags: 0
@@ -969,7 +971,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -4.4, y: 461}
+ m_AnchoredPosition: {x: -4.4, y: 599.66}
m_SizeDelta: {x: 572.84656, y: 146.90869}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8224162413350209359
--
Gitblit v1.9.1