Conflict resolve

Assets/GameManager/GameManager_Map.cs

@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using UnityEditor;
 using UnityEngine;
-using UnityEngine.Localization.Pseudo;
 using UnityEngine.UI;
 
 

Assets/Materials.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6b37670de43269e4f984694475e75510
+guid: 2230bf768ecb84610af77bea6cdd7074
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/New Material.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2651bd22cf5764e4eb358f11641edca2
+guid: 7142a58f80866aba3ae4ffeb79d5f67c
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 0

Assets/Scenes/Kabely/MiniGame-Kabely V4.unity.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8356cb86749a3674299ae725d58c8012
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/Kabely/MiniGame-Kabely V5.unity.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a007c35d1a63dc3418a3afe3c7407450
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/Kabely/MiniGame-Kabely V6.unity.meta

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

Assets/Scenes/Kabely/MiniGame-Kabely V7.unity.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 87c5ee97c7d1da345978bf431113faeb
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/Kabely/MiniGame-Kabely V8.unity.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 17fc65d1a95feae42b8815a07ea2ffef
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/Kabely/MiniGame-Kabely V9.unity.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3f2ca619b4f5384489cf03c1dd13a701
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/MiniGame-Kabely.unity

@@ -193,13 +193,13 @@ Transform:
   m_GameObject: {fileID: 210602716}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -55.235718, y: 368.19592, z: -781.7374}
+  m_LocalPosition: {x: -55.235718, y: 368.19595, z: -781.7374}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1140131532}
   - {fileID: 2102485167}
-  m_Father: {fileID: 1814274513}
+  m_Father: {fileID: 1790534262}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &331729628
 GameObject:
@@ -1570,9 +1570,10 @@ RectTransform:
   m_GameObject: {fileID: 1790534261}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 781.2808}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 2.92736, y: 2.5490422, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 210602717}
   m_Father: {fileID: 143293625}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -1650,9 +1651,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 143293625}
-  - {fileID: 210602717}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 34.899}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}

Assets/TutorialInfo/Icons/URP.png.meta

@@ -1,143 +0,0 @@
-fileFormatVersion: 2
-guid: f39c83cede024654b8b01f3ed649efc8
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 4
-    buildTarget: DefaultTexturePlatform
-    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: 4
-    buildTarget: Standalone
-    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: 4
-    buildTarget: Android
-    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: 4
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    customData: 
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    spriteCustomMetadata:
-      entries: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/TutorialInfo/Layout.wlt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 58a0d1d70570e1340b7bde7edda96e9a
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: bd359125026cdc144a1f35a5c8607b45

Assets/TutorialInfo/Scripts/Readme.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: d0a79df83e583b147b8f08cd4a8a96a8

Assets/_Recovery.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 38f8393f8cca8f24bb21ca2ab3a28acc
+guid: b9c8f9e5bbf063b4fb1152966129a495
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/host a join.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: ae701dd46572ae44faa1c08754c677a1
+guid: 0f6331bfef5b3a00cb6f84141e60f9c4
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/main menu.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: fbd0ba17ed8002141b6b82c678cd3baf
+guid: 43d195e24415843378eb1b53e9e1da18
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: