From 3b379e470a105e8378771a4f8ad30b5e4bf96053 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 1 Jul 2022 11:41:36 +0900 Subject: [PATCH 1/3] =?UTF-8?q?minigame=20=E3=82=B7=E3=83=BC=E3=83=B3?= =?UTF-8?q?=E3=81=8B=E3=82=89=20ProtoGame.prefab=20=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/MiniGame/MiniGame.unity | 269 +--------- .../Scenes/MiniGame/Prefabs/ProtoGame.prefab | 486 ------------------ 2 files changed, 3 insertions(+), 752 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity index 359edcec..35a6b1be 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity @@ -936,7 +936,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &579812654 GameObject: @@ -2237,84 +2237,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1328382762} m_PrefabAsset: {fileID: 0} ---- !u!1 &1337070181 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1337070184} - - component: {fileID: 1337070183} - - component: {fileID: 1337070182} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1337070182 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1337070181} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: New Text ---- !u!222 &1337070183 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1337070181} - m_CullTransparentMesh: 0 ---- !u!224 &1337070184 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1337070181} - 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: 2498033716723453585} - 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: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1340402662 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3113,7 +3035,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1870432535 MonoBehaviour: @@ -3746,7 +3668,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -50, y: -162.02} + m_AnchoredPosition: {x: -50, y: -162.01953} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 1, y: 1} --- !u!114 &2085388516 @@ -3909,191 +3831,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2104274172} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2498033716723453584 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 461748212973672495, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_Name - value: ProtoGame - objectReference: {fileID: 0} - - target: {fileID: 461748212973672495, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1385770932522569332, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2498033716561349204, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_SizeDelta.x - value: 217 - objectReference: {fileID: 0} - - target: {fileID: 2498033716790378514, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2498033716790378514, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2498033716790378514, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_SizeDelta.x - value: 145 - objectReference: {fileID: 0} - - target: {fileID: 2498033716790378514, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 114.5 - objectReference: {fileID: 0} - - target: {fileID: 2498033716790378514, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -40 - objectReference: {fileID: 0} - - target: {fileID: 2498033717143991097, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2498033717143991100, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 1673325602} - - target: {fileID: 2498033717167142416, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2498033717226844049, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2498033717375854813, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2498033717375854813, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2498033717375854813, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_SizeDelta.x - value: 145 - objectReference: {fileID: 0} - - target: {fileID: 2498033717375854813, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 114.5 - objectReference: {fileID: 0} - - target: {fileID: 2498033717375854813, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -40 - objectReference: {fileID: 0} - - target: {fileID: 2498033717790956849, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_SizeDelta.x - value: 217 - objectReference: {fileID: 0} - - target: {fileID: 3927864348137186791, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6362814815096740739, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6390956298179763278, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6506543499675285520, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_UseAutoMass - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8987015135604457535, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8987015135604457535, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_LocalPosition.x - value: 9.285316 - objectReference: {fileID: 0} - - target: {fileID: 8987015135604457535, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_LocalPosition.y - value: -3.2177246 - objectReference: {fileID: 0} - - target: {fileID: 8987015135604457535, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_LocalPosition.z - value: -76.31647 - objectReference: {fileID: 0} - - target: {fileID: 8987015135604457535, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8987015135604457535, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8987015135604457535, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8987015135604457535, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8987015135604457535, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8987015135604457535, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8987015135604457535, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 417e2c534d3274ba1a973fe4284532bd, type: 3} ---- !u!224 &2498033716723453585 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2498033716317352191, guid: 417e2c534d3274ba1a973fe4284532bd, - type: 3} - m_PrefabInstance: {fileID: 2498033716723453584} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4559813503860727169 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ProtoGame.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ProtoGame.prefab index b1e5929a..aea13816 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ProtoGame.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ProtoGame.prefab @@ -706,12 +706,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2845075459559541233} - - {fileID: 5623201354958912150} - - {fileID: 1895130018301109748} - - {fileID: 8126610038817762681} - - {fileID: 4378297054251438819} - - {fileID: 5210202879090184585} - - {fileID: 5912541010185850641} m_Father: {fileID: 8987015135604457535} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1142,86 +1136,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &239748904036194582 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7269014383480657833} - m_Modifications: - - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8063655011831821646, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - propertyPath: m_Name - value: Stage2b - objectReference: {fileID: 0} - - target: {fileID: 8063655011831821646, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, type: 3} ---- !u!4 &4378297054251438819 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4580468283174947829, guid: 0a4cf26c02e2d4b2eb1c0ede826ebd6e, - type: 3} - m_PrefabInstance: {fileID: 239748904036194582} - m_PrefabAsset: {fileID: 0} --- !u!1001 &345452259161712323 PrefabInstance: m_ObjectHideFlags: 0 @@ -1297,86 +1211,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 345452259161712323} m_PrefabAsset: {fileID: 0} ---- !u!1001 &519776160723632317 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7269014383480657833} - m_Modifications: - - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6825300293089241174, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - propertyPath: m_Name - value: Stage1b - objectReference: {fileID: 0} - - target: {fileID: 6825300293089241174, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bbd611303c5ec4c41a4ceca6a0bb9148, type: 3} ---- !u!4 &1895130018301109748 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2124088376866006345, guid: bbd611303c5ec4c41a4ceca6a0bb9148, - type: 3} - m_PrefabInstance: {fileID: 519776160723632317} - m_PrefabAsset: {fileID: 0} --- !u!1001 &941680629101445032 PrefabInstance: m_ObjectHideFlags: 0 @@ -2612,166 +2446,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5459859351198576567} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5834151516866522412 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7269014383480657833} - m_Modifications: - - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5140115440945204540, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - propertyPath: m_Name - value: Stage1a - objectReference: {fileID: 0} - - target: {fileID: 5140115440945204540, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4700f2d6cab15484295a1f9b42d78ec9, type: 3} ---- !u!4 &5623201354958912150 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9, - type: 3} - m_PrefabInstance: {fileID: 5834151516866522412} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &5965344579461997363 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7269014383480657833} - m_Modifications: - - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862439291227870202, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - propertyPath: m_Name - value: Stage2a - objectReference: {fileID: 0} - - target: {fileID: 7862439291227870202, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 904e56c15b0d140e18306aaa0cc87dd0, type: 3} ---- !u!4 &8126610038817762681 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2454089663812030026, guid: 904e56c15b0d140e18306aaa0cc87dd0, - type: 3} - m_PrefabInstance: {fileID: 5965344579461997363} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6018188289142537135 PrefabInstance: m_ObjectHideFlags: 0 @@ -3082,166 +2756,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6918608246709469341} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7897649788636911071 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7269014383480657833} - m_Modifications: - - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3563731758725637829, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - propertyPath: m_Name - value: Stage3a - objectReference: {fileID: 0} - - target: {fileID: 3563731758725637829, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, type: 3} ---- !u!4 &5210202879090184585 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2725888655826027606, guid: f63cbe48d485f4f08b6e5d50d60ae3f5, - type: 3} - m_PrefabInstance: {fileID: 7897649788636911071} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &8169972131502273959 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7269014383480657833} - m_Modifications: - - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7741594668631066970, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - propertyPath: m_Name - value: Stage3b - objectReference: {fileID: 0} - - target: {fileID: 7741594668631066970, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ac953b6a40d53457aa1f141c14a8b485, type: 3} ---- !u!4 &5912541010185850641 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2552418280157887158, guid: ac953b6a40d53457aa1f141c14a8b485, - type: 3} - m_PrefabInstance: {fileID: 8169972131502273959} - m_PrefabAsset: {fileID: 0} --- !u!1001 &9099863749090655763 PrefabInstance: m_ObjectHideFlags: 0 From cf85f4165df74c055bad1467f210ea3133971303 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 1 Jul 2022 11:49:57 +0900 Subject: [PATCH 2/3] =?UTF-8?q?obstacle=20prefab=20=E6=A7=8B=E9=80=A0?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MiniGame/Prefabs/Obstacle 1x1.prefab | 74 +++++++++++++------ .../MiniGame/Prefabs/Obstacle 1x2.prefab | 7 +- .../MiniGame/Prefabs/Obstacle 2x2.prefab | 10 +-- 3 files changed, 64 insertions(+), 27 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x1.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x1.prefab index 054fd291..bb63178c 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x1.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x1.prefab @@ -1,5 +1,37 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1501304099507552920 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1814670119296341110} + m_Layer: 0 + m_Name: Obstacle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1814670119296341110 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1501304099507552920} + 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: + - {fileID: 4888696605717816911} + - {fileID: 4498234376221693368} + m_Father: {fileID: 6091183625377926242} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3565643019619598235 GameObject: m_ObjectHideFlags: 0 @@ -9,6 +41,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6091183625377926242} + - component: {fileID: 6269221055338962044} m_Layer: 0 m_Name: Obstacle 1x1 m_TagString: Untagged @@ -24,13 +57,24 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3565643019619598235} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.75, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4498234376221693368} + - {fileID: 1814670119296341110} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!210 &6269221055338962044 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3565643019619598235} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 --- !u!1 &4498234376221693369 GameObject: m_ObjectHideFlags: 0 @@ -42,9 +86,8 @@ GameObject: - component: {fileID: 4498234376221693368} - component: {fileID: 4498234376221693372} - component: {fileID: 4498234376221693374} - - component: {fileID: 4498234376221693375} m_Layer: 0 - m_Name: Obstacle + m_Name: Collider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -60,10 +103,9 @@ Transform: 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: - - {fileID: 4888696605717816911} - m_Father: {fileID: 6091183625377926242} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 1814670119296341110} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4498234376221693372 MonoBehaviour: @@ -79,6 +121,7 @@ MonoBehaviour: m_EditorClassIdentifier: itemType: 1 point: 0 + effect: {fileID: 0} --- !u!61 &4498234376221693374 BoxCollider2D: m_ObjectHideFlags: 0 @@ -105,17 +148,6 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1.5, y: 1.5} m_EdgeRadius: 0 ---- !u!210 &4498234376221693375 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4498234376221693369} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 4 --- !u!1 &7325959465453491716 GameObject: m_ObjectHideFlags: 0 @@ -140,11 +172,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7325959465453491716} - 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: 4498234376221693368} + m_Father: {fileID: 1814670119296341110} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8948517510153873636 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x2.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x2.prefab index 84e89b19..ae15096a 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x2.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x2.prefab @@ -7,6 +7,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1814670119296341110, guid: b82d5b841abe54f95aee9a8a5a023f6a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.75 + objectReference: {fileID: 0} - target: {fileID: 3565643019619598235, guid: b82d5b841abe54f95aee9a8a5a023f6a, type: 3} propertyPath: m_Name @@ -15,7 +20,7 @@ PrefabInstance: - target: {fileID: 4498234376221693368, guid: b82d5b841abe54f95aee9a8a5a023f6a, type: 3} propertyPath: m_LocalPosition.y - value: 0.75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 2x2.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 2x2.prefab index 7ca96a4d..487a32bd 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 2x2.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 2x2.prefab @@ -7,16 +7,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1814670119296341110, guid: b82d5b841abe54f95aee9a8a5a023f6a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.75 + objectReference: {fileID: 0} - target: {fileID: 3565643019619598235, guid: b82d5b841abe54f95aee9a8a5a023f6a, type: 3} propertyPath: m_Name value: Obstacle 2x2 objectReference: {fileID: 0} - - target: {fileID: 4498234376221693368, guid: b82d5b841abe54f95aee9a8a5a023f6a, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.75 - objectReference: {fileID: 0} - target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a, type: 3} propertyPath: m_Size.x From a1cbefc8035bff4461dfa12159715e411a311c0b Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 1 Jul 2022 11:56:44 +0900 Subject: [PATCH 3/3] fix DebugGame.cs --- popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs index 40310fd1..ca90de92 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs @@ -75,7 +75,11 @@ namespace MyGame.Scenes.MiniGame.Scripts lineRendererObject.transform.localScale = Vector3.one; lineRendererCenter = lineRendererObject.AddComponent(); lineRendererCenter.useWorldSpace = false; +#if UNITY_EDITOR lineRendererCenter.sharedMaterial = UnityEditor.AssetDatabase.GetBuiltinExtraResource("Sprites-Default.mat"); +#else + lineRendererCenter.sharedMaterial = Resources.GetBuiltinResource("Sprites-Default.mat"); +#endif lineRendererCenter.startWidth = .1f; lineRendererCenter.sortingOrder = 20; lineRendererFront = Instantiate(lineRendererCenter, debugObject.transform);