From 4d13da40e8ff7ba3b7abba88c678ca94d1648bb1 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 15 Apr 2022 16:47:08 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=93=E3=83=83=E3=82=AF=E3=83=AA=E3=83=9E?= =?UTF-8?q?=E3=83=BC=E3=82=AF=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Main.unity | 75 ++++++++ .../MyGame/Scenes/Main/Prefabs/Canvas.prefab | 160 +++++++++++++++++- .../Scenes/Main/Prefabs/UI/Footer.prefab | 147 +++++++++++++++- 3 files changed, 367 insertions(+), 15 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index c1d70512..2c37f2d0 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -7669,11 +7669,51 @@ PrefabInstance: propertyPath: m_RootOrder value: 7 objectReference: {fileID: 0} + - target: {fileID: 2532447002622158939, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2532447002622158939, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2532447002622158939, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2532447002622158939, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2532447002622158939, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2532447002622158939, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -31.099998 + objectReference: {fileID: 0} + - target: {fileID: 2532447002622158939, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} - target: {fileID: 2835369144934501534, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3470414520275603510, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y @@ -7984,11 +8024,46 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 8368363098277300098, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8368363098277300098, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8368363098277300098, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8368363098277300098, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8368363098277300098, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_SizeDelta.x + value: 294 + objectReference: {fileID: 0} + - target: {fileID: 8368363098277300098, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_SizeDelta.y + value: 128 + objectReference: {fileID: 0} - target: {fileID: 8368363098277300098, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.x value: 355 objectReference: {fileID: 0} + - target: {fileID: 8368363098277300098, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -489 + objectReference: {fileID: 0} - target: {fileID: 8371710086384095217, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 24b19841..6229c8c6 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -2954,6 +2954,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6498465124467203549} - {fileID: 3470414520275603510} m_Father: {fileID: 3664916832844628215} m_RootOrder: 3 @@ -3403,7 +3404,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8368363098277300098} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3718,6 +3719,11 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4699855437215309545, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Name + value: icon_get + objectReference: {fileID: 0} - target: {fileID: 9193060593438266932, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} propertyPath: m_LocalPosition.y @@ -3737,6 +3743,146 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2246654624185019878} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3082431404261031140 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8368363098277300098} + m_Modifications: + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -22 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -36 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Name + value: icon_get + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3} +--- !u!224 &6498465124467203549 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + m_PrefabInstance: {fileID: 3082431404261031140} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3691625806369805098 PrefabInstance: m_ObjectHideFlags: 0 @@ -3982,18 +4128,18 @@ PrefabInstance: m_RemovedComponents: - {fileID: 3928365105026016678, guid: ac3be7383b736d941b251a588e626963, type: 3} m_SourcePrefab: {fileID: 100100000, guid: ac3be7383b736d941b251a588e626963, type: 3} ---- !u!1 &3664916834242367712 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, - type: 3} - m_PrefabInstance: {fileID: 3691625806369805098} - m_PrefabAsset: {fileID: 0} --- !u!224 &3664916834242367713 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 137127163878687691, guid: ac3be7383b736d941b251a588e626963, type: 3} m_PrefabInstance: {fileID: 3691625806369805098} m_PrefabAsset: {fileID: 0} +--- !u!1 &3664916834242367712 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, + type: 3} + m_PrefabInstance: {fileID: 3691625806369805098} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5515389989501635960 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab index c2106e75..f5af6c82 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab @@ -1289,7 +1289,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4679625445702527582} - m_RootOrder: 0 + 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} @@ -1744,6 +1744,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2187968968486796520} - {fileID: 3310671341740920856} - {fileID: 4563072550906790889} m_Father: {fileID: 3310671341787608546} @@ -1932,7 +1933,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4679625445702527582} - m_RootOrder: 1 + 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} @@ -2093,6 +2094,42 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4699855437215309545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2187968968486796520} + m_Layer: 5 + m_Name: get + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2187968968486796520 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4699855437215309545} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} + m_Children: + - {fileID: 8658160007162249261} + m_Father: {fileID: 4679625445702527582} + 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_AnchoredPosition: {x: -34, y: 88.5} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4987879202237614286 GameObject: m_ObjectHideFlags: 0 @@ -3810,6 +3847,100 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &9178925981934893879 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8658160007162249261} + - component: {fileID: 4336848473336188036} + - component: {fileID: 4482031407013893906} + - component: {fileID: 2269720194667779898} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8658160007162249261 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9178925981934893879} + 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: 2187968968486796520} + 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_AnchoredPosition: {x: 100, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4336848473336188036 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9178925981934893879} + m_CullTransparentMesh: 0 +--- !u!114 &4482031407013893906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9178925981934893879} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: db68872aa6d222445bb84d6ddfc2d9ca, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!95 &2269720194667779898 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9178925981934893879} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: f7b92a2f595b55d42b3a6c528e377344, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1001 &6632112567178762520 PrefabInstance: m_ObjectHideFlags: 0 @@ -3949,15 +4080,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3} ---- !u!1 &2430043917671370164 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, - type: 3} - m_PrefabInstance: {fileID: 6632112567178762520} - m_PrefabAsset: {fileID: 0} --- !u!224 &3233636912317429793 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, type: 3} m_PrefabInstance: {fileID: 6632112567178762520} m_PrefabAsset: {fileID: 0} +--- !u!1 &2430043917671370164 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + m_PrefabInstance: {fileID: 6632112567178762520} + m_PrefabAsset: {fileID: 0}