From 1a45b9a1bbc155629b02c4403b51f5fcae06b6bc Mon Sep 17 00:00:00 2001 From: Ader Alisma 01 Date: Sun, 11 Jun 2023 16:06:01 -0400 Subject: [PATCH] =?UTF-8?q?Ajout=20de=20ClickBehavior=20pour=20d=C3=A9tect?= =?UTF-8?q?er=20le=20click=20sur=20les=20yields?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LevelManager prefab comporte aussi ResourceManager et ClickBehavior Modification de la vitesse de création des yields Création des yields prefabs --- Assets/Prefabs/LevelManager.prefab | 26 +++ Assets/Prefabs/yieldFood.prefab | 221 +++++++++++++++++++++ Assets/Prefabs/yieldFood.prefab.meta | 7 + Assets/Prefabs/yieldRock.prefab | 12 +- Assets/Prefabs/yieldWood.prefab | 221 +++++++++++++++++++++ Assets/Prefabs/yieldWood.prefab.meta | 7 + Assets/Scripts/ClickBehavior.cs | 22 ++ Assets/Scripts/ClickBehavior.cs.meta | 11 + Assets/Scripts/Resource/ResourceMaker.cs | 19 -- Assets/Scripts/Resource/ResourceManager.cs | 26 +-- Assets/Scripts/Tiles/ResourceTile.cs | 7 +- Assets/Tiles/Farm.asset | 7 +- Assets/Tiles/Forest.asset | 5 +- Assets/Tiles/Mountain.asset | 3 +- 14 files changed, 549 insertions(+), 45 deletions(-) create mode 100644 Assets/Prefabs/yieldFood.prefab create mode 100644 Assets/Prefabs/yieldFood.prefab.meta create mode 100644 Assets/Prefabs/yieldWood.prefab create mode 100644 Assets/Prefabs/yieldWood.prefab.meta create mode 100644 Assets/Scripts/ClickBehavior.cs create mode 100644 Assets/Scripts/ClickBehavior.cs.meta diff --git a/Assets/Prefabs/LevelManager.prefab b/Assets/Prefabs/LevelManager.prefab index 34a2a24..86739aa 100644 --- a/Assets/Prefabs/LevelManager.prefab +++ b/Assets/Prefabs/LevelManager.prefab @@ -11,6 +11,8 @@ GameObject: - component: {fileID: 3028288566889208751} - component: {fileID: 3028288566889208750} - component: {fileID: 3028288566889208749} + - component: {fileID: 6046873345209315807} + - component: {fileID: -245230096461627285} m_Layer: 0 m_Name: LevelManager m_TagString: Untagged @@ -78,3 +80,27 @@ MonoBehaviour: - {fileID: 11400000, guid: e715669e1ed4b294c82d07ac011e89bb, type: 2} - {fileID: 11400000, guid: a387250a316b97e43be83b85980101e1, type: 2} - {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} +--- !u!114 &6046873345209315807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3028288566889208744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e6e814b8c91334ca1d6d0e7f530fef, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-245230096461627285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3028288566889208744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37c0aa967043d974783120d6ea9b136c, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/yieldFood.prefab b/Assets/Prefabs/yieldFood.prefab new file mode 100644 index 0000000..dd1762d --- /dev/null +++ b/Assets/Prefabs/yieldFood.prefab @@ -0,0 +1,221 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6962989255644195630 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6962989255644195631} + - component: {fileID: 6072713849781841816} + - component: {fileID: -1491803373025033585} + - component: {fileID: 2238237770060079311} + - component: {fileID: 3600016298306940116} + m_Layer: 0 + m_Name: yieldFood + m_TagString: Resource + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6962989255644195631 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989255644195630} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.61, y: -0.638, z: 1.8112363} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6962989256011107500} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1839735485 &6072713849781841816 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989255644195630} + m_Enabled: 0 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: [] + m_TileSpriteArray: [] + m_TileMatrixArray: [] + m_TileColorArray: [] + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!50 &-1491803373025033585 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989255644195630} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!61 &2238237770060079311 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989255644195630} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.05, y: 0.02} + 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: 0.3, y: 0.46} + m_EdgeRadius: 0 +--- !u!114 &3600016298306940116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989255644195630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9dd6bad38b516d64e8e23a5822ca37bb, type: 3} + m_Name: + m_EditorClassIdentifier: + _resourceMakingAmount: 10 + _resourceChoice: 2 +--- !u!1 &6962989256011107503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6962989256011107500} + - component: {fileID: 6962989256011107501} + m_Layer: 0 + m_Name: sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6962989256011107500 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989256011107503} + m_LocalRotation: {x: 0, y: -0, z: 0, w: -1} + m_LocalPosition: {x: 0.0259, y: 0.01, z: 0} + m_LocalScale: {x: 0.5394133, y: 0.56488746, z: 0.9686} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6962989255644195631} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 360} +--- !u!212 &6962989256011107501 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989256011107503} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: 21300000, guid: 9bd2451627165d44ab67ea16cdabaf2f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.06, y: 1.69} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/yieldFood.prefab.meta b/Assets/Prefabs/yieldFood.prefab.meta new file mode 100644 index 0000000..818bf49 --- /dev/null +++ b/Assets/Prefabs/yieldFood.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a2dc5d9672c10074fa9c35c12f6339c1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/yieldRock.prefab b/Assets/Prefabs/yieldRock.prefab index 323cc17..8baca0b 100644 --- a/Assets/Prefabs/yieldRock.prefab +++ b/Assets/Prefabs/yieldRock.prefab @@ -108,7 +108,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.02, y: -0.01} + m_Offset: {x: 0.05, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -119,7 +119,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.27, y: 0.33} + m_Size: {x: 0.29, y: 0.25} m_EdgeRadius: 0 --- !u!114 &3600016298306940116 MonoBehaviour: @@ -146,7 +146,7 @@ GameObject: - component: {fileID: 6962989256011107500} - component: {fileID: 6962989256011107501} m_Layer: 0 - m_Name: exmeple + m_Name: sprite m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -159,14 +159,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6962989256011107503} - m_LocalRotation: {x: 0, y: -0, z: 0.7071068, w: -0.7071068} + m_LocalRotation: {x: 0, y: -0, z: 0, w: -1} m_LocalPosition: {x: 0.0259, y: 0.01, z: 0} m_LocalScale: {x: 0.5394133, y: 0.56488746, z: 0.9686} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6962989255644195631} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 270} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 360} --- !u!212 &6962989256011107501 SpriteRenderer: m_ObjectHideFlags: 0 @@ -208,7 +208,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 4 - m_Sprite: {fileID: 21300000, guid: 79f48ca2dd34ed7498565c98d95db6cb, type: 3} + m_Sprite: {fileID: 21300000, guid: f67e7f54162405141b42d32ef8df76ad, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Prefabs/yieldWood.prefab b/Assets/Prefabs/yieldWood.prefab new file mode 100644 index 0000000..b07f050 --- /dev/null +++ b/Assets/Prefabs/yieldWood.prefab @@ -0,0 +1,221 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6962989255644195630 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6962989255644195631} + - component: {fileID: 6072713849781841816} + - component: {fileID: -1491803373025033585} + - component: {fileID: 2238237770060079311} + - component: {fileID: 3600016298306940116} + m_Layer: 0 + m_Name: yieldWood + m_TagString: Resource + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6962989255644195631 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989255644195630} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.61, y: -0.638, z: 1.8112363} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6962989256011107500} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1839735485 &6072713849781841816 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989255644195630} + m_Enabled: 0 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: [] + m_TileSpriteArray: [] + m_TileMatrixArray: [] + m_TileColorArray: [] + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!50 &-1491803373025033585 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989255644195630} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!61 &2238237770060079311 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989255644195630} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.06, y: 0.02} + 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: 0.3, y: 0.35} + m_EdgeRadius: 0 +--- !u!114 &3600016298306940116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989255644195630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9dd6bad38b516d64e8e23a5822ca37bb, type: 3} + m_Name: + m_EditorClassIdentifier: + _resourceMakingAmount: 10 + _resourceChoice: 1 +--- !u!1 &6962989256011107503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6962989256011107500} + - component: {fileID: 6962989256011107501} + m_Layer: 0 + m_Name: sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6962989256011107500 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989256011107503} + m_LocalRotation: {x: 0, y: -0, z: 0, w: -1} + m_LocalPosition: {x: 0.0259, y: 0.01, z: 0} + m_LocalScale: {x: 0.5394133, y: 0.56488746, z: 0.9686} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6962989255644195631} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 360} +--- !u!212 &6962989256011107501 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962989256011107503} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: 21300000, guid: 5c630d8b4d37f5d4f974d38f670ad5c1, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.06, y: 1.69} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/yieldWood.prefab.meta b/Assets/Prefabs/yieldWood.prefab.meta new file mode 100644 index 0000000..797352e --- /dev/null +++ b/Assets/Prefabs/yieldWood.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f20569b5452c2b341a95d656b7534b7e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ClickBehavior.cs b/Assets/Scripts/ClickBehavior.cs new file mode 100644 index 0000000..1ccaa58 --- /dev/null +++ b/Assets/Scripts/ClickBehavior.cs @@ -0,0 +1,22 @@ +using UnityEngine; +/// +/// Handles what happens when the user clicks on a collider +/// +public class ClickBehavior : MonoBehaviour +{ + private void Update() + { + if (Input.GetMouseButtonDown(0)) + { + Vector2 clickPoint = Camera.main.ScreenToWorldPoint(Input.mousePosition); + RaycastHit2D hit = Physics2D.Raycast(clickPoint, transform.up); + if (hit.collider != null) + { + if (hit.collider.CompareTag("Resource")) + { + hit.collider.GetComponent().GenerateResource(); + } + } + } + } +} diff --git a/Assets/Scripts/ClickBehavior.cs.meta b/Assets/Scripts/ClickBehavior.cs.meta new file mode 100644 index 0000000..3481a0d --- /dev/null +++ b/Assets/Scripts/ClickBehavior.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 37c0aa967043d974783120d6ea9b136c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Resource/ResourceMaker.cs b/Assets/Scripts/Resource/ResourceMaker.cs index 31eed0f..56a9c0c 100644 --- a/Assets/Scripts/Resource/ResourceMaker.cs +++ b/Assets/Scripts/Resource/ResourceMaker.cs @@ -14,7 +14,6 @@ public class ResourceMaker : MonoBehaviour private void Awake() { _resourceManagerInstance = ResourceManager.Instance; - Debug.Log("Birth"); } /// @@ -36,22 +35,4 @@ public class ResourceMaker : MonoBehaviour } Destroy(gameObject); } - - private void Update() - { - if (Input.GetMouseButtonDown(0)) - { - Vector2 clickPoint = Camera.main.ScreenToWorldPoint(Input.mousePosition); - RaycastHit2D hit = Physics2D.Raycast(clickPoint, transform.up); - if (hit.collider != null) - { - if (hit.collider.CompareTag("Resource")) - { - Debug.Log("I have been summoned"); - GenerateResource(); - - } - } - } - } } diff --git a/Assets/Scripts/Resource/ResourceManager.cs b/Assets/Scripts/Resource/ResourceManager.cs index 5adffc4..12f8208 100644 --- a/Assets/Scripts/Resource/ResourceManager.cs +++ b/Assets/Scripts/Resource/ResourceManager.cs @@ -1,6 +1,4 @@ using UnityEngine; -using System.Collections; - /// /// Sert d'inventaire et gère l'accès aux ressources @@ -8,10 +6,6 @@ using System.Collections; public class ResourceManager : MonoBehaviour { private static ResourceManager _instance = null; - [SerializeField][Range(0.0f, 10.0f)] - private float _randoLimiter = 5.0f; - [SerializeField] - private GameObject _dropPrefab; private int _rockAmount = 20; private int _woodAmount = 20; private int _foodAmount = 20; @@ -103,14 +97,20 @@ public class ResourceManager : MonoBehaviour return false; } - public void SpawnResource(ResourceChoice type, Vector2 position) + private void Update() { - //Instantiate prefab at random position - //var position = new Vector3(Random.Range(-10.0f, 10.0f), 0, Random.Range(-10.0f, 10.0f)); - //Instantiate(prefab, position, Quaternion.identity); - Vector3 droppedPosition = new Vector3(Random.Range(-1.0f, 1.0f),-1.0f); - Instantiate(_dropPrefab, droppedPosition, Quaternion.identity); - + if (Input.GetMouseButtonDown(0)) + { + Vector2 clickPoint = Camera.main.ScreenToWorldPoint(Input.mousePosition); + RaycastHit2D hit = Physics2D.Raycast(clickPoint, transform.up); + if (hit.collider != null) + { + if (hit.collider.CompareTag("Resource")) + { + hit.collider.GetComponent().GenerateResource(); + } + } + } } } diff --git a/Assets/Scripts/Tiles/ResourceTile.cs b/Assets/Scripts/Tiles/ResourceTile.cs index 1a474c3..8dcca62 100644 --- a/Assets/Scripts/Tiles/ResourceTile.cs +++ b/Assets/Scripts/Tiles/ResourceTile.cs @@ -13,6 +13,9 @@ public class ResourceTile : LevelTile [SerializeField] private float _yieldSpeed = 1; //resource per second + [SerializeField] + [Range(-0.5f, 0.5f)] + private float _randomPositionConfig = 0.0f; private float _yieldCounter = 0; public bool Occupied { get; set; } @@ -25,7 +28,9 @@ public class ResourceTile : LevelTile if (_yieldCounter < 1) return; _yieldCounter = 0; - var yielded = Instantiate(_yieldPrefab, Position, Quaternion.identity); + float rangeConfig = 0.3f + _randomPositionConfig; + Vector3 yieldPosition = new Vector3(Position.x + Random.Range(-rangeConfig, rangeConfig), Position.y, Position.z); + var yielded = Instantiate(_yieldPrefab, yieldPosition, Quaternion.identity); yielded.transform.SetParent(LevelManager.Instance.LevelTransform); } public override bool Equals(ILevelObject other) diff --git a/Assets/Tiles/Farm.asset b/Assets/Tiles/Farm.asset index 8334d17..8fd0327 100644 --- a/Assets/Tiles/Farm.asset +++ b/Assets/Tiles/Farm.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 84b05f2a26f63da46a1028488482d079, type: 3} m_Name: Farm m_EditorClassIdentifier: - _sprite: {fileID: 21300000, guid: b1e6b8ebeb2e25f4f8c5de93a31dd6a2, type: 3} - _yieldPrefab: {fileID: 6962989255644195630, guid: 484f0eca1c74ae34694692de56a36739, type: 3} - _yieldSpeed: 1 + _sprite: {fileID: 21300000, guid: 9bd2451627165d44ab67ea16cdabaf2f, type: 3} + _yieldPrefab: {fileID: 6962989255644195630, guid: a2dc5d9672c10074fa9c35c12f6339c1, type: 3} + _yieldSpeed: 0.1 + _randomPositionConfig: 0 diff --git a/Assets/Tiles/Forest.asset b/Assets/Tiles/Forest.asset index 6dcdd52..436c969 100644 --- a/Assets/Tiles/Forest.asset +++ b/Assets/Tiles/Forest.asset @@ -13,5 +13,6 @@ MonoBehaviour: m_Name: Forest m_EditorClassIdentifier: _sprite: {fileID: 21300000, guid: 5c630d8b4d37f5d4f974d38f670ad5c1, type: 3} - _yieldPrefab: {fileID: 6962989255644195630, guid: 484f0eca1c74ae34694692de56a36739, type: 3} - _yieldSpeed: 1 + _yieldPrefab: {fileID: 6962989255644195630, guid: f20569b5452c2b341a95d656b7534b7e, type: 3} + _yieldSpeed: 0.1 + _randomPositionConfig: 0.5 diff --git a/Assets/Tiles/Mountain.asset b/Assets/Tiles/Mountain.asset index 0c6bca9..6b6a489 100644 --- a/Assets/Tiles/Mountain.asset +++ b/Assets/Tiles/Mountain.asset @@ -14,4 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: _sprite: {fileID: 21300000, guid: 6298844400e212d40bce870425ac2a5b, type: 3} _yieldPrefab: {fileID: 6962989255644195630, guid: 484f0eca1c74ae34694692de56a36739, type: 3} - _yieldSpeed: 1 + _yieldSpeed: 0.1 + _randomPositionConfig: -0.5