From 94f918d2dc24dffa71d860e85c7f60097785c401 Mon Sep 17 00:00:00 2001 From: Ader Alisma 01 Date: Mon, 12 Jun 2023 21:05:17 -0400 Subject: [PATCH] =?UTF-8?q?Cr=C3=A9ation=20de=20dossiers=20Script/PlayerAc?= =?UTF-8?q?tion=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