From 69e0fea6c92fd4e153d45e5f26ef89baecf0405a Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 19 Nov 2020 08:51:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Resources/UI/Guide/GuidePanel.prefab | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Assets/Resources/UI/Guide/GuidePanel.prefab b/Assets/Resources/UI/Guide/GuidePanel.prefab
index b5dd3e0..0d5fdf7 100644
--- a/Assets/Resources/UI/Guide/GuidePanel.prefab
+++ b/Assets/Resources/UI/Guide/GuidePanel.prefab
@@ -163,8 +163,8 @@
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: -156, y: -97}
- m_SizeDelta: {x: 150, y: 160}
+ m_AnchoredPosition: {x: -156, y: -124}
+ m_SizeDelta: {x: 120, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1513328901255623773
CanvasRenderer:
@@ -361,7 +361,7 @@
m_GameObject: {fileID: 1353751423052021237}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.15, y: 1.2, z: 1.2}
+ m_LocalScale: {x: 1.05, y: 1.2, z: 1.2}
m_Children:
- {fileID: 3861023101606060413}
m_Father: {fileID: 5148880899991696804}
@@ -10128,8 +10128,8 @@
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: 6, y: -108}
- m_SizeDelta: {x: 150, y: 160}
+ m_AnchoredPosition: {x: 6, y: -124}
+ m_SizeDelta: {x: 120, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1008060919980179297
CanvasRenderer:
@@ -10434,7 +10434,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4033919787940865614}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7678627218380787076}
@@ -10444,7 +10444,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: -302, y: -549.5}
+ m_AnchoredPosition: {x: -345, y: -451}
m_SizeDelta: {x: 135, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &40450391755731747
@@ -10775,7 +10775,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: 302, y: -549.5}
+ m_AnchoredPosition: {x: 347, y: -438}
m_SizeDelta: {x: 135, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5571260166908534693
@@ -10932,7 +10932,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6276095933853610772}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5966368840673147708}
@@ -10941,7 +10941,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: 0, y: -701}
+ m_AnchoredPosition: {x: 0, y: -604}
m_SizeDelta: {x: 135, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4760460880310566967
@@ -11415,7 +11415,7 @@
m_GameObject: {fileID: 7559096288375407272}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.15, y: 1.2, z: 1.2}
+ m_LocalScale: {x: 1.05, y: 1.2, z: 1.2}
m_Children: []
m_Father: {fileID: 4603625676959611805}
m_RootOrder: 0
@@ -16751,7 +16751,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8950312693980221416}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3078043526367245840}
@@ -16760,7 +16760,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: -302, y: -701}
+ m_AnchoredPosition: {x: -356, y: -600}
m_SizeDelta: {x: 135, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4223709936664550011
--
Gitblit v1.9.1