From c68d64ab1decc8d17c0ae23b0b911b2a015c470e Mon Sep 17 00:00:00 2001 From: Pasha Date: Sun, 12 Apr 2026 14:21:33 +0100 Subject: [PATCH] Made fruit be randomised --- Assets/Prefabs/Fruit.meta | 8 + .../{Fruit.prefab => Fruit/Apple.prefab} | 263 +++++++----------- .../Apple.prefab.meta} | 2 +- Assets/Prefabs/Fruit/Grape.prefab | 196 +++++++++++++ Assets/Prefabs/Fruit/Grape.prefab.meta | 7 + Assets/Scenes/SampleScene.unity | 5 +- Assets/Scripts/Game/FruitBehaviour.cs | 5 +- Assets/Scripts/Game/FruitSpawner.cs | 8 +- 8 files changed, 325 insertions(+), 169 deletions(-) create mode 100644 Assets/Prefabs/Fruit.meta rename Assets/Prefabs/{Fruit.prefab => Fruit/Apple.prefab} (55%) rename Assets/Prefabs/{Fruit.prefab.meta => Fruit/Apple.prefab.meta} (74%) create mode 100644 Assets/Prefabs/Fruit/Grape.prefab create mode 100644 Assets/Prefabs/Fruit/Grape.prefab.meta diff --git a/Assets/Prefabs/Fruit.meta b/Assets/Prefabs/Fruit.meta new file mode 100644 index 0000000..a730fcd --- /dev/null +++ b/Assets/Prefabs/Fruit.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 13c9b429f33e3924fb8eb45e0235d7c1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Fruit.prefab b/Assets/Prefabs/Fruit/Apple.prefab similarity index 55% rename from Assets/Prefabs/Fruit.prefab rename to Assets/Prefabs/Fruit/Apple.prefab index 1cce14f..61f1c81 100644 --- a/Assets/Prefabs/Fruit.prefab +++ b/Assets/Prefabs/Fruit/Apple.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2456106081754027966 +--- !u!1 &4062657912758122058 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,11 +8,92 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5459288295520796107} - - component: {fileID: 7354729621375102571} - - component: {fileID: 4856511816064388395} - - component: {fileID: 1572770211658593958} - - component: {fileID: 1030068666342984902} + - component: {fileID: 1401800242719993207} + - component: {fileID: 3064349466090016812} + - component: {fileID: 8517387188847136902} + m_Layer: 0 + m_Name: Apple + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1401800242719993207 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4062657912758122058} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4835022621393332192} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3064349466090016812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4062657912758122058} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed414fdac7005b54db4dc1ec26e16bd6, type: 3} + m_Name: + m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.FruitBehaviour + RectTransform: {fileID: 1401800242719993207} + Body2D: {fileID: 8517387188847136902} + AttachedCanvas: {fileID: 0} + Spawner: {fileID: 0} + EnteredCanvas: 0 +--- !u!50 &8517387188847136902 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4062657912758122058} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!1 &7389188266314161223 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4835022621393332192} + - component: {fileID: 8769433925158838710} + - component: {fileID: 7623882219544063352} + - component: {fileID: 5089115826042872001} m_Layer: 0 m_Name: Sprite m_TagString: Untagged @@ -20,45 +101,45 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5459288295520796107 +--- !u!224 &4835022621393332192 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2456106081754027966} + m_GameObject: {fileID: 7389188266314161223} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3605213539719865219} + m_Father: {fileID: 1401800242719993207} 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: 100, y: 100} + m_SizeDelta: {x: 108, y: 116} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7354729621375102571 +--- !u!222 &8769433925158838710 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2456106081754027966} + m_GameObject: {fileID: 7389188266314161223} m_CullTransparentMesh: 1 ---- !u!114 &4856511816064388395 +--- !u!114 &7623882219544063352 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2456106081754027966} + m_GameObject: {fileID: 7389188266314161223} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: - m_EditorClassIdentifier: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -67,7 +148,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: -1419298673, guid: 0b22d44e7af484c4fa779bb0dd8e2b66, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -77,58 +158,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1572770211658593958 -MonoBehaviour: +--- !u!58 &5089115826042872001 +CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2456106081754027966} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 4856511816064388395} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!61 &1030068666342984902 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2456106081754027966} + m_GameObject: {fileID: 7389188266314161223} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -152,100 +190,7 @@ BoxCollider2D: m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 100, y: 100} - m_EdgeRadius: 0 ---- !u!1 &8732739964968511634 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3605213539719865219} - - component: {fileID: 1754222534141843334} - - component: {fileID: 5645363082347469150} - m_Layer: 0 - m_Name: Fruit - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3605213539719865219 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8732739964968511634} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5459288295520796107} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1754222534141843334 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8732739964968511634} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed414fdac7005b54db4dc1ec26e16bd6, type: 3} - m_Name: - m_EditorClassIdentifier: - RectTransform: {fileID: 3605213539719865219} - Body2D: {fileID: 5645363082347469150} - Button: {fileID: 1572770211658593958} - AttachedCanvas: {fileID: 0} - Spawner: {fileID: 0} - EnteredCanvas: 0 ---- !u!50 &5645363082347469150 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8732739964968511634} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 1 - m_SleepingMode: 1 - m_CollisionDetection: 1 - m_Constraints: 0 + m_Radius: 55 diff --git a/Assets/Prefabs/Fruit.prefab.meta b/Assets/Prefabs/Fruit/Apple.prefab.meta similarity index 74% rename from Assets/Prefabs/Fruit.prefab.meta rename to Assets/Prefabs/Fruit/Apple.prefab.meta index 046a974..1d9cc42 100644 --- a/Assets/Prefabs/Fruit.prefab.meta +++ b/Assets/Prefabs/Fruit/Apple.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 958453a8750b46642babdd2f3a92952e +guid: 23e3bfe33d8c6004c85fd638db567ab6 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Fruit/Grape.prefab b/Assets/Prefabs/Fruit/Grape.prefab new file mode 100644 index 0000000..17906bb --- /dev/null +++ b/Assets/Prefabs/Fruit/Grape.prefab @@ -0,0 +1,196 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1922069975040978555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2685125877769015601} + - component: {fileID: 3117499011398239765} + - component: {fileID: 9116958278338220457} + - component: {fileID: 5013177692595303023} + m_Layer: 0 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2685125877769015601 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1922069975040978555} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 632342871567537671} + 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: 16, y: 16} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3117499011398239765 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1922069975040978555} + m_CullTransparentMesh: 1 +--- !u!114 &9116958278338220457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1922069975040978555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -957186419, guid: df229586b5166094085d7b7cfc627869, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!58 &5013177692595303023 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1922069975040978555} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 8 +--- !u!1 &8799415981405337049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 632342871567537671} + - component: {fileID: -1185529094939362115} + - component: {fileID: -7341975215906076796} + m_Layer: 0 + m_Name: Grape + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &632342871567537671 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8799415981405337049} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2685125877769015601} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &-1185529094939362115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8799415981405337049} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed414fdac7005b54db4dc1ec26e16bd6, type: 3} + m_Name: + m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.FruitBehaviour + RectTransform: {fileID: 632342871567537671} + Body2D: {fileID: -7341975215906076796} + AttachedCanvas: {fileID: 0} + Spawner: {fileID: 0} + EnteredCanvas: 0 +--- !u!50 &-7341975215906076796 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8799415981405337049} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 0 diff --git a/Assets/Prefabs/Fruit/Grape.prefab.meta b/Assets/Prefabs/Fruit/Grape.prefab.meta new file mode 100644 index 0000000..b3d2343 --- /dev/null +++ b/Assets/Prefabs/Fruit/Grape.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c21e0b5539573904cb10d979de4a3f72 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 82a1173..45c96c5 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2114,8 +2114,9 @@ MonoBehaviour: MinSpawnTime: 0 MaxSpawnTime: 0.2 FruitSpawnParent: {fileID: 1944344878} - FruitPrefab: {fileID: 8732739964968511634, guid: 958453a8750b46642babdd2f3a92952e, - type: 3} + FruitPrefabs: + - {fileID: 4062657912758122058, guid: 23e3bfe33d8c6004c85fd638db567ab6, type: 3} + - {fileID: 8799415981405337049, guid: c21e0b5539573904cb10d979de4a3f72, type: 3} GameCanvas: {fileID: 1165634413} ActiveFruits: [] --- !u!1 &1944344877 diff --git a/Assets/Scripts/Game/FruitBehaviour.cs b/Assets/Scripts/Game/FruitBehaviour.cs index 7e2932b..eb16046 100644 --- a/Assets/Scripts/Game/FruitBehaviour.cs +++ b/Assets/Scripts/Game/FruitBehaviour.cs @@ -1,8 +1,6 @@ -using Fruitomation.Global; using PashaBibko.Pacore.Attributes; -using UnityEngine.UI; +using Fruitomation.Global; using UnityEngine; -using Random = UnityEngine.Random; namespace Fruitomation.Game { @@ -11,7 +9,6 @@ namespace Fruitomation.Game [Header("References")] [SerializeField] private RectTransform RectTransform; [SerializeField] private Rigidbody2D Body2D; - [SerializeField] private Button Button; [Header("Read only")] [InspectorReadOnly, SerializeField] private Canvas AttachedCanvas; diff --git a/Assets/Scripts/Game/FruitSpawner.cs b/Assets/Scripts/Game/FruitSpawner.cs index 68e7d57..d60fc5c 100644 --- a/Assets/Scripts/Game/FruitSpawner.cs +++ b/Assets/Scripts/Game/FruitSpawner.cs @@ -14,7 +14,7 @@ namespace Fruitomation.Game [Header("References")] [SerializeField] private Transform FruitSpawnParent; - [SerializeField] private GameObject FruitPrefab; + [SerializeField] private GameObject[] FruitPrefabs; [SerializeField] private Canvas GameCanvas; [Header("Read only")] @@ -38,9 +38,11 @@ namespace Fruitomation.Game private void SpawnFruit() { - GameObject go = Instantiate(FruitPrefab, FruitSpawnParent); + GameObject prefab = FruitPrefabs[Random.Range(0, FruitPrefabs.Length)]; + GameObject go = Instantiate(prefab, FruitSpawnParent); + FruitBehaviour behaviour = go.GetComponent(); - Debug.Assert(behaviour != null, "Could not find FruitBehaviour"); + Debug.Assert(behaviour is not null, "Could not find FruitBehaviour"); ActiveFruits.Add(behaviour); behaviour.InitFruitBehaviour