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/Endless/Energy.prefab | 126 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 121 insertions(+), 5 deletions(-)
diff --git a/Assets/Prefabs/UI/Endless/Energy.prefab b/Assets/Prefabs/UI/Endless/Energy.prefab
index 22c5bd5..388e5a3 100644
--- a/Assets/Prefabs/UI/Endless/Energy.prefab
+++ b/Assets/Prefabs/UI/Endless/Energy.prefab
@@ -130,8 +130,9 @@
- {fileID: 9149158087180956820}
- {fileID: 7675384370951959148}
- {fileID: 1601561953590493166}
- - {fileID: 5769365057982938342}
- {fileID: 2852732232758538960}
+ - {fileID: 5769365057982938342}
+ - {fileID: 4081107454225396487}
- {fileID: 1229591115306338502}
m_Father: {fileID: 573987700737003514}
m_RootOrder: 0
@@ -213,7 +214,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.000030517578, y: 7.4999695}
+ m_AnchoredPosition: {x: 0.000030517578, y: 15}
m_SizeDelta: {x: 51, y: 22}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3260020812057652054
@@ -575,7 +576,7 @@
m_LocalScale: {x: 1.4, y: 1.4, z: 1}
m_Children: []
m_Father: {fileID: 2245660995521503250}
- m_RootOrder: 6
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@@ -738,6 +739,121 @@
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1001 &1686608653397591835
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2245660995521503250}
+ m_Modifications:
+ - target: {fileID: 779759227532459688, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1301871034731117957, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 13
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 13
+ objectReference: {fileID: 0}
+ - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 13
+ objectReference: {fileID: 0}
+ - target: {fileID: 5760679434611394543, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_UI_JiNengTuBiao_03
+ objectReference: {fileID: 0}
+ - target: {fileID: 5760679434611394543, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 6946364723161781365, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8082333923366032818, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: ef2dad6d8015ab24f84f48e31f60fb12, type: 3}
+--- !u!4 &4081107454225396487 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
+ type: 3}
+ m_PrefabInstance: {fileID: 1686608653397591835}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &5410636901338817931
PrefabInstance:
m_ObjectHideFlags: 0
@@ -845,7 +961,7 @@
- target: {fileID: 7818391072442849115, guid: 5591b24d709da864d8fa54fb582b837f,
type: 3}
propertyPath: m_RootOrder
- value: 5
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 7818391072442849115, guid: 5591b24d709da864d8fa54fb582b837f,
type: 3}
@@ -940,7 +1056,7 @@
- target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
type: 3}
propertyPath: m_RootOrder
- value: 4
+ value: 5
objectReference: {fileID: 0}
- target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
type: 3}
--
Gitblit v1.9.1