Merge remote-tracking branch 'origin/main' into feature/waveEditor

Assets/Editor/LevelManagerEditor.cs

@@ -7,13 +7,16 @@ public class LevelManagerEditor : Editor
     public override void OnInspectorGUI()
     {
         DrawDefaultInspector();
-        if (GUILayout.Button("Save"))
+        if (Application.isPlaying)
         {
-            LevelManager.Instance.SaveFile();
+            if (GUILayout.Button("Save"))
-        }
+            {
-        if (GUILayout.Button("Load"))
+                LevelManager.Instance.SaveFile();
-        {
+            }
-            LevelManager.Instance.LoadFile();
+            if (GUILayout.Button("Load"))
+            {
+                LevelManager.Instance.LoadFile();
+            }
         }
     }
 }

Assets/KeepLevelAnchored.cs

@@ -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;
-    }
-}

Assets/Prefabs/Castle.prefab

@@ -62,7 +62,7 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}

Assets/Prefabs/Monsters/ClawClawRough_monster.prefab

@@ -106,7 +106,7 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}

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

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

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
@@ -511,7 +495,7 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 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

Assets/Prefabs/Sticks/archerStick.prefab

@@ -643,7 +643,7 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}

Assets/Prefabs/Sticks/baseStick.prefab

@@ -511,7 +511,7 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}

Assets/Prefabs/Sticks/farmersAssociation.prefab

@@ -1176,7 +1176,7 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}

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

Assets/Prefabs/UI/WorldMap/LevelSelection.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 096f5f6b487dccb41a48faf69f87fae9
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/baseMonster.prefab

@@ -67,7 +67,7 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}

Assets/Prefabs/baseProjectile.prefab

@@ -107,7 +107,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 01782bd631a6e1446956ed140a24c530, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _detectionLinked: {fileID: 3172728477976940186}
+  _detectionLinked: {fileID: 4130391605812397686}
   _angle: 10
   _speed: 1
 --- !u!1 &6962989256011107503
@@ -204,7 +204,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6802302589573039538}
   - component: {fileID: 7006189111012443782}
-  - component: {fileID: 3172728477976940186}
+  - component: {fileID: 4130391605812397686}
   m_Layer: 0
   m_Name: detection
   m_TagString: Untagged
@@ -253,7 +253,7 @@ BoxCollider2D:
   serializedVersion: 2
   m_Size: {x: 0.3744527, y: 0.17825907}
   m_EdgeRadius: 0
---- !u!114 &3172728477976940186
+--- !u!114 &4130391605812397686
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}

Assets/Scenes/Game.unity

@@ -538,7 +538,7 @@ Camera:
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 55
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0
@@ -783,6 +783,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: LevelManager
       objectReference: {fileID: 0}
+    - target: {fileID: 3028288566889208750, guid: 02daecb0115395844b4932445d039051, type: 3}
+      propertyPath: _gameScene
+      value: Game
+      objectReference: {fileID: 0}
+    - target: {fileID: 3028288566889208750, guid: 02daecb0115395844b4932445d039051, type: 3}
+      propertyPath: _firstLevel
+      value: 
+      objectReference: {fileID: 11400000, guid: a6e34739c9325da4cac4fbaea30d052c, type: 2}
     - target: {fileID: 3028288566889208751, guid: 02daecb0115395844b4932445d039051, type: 3}
       propertyPath: m_RootOrder
       value: 2
@@ -926,6 +934,7 @@ RectTransform:
   - {fileID: 115274809}
   - {fileID: 1709530844}
   - {fileID: 2019202047}
+  - {fileID: 2064630363}
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -943,11 +952,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 +964,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 +984,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 +996,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 +1064,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 +1076,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 +1092,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 +1144,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 +1156,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 +1176,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 +1188,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 +1238,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 +1375,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 +1488,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}
@@ -1804,3 +1817,152 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2019202046}
   m_CullTransparentMesh: 1
