From 17c6e8b6f2aee4ed9a15c886f54a73f0cb61b125 Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Wed, 09 Dec 2020 17:14:59 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Resources/UI/Final/FinalPanel.prefab | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/Assets/Resources/UI/Final/FinalPanel.prefab b/Assets/Resources/UI/Final/FinalPanel.prefab
index 54fe816..835dec3 100644
--- a/Assets/Resources/UI/Final/FinalPanel.prefab
+++ b/Assets/Resources/UI/Final/FinalPanel.prefab
@@ -1124,10 +1124,10 @@
- {fileID: 5748941952564637225}
- {fileID: 5646961902762380150}
- {fileID: 8431080647543519056}
- - {fileID: 197643528144310344}
- {fileID: 7878479991277281519}
- {fileID: 8441617594771339911}
- {fileID: 1844543117816446403}
+ - {fileID: 197643528144310344}
- {fileID: 1818325968707775638}
- {fileID: 8661324587580357946}
- {fileID: 3492065258373943105}
@@ -1712,7 +1712,7 @@
- component: {fileID: 3364687659647567917}
- component: {fileID: 7512340566086335350}
m_Layer: 5
- m_Name: Text
+ m_Name: GoOnText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -2099,11 +2099,11 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4084473540632843494}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+ m_LocalPosition: {x: 0, y: 0, z: -1450}
+ m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 8
+ m_RootOrder: 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}
@@ -2266,11 +2266,11 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4282407097951878964}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+ m_LocalPosition: {x: 0, y: 0, z: -1450}
+ m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 6
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2421,7 +2421,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4409748864798671065}
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.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5825945650563712391}
@@ -2806,11 +2806,11 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5531562892244897489}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+ m_LocalPosition: {x: 0, y: 0, z: -1450}
+ m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 7
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4074,7 +4074,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7768128128048353543}
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: -1450}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4379579164978002596}
@@ -4455,15 +4455,15 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8519968415981260941}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.7, y: 0.5, z: 0.5}
+ m_LocalPosition: {x: 0, y: 0, z: -1450}
+ m_LocalScale: {x: 0.7, y: 0.49999997, z: 0.49999997}
m_Children: []
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 5
+ m_RootOrder: 8
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: -3.1, y: -563.2}
+ m_AnchoredPosition: {x: -3.0999718, y: -563.2}
m_SizeDelta: {x: 867, y: 242}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4719901733496479003
@@ -4980,6 +4980,11 @@
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
+ - target: {fileID: 3722113802779180166, guid: 475bea2daa2edd9489bdf4733073ff7d,
+ type: 3}
+ propertyPath: m_SortingOrder
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 5630114664672368968, guid: 475bea2daa2edd9489bdf4733073ff7d,
type: 3}
propertyPath: playOnAwake
@@ -5008,7 +5013,7 @@
- target: {fileID: 6225265779541526635, guid: 475bea2daa2edd9489bdf4733073ff7d,
type: 3}
propertyPath: m_LocalPosition.z
- value: 1
+ value: -690
objectReference: {fileID: 0}
- target: {fileID: 6225265779541526635, guid: 475bea2daa2edd9489bdf4733073ff7d,
type: 3}
--
Gitblit v1.9.1