From 45f7442afa3b25cc79c76898224e48d6aed1a2ee Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 24 Dec 2020 15:22:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Prefabs/UI/Main/MainPanel.prefab | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Assets/Prefabs/UI/Main/MainPanel.prefab b/Assets/Prefabs/UI/Main/MainPanel.prefab
index 44ef2fe..3770a05 100644
--- a/Assets/Prefabs/UI/Main/MainPanel.prefab
+++ b/Assets/Prefabs/UI/Main/MainPanel.prefab
@@ -612,10 +612,10 @@
m_Father: {fileID: 5622757516385199873}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMin: {x: 0, y: 0.8}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: -193.4}
- m_SizeDelta: {x: 0, y: 386.7865}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9076701139633534762
CanvasRenderer:
@@ -732,7 +732,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: -1.5, y: -472}
+ m_AnchoredPosition: {x: -1.5, y: -500}
m_SizeDelta: {x: 449, y: 89}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9076701139660066710
@@ -805,10 +805,10 @@
m_Father: {fileID: 5622757516385199873}
m_RootOrder: 0
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_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 1080, y: 1920}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9076701139859261526
CanvasRenderer:
@@ -1076,9 +1076,9 @@
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 0}
- m_AnchoredPosition: {x: 0, y: 76.8}
- m_SizeDelta: {x: 0, y: 153.66376}
+ m_AnchorMax: {x: 1, y: 0.08}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9076701140607970203
CanvasRenderer:
--
Gitblit v1.9.1