+--- !u!1 &2064630362
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2064630363}
+  - component: {fileID: 2064630366}
+  - component: {fileID: 2064630365}
+  - component: {fileID: 2064630364}
+  - component: {fileID: 2064630367}
+  m_Layer: 5
+  m_Name: TemporaryGoBackButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2064630363
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2064630362}
+  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: 1092900232}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 786, y: 603.62}
+  m_SizeDelta: {x: 97.7374, y: 78.499}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2064630364
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2064630362}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2064630365}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 2064630367}
+        m_TargetAssemblyTypeName: ChangeScene, GameAssembly
+        m_MethodName: LoadScene
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &2064630365
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2064630362}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 40f4f2cff86c68f4aaccce14435eba65, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &2064630366
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2064630362}
+  m_CullTransparentMesh: 1
+--- !u!114 &2064630367
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2064630362}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5013085c123fae4499f80b0a896f63af, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scene: LevelSelect
+  sceneAction: 0
+  loadSceneMode: 0

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<HarvesterResourcePair> _harvesterResourcePairs;
+    protected ResourceChoice ResourceChoice => _resourceChoice;
+    [SerializeField]
+    private ResourceChoice _resourceChoice;
+    public override sealed void Start()
+    {
+        base.Start();
+
+        ChooseSkinForHarvester();
+    }
+
+    /// <summary>
+    /// changes the harvester's appearance depending on the resource they're harvesting
+    /// </summary>
+    private void ChooseSkinForHarvester()
+    {
+        //get the tile we're on
+        var tile = LevelManager.Instance.Get<ResourceTile>(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<ResourceMaker>();
+        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);
+    }
 }

Assets/Scripts/Ally/HarvesterResourcePair.cs

@@ -0,0 +1,17 @@
+using static Enum;
+using UnityEngine;
+
+/// <summary>
+/// a data class for the harvesters
+/// </summary>
+[System.Serializable]
+public class HarvesterResourcePair
+{
+    [SerializeField]
+    private GameObject _harvesterPrefab;
+    [SerializeField]
+    private ResourceChoice _resource;
+
+    public GameObject HarvesterPrefab => _harvesterPrefab;
+    public ResourceChoice Resource => _resource;
+}

Assets/Scripts/Ally/HarvesterResourcePair.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 64f379c3b297ed249be5c01c7947a5fe
+guid: 7e6c18bcc79659b4cb0671d990dd848c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/AnimationEntity.cs

@@ -8,6 +8,7 @@ public class AnimationEntity : MonoBehaviour
     private Animator _animatorEntity;
     private bool _doSomething = false;
     private bool _isDead = false;
+    private bool _isWalking = false;
 
     void Start() 
     {
@@ -21,6 +22,7 @@ public class AnimationEntity : MonoBehaviour
         {
             PlayIdleAnim();
             _doSomething = false;
+            _isWalking = false;
         }
     }
 
@@ -35,6 +37,7 @@ public class AnimationEntity : MonoBehaviour
     {
         if(!_isDead) {
             _animatorEntity.Play("walk", 0, 0f);
+            _isWalking = true;
         }
     }
 
@@ -53,4 +56,11 @@ public class AnimationEntity : MonoBehaviour
         _isDead = true;
     }
 
+    //SETTER GETTER
+    public bool IsWalking
+    {
+        get { return _isWalking; }
+        set { _isWalking = value; }
+    }
+
 }

Assets/Scripts/ChangeScene.cs

@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class ChangeScene : MonoBehaviour
+{
+    [Scene]
+    public string scene;
+    public SceneActionType sceneAction;
+    public LoadSceneMode loadSceneMode;
+    public enum SceneActionType 
+    {
+        Load,
+        Unload
+    }
+    public void LoadScene()
+    {
+        if (sceneAction == SceneActionType.Load)
+        {
+            SceneManager.LoadScene(scene, loadSceneMode);
+        }
+        else if (sceneAction == SceneActionType.Unload)
+        {
+            for (int i = 0; i < SceneManager.sceneCount; i++) 
+            {
+                var scene = SceneManager.GetSceneAt(i);
+                if (scene.name == this.scene)
+                {
+                    SceneManager.UnloadSceneAsync(scene);
+                }
+            }
+            
+            
+        }
+    }
+}

Assets/Scripts/ChangeScene.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5013085c123fae4499f80b0a896f63af
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Detection.cs

@@ -18,6 +18,7 @@ public class Detection : MonoBehaviour
 
     //If it's a projectile damage > 0
     private int _projectileDamage = 0;
