From 52fb8c663b1e74b2a36b79bc70a452ca73db6341 Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 12 Nov 2020 17:20:08 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Resources/UI/Final/FinalPanelItem.prefab | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Assets/Resources/UI/Final/FinalPanelItem.prefab b/Assets/Resources/UI/Final/FinalPanelItem.prefab
index a158e07..e3bacb2 100644
--- a/Assets/Resources/UI/Final/FinalPanelItem.prefab
+++ b/Assets/Resources/UI/Final/FinalPanelItem.prefab
@@ -25,12 +25,12 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3159367684285514522}
- 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: 8311693735236508096}
- m_RootOrder: 4
+ m_Father: {fileID: 7359536407882811423}
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
@@ -160,12 +160,12 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3761020362054372983}
- 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: 8311693735236508096}
- m_RootOrder: 1
+ m_Father: {fileID: 7359536407882811423}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
@@ -238,15 +238,19 @@
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_Children:
+ - {fileID: 2331103944869751900}
+ - {fileID: 1569594598514201795}
+ - {fileID: 8306878617479166037}
+ - {fileID: 4247350568657291985}
m_Father: {fileID: 8311693735236508096}
m_RootOrder: 0
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_AnchorMin: {x: 0, y: 0.5}
+ m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 696, y: 70}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1258189153454871389
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -314,12 +318,12 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 8311693735236508096}
- m_RootOrder: 3
+ m_Father: {fileID: 7359536407882811423}
+ m_RootOrder: 2
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: 171.89, y: -0.000036478}
+ m_AnchoredPosition: {x: 171.89001, y: -0.000038146973}
m_SizeDelta: {x: 300, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2147142016798250748
@@ -445,12 +449,12 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8306847320312959411}
- 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: 8311693735236508096}
- m_RootOrder: 2
+ m_Father: {fileID: 7359536407882811423}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
@@ -528,10 +532,6 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7359536407882811423}
- - {fileID: 2331103944869751900}
- - {fileID: 1569594598514201795}
- - {fileID: 8306878617479166037}
- - {fileID: 4247350568657291985}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--
Gitblit v1.9.1