diff --git a/Assets/Prefabs/BaseItemPrefab.prefab b/Assets/Prefabs/BaseItemPrefab.prefab new file mode 100644 index 0000000..8f50651 --- /dev/null +++ b/Assets/Prefabs/BaseItemPrefab.prefab @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &988939638164667087 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 793006107409141834} + - component: {fileID: 4250375896501906719} + - component: {fileID: 2519631449462165926} + - component: {fileID: 8934494252055606214} + m_Layer: 0 + m_Name: BaseItemPrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &793006107409141834 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 988939638164667087} + 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: 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!222 &4250375896501906719 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 988939638164667087} + m_CullTransparentMesh: 1 +--- !u!114 &2519631449462165926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 988939638164667087} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76050cf8c863ec84ca2c83053f33726c, type: 3} + m_Name: + m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.Items.ItemBehaviour +--- !u!50 &8934494252055606214 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 988939638164667087} + 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: 6200000, guid: 5bd3676f7699e1d4f9d2f61bf372ada5, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 1 + m_SleepingMode: 0 + m_CollisionDetection: 1 + m_Constraints: 0 diff --git a/Assets/Prefabs/BaseItemPrefab.prefab.meta b/Assets/Prefabs/BaseItemPrefab.prefab.meta new file mode 100644 index 0000000..cee7b3d --- /dev/null +++ b/Assets/Prefabs/BaseItemPrefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 74975659e85ee6843995caf836d16f7c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Items/Apple.prefab b/Assets/Prefabs/Items/Apple.prefab index 0d5f9fc..687a674 100644 --- a/Assets/Prefabs/Items/Apple.prefab +++ b/Assets/Prefabs/Items/Apple.prefab @@ -9,8 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1401800242719993207} - - component: {fileID: 3064349466090016812} - - component: {fileID: 8517387188847136902} + - component: {fileID: 170707656067593105} + - component: {fileID: 9015791529391101642} + - component: {fileID: 2143027257179275844} m_Layer: 0 m_Name: Apple m_TagString: Untagged @@ -29,142 +30,21 @@ RectTransform: 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: 10 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 5bd3676f7699e1d4f9d2f61bf372ada5, type: 2} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 1 - m_SleepingMode: 0 - 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 - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4835022621393332192 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - 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: 1401800242719993207} + 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: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8769433925158838710 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - m_CullTransparentMesh: 1 ---- !u!114 &7623882219544063352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - 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: 21300000, guid: b9ffb605d71f3584e9797e6b3a80630f, 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 &5089115826042872001 +--- !u!58 &170707656067593105 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} + m_GameObject: {fileID: 4062657912758122058} m_Enabled: 1 serializedVersion: 3 m_Density: 1 @@ -194,3 +74,41 @@ CircleCollider2D: m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_Radius: 20 +--- !u!222 &9015791529391101642 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4062657912758122058} + m_CullTransparentMesh: 1 +--- !u!114 &2143027257179275844 +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: 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: 21300000, guid: b9ffb605d71f3584e9797e6b3a80630f, 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 diff --git a/Assets/Prefabs/Items/Banana.prefab b/Assets/Prefabs/Items/Banana.prefab index 3c506a0..efd4cd8 100644 --- a/Assets/Prefabs/Items/Banana.prefab +++ b/Assets/Prefabs/Items/Banana.prefab @@ -9,8 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1401800242719993207} - - component: {fileID: 3064349466090016812} - - component: {fileID: 8517387188847136902} + - component: {fileID: 6022429437766446618} + - component: {fileID: 6710749987800196452} + - component: {fileID: 2034412630507027966} m_Layer: 0 m_Name: Banana m_TagString: Untagged @@ -29,138 +30,21 @@ RectTransform: 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 - OverridenItemType: 2 ---- !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: 10 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 5bd3676f7699e1d4f9d2f61bf372ada5, type: 2} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 1 - m_SleepingMode: 0 - 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: 3673821044548531600} - m_Layer: 0 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4835022621393332192 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - 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: 1401800242719993207} + 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: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8769433925158838710 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - m_CullTransparentMesh: 1 ---- !u!114 &7623882219544063352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - 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: 21300000, guid: 1bae8e5a7111a574abe3a098fc9bfc15, 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!60 &3673821044548531600 +--- !u!60 &6022429437766446618 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} + m_GameObject: {fileID: 4062657912758122058} m_Enabled: 1 serializedVersion: 3 m_Density: 1 @@ -209,3 +93,41 @@ PolygonCollider2D: - {x: 20, y: 12} - {x: 12, y: 20} m_UseDelaunayMesh: 1 +--- !u!222 &6710749987800196452 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4062657912758122058} + m_CullTransparentMesh: 1 +--- !u!114 &2034412630507027966 +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: 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: 21300000, guid: 1bae8e5a7111a574abe3a098fc9bfc15, 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 diff --git a/Assets/Prefabs/Items/BuddhasHand.prefab b/Assets/Prefabs/Items/BuddhasHand.prefab index 2a8dfb5..bd16375 100644 --- a/Assets/Prefabs/Items/BuddhasHand.prefab +++ b/Assets/Prefabs/Items/BuddhasHand.prefab @@ -9,8 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1401800242719993207} - - component: {fileID: 3064349466090016812} - - component: {fileID: 8517387188847136902} + - component: {fileID: 583702482227284555} + - component: {fileID: 6416977611996712630} + - component: {fileID: 6728572696821424054} m_Layer: 0 m_Name: BuddhasHand m_TagString: Untagged @@ -29,138 +30,21 @@ RectTransform: 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 - OverridenItemType: 7 ---- !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: 10 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 5bd3676f7699e1d4f9d2f61bf372ada5, type: 2} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 1 - m_SleepingMode: 0 - 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: 6960133166067407619} - m_Layer: 0 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4835022621393332192 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - 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: 1401800242719993207} + 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: 64, y: 80} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8769433925158838710 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - m_CullTransparentMesh: 1 ---- !u!114 &7623882219544063352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - 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: -682307201, guid: eca67a655c8e3824ebc43716fe0ee511, 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!60 &6960133166067407619 +--- !u!60 &583702482227284555 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} + m_GameObject: {fileID: 4062657912758122058} m_Enabled: 1 serializedVersion: 3 m_Density: 1 @@ -209,3 +93,41 @@ PolygonCollider2D: - {x: -24, y: -16} - {x: -32, y: 32} m_UseDelaunayMesh: 1 +--- !u!222 &6416977611996712630 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4062657912758122058} + m_CullTransparentMesh: 1 +--- !u!114 &6728572696821424054 +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: 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: -682307201, guid: eca67a655c8e3824ebc43716fe0ee511, 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 diff --git a/Assets/Prefabs/Items/Durian.prefab b/Assets/Prefabs/Items/Durian.prefab index 91f19b6..1d25ad3 100644 --- a/Assets/Prefabs/Items/Durian.prefab +++ b/Assets/Prefabs/Items/Durian.prefab @@ -9,8 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1401800242719993207} - - component: {fileID: 3064349466090016812} - - component: {fileID: 8517387188847136902} + - component: {fileID: 5673621187239732349} + - component: {fileID: 3055702604452257690} + - component: {fileID: 963027178517632149} m_Layer: 0 m_Name: Durian m_TagString: Untagged @@ -29,138 +30,21 @@ RectTransform: 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 - OverridenItemType: 6 ---- !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: 10 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 5bd3676f7699e1d4f9d2f61bf372ada5, type: 2} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 1 - m_SleepingMode: 0 - 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: 1093767447866678030} - m_Layer: 0 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4835022621393332192 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - 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: 1401800242719993207} + 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: 56, y: 80} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8769433925158838710 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - m_CullTransparentMesh: 1 ---- !u!114 &7623882219544063352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - 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: 364554639, guid: 7441414edf591d94186d77004b194855, 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!70 &1093767447866678030 +--- !u!70 &5673621187239732349 CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} + m_GameObject: {fileID: 4062657912758122058} m_Enabled: 1 serializedVersion: 3 m_Density: 1 @@ -191,3 +75,41 @@ CapsuleCollider2D: m_Offset: {x: 0, y: 0} m_Size: {x: 56, y: 80} m_Direction: 0 +--- !u!222 &3055702604452257690 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4062657912758122058} + m_CullTransparentMesh: 1 +--- !u!114 &963027178517632149 +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: 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: 364554639, guid: 7441414edf591d94186d77004b194855, 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 diff --git a/Assets/Prefabs/Items/Grape.prefab b/Assets/Prefabs/Items/Grape.prefab index 8f14f49..6108718 100644 --- a/Assets/Prefabs/Items/Grape.prefab +++ b/Assets/Prefabs/Items/Grape.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1922069975040978555 +--- !u!1 &8799415981405337049 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,81 +8,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2685125877769015601} - - component: {fileID: 3117499011398239765} - - component: {fileID: 9116958278338220457} - - component: {fileID: 5013177692595303023} + - component: {fileID: 632342871567537671} + - component: {fileID: 4016799572980916140} + - component: {fileID: 4889414921371628351} + - component: {fileID: 6039744482559740417} m_Layer: 0 - m_Name: Sprite + m_Name: Grape m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2685125877769015601 +--- !u!224 &632342871567537671 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1922069975040978555} + 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: [] - m_Father: {fileID: 632342871567537671} + 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: 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 +--- !u!58 &4016799572980916140 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1922069975040978555} + m_GameObject: {fileID: 8799415981405337049} m_Enabled: 1 serializedVersion: 3 m_Density: 1 @@ -112,45 +74,15 @@ CircleCollider2D: 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: +--- !u!222 &4889414921371628351 +CanvasRenderer: 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 + m_CullTransparentMesh: 1 +--- !u!114 &6039744482559740417 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -159,34 +91,24 @@ MonoBehaviour: m_GameObject: {fileID: 8799415981405337049} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed414fdac7005b54db4dc1ec26e16bd6, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: - m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.FruitBehaviour - OverridenItemType: 1 ---- !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: 10 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 5bd3676f7699e1d4f9d2f61bf372ada5, type: 2} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 1 - m_SleepingMode: 0 - m_CollisionDetection: 1 - m_Constraints: 0 + 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 diff --git a/Assets/Prefabs/Items/Kiwi.prefab b/Assets/Prefabs/Items/Kiwi.prefab index 7cafdfc..2b38d71 100644 --- a/Assets/Prefabs/Items/Kiwi.prefab +++ b/Assets/Prefabs/Items/Kiwi.prefab @@ -9,8 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1401800242719993207} - - component: {fileID: 3064349466090016812} - - component: {fileID: 8517387188847136902} + - component: {fileID: 7690593262013444070} + - component: {fileID: 4415690043126729105} + - component: {fileID: 5561862563799791105} m_Layer: 0 m_Name: Kiwi m_TagString: Untagged @@ -29,138 +30,21 @@ RectTransform: 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 - OverridenItemType: 3 ---- !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: 10 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 5bd3676f7699e1d4f9d2f61bf372ada5, type: 2} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 1 - m_SleepingMode: 0 - 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: 1899649188662454376} - m_Layer: 0 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4835022621393332192 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - 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: 1401800242719993207} + 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: 32, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8769433925158838710 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - m_CullTransparentMesh: 1 ---- !u!114 &7623882219544063352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - 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: -831583347, guid: 0152a15f07f9b0e449a7f5e04fd7ef4c, 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!70 &1899649188662454376 +--- !u!70 &7690593262013444070 CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} + m_GameObject: {fileID: 4062657912758122058} m_Enabled: 1 serializedVersion: 3 m_Density: 1 @@ -191,3 +75,41 @@ CapsuleCollider2D: m_Offset: {x: 0, y: 0} m_Size: {x: 32, y: 20} m_Direction: 1 +--- !u!222 &4415690043126729105 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4062657912758122058} + m_CullTransparentMesh: 1 +--- !u!114 &5561862563799791105 +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: 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: -831583347, guid: 0152a15f07f9b0e449a7f5e04fd7ef4c, 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 diff --git a/Assets/Prefabs/Items/Mango.prefab b/Assets/Prefabs/Items/Mango.prefab index c2c9ed3..1da7e7d 100644 --- a/Assets/Prefabs/Items/Mango.prefab +++ b/Assets/Prefabs/Items/Mango.prefab @@ -9,8 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1401800242719993207} - - component: {fileID: 3064349466090016812} - - component: {fileID: 8517387188847136902} + - component: {fileID: 5779066027437858329} + - component: {fileID: 8572516747556436847} + - component: {fileID: 1774449426770163631} m_Layer: 0 m_Name: Mango m_TagString: Untagged @@ -29,138 +30,21 @@ RectTransform: 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 - OverridenItemType: 4 ---- !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: 10 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 5bd3676f7699e1d4f9d2f61bf372ada5, type: 2} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 1 - m_SleepingMode: 0 - 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: 9016837449730114838} - m_Layer: 0 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4835022621393332192 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - 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: 1401800242719993207} + 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: 36, y: 36} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8769433925158838710 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - m_CullTransparentMesh: 1 ---- !u!114 &7623882219544063352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - 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: -26432677, guid: d0db3013f50effd4cb2cd776c5ba809b, 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!60 &9016837449730114838 +--- !u!60 &5779066027437858329 PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} + m_GameObject: {fileID: 4062657912758122058} m_Enabled: 1 serializedVersion: 3 m_Density: 1 @@ -209,3 +93,41 @@ PolygonCollider2D: - {x: 18, y: 10} - {x: 10, y: 18} m_UseDelaunayMesh: 1 +--- !u!222 &8572516747556436847 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4062657912758122058} + m_CullTransparentMesh: 1 +--- !u!114 &1774449426770163631 +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: 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: -26432677, guid: d0db3013f50effd4cb2cd776c5ba809b, 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 diff --git a/Assets/Prefabs/Items/Pitaya.prefab b/Assets/Prefabs/Items/Pitaya.prefab index 34a6a7a..8e12d2e 100644 --- a/Assets/Prefabs/Items/Pitaya.prefab +++ b/Assets/Prefabs/Items/Pitaya.prefab @@ -9,8 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1401800242719993207} - - component: {fileID: 3064349466090016812} - - component: {fileID: 8517387188847136902} + - component: {fileID: 5411504766647877595} + - component: {fileID: 8561610707771141133} + - component: {fileID: 6348747951340073204} m_Layer: 0 m_Name: Pitaya m_TagString: Untagged @@ -29,138 +30,21 @@ RectTransform: 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 - OverridenItemType: 5 ---- !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: 10 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 5bd3676f7699e1d4f9d2f61bf372ada5, type: 2} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 1 - m_SleepingMode: 0 - 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: 416407117823138567} - m_Layer: 0 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4835022621393332192 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - 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: 1401800242719993207} + 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: 32, y: 40} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8769433925158838710 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - m_CullTransparentMesh: 1 ---- !u!114 &7623882219544063352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} - 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: -663877772, guid: a0a2413960d6785458f406c3630e0790, 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!70 &416407117823138567 +--- !u!70 &5411504766647877595 CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389188266314161223} + m_GameObject: {fileID: 4062657912758122058} m_Enabled: 1 serializedVersion: 3 m_Density: 1 @@ -191,3 +75,41 @@ CapsuleCollider2D: m_Offset: {x: 0, y: 0} m_Size: {x: 32, y: 40} m_Direction: 0 +--- !u!222 &8561610707771141133 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4062657912758122058} + m_CullTransparentMesh: 1 +--- !u!114 &6348747951340073204 +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: 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: -663877772, guid: a0a2413960d6785458f406c3630e0790, 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 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index b36fb97..20e25b8 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -2242,6 +2242,8 @@ MonoBehaviour: MaxSpawnTime: 0.2 FruitSpawnParent: {fileID: 1944344878} GameCanvas: {fileID: 1165634413} + BaseItemPrefab: {fileID: 988939638164667087, guid: 74975659e85ee6843995caf836d16f7c, + type: 3} ApplePrefab: {fileID: 4062657912758122058, guid: 23e3bfe33d8c6004c85fd638db567ab6, type: 3} GrapePrefab: {fileID: 8799415981405337049, guid: c21e0b5539573904cb10d979de4a3f72, @@ -2268,7 +2270,7 @@ GameObject: m_Component: - component: {fileID: 1944344878} m_Layer: 5 - m_Name: Fruit + m_Name: Items m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/Game/FruitSpawner.cs b/Assets/Scripts/Game/FruitSpawner.cs index 3a65702..5d33513 100644 --- a/Assets/Scripts/Game/FruitSpawner.cs +++ b/Assets/Scripts/Game/FruitSpawner.cs @@ -1,4 +1,3 @@ -using PashaBibko.Pacore.Attributes; using System.Collections.Generic; using Fruitomation.Game.Items; using Fruitomation.Global; @@ -18,6 +17,7 @@ namespace Fruitomation.Game [SerializeField] private Canvas GameCanvas; [Header("Prefabs")] + [SerializeField] private GameObject BaseItemPrefab; [SerializeField] private GameObject ApplePrefab; [SerializeField] private GameObject GrapePrefab; [SerializeField] private GameObject BananaPrefab; @@ -47,36 +47,38 @@ namespace Fruitomation.Game private void SpawnFruit() { - List unlocked = new() { ApplePrefab }; + List<(ItemType, GameObject)> unlocked = new() { (ItemType.Apple, ApplePrefab) }; if (UpgradeManager.Is(BasicUpgrade.Grapes)) - unlocked.Add(GrapePrefab); + unlocked.Add((ItemType.Grape, GrapePrefab)); if (UpgradeManager.Is(BasicUpgrade.Bananas)) - unlocked.Add(BananaPrefab); + unlocked.Add((ItemType.Banana, BananaPrefab)); if (UpgradeManager.Is(BasicUpgrade.Kiwi)) - unlocked.Add(KiwiPrefab); + unlocked.Add((ItemType.Kiwi, KiwiPrefab)); if (UpgradeManager.Is(BasicUpgrade.Mangoes)) - unlocked.Add(MangoPrefab); + unlocked.Add((ItemType.Mango, MangoPrefab)); if (UpgradeManager.Is(BasicUpgrade.Durian)) - unlocked.Add(DurianPrefab); + unlocked.Add((ItemType.Durian, DurianPrefab)); if (UpgradeManager.Is(BasicUpgrade.BuddhasHand)) - unlocked.Add(BuddhasHandPrefab); + unlocked.Add((ItemType.BuddhasHand, BuddhasHandPrefab)); if (UpgradeManager.Is(BasicUpgrade.Pitayas)) - unlocked.Add(PitayaPrefab); + unlocked.Add((ItemType.Pitaya, PitayaPrefab)); - GameObject prefab = unlocked[Random.Range(0, unlocked.Count)]; - GameObject go = Instantiate(prefab, FruitSpawnParent); + GameObject parent = Instantiate(BaseItemPrefab, FruitSpawnParent); - FruitBehaviour behaviour = go.GetComponent(); - Debug.Assert(behaviour is not null, "Could not find FruitBehaviour"); + (ItemType type, GameObject prefab) = unlocked[Random.Range(0, unlocked.Count)]; + GameObject go = Instantiate(prefab, parent.transform); + + ItemBehaviour behaviour = parent.GetComponent(); + Debug.Assert(behaviour is not null, "Could not find ItemBehaviour"); - behaviour.InitBehaviour(GameCanvas); + behaviour.InitBehaviour(GameCanvas, type); } } } diff --git a/Assets/Scripts/Game/Items/FruitBehaviour.cs b/Assets/Scripts/Game/Items/FruitBehaviour.cs index 98f3c4b..59b591e 100644 --- a/Assets/Scripts/Game/Items/FruitBehaviour.cs +++ b/Assets/Scripts/Game/Items/FruitBehaviour.cs @@ -4,12 +4,9 @@ namespace Fruitomation.Game.Items { public class FruitBehaviour : ItemBehaviour { - [SerializeField] private ItemType OverridenItemType; - protected override void OnInitialized() { Body2D.linearVelocity = Random.insideUnitCircle * 2.5f; - CurrentType = OverridenItemType; } } } \ No newline at end of file diff --git a/Assets/Scripts/Game/Items/ItemBehaviour.cs b/Assets/Scripts/Game/Items/ItemBehaviour.cs index 5112437..5f86924 100644 --- a/Assets/Scripts/Game/Items/ItemBehaviour.cs +++ b/Assets/Scripts/Game/Items/ItemBehaviour.cs @@ -15,19 +15,17 @@ namespace Fruitomation.Game.Items public ItemType CurrentType { get => InternalItemType; - set - { - InternalItemType = value; - } + set => InternalItemType = value; } protected virtual void OnInitialized() { } - - public void InitBehaviour(Canvas canvas) + + public void InitBehaviour(Canvas canvas, ItemType startType) { RectTransform = transform.GetComponent(); Body2D = transform.GetComponent(); + InternalItemType = startType; AttachedCanvas = canvas; EnteredCanvas = false;