+    private float _distanceMin = 100f;
 
     void OnTriggerEnter2D(Collider2D other)
     {
@@ -29,9 +30,10 @@ public class Detection : MonoBehaviour
                 //Kill if no hp
                 if(other.gameObject.GetComponent<Entity>().Hp <= 0) {
                     other.gameObject.GetComponent<Entity>().Death();
-                    _entityLinked = null;
                 }
 
+                _entityLinked = null;
+
             }
         }
         
@@ -39,21 +41,32 @@ public class Detection : MonoBehaviour
 
     void OnTriggerStay2D(Collider2D other) 
     {
-        if(_entityLinked != null) {
+        if(_entityLinked != null && _projectileDamage == 0) {
-            if(_entityLinked.Enemy == null) {
+
                 //Detect the enemy and inform the Ally
-                if (other.gameObject.tag == "Opponent" && _entityLinked is Ally) {
+                if (other.gameObject.tag == "Opponent" && _entityLinked.gameObject.tag == "Ally") {
-                    _entityLinked.IsEnemyDetected = true;
+                    if(other.gameObject.transform.position.x <= _distanceMin) {
-                    _entityLinked.Enemy = other.gameObject.GetComponent<Entity>();
+                        _distanceMin = other.gameObject.transform.position.x;
+                        _entityLinked.IsEnemyDetected = true;
+                        _entityLinked.Enemy = other.gameObject.GetComponent<Entity>();
+                    }
                 }
 
                 //Detect the enemy and inform the Opponent
-                if (other.gameObject.tag == "Ally" && _entityLinked is Opponent) {
+                if (other.gameObject.tag == "Ally" &&  _entityLinked.gameObject.tag == "Opponent" ) {
-                    _entityLinked.IsEnemyDetected = true;
+                    if(other.gameObject.transform.position.x <= _distanceMin) {
-                    _entityLinked.Enemy = other.gameObject.GetComponent<Entity>();
+                        _distanceMin = other.gameObject.transform.position.x;
-                }
+                        _entityLinked.IsEnemyDetected = true;
-            }
+                        _entityLinked.Enemy = other.gameObject.GetComponent<Entity>();
+                    }
+                }  
+                
+                if(_entityLinked.Enemy == null && _distanceMin != 100f) {
+                    _distanceMin = 100f;
+                }       
         }
+
+        
                     
     }
 

Assets/Scripts/Drag&Drop/ObjectPlaceholder.cs

@@ -5,7 +5,7 @@ public class ObjectPlaceholder : DraggablePlaceholder
     public GameObject Prefab { get; set; }
     public override void Place()
     {
-        Prefab.Create(transform.position);
+        Prefab.Create(transform.position, parent : LevelManager.Instance.LevelTransform);
     }
     public override bool CanBePlacedHere()
     {

Assets/Scripts/Entity.cs

@@ -82,6 +82,12 @@ public class Entity : LevelObject
         }
     }
 
+    public void Move() {
+        if(!_animation.IsWalking) {
+            _animation.PlayWalkAnim();
+        }
+    }
+
     //GETTERS AND SETTERS
     
     public int Hp

Assets/Scripts/LevelEditor/TilemapData.cs

@@ -131,7 +131,12 @@ namespace GatherAndDefend.LevelEditor
 
             //get grid
             var grid = GameObject.FindObjectOfType<Grid>();
-            if (!grid) grid = new GameObject("Grid").AddComponent<Grid>();
+            if (!grid)
+            {
+                var levelMgrScript = GameObject.FindObjectOfType<LevelManagerScript>();
+                grid = new GameObject("Grid").AddComponent<Grid>();
+                grid.transform.SetParent(levelMgrScript.transform.parent);
+            }
 
             //get tilemap by name
             var tilemap = grid.GetComponentInChildren<Tilemap>(key);

Assets/Scripts/LevelManager/LevelManager.cs

@@ -97,8 +97,9 @@ public class LevelManager : Singleton<LevelManager>
 
     #region [Level management]
 
-    public void UpdateLevel()
+    public void AddAndRemoveObjects()
     {
+        //add and remove
         var toAdd = new List<ILevelObject>(_toAdd);
         toAdd.ForEach(addedObject =>
         {
@@ -114,27 +115,18 @@ public class LevelManager : Singleton<LevelManager>
             _levelObjects.Remove(removedObject);
             removedObject.LevelDestroy();
         });
+    }
+
+    public void UpdateLevel()
+    {
+        AddAndRemoveObjects();
 
         _levelObjects.ForEach(levelObject =>
         {
             levelObject.LevelUpdate();
         });
 
-        toAdd = new List<ILevelObject>(_toAdd);
+        AddAndRemoveObjects();
-        toAdd.ForEach(addedObject =>
-        {
-            _toAdd.Remove(addedObject);
-            _levelObjects.Add(addedObject);
-            addedObject.LevelStart();
-        });
-
-        toRemove = new List<ILevelObject>(_toRemove);
-        toRemove.ForEach(removedObject =>
-        {
-            _toRemove.Remove(removedObject);
-            _levelObjects.Remove(removedObject);
-            removedObject.LevelDestroy();
-        });
     }
 
     public void ClearLevel()
@@ -165,7 +157,9 @@ public class LevelManager : Singleton<LevelManager>
         //create new grid if there is none
         if (!grid)
         {
+            var levelMgrScript = Object.FindObjectOfType<LevelManagerScript>();
             grid = new GameObject("Grid").AddComponent<Grid>();
+            grid.transform.SetParent(levelMgrScript.transform);
         }
         //remove all tilemaps if there is a grid
         else
@@ -202,11 +196,6 @@ public class LevelManager : Singleton<LevelManager>
             ClearLevel();
         }
 
