From 8badd9a7cac6dd785767025f9ab170d750760ef0 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 17 Jun 2021 12:02:11 +0900 Subject: [PATCH] =?UTF-8?q?=E5=8B=95=E3=81=8D=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Main/Controller.prefab | 654 +----------- popcorn/Assets/MyGame/Scenes/Main/Corn.cs | 38 +- popcorn/Assets/MyGame/Scenes/Main/Main.unity | 945 +++++++++++++++++- popcorn/Assets/MyGame/Scenes/Main/Pan.cs | 5 +- .../MyGame/Scenes/Main/PanController.cs | 8 +- .../MyGame/Scenes/Main/corn.physicsMaterial2D | 4 +- popcorn/Assets/MyGame/Scenes/Main/corn.prefab | 38 +- 7 files changed, 996 insertions(+), 696 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Controller.prefab b/popcorn/Assets/MyGame/Scenes/Main/Controller.prefab index f09b7192..a96a29e7 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Controller.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Controller.prefab @@ -212,14 +212,7 @@ Transform: m_LocalPosition: {x: -0.73, y: 1.13, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1453251555594571276} - - {fileID: 453186607433689706} - - {fileID: 453186608541380723} - - {fileID: 453186607721184820} - - {fileID: 453186609487715512} - - {fileID: 453186608292917714} - - {fileID: 453186609261945315} - - {fileID: 453186609378900462} + - {fileID: 5097855244930370726} m_Father: {fileID: 1453251556377932393} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -263,7 +256,7 @@ EdgeCollider2D: m_GameObject: {fileID: 1453251557352552635} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 1e68e56cd6ac4484ba25eb760e0d3057, type: 2} + m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -284,7 +277,7 @@ EdgeCollider2D: - {x: 0.045930877, y: 0.043994725} - {x: 0.07751208, y: 0.023389027} - {x: 0.08064145, y: -0.00019192172} ---- !u!1001 &453186607588802692 +--- !u!1001 &6115833401877185070 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -294,7 +287,7 @@ PrefabInstance: - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} propertyPath: m_Name - value: corn + value: Corn objectReference: {fileID: 0} - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} @@ -351,646 +344,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1324329073609281163, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_SortingOrder - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} ---- !u!4 &1453251555594571276 stripped +--- !u!4 &5097855244930370726 stripped Transform: m_CorrespondingSourceObject: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} - m_PrefabInstance: {fileID: 453186607588802692} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1453251555453792444 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1453251556440263711} - m_Modifications: - - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_Name - value: corn (3) - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} ---- !u!4 &453186607721184820 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - m_PrefabInstance: {fileID: 1453251555453792444} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1453251555774473442 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1453251556440263711} - m_Modifications: - - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_Name - value: corn (1) - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} ---- !u!4 &453186607433689706 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - m_PrefabInstance: {fileID: 1453251555774473442} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1453251555963141978 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1453251556440263711} - m_Modifications: - - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_Name - value: corn (5) - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} ---- !u!4 &453186608292917714 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - m_PrefabInstance: {fileID: 1453251555963141978} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1453251556813487867 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1453251556440263711} - m_Modifications: - - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_Name - value: corn (2) - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} ---- !u!4 &453186608541380723 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - m_PrefabInstance: {fileID: 1453251556813487867} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1453251556950315568 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1453251556440263711} - m_Modifications: - - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_Name - value: corn (4) - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} ---- !u!4 &453186609487715512 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - m_PrefabInstance: {fileID: 1453251556950315568} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1453251557042304870 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1453251556440263711} - m_Modifications: - - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_Name - value: corn (7) - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} ---- !u!4 &453186609378900462 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - m_PrefabInstance: {fileID: 1453251557042304870} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1453251557132971883 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1453251556440263711} - m_Modifications: - - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_Name - value: corn (6) - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} ---- !u!4 &453186609261945315 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, - type: 3} - m_PrefabInstance: {fileID: 1453251557132971883} + m_PrefabInstance: {fileID: 6115833401877185070} m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Corn.cs b/popcorn/Assets/MyGame/Scenes/Main/Corn.cs index 04552cf1..88c0fcf4 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Corn.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Corn.cs @@ -2,15 +2,47 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using Random = UnityEngine.Random; [RequireComponent(typeof(Rigidbody2D))] public class Corn : MonoBehaviour { - [SerializeField] private float thrust; - private Rigidbody2D rigidbody; + // [SerializeField] private List cornSprites; + [SerializeField] private Sprite cornSimpleSprite; + // コーン速度 + [SerializeField] private float cornVelocity; + // コーンがスポーンしてからの時間 + [SerializeField] private float cornLifeTime; + // コーン弾ける時間！ + private float cornPopTime; + // コーンが停まってる時間（焦げる判定 + // コーンが動いている総時間 + + private float cornSpawnTime; + // Start is called before the first frame update + + private Rigidbody2D rigidbody2D; void Start() { - rigidbody = GetComponent(); + rigidbody2D = GetComponent(); + cornSpawnTime = Time.time; + var cornPopBasicTime = 10f; + cornPopTime = cornPopBasicTime + Random.Range(0, 5); + } + + private void Update() + { + cornVelocity = rigidbody2D.velocity.magnitude; + cornLifeTime = Time.time - cornSpawnTime; + if (cornLifeTime >= cornPopTime) + { + CornPop(); + } + } + + private void CornPop() + { + GetComponent().sprite = cornSimpleSprite; } } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 95018def..fb186829 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -121,6 +121,174 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &300421358 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 878737614} + m_Modifications: + - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_Name + value: Corn (3) + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} +--- !u!1001 &346088777 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 878737614} + m_Modifications: + - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_Name + value: Corn (6) + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} --- !u!1 &420543913 GameObject: m_ObjectHideFlags: 0 @@ -334,6 +502,516 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3d5a5f132babc4b3e9790ccbeb891054, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &858614630 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 878737614} + m_Modifications: + - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_Name + value: Corn (5) + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} +--- !u!4 &878737614 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1453251556440263711, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + m_PrefabInstance: {fileID: 2137549891} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1117546076 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 878737614} + m_Modifications: + - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_Name + value: Corn (4) + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} +--- !u!1001 &1167181615 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 878737614} + m_Modifications: + - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_Name + value: Corn (7) + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} +--- !u!1001 &1271260483 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 878737614} + m_Modifications: + - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_Name + value: Corn (2) + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} +--- !u!1001 &1659037769 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 878737614} + m_Modifications: + - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_Name + value: Corn (1) + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} +--- !u!1001 &1660900678 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 878737614} + m_Modifications: + - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_Name + value: Corn (8) + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} --- !u!1 &1673325601 GameObject: m_ObjectHideFlags: 0 @@ -515,12 +1193,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1453251556377932372, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 552581214f14f3a49b0ed2ac0a72777d, - type: 3} - target: {fileID: 1453251556377932392, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: m_Name @@ -531,21 +1203,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: m_LocalPosition.x @@ -559,7 +1216,7 @@ PrefabInstance: - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.015381 objectReference: {fileID: 0} - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} @@ -596,5 +1253,249 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1760968235348138510, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 1760968235348138510, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_LinearDrag + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1760968235348138510, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_GravityScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1760968235348138510, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_CollisionDetection + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2521509118960237362, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 2521509118960237362, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_LinearDrag + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2521509118960237362, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_GravityScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2521509118960237362, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_CollisionDetection + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5551236955703752092, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 5551236955703752092, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_LinearDrag + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5551236955703752092, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_GravityScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5551236955703752092, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_CollisionDetection + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6458538165795884112, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 6458538165795884112, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_LinearDrag + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6458538165795884112, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_GravityScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6458538165795884112, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_CollisionDetection + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6597149436434456199, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 6597149436434456199, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_LinearDrag + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6597149436434456199, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_GravityScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6597149436434456199, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_CollisionDetection + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7684266959770282731, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 7684266959770282731, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_LinearDrag + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7684266959770282731, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_GravityScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7684266959770282731, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_CollisionDetection + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8342477944218972898, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 8342477944218972898, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_LinearDrag + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8342477944218972898, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_GravityScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8342477944218972898, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_CollisionDetection + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8815684202634134473, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 8815684202634134473, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_LinearDrag + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8815684202634134473, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_GravityScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8815684202634134473, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_CollisionDetection + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} +--- !u!1001 &2147318244 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 878737614} + m_Modifications: + - target: {fileID: 1324329073609281157, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_Name + value: Corn (9) + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1324329073609281160, guid: 2b790fd908bd14de4a601c21374fb55b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b790fd908bd14de4a601c21374fb55b, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Pan.cs b/popcorn/Assets/MyGame/Scenes/Main/Pan.cs index 5c693223..4efb0e13 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Pan.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Pan.cs @@ -7,6 +7,7 @@ namespace MyGame.Scenes.Main { [SerializeField] private float thrust; private PanController controller; + private int direct; private void Start() { @@ -16,7 +17,9 @@ namespace MyGame.Scenes.Main private void OnTriggerStay2D(Collider2D other) { // Debug.Log(controller.Direction); - other.attachedRigidbody.AddForce(controller.Direction * thrust, ForceMode2D.Impulse); + // 移動量が少ないときは動かない + direct = controller.Delta.magnitude < 0.1f ? 0 : 1; + other.attachedRigidbody.AddForce(controller.Delta * thrust * direct, ForceMode2D.Impulse); } } } \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/PanController.cs b/popcorn/Assets/MyGame/Scenes/Main/PanController.cs index 3571f45a..a68b9283 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/PanController.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/PanController.cs @@ -17,6 +17,8 @@ public class PanController : MonoBehaviour, IDragHandler, IBeginDragHandler // public bool IsEnter { get; private set; } private Vector2 direction; public Vector2 Direction => direction; + private Vector2 delta; + public Vector2 Delta => delta; private Vector3 prevPos; // Start is called before the first frame update @@ -51,12 +53,14 @@ public class PanController : MonoBehaviour, IDragHandler, IBeginDragHandler { var currentPoint = Camera.main.ScreenToWorldPoint(new Vector3(eventData.position.x, eventData.position.y, cacheTransform.position.z)); - direction = eventData.delta.normalized; var pos = currentPoint + offset; // 移動範囲を制限 pos.x = Mathf.Clamp(pos.x, borderX.min, borderX.max); pos.y = Mathf.Clamp(pos.y, borderY.min, borderY.max); - // FutonSpeed = (pos - cacheTransform.position).magnitude * futonSpeedMagnificcation; + + // Debug.Log($"delta: {eventData.delta.magnitude} localDelta: {(pos - cacheTransform.position).magnitude}"); + delta = pos - cacheTransform.position; + Debug.Log($"delta: {delta.magnitude}"); cacheTransform.position = pos; } diff --git a/popcorn/Assets/MyGame/Scenes/Main/corn.physicsMaterial2D b/popcorn/Assets/MyGame/Scenes/Main/corn.physicsMaterial2D index 5a8c5569..f36e72de 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/corn.physicsMaterial2D +++ b/popcorn/Assets/MyGame/Scenes/Main/corn.physicsMaterial2D @@ -6,6 +6,6 @@ PhysicsMaterial2D: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: corn - friction: 0 + m_Name: Corn + friction: 0.5 bounciness: 0.4 diff --git a/popcorn/Assets/MyGame/Scenes/Main/corn.prefab b/popcorn/Assets/MyGame/Scenes/Main/corn.prefab index 050f4e37..a0246bfa 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/corn.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/corn.prefab @@ -9,12 +9,12 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1324329073609281160} + - component: {fileID: 5686223397932607609} - component: {fileID: 1324329073609281163} - component: {fileID: 1324329073609281162} - component: {fileID: 1324329073609281161} - - component: {fileID: 5686223397932607609} m_Layer: 0 - m_Name: corn + m_Name: Corn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -34,6 +34,21 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5686223397932607609 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324329073609281157} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 175dce409df2f4d3aa1941a08822e03e, type: 3} + m_Name: + m_EditorClassIdentifier: + cornSimpleSprite: {fileID: 21300000, guid: 97ac0328246620745b8881e07f709ce7, type: 3} + cornVelocity: 0 + cornLifeTime: 0 --- !u!212 &1324329073609281163 SpriteRenderer: m_ObjectHideFlags: 0 @@ -113,24 +128,11 @@ Rigidbody2D: m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 m_Mass: 1 - m_LinearDrag: 0.1 - m_AngularDrag: 0.05 + m_LinearDrag: 1 + m_AngularDrag: 5 m_GravityScale: 0 m_Material: {fileID: 6200000, guid: 1e68e56cd6ac4484ba25eb760e0d3057, type: 2} m_Interpolate: 0 m_SleepingMode: 1 - m_CollisionDetection: 1 + m_CollisionDetection: 0 m_Constraints: 0 ---- !u!114 &5686223397932607609 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1324329073609281157} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 175dce409df2f4d3aa1941a08822e03e, type: 3} - m_Name: - m_EditorClassIdentifier: - thrust: 0