From ae487b742c792c43b81cce6f060b881e5609d160 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Tue, 08 Dec 2020 11:48:26 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Resources/UI/Final/FinalPanel.prefab | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Assets/Resources/UI/Final/FinalPanel.prefab b/Assets/Resources/UI/Final/FinalPanel.prefab
index ff01156..6174575 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}
@@ -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: -1500}
- 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: -1500}
- 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}
@@ -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: -1500}
- 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}
@@ -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
--
Gitblit v1.9.1