From b1cfb714a60996898c83f7c5f45d0f4b2d8c9fde Mon Sep 17 00:00:00 2001 From: Felix Boucher Date: Sun, 23 Jul 2023 11:53:07 -0400 Subject: [PATCH] changer l'apparence du harvester MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit problème : - le harvester avait une apparence non-changeante dépendant du genre de ressource sur lequel il était placé. solution : - ajouter une logique qui change le prefab choisi dépendant de sur quelle tuile on place le harvester. - also, quelques micro refactorings (changement de noms, ajout de doc) --- Assets/KeepLevelAnchored.cs | 53 --- .../Sticks/Harversters/axemanStick.prefab | 44 +- .../Sticks/Harversters/farmerStick.prefab | 42 +- .../Sticks/Harversters/minerStick.prefab | 44 +- .../UnitPlacementButtons.prefab | 402 ++---------------- Assets/Scenes/Game.unity | 106 ++--- Assets/Scripts/Ally/Harvester.cs | 42 ++ Assets/Scripts/Ally/HarvesterResourcePair.cs | 17 + .../Ally/HarvesterResourcePair.cs.meta} | 2 +- Assets/Scripts/Resource/ResourceMaker.cs | 6 +- Assets/Scripts/Tiles/ResourceTile.cs | 1 + 11 files changed, 235 insertions(+), 524 deletions(-) delete mode 100644 Assets/KeepLevelAnchored.cs create mode 100644 Assets/Scripts/Ally/HarvesterResourcePair.cs rename Assets/{KeepLevelAnchored.cs.meta => Scripts/Ally/HarvesterResourcePair.cs.meta} (83%) diff --git a/Assets/KeepLevelAnchored.cs b/Assets/KeepLevelAnchored.cs deleted file mode 100644 index 047b613..0000000 --- a/Assets/KeepLevelAnchored.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class KeepLevelAnchored : MonoBehaviour -{ - Camera _camera; - Rect _levelBound; - // Start is called before the first frame update - void Start() - { - LevelManager.Instance.LevelLoaded += CalculateBound; - CalculateBound(LevelManager.Instance.CurrentLevel); - _camera = Camera.main; - } - - private void CalculateBound(GatherAndDefend.LevelEditor.Level level) - { - _levelBound = level.CalculateBounds(); - } - - void OnDestroy() - { - LevelManager.Instance.LevelLoaded -= CalculateBound; - } - - // Update is called once per frame - void Update() - { - //move right - var xMax = _levelBound.xMax; - var width = _camera.ScreenToWorldPoint(Vector2.one * _camera.pixelWidth).x; - var rightDiff = width - xMax; - var camPos = _camera.transform.position; - - camPos.x -= rightDiff; - - _camera.transform.position = camPos; - - - //resize - var xMin = _levelBound.xMin; - var left = _camera.ScreenToWorldPoint(Vector2.zero).x; - var center = _camera.ScreenToWorldPoint(Vector2.one * _camera.pixelWidth / 3).x; - - var leftDiff = xMax - xMin; - var centerDiff = xMax - center; - - var ratio = centerDiff / leftDiff; - - _camera.orthographicSize /= ratio; - } -} diff --git a/Assets/Prefabs/Sticks/Harversters/axemanStick.prefab b/Assets/Prefabs/Sticks/Harversters/axemanStick.prefab index 72b1241..4bddfbf 100644 --- a/Assets/Prefabs/Sticks/Harversters/axemanStick.prefab +++ b/Assets/Prefabs/Sticks/Harversters/axemanStick.prefab @@ -397,10 +397,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6962989255644195631} - - component: {fileID: 6267942154098158814} - component: {fileID: 6072713849781841816} - component: {fileID: -1491803373025033585} - component: {fileID: -7538281095464317747} + - component: {fileID: -7651792297317791922} m_Layer: 0 m_Name: axemanStick m_TagString: Ally @@ -426,22 +426,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6267942154098158814 -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: c0051e3c39a18654fbc359fd2353010f, type: 3} - m_Name: - m_EditorClassIdentifier: - _hp: 10 - _speed: 0 - _attack_damage: 0 - _attack_speed: 0 --- !u!1839735485 &6072713849781841816 Tilemap: m_ObjectHideFlags: 0 @@ -527,6 +511,30 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!114 &-7651792297317791922 +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: c0051e3c39a18654fbc359fd2353010f, type: 3} + m_Name: + m_EditorClassIdentifier: + _hp: 0 + _speed: 0 + _attack_damage: 0 + _attack_speed: 0 + _harvesterResourcePairs: + - _harvesterPrefab: {fileID: 5157279992115123224, guid: 85534a2d6c2add54d864073914646192, type: 3} + _resource: 2 + - _harvesterPrefab: {fileID: 6962989255644195630, guid: 8b50d9afb3bbd204d8dfea3d64f13fa2, type: 3} + _resource: 0 + - _harvesterPrefab: {fileID: 6962989255644195630} + _resource: 1 + _resourceChoice: 1 --- !u!1 &6962989255710846697 GameObject: m_ObjectHideFlags: 0 @@ -747,7 +755,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c0fbd934c179894458914437255781c4, type: 3} m_Name: m_EditorClassIdentifier: - _entity: {fileID: 6267942154098158814} + _entity: {fileID: 0} _projectile: {fileID: 0} _projectileSpawn: {fileID: 0} --- !u!1 &6962989255885988245 diff --git a/Assets/Prefabs/Sticks/Harversters/farmerStick.prefab b/Assets/Prefabs/Sticks/Harversters/farmerStick.prefab index 4a1425b..735c168 100644 --- a/Assets/Prefabs/Sticks/Harversters/farmerStick.prefab +++ b/Assets/Prefabs/Sticks/Harversters/farmerStick.prefab @@ -300,9 +300,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5157279992115123225} - - component: {fileID: -3852588021827760540} - component: {fileID: -6358718468452003836} - component: {fileID: 6414742418917179956} + - component: {fileID: 7429562175137956843} m_Layer: 0 m_Name: farmerStick m_TagString: Untagged @@ -327,22 +327,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &-3852588021827760540 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5157279992115123224} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c0051e3c39a18654fbc359fd2353010f, type: 3} - m_Name: - m_EditorClassIdentifier: - _hp: 10 - _speed: 0 - _attack_damage: 0 - _attack_speed: 0 --- !u!50 &-6358718468452003836 Rigidbody2D: serializedVersion: 4 @@ -390,6 +374,30 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!114 &7429562175137956843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5157279992115123224} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0051e3c39a18654fbc359fd2353010f, type: 3} + m_Name: + m_EditorClassIdentifier: + _hp: 0 + _speed: 0 + _attack_damage: 0 + _attack_speed: 0 + _harvesterResourcePairs: + - _harvesterPrefab: {fileID: 5157279992115123224} + _resource: 2 + - _harvesterPrefab: {fileID: 6962989255644195630, guid: 8b50d9afb3bbd204d8dfea3d64f13fa2, type: 3} + _resource: 0 + - _harvesterPrefab: {fileID: 6962989255644195630, guid: 02eb2d787f58e9943a0cb46d0b13e6b8, type: 3} + _resource: 1 + _resourceChoice: 2 --- !u!1 &5157279992317039071 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Sticks/Harversters/minerStick.prefab b/Assets/Prefabs/Sticks/Harversters/minerStick.prefab index e768fce..2daa95c 100644 --- a/Assets/Prefabs/Sticks/Harversters/minerStick.prefab +++ b/Assets/Prefabs/Sticks/Harversters/minerStick.prefab @@ -397,10 +397,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6962989255644195631} - - component: {fileID: 6267942154098158814} - component: {fileID: 6072713849781841816} - component: {fileID: -1491803373025033585} - component: {fileID: -7538281095464317747} + - component: {fileID: 6812572548963698156} m_Layer: 0 m_Name: minerStick m_TagString: Ally @@ -426,22 +426,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6267942154098158814 -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: c0051e3c39a18654fbc359fd2353010f, type: 3} - m_Name: - m_EditorClassIdentifier: - _hp: 10 - _speed: 0 - _attack_damage: 0 - _attack_speed: 0 --- !u!1839735485 &6072713849781841816 Tilemap: m_ObjectHideFlags: 0 @@ -527,6 +511,30 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!114 &6812572548963698156 +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: c0051e3c39a18654fbc359fd2353010f, type: 3} + m_Name: + m_EditorClassIdentifier: + _hp: 0 + _speed: 0 + _attack_damage: 0 + _attack_speed: 0 + _harvesterResourcePairs: + - _harvesterPrefab: {fileID: 5157279992115123224, guid: 85534a2d6c2add54d864073914646192, type: 3} + _resource: 2 + - _harvesterPrefab: {fileID: 6962989255644195630} + _resource: 0 + - _harvesterPrefab: {fileID: 6962989255644195630, guid: 02eb2d787f58e9943a0cb46d0b13e6b8, type: 3} + _resource: 1 + _resourceChoice: 0 --- !u!1 &6962989255710846697 GameObject: m_ObjectHideFlags: 0 @@ -747,7 +755,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c0fbd934c179894458914437255781c4, type: 3} m_Name: m_EditorClassIdentifier: - _entity: {fileID: 6267942154098158814} + _entity: {fileID: 0} _projectile: {fileID: 0} _projectileSpawn: {fileID: 0} --- !u!1 &6962989255885988245 diff --git a/Assets/Prefabs/UI/BuyableUnitsView/UnitPlacementButtons.prefab b/Assets/Prefabs/UI/BuyableUnitsView/UnitPlacementButtons.prefab index 8cc8262..dea7bde 100644 --- a/Assets/Prefabs/UI/BuyableUnitsView/UnitPlacementButtons.prefab +++ b/Assets/Prefabs/UI/BuyableUnitsView/UnitPlacementButtons.prefab @@ -157,8 +157,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5639720393720315369} - - {fileID: 5639720393273189869} - - {fileID: 5639720393215043968} - {fileID: 5639720393060989426} - {fileID: 8992921944992653498} m_Father: {fileID: 4817988606444742094} @@ -195,168 +193,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1001 &4817988604996744117 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4817988606957756069} - m_Modifications: - - target: {fileID: 907652127959947826, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_Name - value: Axeman - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.y - value: -201.6 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652128235033332, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: aa033001c3067ea41a2fc684a6320489, type: 3} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.y - value: -47.711605 - objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.y - value: -26.874405 - objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.y - value: -6.0372024 - objectReference: {fileID: 0} - - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: _food - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: _prefab - value: - objectReference: {fileID: 6962989255644195630, guid: 02eb2d787f58e9943a0cb46d0b13e6b8, type: 3} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} ---- !u!224 &5639720393215043968 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - m_PrefabInstance: {fileID: 4817988604996744117} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4817988605156991943 PrefabInstance: m_ObjectHideFlags: 0 @@ -378,7 +214,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_RootOrder - value: 3 + value: 1 objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.x @@ -386,7 +222,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.x @@ -394,7 +230,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_SizeDelta.x @@ -438,7 +274,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -299.90002 + value: 0 objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -458,11 +294,11 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 178d3231a9182834aa1a4394bd40b644, type: 3} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x @@ -470,15 +306,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -47.711605 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x @@ -486,15 +322,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -26.874405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x @@ -502,7 +338,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -6.0372024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: _food @@ -523,168 +359,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} m_PrefabInstance: {fileID: 4817988605156991943} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4817988605374709720 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4817988606957756069} - m_Modifications: - - target: {fileID: 907652127959947826, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_Name - value: Miner - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.y - value: -103.3 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 907652128235033332, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 22ca7c7532351034fb391731923cf3d2, type: 3} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.y - value: -47.711605 - objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.y - value: -26.874405 - objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.y - value: -6.0372024 - objectReference: {fileID: 0} - - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: _food - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: _prefab - value: - objectReference: {fileID: 6962989255644195630, guid: 8b50d9afb3bbd204d8dfea3d64f13fa2, type: 3} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} ---- !u!224 &5639720393273189869 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - m_PrefabInstance: {fileID: 4817988605374709720} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4817988606013954844 PrefabInstance: m_ObjectHideFlags: 0 @@ -1246,7 +920,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.x @@ -1254,7 +928,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_SizeDelta.x @@ -1298,7 +972,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1314,11 +988,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x @@ -1326,15 +1000,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -47.711605 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x @@ -1342,15 +1016,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -26.874405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x @@ -1358,7 +1032,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -6.0372024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: _food @@ -1396,7 +1070,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_RootOrder - value: 4 + value: 2 objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.x @@ -1404,7 +1078,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.x @@ -1412,7 +1086,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_SizeDelta.x @@ -1456,7 +1130,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -398.2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1504,11 +1178,11 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 7f013ea28cc038c4794a38dc2f1b0685, type: 3} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x @@ -1516,15 +1190,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -47.711605 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x @@ -1532,15 +1206,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -26.874405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x @@ -1548,7 +1222,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -6.0372024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: _food diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 2e72fe6..2cf07a4 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -943,11 +943,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 400568529911642456, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400568529911642456, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400568529911642456, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -955,7 +955,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400568529911642456, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -47.711605 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400568530076150058, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -975,11 +975,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400568530256114997, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400568530256114997, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400568530256114997, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -987,7 +987,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400568530256114997, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -47.711605 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400568530484276529, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -1055,11 +1055,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2335911515542116969, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2335911515542116969, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2335911515542116969, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -1067,15 +1067,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2335911515542116969, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -6.0372024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2335911515584534020, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2335911515584534020, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2335911515584534020, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -1083,7 +1083,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2335911515584534020, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -6.0372024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2335911515764278902, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -1135,11 +1135,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2340796561267475078, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2340796561267475078, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2340796561267475078, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -1147,7 +1147,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2340796561267475078, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -26.874405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2340796561450327705, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -1167,11 +1167,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2340796561610837739, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2340796561610837739, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2340796561610837739, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -1179,7 +1179,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2340796561610837739, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -26.874405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2340796562313902855, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -1229,6 +1229,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -47.711605 objectReference: {fileID: 0} + - target: {fileID: 4021885618914922922, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: _food + value: 10 + objectReference: {fileID: 0} - target: {fileID: 4817988606444742093, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_Name value: UnitPlacementButtons @@ -1362,41 +1366,41 @@ PrefabInstance: value: 5 objectReference: {fileID: 0} - target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -299.90002 - objectReference: {fileID: 0} - - target: {fileID: 5639720393215043968, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5639720393215043968, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5639720393215043968, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5639720393215043968, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -201.6 - objectReference: {fileID: 0} - - target: {fileID: 5639720393273189869, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5639720393273189869, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5639720393273189869, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5639720393273189869, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y value: -103.3 objectReference: {fileID: 0} + - target: {fileID: 5639720393215043968, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5639720393215043968, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5639720393215043968, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5639720393215043968, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5639720393273189869, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5639720393273189869, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5639720393273189869, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5639720393273189869, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5639720393720315369, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -1475,7 +1479,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8992921944992653498, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -398.2 + value: -201.6 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} diff --git a/Assets/Scripts/Ally/Harvester.cs b/Assets/Scripts/Ally/Harvester.cs index 6f236e0..2e117da 100644 --- a/Assets/Scripts/Ally/Harvester.cs +++ b/Assets/Scripts/Ally/Harvester.cs @@ -1,6 +1,48 @@ using UnityEngine; using System.Collections.Generic; +using static Enum; public class Harvester : Entity { + [SerializeField][Tooltip("helps choose the right skin for the harvester depending on resource")] + private List _harvesterResourcePairs; + protected ResourceChoice ResourceChoice => _resourceChoice; + [SerializeField] + private ResourceChoice _resourceChoice; + public override sealed void Start() + { + base.Start(); + + ChooseSkinForHarvester(); + } + + /// + /// changes the harvester's appearance depending on the resource they're harvesting + /// + private void ChooseSkinForHarvester() + { + //get the tile we're on + var tile = LevelManager.Instance.Get(t => t.Position == Position); + if (tile == default) return; + + //get the resource of the tile we're on + var yieldPrefab = tile.YieldPrefab; + if (!yieldPrefab) return; + + var resourceMaker = yieldPrefab.GetComponent(); + if (!resourceMaker) return; + + //if we already have the right harvester for the resource, no need to change + var resourceChoice = resourceMaker.ResourceChoice; + if (resourceChoice == this.ResourceChoice) return; + + //get the right pair for the resource we're on + var harvResPair = _harvesterResourcePairs.Find(hrp => hrp.Resource == resourceChoice); + if (harvResPair == null) return; + + //exchange harvesters + var newHarvester = Instantiate(harvResPair.HarvesterPrefab, transform.position, Quaternion.identity); + newHarvester.transform.SetParent(transform.parent); + Destroy(gameObject); + } } \ No newline at end of file diff --git a/Assets/Scripts/Ally/HarvesterResourcePair.cs b/Assets/Scripts/Ally/HarvesterResourcePair.cs new file mode 100644 index 0000000..f76addc --- /dev/null +++ b/Assets/Scripts/Ally/HarvesterResourcePair.cs @@ -0,0 +1,17 @@ +using static Enum; +using UnityEngine; + +/// +/// a data class for the harvesters +/// +[System.Serializable] +public class HarvesterResourcePair +{ + [SerializeField] + private GameObject _harvesterPrefab; + [SerializeField] + private ResourceChoice _resource; + + public GameObject HarvesterPrefab => _harvesterPrefab; + public ResourceChoice Resource => _resource; +} \ No newline at end of file diff --git a/Assets/KeepLevelAnchored.cs.meta b/Assets/Scripts/Ally/HarvesterResourcePair.cs.meta similarity index 83% rename from Assets/KeepLevelAnchored.cs.meta rename to Assets/Scripts/Ally/HarvesterResourcePair.cs.meta index 7310fbd..1da1370 100644 --- a/Assets/KeepLevelAnchored.cs.meta +++ b/Assets/Scripts/Ally/HarvesterResourcePair.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 64f379c3b297ed249be5c01c7947a5fe +guid: 7e6c18bcc79659b4cb0671d990dd848c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Resource/ResourceMaker.cs b/Assets/Scripts/Resource/ResourceMaker.cs index f07df52..b52a821 100644 --- a/Assets/Scripts/Resource/ResourceMaker.cs +++ b/Assets/Scripts/Resource/ResourceMaker.cs @@ -1,7 +1,7 @@ using System.Collections; using UnityEngine; /// -/// Gère la production de ressource et sert de minuteur pour laisser la ressource sur le sol. +/// Manages resource production, and serves as a countdown to leave a resource on the ground /// public class ResourceMaker : MonoBehaviour { @@ -18,6 +18,8 @@ public class ResourceMaker : MonoBehaviour private float _timePassed = 0f; private bool _isPlaying = false; + public Enum.ResourceChoice ResourceChoice => _resourceChoice; + private void Start() { _resourceManagerInstance = ResourceManager.Instance; @@ -29,7 +31,7 @@ public class ResourceMaker : MonoBehaviour } /// - /// D'après le choix de resource à générer, choisi le prefab à instancier + /// Depending on the resource choice, chooses the prefab it should instantiate /// private void Update() { diff --git a/Assets/Scripts/Tiles/ResourceTile.cs b/Assets/Scripts/Tiles/ResourceTile.cs index 3352985..0327ef5 100644 --- a/Assets/Scripts/Tiles/ResourceTile.cs +++ b/Assets/Scripts/Tiles/ResourceTile.cs @@ -9,6 +9,7 @@ public class ResourceTile : LevelTile [Tooltip("the prefab of the currency that will be spawned when mining this resource")] private GameObject _yieldPrefab; + public GameObject YieldPrefab => _yieldPrefab; private string YieldPrefabName => _yieldPrefab.name; [SerializeField]