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/FinalPanel.prefab | 135 ++++++++++++++++++++++++++++++--------------
1 files changed, 92 insertions(+), 43 deletions(-)
diff --git a/Assets/Resources/UI/Final/FinalPanel.prefab b/Assets/Resources/UI/Final/FinalPanel.prefab
index cc64355..74ccd26 100644
--- a/Assets/Resources/UI/Final/FinalPanel.prefab
+++ b/Assets/Resources/UI/Final/FinalPanel.prefab
@@ -49,6 +49,7 @@
- component: {fileID: 516299254}
- component: {fileID: 516299253}
- component: {fileID: 516299252}
+ - component: {fileID: 3197980363054477934}
m_Layer: 5
m_Name: Scroller
m_TagString: Untagged
@@ -69,12 +70,12 @@
m_Children:
- {fileID: 332274925}
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 9
+ m_RootOrder: 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: -1.5, y: -1000}
- m_SizeDelta: {x: 711.27344, y: 640}
+ m_SizeDelta: {x: 771.2734, y: 640}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &516299256
CanvasRenderer:
@@ -99,8 +100,8 @@
scrollDirection: 0
spacing: 25
padding:
- m_Left: 10
- m_Right: 10
+ m_Left: 40
+ m_Right: 40
m_Top: 30
m_Bottom: 10
loop: 0
@@ -186,6 +187,18 @@
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
+--- !u!225 &3197980363054477934
+CanvasGroup:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 516299250}
+ m_Enabled: 1
+ m_Alpha: 0
+ m_Interactable: 1
+ m_BlocksRaycasts: 1
+ m_IgnoreParentGroups: 0
--- !u!1 &2271693986087398356
GameObject:
m_ObjectHideFlags: 0
@@ -217,23 +230,20 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5646961902762380150}
- - {fileID: 6820271757256221080}
- - {fileID: 197643528144310344}
+ - {fileID: 4943816522755542425}
- {fileID: 1818325968707775638}
- {fileID: 8661324587580357946}
- {fileID: 3492065258373943105}
- {fileID: 7909169244235860091}
- - {fileID: 8214016810444386803}
- {fileID: 3950903702536346173}
- {fileID: 516299251}
- - {fileID: 2909423727142955745}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_SizeDelta: {x: 1080, y: 1920}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2077414507324883705
CanvasRenderer:
@@ -326,7 +336,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 4
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -405,12 +415,12 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 8
+ 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}
- m_AnchoredPosition: {x: -3.1, y: -590.18}
- m_SizeDelta: {x: 263.4099, y: 49.729706}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 0}
+ m_AnchoredPosition: {x: -3.1, y: 369.82}
+ m_SizeDelta: {x: 263.4099, y: 49.729736}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3364687659647567917
CanvasRenderer:
@@ -479,17 +489,17 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3957429093911465766}
- 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: 5825945650563712391}
- m_RootOrder: 10
+ m_Father: {fileID: 7909169244235860091}
+ m_RootOrder: 1
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: 115.2, y: -424.1}
- m_SizeDelta: {x: 405.58575, y: 64.630035}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 0}
+ m_AnchoredPosition: {x: 115.2, y: 35}
+ m_SizeDelta: {x: 405.58575, y: 64.630005}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7463909619429382955
CanvasRenderer:
@@ -708,6 +718,43 @@
m_OnClick:
m_PersistentCalls:
m_Calls: []
+--- !u!1 &5006132482673416349
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4943816522755542425}
+ m_Layer: 5
+ m_Name: Images
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4943816522755542425
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5006132482673416349}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 2, y: 2, z: 2}
+ m_Children:
+ - {fileID: 6820271757256221080}
+ - {fileID: 197643528144310344}
+ m_Father: {fileID: 5825945650563712391}
+ m_RootOrder: 1
+ 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: 0}
+ m_SizeDelta: {x: 1080, y: 1920}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6023250998366712290
GameObject:
m_ObjectHideFlags: 0
@@ -733,16 +780,16 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6023250998366712290}
- 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: 5825945650563712391}
- m_RootOrder: 7
+ m_Father: {fileID: 7909169244235860091}
+ 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: -218.5, y: 530.2}
+ m_AnchoredPosition: {x: -218.5, y: 29.299927}
m_SizeDelta: {x: 200.58157, y: 47.86261}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1295767360570489712
@@ -812,12 +859,12 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6819379700565871762}
- 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: 5825945650563712391}
- m_RootOrder: 1
+ m_Father: {fileID: 4943816522755542425}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -874,7 +921,7 @@
- component: {fileID: 3351698810775391857}
- component: {fileID: 3769021108208984057}
m_Layer: 5
- m_Name: Image
+ m_Name: Image_NewRecord
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -892,7 +939,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -967,11 +1014,11 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 5
+ m_RootOrder: 4
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: -4.4, y: 599.66}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: -4.4, y: -505}
m_SizeDelta: {x: 572.84656, y: 146.90869}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8224162413350209359
@@ -1041,12 +1088,12 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8519968415981260941}
- 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: 5825945650563712391}
- m_RootOrder: 2
+ m_Father: {fileID: 4943816522755542425}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -1103,7 +1150,7 @@
- component: {fileID: 139394436063301678}
- component: {fileID: 3500119513403614750}
m_Layer: 5
- m_Name: Image
+ m_Name: Image_HScore
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1119,9 +1166,11 @@
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: 8214016810444386803}
+ - {fileID: 2909423727142955745}
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}
m_AnchorMax: {x: 0.5, y: 0}
--
Gitblit v1.9.1