-        foreach (var ob in Database.Instance.ScriptableObjects)
-        {
-            Debug.Log(ob);
-        }
-
         //fetch level from database
         _currentLevel = Database.Instance.ScriptableObjects[levelName] as Level;
 
@@ -293,10 +282,5 @@ public class LevelManager : Singleton<LevelManager>
 
 
     }
-  
-    /// <summary>
-    /// align camera to the rightmost tile of the tilemap
-    /// </summary>
-   
     #endregion
 }

Assets/Scripts/LevelManager/LevelManagerScript.cs

@@ -1,14 +1,15 @@
 using UnityEngine;
-using GatherAndDefend.LevelEditor;
+using UnityEngine.SceneManagement;
-
+using Level = GatherAndDefend.LevelEditor.Level;
-public class LevelManagerScript : SingletonBehaviour<LevelManagerScript>
+public class LevelManagerScript : MonoBehaviour
 {
-    public Level firstLevel;
+    [Scene][SerializeField]
+    private string _gameScene;
+    [SerializeField]
+    private Level _firstLevel;
     private void Start()
     {
-        DontDestroyOnLoad(gameObject);
+        LevelManager.Instance.LevelTransform = transform;
-        if (!firstLevel) throw new System.Exception("there is no first level set in the level manager script");
-
         int levelToLoadFromWorldMap = PlayerPrefs.GetInt("LevelToLoad", -1);
         if (levelToLoadFromWorldMap != -1)
         {
@@ -16,8 +17,14 @@ public class LevelManagerScript : SingletonBehaviour<LevelManagerScript>
             LevelManager.Instance.LoadLevel(lvlName, true);
             return;
         }
-
+        else if (_firstLevel)
-        LevelManager.Instance.LoadLevel(firstLevel, true);
+        {
+            LevelManager.Instance.LoadLevel(_firstLevel, true);
+        }
+        else
+        {
+            Debug.LogWarning("there is no first level set in the level manager script");
+        }
     }
 
     void Update()

Assets/Scripts/Opponent/Opponent.cs

@@ -18,14 +18,18 @@ public class Opponent : Entity
 
     void Update() 
     {
-
-        _movementVector.x = -Time.deltaTime * Speed;
-
-        transform.position += (Vector3)_movementVector;
-
         if(IsEnemyDetected) {
             AttackEnemy();
+        }else {
+            _movementVector.x = -Time.deltaTime * Speed;
+
+            transform.position += (Vector3)_movementVector;
+
+            Move();
         }
+        
+
+        
 
     }
 

Assets/Scripts/PlayerAction/ClickBehavior.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using UnityEngine;
 /// <summary>
 /// Handles what happens when the user clicks on a collider
@@ -9,13 +10,15 @@ public class ClickBehavior : MonoBehaviour
         if (Input.GetMouseButton(0))
         {
             Vector2 clickPoint = Camera.main.ScreenToWorldPoint(Input.mousePosition);
-            RaycastHit2D hit = Physics2D.Raycast(clickPoint, transform.up, 0.0f);
+            List<Collider2D> listColliders = new(Physics2D.OverlapCircleAll(clickPoint, 0.05f));
-            if (hit.collider != null)
+            List<Collider2D> resourceColliders = listColliders.FindAll(obj => obj.CompareTag("Resource"));
+            if (resourceColliders.Count > 0)
             {
-                if (hit.collider.CompareTag("Resource"))
+                foreach (Collider2D collider in resourceColliders)
                 {
-                    hit.collider.GetComponent<ResourceMaker>().GenerateResource();
+                    collider.GetComponent<ResourceMaker>().GenerateResource();
                 }
+                
             }
         }
     }

