Merge branch 'DevMax' into TestProject(Не-трогать)

Assets/Prefab/For Map/1PlayerMarker.png.meta

@@ -93,19 +93,6 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048

Assets/Prefab/For Map/2PlayerMarker.png.meta

@@ -93,19 +93,6 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048

Assets/Prefab/For Map/Map.prefab.meta

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

Assets/Prefab/For Map/MaskBasic.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 545207f531b8e424f95c3d5da8b62b3a
+guid: f9e02c69c1cf55840838e9f7f2c839c3
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -93,19 +93,6 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048

Assets/Scripts/Map.meta

@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: 98d51bd430fa57042baccfe371c9c062
-PrefabImporter:
+guid: 728eca47a6b4b7c42a8d4ffb8bd8a789
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Scripts/Map/FollowTarget.cs

@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class FollowTarget : MonoBehaviour
+{
+    [SerializeField] private Transform target;
+    [SerializeField] private  Vector3 offset;   
+
+    // Update is called once per frame
+    void Update()
+    {
+        transform.position = target.transform.position + offset;
+    }
+}

Assets/Scripts/Map/FollowTarget.cs.meta

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

Assets/Scripts/Map/FollowYRotation.cs

@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class FollowYRotation : MonoBehaviour
+{
+    [SerializeField] Transform target;
+
+    void Update()
+    {
+        transform.eulerAngles = new Vector3(0, target.eulerAngles.y, 0);
+    }
+}

Assets/Scripts/Map/FollowYRotation.cs.meta

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