From 9e0ad4beb3ec784d54e42b013af20b0f1924ae81 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 12 Dec 2020 14:12:46 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Prefabs/UI/Endless/Energy.prefab | 66 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/Assets/Prefabs/UI/Endless/Energy.prefab b/Assets/Prefabs/UI/Endless/Energy.prefab
index c26d293..e491744 100644
--- a/Assets/Prefabs/UI/Endless/Energy.prefab
+++ b/Assets/Prefabs/UI/Endless/Energy.prefab
@@ -26,16 +26,16 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1310074049386371692}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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_Children: []
m_Father: {fileID: 2245660995521503250}
- m_RootOrder: 1
+ m_RootOrder: 3
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: 35}
+ m_AnchoredPosition: {x: 0.000030517578, y: 34.99997}
m_SizeDelta: {x: 25, y: 22}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8519987240805750534
@@ -126,12 +126,12 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.3, y: 1.3, z: 1.3}
m_Children:
- - {fileID: 9149158087180956820}
- - {fileID: 1601561953590493166}
- - {fileID: 7675384370951959148}
- {fileID: 5383122461395927091}
- - {fileID: 2852732232758538960}
+ - {fileID: 9149158087180956820}
+ - {fileID: 7675384370951959148}
+ - {fileID: 1601561953590493166}
- {fileID: 5769365057982938342}
+ - {fileID: 2852732232758538960}
- {fileID: 1229591115306338502}
m_Father: {fileID: 573987700737003514}
m_RootOrder: 0
@@ -139,7 +139,7 @@
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -81, y: 300}
- m_SizeDelta: {x: 74, y: 332}
+ m_SizeDelta: {x: 78, y: 339}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4696670999143271602
CanvasRenderer:
@@ -169,7 +169,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: cda1ffd53d268f74fa300a5403c86531, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 243c7c03ef72a5b45bc1b772d1639260, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -204,7 +204,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3413320520729169847}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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_Children: []
@@ -213,7 +213,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: 0, y: 11}
+ m_AnchoredPosition: {x: 0.000030517578, y: 7.4999695}
m_SizeDelta: {x: 51, y: 22}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3260020812057652054
@@ -285,11 +285,11 @@
m_Children:
- {fileID: 182146690775761759}
m_Father: {fileID: 2245660995521503250}
- m_RootOrder: 3
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: -17}
+ m_AnchoredPosition: {x: 0.000030517578, y: -13.5}
m_SizeDelta: {x: 60, y: 34}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2500573068092287740
@@ -486,11 +486,11 @@
m_Children:
- {fileID: 7713304129688559897}
m_Father: {fileID: 2245660995521503250}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: 201}
+ m_AnchoredPosition: {x: 0.000030517578, y: 204.50012}
m_SizeDelta: {x: 30, y: 236}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1906910477548184221
@@ -570,7 +570,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7315659998893532791}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.4, y: 1.4, z: 1}
m_Children: []
@@ -579,7 +579,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: 28.6}
+ m_AnchoredPosition: {x: 0.000061035156, y: 32.100098}
m_SizeDelta: {x: 74, y: 89.42857}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1116309519812232840
@@ -799,7 +799,7 @@
- target: {fileID: 7818391072442849115, guid: 5591b24d709da864d8fa54fb582b837f,
type: 3}
propertyPath: m_LocalPosition.y
- value: 0
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 7818391072442849115, guid: 5591b24d709da864d8fa54fb582b837f,
type: 3}
@@ -809,17 +809,17 @@
- target: {fileID: 7818391072442849115, guid: 5591b24d709da864d8fa54fb582b837f,
type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 7818391072442849115, guid: 5591b24d709da864d8fa54fb582b837f,
type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 7818391072442849115, guid: 5591b24d709da864d8fa54fb582b837f,
type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 7818391072442849115, guid: 5591b24d709da864d8fa54fb582b837f,
type: 3}
@@ -829,7 +829,7 @@
- target: {fileID: 7818391072442849115, guid: 5591b24d709da864d8fa54fb582b837f,
type: 3}
propertyPath: m_RootOrder
- value: 4
+ value: 5
objectReference: {fileID: 0}
- target: {fileID: 7818391072442849115, guid: 5591b24d709da864d8fa54fb582b837f,
type: 3}
@@ -884,12 +884,12 @@
- target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
type: 3}
propertyPath: m_LocalPosition.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
type: 3}
propertyPath: m_LocalPosition.y
- value: -130
+ value: -124
objectReference: {fileID: 0}
- target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
type: 3}
@@ -899,17 +899,17 @@
- target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
type: 3}
@@ -919,7 +919,7 @@
- target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
type: 3}
propertyPath: m_RootOrder
- value: 5
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
type: 3}
@@ -956,6 +956,16 @@
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
+ - target: {fileID: 3993767359388031876, guid: cc9473b9d3a93c5458c8e125a8130bc2,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4804171030978848883, guid: cc9473b9d3a93c5458c8e125a8130bc2,
+ type: 3}
+ propertyPath: m_SortingOrder
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 5890933633274329196, guid: cc9473b9d3a93c5458c8e125a8130bc2,
type: 3}
propertyPath: m_Layer
--
Gitblit v1.9.1