From 243d65af53aae9e3084f20ea9c5815f5b29df09e Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 26 Nov 2020 18:26:58 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Resources/UI/Props/Icon.prefab | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Assets/Resources/UI/Props/Icon.prefab b/Assets/Resources/UI/Props/Icon.prefab
index 07f8a34..e2d5e34 100644
--- a/Assets/Resources/UI/Props/Icon.prefab
+++ b/Assets/Resources/UI/Props/Icon.prefab
@@ -28,15 +28,15 @@
m_GameObject: {fileID: 1227610056024535752}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children: []
m_Father: {fileID: 0}
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_AnchoredPosition: {x: -105, y: 0}
- m_SizeDelta: {x: 67, y: 67}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 52, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8351290247369744125
CanvasRenderer:
@@ -60,13 +60,13 @@
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 22253e4af58f9504ea78ba1dd24ff910, type: 3}
+ m_Sprite: {fileID: 21300000, guid: f95a7e975f487ac4b932bea4f52cc966, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
--
Gitblit v1.9.1