From 8ecf5e055242d8ec50b6e8c1217bb88cced45ce9 Mon Sep 17 00:00:00 2001 From: Ader Alisma 01 Date: Thu, 8 Jun 2023 17:13:22 -0400 Subject: [PATCH 1/6] Ajout des Yield prefabs et de ResourceMaker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ResourceMaker détecte le click sur le Yield Les yields font partis du ResourceTile --- Assets/Prefabs/yieldRock.prefab | 221 ++++++++++++++++++ Assets/Prefabs/yieldRock.prefab.meta | 7 + Assets/Scripts/Resource/ResourceMaker.cs | 57 +++++ Assets/Scripts/Resource/ResourceMaker.cs.meta | 11 + Assets/Scripts/Resource/ResourceManager.cs | 22 +- Assets/Scripts/Tiles/ResourceTile.cs | 2 +- Assets/Tiles/Farm.asset | 17 ++ Assets/Tiles/Farm.asset.meta | 8 + Assets/Tiles/Forest.asset | 17 ++ Assets/Tiles/Forest.asset.meta | 8 + Assets/Tiles/Mountain.asset | 17 ++ Assets/Tiles/Mountain.asset.meta | 8 + ProjectSettings/TagManager.asset | 1 + 13 files changed, 394 insertions(+), 2 deletions(-) create mode 100644 Assets/Prefabs/yieldRock.prefab create mode 100644 Assets/Prefabs/yieldRock.prefab.meta create mode 100644 Assets/Scripts/Resource/ResourceMaker.cs create mode 100644 Assets/Scripts/Resource/ResourceMaker.cs.meta create mode 100644 Assets/Tiles/Farm.asset create mode 100644 Assets/Tiles/Farm.asset.meta create mode 100644 Assets/Tiles/Forest.asset create mode 100644 Assets/Tiles/Forest.asset.meta create mode 100644 Assets/Tiles/Mountain.asset create mode 100644 Assets/Tiles/Mountain.asset.meta diff --git a/Assets/Prefabs/yieldRock.prefab b/Assets/Prefabs/yieldRock.prefab new file mode 100644 index 0000000..323cc17 --- /dev/null +++ b/Assets/Prefabs/yieldRock.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: yieldRock + 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.02, y: -0.01} + 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.27, y: 0.33} + 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: 0 +--- !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: exmeple + 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.7071068, w: -0.7071068} + 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} +--- !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: 79f48ca2dd34ed7498565c98d95db6cb, 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/yieldRock.prefab.meta b/Assets/Prefabs/yieldRock.prefab.meta new file mode 100644 index 0000000..6811008 --- /dev/null +++ b/Assets/Prefabs/yieldRock.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 484f0eca1c74ae34694692de56a36739 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Resource/ResourceMaker.cs b/Assets/Scripts/Resource/ResourceMaker.cs new file mode 100644 index 0000000..31eed0f --- /dev/null +++ b/Assets/Scripts/Resource/ResourceMaker.cs @@ -0,0 +1,57 @@ +using System.Collections; +using UnityEngine; +/// +/// Gère la production de ressource et sert de minuteur pour laisser la ressource sur le sol. +/// +public class ResourceMaker : MonoBehaviour +{ + [SerializeField] + private int _resourceMakingAmount; + [SerializeField] + private ResourceManager.ResourceChoice _resourceChoice; + private ResourceManager _resourceManagerInstance; + + private void Awake() + { + _resourceManagerInstance = ResourceManager.Instance; + Debug.Log("Birth"); + } + + /// + /// D'après le choix de resource à générer, choisi le prefab à instancier + /// + public void GenerateResource() + { + switch (_resourceChoice) + { + case ResourceManager.ResourceChoice.Rock: + _resourceManagerInstance.RockAmount = _resourceMakingAmount; + break; + case ResourceManager.ResourceChoice.Wood: + _resourceManagerInstance.WoodAmount = _resourceMakingAmount; + break; + case ResourceManager.ResourceChoice.Food: + _resourceManagerInstance.FoodAmount = _resourceMakingAmount; + break; + } + 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/ResourceMaker.cs.meta b/Assets/Scripts/Resource/ResourceMaker.cs.meta new file mode 100644 index 0000000..2a5c437 --- /dev/null +++ b/Assets/Scripts/Resource/ResourceMaker.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9dd6bad38b516d64e8e23a5822ca37bb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Resource/ResourceManager.cs b/Assets/Scripts/Resource/ResourceManager.cs index 978905e..5adffc4 100644 --- a/Assets/Scripts/Resource/ResourceManager.cs +++ b/Assets/Scripts/Resource/ResourceManager.cs @@ -1,16 +1,28 @@ using UnityEngine; using System.Collections; + /// /// Sert d'inventaire et gère l'accès aux ressources /// 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; + public enum ResourceChoice + { + Rock, + Wood, + Food + }; + public enum AddOrRemove { Add, @@ -91,6 +103,14 @@ public class ResourceManager : MonoBehaviour return false; } - + public void SpawnResource(ResourceChoice type, Vector2 position) + { + //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); + + } } diff --git a/Assets/Scripts/Tiles/ResourceTile.cs b/Assets/Scripts/Tiles/ResourceTile.cs index b63bb6c..1a474c3 100644 --- a/Assets/Scripts/Tiles/ResourceTile.cs +++ b/Assets/Scripts/Tiles/ResourceTile.cs @@ -18,7 +18,7 @@ public class ResourceTile : LevelTile public override void LevelUpdate() { - if (!Occupied) return; + //if (!Occupied) return; _yieldCounter += Time.deltaTime * _yieldSpeed; diff --git a/Assets/Tiles/Farm.asset b/Assets/Tiles/Farm.asset new file mode 100644 index 0000000..8334d17 --- /dev/null +++ b/Assets/Tiles/Farm.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + 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 diff --git a/Assets/Tiles/Farm.asset.meta b/Assets/Tiles/Farm.asset.meta new file mode 100644 index 0000000..260cdc8 --- /dev/null +++ b/Assets/Tiles/Farm.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 953a02bba997b9348bee7f306f609a96 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tiles/Forest.asset b/Assets/Tiles/Forest.asset new file mode 100644 index 0000000..6dcdd52 --- /dev/null +++ b/Assets/Tiles/Forest.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84b05f2a26f63da46a1028488482d079, type: 3} + m_Name: Forest + m_EditorClassIdentifier: + _sprite: {fileID: 21300000, guid: 5c630d8b4d37f5d4f974d38f670ad5c1, type: 3} + _yieldPrefab: {fileID: 6962989255644195630, guid: 484f0eca1c74ae34694692de56a36739, type: 3} + _yieldSpeed: 1 diff --git a/Assets/Tiles/Forest.asset.meta b/Assets/Tiles/Forest.asset.meta new file mode 100644 index 0000000..7492f62 --- /dev/null +++ b/Assets/Tiles/Forest.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0b1d2d816ae5624c99b09a2bebb2a39 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tiles/Mountain.asset b/Assets/Tiles/Mountain.asset new file mode 100644 index 0000000..0c6bca9 --- /dev/null +++ b/Assets/Tiles/Mountain.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84b05f2a26f63da46a1028488482d079, type: 3} + m_Name: Mountain + m_EditorClassIdentifier: + _sprite: {fileID: 21300000, guid: 6298844400e212d40bce870425ac2a5b, type: 3} + _yieldPrefab: {fileID: 6962989255644195630, guid: 484f0eca1c74ae34694692de56a36739, type: 3} + _yieldSpeed: 1 diff --git a/Assets/Tiles/Mountain.asset.meta b/Assets/Tiles/Mountain.asset.meta new file mode 100644 index 0000000..1ee5766 --- /dev/null +++ b/Assets/Tiles/Mountain.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0d57b3c128ba1447920637cdb289530 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index f63a055..cb52e17 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,6 +6,7 @@ TagManager: tags: - Opponent - Ally + - Resource layers: - Default - TransparentFX From 1a45b9a1bbc155629b02c4403b51f5fcae06b6bc Mon Sep 17 00:00:00 2001 From: Ader Alisma 01 Date: Sun, 11 Jun 2023 16:06:01 -0400 Subject: [PATCH 2/6] =?UTF-8?q?Ajout=20de=20ClickBehavior=20pour=20d=C3=A9?= =?UTF-8?q?tecter=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 From 0c0add8f43cb1bde769ea144f3efb199177c544d Mon Sep 17 00:00:00 2001 From: Ader Alisma 01 Date: Sun, 11 Jun 2023 18:40:10 -0400 Subject: [PATCH 3/6] =?UTF-8?q?Augment=C3=A9=20la=20vitesse=20de=20product?= =?UTF-8?q?ion=20de=20ressource?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix la zone de ramassage --- Assets/Scripts/Resource/ResourceManager.cs | 17 ----------------- Assets/Scripts/Tiles/ResourceTile.cs | 6 +++--- Assets/Tiles/Farm.asset | 4 ++-- Assets/Tiles/Forest.asset | 2 +- Assets/Tiles/Mountain.asset | 4 ++-- 5 files changed, 8 insertions(+), 25 deletions(-) diff --git a/Assets/Scripts/Resource/ResourceManager.cs b/Assets/Scripts/Resource/ResourceManager.cs index 12f8208..70bc44e 100644 --- a/Assets/Scripts/Resource/ResourceManager.cs +++ b/Assets/Scripts/Resource/ResourceManager.cs @@ -96,21 +96,4 @@ public class ResourceManager : MonoBehaviour } return false; } - - 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/Tiles/ResourceTile.cs b/Assets/Scripts/Tiles/ResourceTile.cs index 8dcca62..cdf9adc 100644 --- a/Assets/Scripts/Tiles/ResourceTile.cs +++ b/Assets/Scripts/Tiles/ResourceTile.cs @@ -14,8 +14,8 @@ public class ResourceTile : LevelTile [SerializeField] private float _yieldSpeed = 1; //resource per second [SerializeField] - [Range(-0.5f, 0.5f)] - private float _randomPositionConfig = 0.0f; + [Range(0.0f, 5.0f)] + private float _randomPositionConfig = 0.5f; private float _yieldCounter = 0; public bool Occupied { get; set; } @@ -28,7 +28,7 @@ public class ResourceTile : LevelTile if (_yieldCounter < 1) return; _yieldCounter = 0; - float rangeConfig = 0.3f + _randomPositionConfig; + float rangeConfig = 0.5f + _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); diff --git a/Assets/Tiles/Farm.asset b/Assets/Tiles/Farm.asset index 8fd0327..6124109 100644 --- a/Assets/Tiles/Farm.asset +++ b/Assets/Tiles/Farm.asset @@ -14,5 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: _sprite: {fileID: 21300000, guid: 9bd2451627165d44ab67ea16cdabaf2f, type: 3} _yieldPrefab: {fileID: 6962989255644195630, guid: a2dc5d9672c10074fa9c35c12f6339c1, type: 3} - _yieldSpeed: 0.1 - _randomPositionConfig: 0 + _yieldSpeed: 0.5 + _randomPositionConfig: 0.5 diff --git a/Assets/Tiles/Forest.asset b/Assets/Tiles/Forest.asset index 436c969..10bb32e 100644 --- a/Assets/Tiles/Forest.asset +++ b/Assets/Tiles/Forest.asset @@ -14,5 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: _sprite: {fileID: 21300000, guid: 5c630d8b4d37f5d4f974d38f670ad5c1, type: 3} _yieldPrefab: {fileID: 6962989255644195630, guid: f20569b5452c2b341a95d656b7534b7e, type: 3} - _yieldSpeed: 0.1 + _yieldSpeed: 0.5 _randomPositionConfig: 0.5 diff --git a/Assets/Tiles/Mountain.asset b/Assets/Tiles/Mountain.asset index 6b6a489..53f427b 100644 --- a/Assets/Tiles/Mountain.asset +++ b/Assets/Tiles/Mountain.asset @@ -14,5 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: _sprite: {fileID: 21300000, guid: 6298844400e212d40bce870425ac2a5b, type: 3} _yieldPrefab: {fileID: 6962989255644195630, guid: 484f0eca1c74ae34694692de56a36739, type: 3} - _yieldSpeed: 0.1 - _randomPositionConfig: -0.5 + _yieldSpeed: 0.5 + _randomPositionConfig: 0.5 From 4b756a53215fc543eac3460a2f6d88eb12dea565 Mon Sep 17 00:00:00 2001 From: Ader Alisma 01 Date: Sun, 11 Jun 2023 19:37:29 -0400 Subject: [PATCH 4/6] =?UTF-8?q?Corrig=C3=A9=20conflit=20du=20merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajout de YieldTile dans la scène de TestDragAndDrop Ajout de Meat pour le yield de nourriture afin de séparer Farm Ajusté ResourceTile pour toujours produire des ressources à moins que YieldSpeed est égal à 0 --- Assets/Scenes/TestDragAndDrop.unity | 184 +++++++++++++++++++++++++++ Assets/Scripts/Tiles/ResourceTile.cs | 2 +- Assets/Tiles/Farm.asset | 6 +- Assets/Tiles/Meat.asset | 19 +++ Assets/Tiles/Meat.asset.meta | 8 ++ 5 files changed, 215 insertions(+), 4 deletions(-) create mode 100644 Assets/Tiles/Meat.asset create mode 100644 Assets/Tiles/Meat.asset.meta diff --git a/Assets/Scenes/TestDragAndDrop.unity b/Assets/Scenes/TestDragAndDrop.unity index 7c8d833..67fd459 100644 --- a/Assets/Scenes/TestDragAndDrop.unity +++ b/Assets/Scenes/TestDragAndDrop.unity @@ -134,6 +134,7 @@ GameObject: - component: {fileID: 85245388} - component: {fileID: 85245387} - component: {fileID: 85245386} + - component: {fileID: 85245389} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -207,6 +208,39 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &85245389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 85245385} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &240774883 GameObject: m_ObjectHideFlags: 0 @@ -566,6 +600,155 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tile: {fileID: 11400000, guid: 7568f730b2ba3754297a7612452482e2, type: 2} +--- !u!1 &454853570 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 454853571} + - component: {fileID: 454853574} + - component: {fileID: 454853573} + - component: {fileID: 454853572} + m_Layer: 5 + m_Name: YieldTile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &454853571 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 454853570} + 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: 1216531426} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &454853572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 454853570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f3b5cc0d246c3b459ddf4ed75c4fa16, type: 3} + m_Name: + m_EditorClassIdentifier: + tile: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2} +--- !u!114 &454853573 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 454853570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_text: Yield tile + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &454853574 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 454853570} + m_CullTransparentMesh: 1 --- !u!1 &1195238450 GameObject: m_ObjectHideFlags: 0 @@ -665,6 +848,7 @@ RectTransform: m_Children: - {fileID: 240774884} - {fileID: 391777831} + - {fileID: 454853571} m_Father: {fileID: 2091724718} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Tiles/ResourceTile.cs b/Assets/Scripts/Tiles/ResourceTile.cs index cdf9adc..0f1e7f1 100644 --- a/Assets/Scripts/Tiles/ResourceTile.cs +++ b/Assets/Scripts/Tiles/ResourceTile.cs @@ -21,7 +21,7 @@ public class ResourceTile : LevelTile public override void LevelUpdate() { - //if (!Occupied) return; + //if (!Occupied) return; Uncomment once tile occupation exists _yieldCounter += Time.deltaTime * _yieldSpeed; diff --git a/Assets/Tiles/Farm.asset b/Assets/Tiles/Farm.asset index 5316fdb..168d2ed 100644 --- a/Assets/Tiles/Farm.asset +++ b/Assets/Tiles/Farm.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Farm m_EditorClassIdentifier: _sprite: {fileID: 21300000, guid: ccca3e050cb082b45af0a099790463f6, type: 3} - _isCollidable: 1 - _yieldPrefab: {fileID: 6962989255644195630, guid: a2dc5d9672c10074fa9c35c12f6339c1, type: 3} - _yieldSpeed: 0.5 + _isCollidable: 0 + _yieldPrefab: {fileID: 0} + _yieldSpeed: 0 _randomPositionConfig: 0.5 diff --git a/Assets/Tiles/Meat.asset b/Assets/Tiles/Meat.asset new file mode 100644 index 0000000..41adbe1 --- /dev/null +++ b/Assets/Tiles/Meat.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84b05f2a26f63da46a1028488482d079, type: 3} + m_Name: Meat + m_EditorClassIdentifier: + _sprite: {fileID: 21300000, guid: b1e6b8ebeb2e25f4f8c5de93a31dd6a2, type: 3} + _isCollidable: 0 + _yieldPrefab: {fileID: 6962989255644195630, guid: a2dc5d9672c10074fa9c35c12f6339c1, type: 3} + _yieldSpeed: 0.5 + _randomPositionConfig: 0.5 diff --git a/Assets/Tiles/Meat.asset.meta b/Assets/Tiles/Meat.asset.meta new file mode 100644 index 0000000..50829fc --- /dev/null +++ b/Assets/Tiles/Meat.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a19b3b6859986b449aac7484e064097a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: From 475ebbaac6286973a18689ab648b6a67c9fcc031 Mon Sep 17 00:00:00 2001 From: Ader Alisma 01 Date: Mon, 12 Jun 2023 20:55:29 -0400 Subject: [PATCH 5/6] Correction des commentaires de PR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Déplacé énum RessourceChoice vers ResourceMaker Retiré code commenté dans ResourceTile Remplacé Awake pour Start dans ResourceMaker --- Assets/Scripts/Resource/ResourceMaker.cs | 17 ++++++++++++----- Assets/Scripts/Resource/ResourceManager.cs | 13 ------------- Assets/Scripts/Tiles/ResourceTile.cs | 3 --- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/Assets/Scripts/Resource/ResourceMaker.cs b/Assets/Scripts/Resource/ResourceMaker.cs index 56a9c0c..55f57c7 100644 --- a/Assets/Scripts/Resource/ResourceMaker.cs +++ b/Assets/Scripts/Resource/ResourceMaker.cs @@ -8,10 +8,17 @@ public class ResourceMaker : MonoBehaviour [SerializeField] private int _resourceMakingAmount; [SerializeField] - private ResourceManager.ResourceChoice _resourceChoice; + private ResourceChoice _resourceChoice; private ResourceManager _resourceManagerInstance; - private void Awake() + public enum ResourceChoice + { + Rock, + Wood, + Food + }; + + private void Start() { _resourceManagerInstance = ResourceManager.Instance; } @@ -23,13 +30,13 @@ public class ResourceMaker : MonoBehaviour { switch (_resourceChoice) { - case ResourceManager.ResourceChoice.Rock: + case ResourceChoice.Rock: _resourceManagerInstance.RockAmount = _resourceMakingAmount; break; - case ResourceManager.ResourceChoice.Wood: + case ResourceChoice.Wood: _resourceManagerInstance.WoodAmount = _resourceMakingAmount; break; - case ResourceManager.ResourceChoice.Food: + case ResourceChoice.Food: _resourceManagerInstance.FoodAmount = _resourceMakingAmount; break; } diff --git a/Assets/Scripts/Resource/ResourceManager.cs b/Assets/Scripts/Resource/ResourceManager.cs index 70bc44e..d7748b1 100644 --- a/Assets/Scripts/Resource/ResourceManager.cs +++ b/Assets/Scripts/Resource/ResourceManager.cs @@ -10,19 +10,6 @@ public class ResourceManager : MonoBehaviour private int _woodAmount = 20; private int _foodAmount = 20; - public enum ResourceChoice - { - Rock, - Wood, - Food - }; - - public enum AddOrRemove - { - Add, - Remove - }; - private const int MAX = 100; private const int MIN = 0; diff --git a/Assets/Scripts/Tiles/ResourceTile.cs b/Assets/Scripts/Tiles/ResourceTile.cs index 0f1e7f1..7a7ab28 100644 --- a/Assets/Scripts/Tiles/ResourceTile.cs +++ b/Assets/Scripts/Tiles/ResourceTile.cs @@ -21,9 +21,6 @@ public class ResourceTile : LevelTile public override void LevelUpdate() { - //if (!Occupied) return; Uncomment once tile occupation exists - - _yieldCounter += Time.deltaTime * _yieldSpeed; if (_yieldCounter < 1) return; From 94f918d2dc24dffa71d860e85c7f60097785c401 Mon Sep 17 00:00:00 2001 From: Ader Alisma 01 Date: Mon, 12 Jun 2023 21:05:17 -0400 Subject: [PATCH 6/6] =?UTF-8?q?Cr=C3=A9ation=20de=20dossiers=20Script/Play?= =?UTF-8?q?erAction=20et=20Prefab/Yield?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Déplacé le enum ResourceChoice vers classe Enum Suppression des fichiers .orig créés lors du merge conflict --- .../Yield.meta} | 3 ++- Assets/Prefabs/{ => Yield}/yieldFood.prefab | 0 .../Prefabs/{ => Yield}/yieldFood.prefab.meta | 0 Assets/Prefabs/{ => Yield}/yieldRock.prefab | 0 .../Prefabs/{ => Yield}/yieldRock.prefab.meta | 0 Assets/Prefabs/{ => Yield}/yieldWood.prefab | 0 .../Prefabs/{ => Yield}/yieldWood.prefab.meta | 0 Assets/Scripts/Enum.cs | 9 +++++++ Assets/Scripts/Enum.cs.meta | 11 +++++++++ .../PlayerAction.meta} | 3 ++- .../{ => PlayerAction}/ClickBehavior.cs | 0 .../{ => PlayerAction}/ClickBehavior.cs.meta | 0 Assets/Scripts/Resource/ResourceMaker.cs | 15 ++++-------- Assets/Tiles/Farm.asset.meta.orig | 12 ---------- Assets/Tiles/Farm.asset.orig | 24 ------------------- 15 files changed, 28 insertions(+), 49 deletions(-) rename Assets/{Tiles/Farm.asset.meta.orig.meta => Prefabs/Yield.meta} (67%) rename Assets/Prefabs/{ => Yield}/yieldFood.prefab (100%) rename Assets/Prefabs/{ => Yield}/yieldFood.prefab.meta (100%) rename Assets/Prefabs/{ => Yield}/yieldRock.prefab (100%) rename Assets/Prefabs/{ => Yield}/yieldRock.prefab.meta (100%) rename Assets/Prefabs/{ => Yield}/yieldWood.prefab (100%) rename Assets/Prefabs/{ => Yield}/yieldWood.prefab.meta (100%) create mode 100644 Assets/Scripts/Enum.cs create mode 100644 Assets/Scripts/Enum.cs.meta rename Assets/{Tiles/Farm.asset.orig.meta => Scripts/PlayerAction.meta} (67%) rename Assets/Scripts/{ => PlayerAction}/ClickBehavior.cs (100%) rename Assets/Scripts/{ => PlayerAction}/ClickBehavior.cs.meta (100%) delete mode 100644 Assets/Tiles/Farm.asset.meta.orig delete mode 100644 Assets/Tiles/Farm.asset.orig diff --git a/Assets/Tiles/Farm.asset.meta.orig.meta b/Assets/Prefabs/Yield.meta similarity index 67% rename from Assets/Tiles/Farm.asset.meta.orig.meta rename to Assets/Prefabs/Yield.meta index c3b4d92..1864415 100644 --- a/Assets/Tiles/Farm.asset.meta.orig.meta +++ b/Assets/Prefabs/Yield.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 33f9649109a42ed4eb5adf1bef280046 +guid: 070f4a098d5a23c4595bcba6dee7bd1c +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/yieldFood.prefab b/Assets/Prefabs/Yield/yieldFood.prefab similarity index 100% rename from Assets/Prefabs/yieldFood.prefab rename to Assets/Prefabs/Yield/yieldFood.prefab diff --git a/Assets/Prefabs/yieldFood.prefab.meta b/Assets/Prefabs/Yield/yieldFood.prefab.meta similarity index 100% rename from Assets/Prefabs/yieldFood.prefab.meta rename to Assets/Prefabs/Yield/yieldFood.prefab.meta diff --git a/Assets/Prefabs/yieldRock.prefab b/Assets/Prefabs/Yield/yieldRock.prefab similarity index 100% rename from Assets/Prefabs/yieldRock.prefab rename to Assets/Prefabs/Yield/yieldRock.prefab diff --git a/Assets/Prefabs/yieldRock.prefab.meta b/Assets/Prefabs/Yield/yieldRock.prefab.meta similarity index 100% rename from Assets/Prefabs/yieldRock.prefab.meta rename to Assets/Prefabs/Yield/yieldRock.prefab.meta diff --git a/Assets/Prefabs/yieldWood.prefab b/Assets/Prefabs/Yield/yieldWood.prefab similarity index 100% rename from Assets/Prefabs/yieldWood.prefab rename to Assets/Prefabs/Yield/yieldWood.prefab diff --git a/Assets/Prefabs/yieldWood.prefab.meta b/Assets/Prefabs/Yield/yieldWood.prefab.meta similarity index 100% rename from Assets/Prefabs/yieldWood.prefab.meta rename to Assets/Prefabs/Yield/yieldWood.prefab.meta diff --git a/Assets/Scripts/Enum.cs b/Assets/Scripts/Enum.cs new file mode 100644 index 0000000..447fa9a --- /dev/null +++ b/Assets/Scripts/Enum.cs @@ -0,0 +1,9 @@ +public class Enum +{ + public enum ResourceChoice + { + Rock, + Wood, + Food + }; +} diff --git a/Assets/Scripts/Enum.cs.meta b/Assets/Scripts/Enum.cs.meta new file mode 100644 index 0000000..32029fb --- /dev/null +++ b/Assets/Scripts/Enum.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fd5cc1d3962cc044b9b0b7173ded952b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tiles/Farm.asset.orig.meta b/Assets/Scripts/PlayerAction.meta similarity index 67% rename from Assets/Tiles/Farm.asset.orig.meta rename to Assets/Scripts/PlayerAction.meta index eab0ff8..0d4f093 100644 --- a/Assets/Tiles/Farm.asset.orig.meta +++ b/Assets/Scripts/PlayerAction.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: dc323a4657283c04991e165963a0238b +guid: 441c4a0f2bcadbe4699f8f9641f20a51 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scripts/ClickBehavior.cs b/Assets/Scripts/PlayerAction/ClickBehavior.cs similarity index 100% rename from Assets/Scripts/ClickBehavior.cs rename to Assets/Scripts/PlayerAction/ClickBehavior.cs diff --git a/Assets/Scripts/ClickBehavior.cs.meta b/Assets/Scripts/PlayerAction/ClickBehavior.cs.meta similarity index 100% rename from Assets/Scripts/ClickBehavior.cs.meta rename to Assets/Scripts/PlayerAction/ClickBehavior.cs.meta diff --git a/Assets/Scripts/Resource/ResourceMaker.cs b/Assets/Scripts/Resource/ResourceMaker.cs index 55f57c7..aa2f870 100644 --- a/Assets/Scripts/Resource/ResourceMaker.cs +++ b/Assets/Scripts/Resource/ResourceMaker.cs @@ -8,16 +8,9 @@ public class ResourceMaker : MonoBehaviour [SerializeField] private int _resourceMakingAmount; [SerializeField] - private ResourceChoice _resourceChoice; + private Enum.ResourceChoice _resourceChoice; private ResourceManager _resourceManagerInstance; - public enum ResourceChoice - { - Rock, - Wood, - Food - }; - private void Start() { _resourceManagerInstance = ResourceManager.Instance; @@ -30,13 +23,13 @@ public class ResourceMaker : MonoBehaviour { switch (_resourceChoice) { - case ResourceChoice.Rock: + case Enum.ResourceChoice.Rock: _resourceManagerInstance.RockAmount = _resourceMakingAmount; break; - case ResourceChoice.Wood: + case Enum.ResourceChoice.Wood: _resourceManagerInstance.WoodAmount = _resourceMakingAmount; break; - case ResourceChoice.Food: + case Enum.ResourceChoice.Food: _resourceManagerInstance.FoodAmount = _resourceMakingAmount; break; } diff --git a/Assets/Tiles/Farm.asset.meta.orig b/Assets/Tiles/Farm.asset.meta.orig deleted file mode 100644 index 0a56497..0000000 --- a/Assets/Tiles/Farm.asset.meta.orig +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -<<<<<<< HEAD -guid: 953a02bba997b9348bee7f306f609a96 -======= -guid: 7568f730b2ba3754297a7612452482e2 ->>>>>>> origin/main -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tiles/Farm.asset.orig b/Assets/Tiles/Farm.asset.orig deleted file mode 100644 index 1346bc1..0000000 --- a/Assets/Tiles/Farm.asset.orig +++ /dev/null @@ -1,24 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 84b05f2a26f63da46a1028488482d079, type: 3} - m_Name: Farm - m_EditorClassIdentifier: -<<<<<<< HEAD - _sprite: {fileID: 21300000, guid: 9bd2451627165d44ab67ea16cdabaf2f, type: 3} - _yieldPrefab: {fileID: 6962989255644195630, guid: a2dc5d9672c10074fa9c35c12f6339c1, type: 3} - _yieldSpeed: 0.5 - _randomPositionConfig: 0.5 -======= - _sprite: {fileID: 21300000, guid: ccca3e050cb082b45af0a099790463f6, type: 3} - _yieldPrefab: {fileID: 0} - _yieldSpeed: 1 ->>>>>>> origin/main