Assets/Scripts/Resource/ResourceMaker.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using UnityEngine;
 /// <summary>
-/// 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
 /// </summary>
 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
     }
 
     /// <summary>
-    /// 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
     /// </summary>
     private void Update()
     {

Assets/Scripts/SceneDrawer.cs

@@ -0,0 +1,55 @@
+using UnityEditor;
+using UnityEngine;
+
+
+public class SceneAttribute : PropertyAttribute { }
+
+[CustomPropertyDrawer(typeof(SceneAttribute))]
+public class SceneDrawer : PropertyDrawer
+{
+
+	public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+	{
+
+		if (property.propertyType == SerializedPropertyType.String)
+		{
+			var sceneObject = GetSceneObject(property.stringValue);
+			var scene = EditorGUI.ObjectField(position, label, sceneObject, typeof(SceneAsset), true);
+			if (scene == null)
+			{
+				property.stringValue = "";
+			}
+			else if (scene.name != property.stringValue)
+			{
+				var sceneObj = GetSceneObject(scene.name);
+				if (sceneObj == null)
+				{
+					Debug.LogWarning("The scene " + scene.name + " cannot be used. To use this scene add it to the build settings for the project");
+				}
+				else
+				{
+					property.stringValue = scene.name;
+				}
+			}
+		}
+		else
+			EditorGUI.LabelField(position, label.text, "Use [Scene] with strings.");
+	}
+	protected SceneAsset GetSceneObject(string sceneObjectName)
+	{
+		if (string.IsNullOrEmpty(sceneObjectName))
+		{
+			return null;
+		}
+
+		foreach (var editorScene in EditorBuildSettings.scenes)
+		{
+			if (editorScene.path.IndexOf(sceneObjectName) != -1)
+			{
+				return AssetDatabase.LoadAssetAtPath(editorScene.path, typeof(SceneAsset)) as SceneAsset;
+			}
+		}
+		Debug.LogWarning("Scene [" + sceneObjectName + "] cannot be used. Add this scene to the 'Scenes in the Build' in build settings.");
+		return null;
+	}
+}

Assets/Scripts/SceneDrawer.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 389cc3c423055324fb8d7de50f62f709
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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]

Assets/Scripts/WorldMap/WorldMapManager.cs

@@ -16,6 +16,8 @@ public class WorldMapManager : MonoBehaviour
     private Sprite _lockedIcon;
     [SerializeField]
     private Sprite _savedIcon;
+    [Scene][SerializeField]
+    private string gameScene;
 
     private WorldMapSave _worldMapSave;
 
@@ -70,12 +72,10 @@ public class WorldMapManager : MonoBehaviour
 
     public void CallLevelWorld1(int levelToCall)
     {
-        string levelToGet = "1-" + levelToCall;
         if (_buttonList[levelToCall - 1].GetComponent<Image>().sprite.name != "worldmap_level_locked")
         {
             PlayerPrefs.SetInt("LevelToLoad", levelToCall);
-            SceneManager.LoadScene("Game");
+            SceneManager.LoadScene(gameScene);
-            //LevelManager.Instance.LoadLevel(levelToGet, true);
         }
     }
 }