Merge branch 'ruud' into 'main'

Ruud

See merge request !11

MrBigsock/Assets/Code/FollowPlayer.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Tilemaps;
+using static System.Net.WebRequestMethods;
+
+
+namespace BigSock
+{
+    public class FollowPlayer : MonoBehaviour
+    {
+        public GameObject player;
+        public GameObject leftSide;
+        public GameObject rightSide;
+        public GameObject topSide;
+        public GameObject bottomSide;
+
+        Vector3 offset = new Vector3(0, 0, -10);
+
+        void Start()
+        {
+
+        }
+
+        void LateUpdate()
+        {
+            if(player.transform.position.x <= leftSide.transform.position.x && player.transform.position.y >= topSide.transform.position.y)
+            {
+                transform.position = new Vector3(leftSide.transform.position.x, topSide.transform.position.y, offset.z);
+            }
+            else if (player.transform.position.x >= rightSide.transform.position.x && player.transform.position.y >= topSide.transform.position.y)
+            {
+                transform.position = new Vector3(rightSide.transform.position.x, topSide.transform.position.y, offset.z);
+            }
+            else if(player.transform.position.x <= leftSide.transform.position.x && player.transform.position.y <= bottomSide.transform.position.y)
+            {
+                transform.position = new Vector3(leftSide.transform.position.x, bottomSide.transform.position.y, offset.z);
+            }
+            else if (player.transform.position.x >= rightSide.transform.position.x && player.transform.position.y <= bottomSide.transform.position.y)
+            {
+                transform.position = new Vector3(rightSide.transform.position.x, bottomSide.transform.position.y, offset.z);
+            }
+
+
+            else if (player.transform.position.x <= leftSide.transform.position.x )
+            {
+                transform.position = new Vector3(leftSide.transform.position.x, player.transform.position.y,offset.z);
+            }
+            else if (player.transform.position.x >= rightSide.transform.position.x)
+            {
+                transform.position = new Vector3(rightSide.transform.position.x, player.transform.position.y,offset.z);
+            }
+            else if (player.transform.position.y <= bottomSide.transform.position.y)
+            {
+                transform.position = new Vector3(player.transform.position.x, bottomSide.transform.position.y, offset.z);
+            }
+            else if (player.transform.position.y >= topSide.transform.position.y)
+            {
+                transform.position = new Vector3(player.transform.position.x, topSide.transform.position.y, offset.z);
+            }
+            else
+            {
+                transform.position = player.transform.position + offset;
+            }
+
+
+            //transform.position = player.transform.position + offset;
+        }
+    }
+}

MrBigsock/Assets/Code/FollowPlayer.cs.meta

+fileFormatVersion: 2
+guid: 81ea7bde155ea8c4e8bb2a3f3a9287f4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab

@@ -14,7 +14,7 @@ GameObject:
   - component: {fileID: 5891912875293609069}
   - component: {fileID: 1992931693109878676}
   - component: {fileID: 2395291586284291126}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: enemy_orc_warrior
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -201,7 +201,7 @@ GameObject:
   - component: {fileID: 2753253562357840752}
   - component: {fileID: 7566484513581878393}
   - component: {fileID: 8365831662590702362}
-  m_Layer: 3
+  m_Layer: 6
   m_Name: followCollider
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -262,7 +262,7 @@ GameObject:
   - component: {fileID: 1701851832504875480}
   - component: {fileID: 8983526051028480608}
   - component: {fileID: 6373942986610437007}
-  m_Layer: 3
+  m_Layer: 6
   m_Name: MeleeCollider
   m_TagString: Untagged
   m_Icon: {fileID: 0}

MrBigsock/Assets/Scenes/TestLevel1.unity.meta

+fileFormatVersion: 2
+guid: f2e6e80f9d3fd224e9d6b436b40b462e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MrBigsock/ProjectSettings/DynamicsManager.asset

@@ -33,5 +33,6 @@ PhysicsManager:
   m_FrictionType: 0
   m_EnableEnhancedDeterminism: 0
   m_EnableUnifiedHeightmaps: 1
+  m_ImprovedPatchFriction: 0
   m_SolverType: 0
   m_DefaultMaxAngularSpeed: 50