From 7b9712f33f42b14e4d277166fa533a379021312d Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 18 Dec 2020 09:52:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Prefabs/UI/GuideUI/BoxPanel.prefab | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Assets/Prefabs/UI/GuideUI/BoxPanel.prefab b/Assets/Prefabs/UI/GuideUI/BoxPanel.prefab
index 38ec02a..329c812 100644
--- a/Assets/Prefabs/UI/GuideUI/BoxPanel.prefab
+++ b/Assets/Prefabs/UI/GuideUI/BoxPanel.prefab
@@ -824,7 +824,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 512, y: 512}
+ m_SizeDelta: {x: 649, y: 690}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7107213133892301551
CanvasRenderer:
@@ -854,7 +854,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 8ef031eaacab11d49b80a1556872a62b, type: 3}
+ m_Sprite: {fileID: 21300000, guid: d2d7060db23896c4eb0f5c43242e8a02, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -899,7 +899,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 512, y: 512}
+ m_SizeDelta: {x: 649, y: 690}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7113859375695730988
CanvasRenderer:
@@ -929,7 +929,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 3e1ba3883c4ffb24f8005398456c7cf9, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 6f3058c4388112d40af3c5ed5abf7429, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2035,7 +2035,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 512, y: 512}
+ m_SizeDelta: {x: 649, y: 690}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6701776875718732619
CanvasRenderer:
@@ -2065,7 +2065,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 052ead79c00877c4596e05fb4ea39ae8, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 2e88501cf6517bd448468557f47f823c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
--
Gitblit v1.9.1