Merge pull request 'Pajka' (#27) from Pajka into main

Reviewed-on: #27

Assets/GameManager/GameManager.cs

@@ -57,12 +57,12 @@ public class GameManager : MonoBehaviour
     // and each one MUST be enabled in EditorBuildSettings, or LoadSceneAsync
     // will silently fail and the task button will appear dead.
     [SerializeField] public string[] minigameScenes = {
-        "MiniGame-Kabely V10",
+        "MiniGame-Kabely",
-        "MiniGame-insertkeys",
+        //"MiniGame-insertkeys", Obsolete ?
-        "MiniGame-FlappyBird",
+        "MiniGame-KeyInsert",
-        "MiniGame-ThrowInHole",
+        //"MiniGame-FlappyBird", Out Of Order, Not assigned prefabs
-        "MiniGame-Satelit"
+        //"MiniGame-ThrowInHole", Not pushed into main branch
-        // Add minigame scene name here
+        //"MiniGame-Satelit", No assets, just placeholder task
     };
 
     [Header("Debug")]

Assets/Scenes/Client.unity

@@ -1509,7 +1509,6 @@ MonoBehaviour:
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -2194,96 +2193,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1304493835}
   m_CullTransparentMesh: 1
---- !u!1 &1353866370
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1353866371}
-  - component: {fileID: 1353866372}
-  m_Layer: 0
-  m_Name: Game
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1353866371
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1353866370}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 56.6539, y: 0, z: 0.06448}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1353866372
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1353866370}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 22bf82e679cf6e1419440d236360ba3b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::GameManager
-  displayName: 
-  JoinCreateLobby: {fileID: 1403738864}
-  InLobby: {fileID: 12226903}
-  LoadingScreen: {fileID: 247614966}
-  GameScreen: {fileID: 1631266632}
-  MapCenterPoint: {fileID: 216559629}
-  buildingSettings:
-    ResidentialBuildingsMat: {fileID: 2100000, guid: 43a59ce0be297c44a94d4266bc86174d, type: 2}
-    ResidentialBuildingHeight: 0
-    CommercialBuildingsMat: {fileID: 2100000, guid: d7a2ebf8eb383bc43a5203bcaf1b63e2, type: 2}
-    CommercialBuildingHeight: 8
-    IndustrialBuildingsMat: {fileID: 2100000, guid: 30078b48eb864694dbcb63ce7a222fc4, type: 2}
-    IndustrialBuildingHeight: 15
-    DefaultBuildingMat: {fileID: 2100000, guid: 43a59ce0be297c44a94d4266bc86174d, type: 2}
-    DefaultBuildingHeight: 30
-  pathwaySettings:
-    FootwayMat: {fileID: 2100000, guid: fbe49e8a4c50f024989408f62bfdcb33, type: 2}
-    FootwayWidth: 3
-    PathMat: {fileID: 2100000, guid: f745f6d4b3e89844aadf9e01fcf41cf3, type: 2}
-    PathWidth: 3
-    StepsMat: {fileID: 2100000, guid: e5e090726056f374dbbd3a626772822f, type: 2}
-    StepsWidth: 4
-    CyclewayMat: {fileID: 2100000, guid: a83875b5ebf7d7b42a074d07e791fee7, type: 2}
-    CyclewayWidth: 4
-    PedestrianMat: {fileID: 2100000, guid: c4c816c88b520f649a38ab2b4e1716f4, type: 2}
-    PedestrianWidth: 4
-    RoadMat: {fileID: 2100000, guid: 616bfa229ebc56548ae11df790a4cf12, type: 2}
-    RoadWidth: 5
-    ServiceMat: {fileID: 2100000, guid: 2faa8c507cbdf4e44bda99e39e5ee03d, type: 2}
-    ServiceWidth: 5
-    ResidentialMat: {fileID: 2100000, guid: 1848627499bdc424fa11b913e3aa2c1d, type: 2}
-    ResidentialWidth: 6
-    TrackMat: {fileID: 2100000, guid: 33108960a53974744ae1f1f329275c9d, type: 2}
-    TrackWidth: 6
-    DefaultMat: {fileID: 2100000, guid: 8be50db4bd8c0aa4e884602af1bdccbc, type: 2}
-    DefaultWidth: 5
-  areaSettings:
-    ParkMat: {fileID: 0}
-    GardenMat: {fileID: 0}
-    PlaygroundMat: {fileID: 0}
-    ForestMat: {fileID: 0}
-    GrassMat: {fileID: 0}
-    WaterMat: {fileID: 0}
-    DefaultMat: {fileID: 0}
-  Player: {fileID: 1161233721}
-  testMode: 1
 --- !u!1 &1403738861
 GameObject:
   m_ObjectHideFlags: 0
@@ -3425,7 +3334,6 @@ SceneRoots:
   m_Roots:
   - {fileID: 442151208}
   - {fileID: 1403738865}
-  - {fileID: 1353866371}
   - {fileID: 157221436}
   - {fileID: 12226904}
   - {fileID: 247614967}

Assets/Scenes/MainScene.unity

@@ -85,8 +85,8 @@ LightmapSettings:
     m_PVREnvironmentMIS: 1
     m_PVRCulling: 1
     m_PVRFilteringGaussRadiusDirect: 1
-    m_PVRFilteringGaussRadiusIndirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
-    m_PVRFilteringGaussRadiusAO: 1
+    m_PVRFilteringGaussRadiusAO: 2
     m_PVRFilteringAtrousPositionSigmaDirect: 0.5
     m_PVRFilteringAtrousPositionSigmaIndirect: 2
     m_PVRFilteringAtrousPositionSigmaAO: 1
@@ -119,7 +119,7 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!1 &564375757
+--- !u!1 &90211612
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -127,9 +127,106 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 564375760}
+  - component: {fileID: 90211614}
-  - component: {fileID: 564375759}
+  - component: {fileID: 90211613}
-  - component: {fileID: 564375758}
+  m_Layer: 0
+  m_Name: GameManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &90211613
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 90211612}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 22bf82e679cf6e1419440d236360ba3b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::GameManager
+  displayName: Hrac
+  firstMenuScene: main menu asi idk lol
+  buildingSettings:
+    ResidentialBuildingsMat: {fileID: 2100000, guid: 43a59ce0be297c44a94d4266bc86174d, type: 2}
+    ResidentialBuildingHeight: 2
+    CommercialBuildingsMat: {fileID: 2100000, guid: d7a2ebf8eb383bc43a5203bcaf1b63e2, type: 2}
+    CommercialBuildingHeight: 8
+    IndustrialBuildingsMat: {fileID: 2100000, guid: 30078b48eb864694dbcb63ce7a222fc4, type: 2}
+    IndustrialBuildingHeight: 15
+    DefaultBuildingMat: {fileID: 2100000, guid: 43a59ce0be297c44a94d4266bc86174d, type: 2}
+    DefaultBuildingHeight: 30
+  pathwaySettings:
+    FootwayMat: {fileID: 2100000, guid: fbe49e8a4c50f024989408f62bfdcb33, type: 2}
+    FootwayWidth: 3
+    PathMat: {fileID: 2100000, guid: f745f6d4b3e89844aadf9e01fcf41cf3, type: 2}
+    PathWidth: 3
+    StepsMat: {fileID: 2100000, guid: e5e090726056f374dbbd3a626772822f, type: 2}
+    StepsWidth: 4
+    CyclewayMat: {fileID: 2100000, guid: a83875b5ebf7d7b42a074d07e791fee7, type: 2}
+    CyclewayWidth: 4
+    PedestrianMat: {fileID: 2100000, guid: c4c816c88b520f649a38ab2b4e1716f4, type: 2}
+    PedestrianWidth: 4
+    RoadMat: {fileID: 2100000, guid: 616bfa229ebc56548ae11df790a4cf12, type: 2}
+    RoadWidth: 5
+    ServiceMat: {fileID: 2100000, guid: 2faa8c507cbdf4e44bda99e39e5ee03d, type: 2}
+    ServiceWidth: 5
+    ResidentialMat: {fileID: 2100000, guid: 1848627499bdc424fa11b913e3aa2c1d, type: 2}
+    ResidentialWidth: 6
+    TrackMat: {fileID: 2100000, guid: 33108960a53974744ae1f1f329275c9d, type: 2}
+    TrackWidth: 6
+    DefaultMat: {fileID: 2100000, guid: 8be50db4bd8c0aa4e884602af1bdccbc, type: 2}
+    DefaultWidth: 5
+  areaSettings:
+    ParkMat: {fileID: 2100000, guid: 77b772132676975a3462e3aca2cfac0c, type: 2}
+    GardenMat: {fileID: 2100000, guid: 77b772132676975a3462e3aca2cfac0c, type: 2}
+    PlaygroundMat: {fileID: 2100000, guid: 77b772132676975a3462e3aca2cfac0c, type: 2}
+    ForestMat: {fileID: 2100000, guid: ef4ea3212671d276649ca366ed6e7f0c, type: 2}
+    GrassMat: {fileID: 2100000, guid: 77b772132676975a3462e3aca2cfac0c, type: 2}
+    WaterMat: {fileID: 2100000, guid: eff7cc5b4e29f7918320d3979c3d0cb1, type: 2}
+    DefaultMat: {fileID: 2100000, guid: 57c69638d7afff039a48123e7b4ade7b, type: 2}
+  pendingRadius: 500
+  pendingImpostorCount: 1
+  pendingTaskCount: 5
+  minigameScenes:
+  - MiniGame-Kabely V10
+  - MiniGame-insertkeys
+  - MiniGame-FlappyBird
+  - MiniGame-ThrowInHole
+  - MiniGame-Satelit
+  testMode: 0
+  showGPSDebugOverlay: 1
+  testClientCount: 3
+--- !u!4 &90211614
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 90211612}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.21709, y: 0, z: 3.25431}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &330585543
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 330585546}
+  - component: {fileID: 330585545}
+  - component: {fileID: 330585544}
+  - component: {fileID: 330585547}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -137,21 +234,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!81 &564375758
+--- !u!81 &330585544
 AudioListener:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 564375757}
+  m_GameObject: {fileID: 330585543}
   m_Enabled: 1
---- !u!20 &564375759
+--- !u!20 &330585545
 Camera:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 564375757}
+  m_GameObject: {fileID: 330585543}
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 1
@@ -196,13 +293,13 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
---- !u!4 &564375760
+--- !u!4 &330585546
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 564375757}
+  m_GameObject: {fileID: 330585543}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1, z: -10}
@@ -211,121 +308,51 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1274200469
+--- !u!114 &330585547
-GameObject:
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
+  m_GameObject: {fileID: 330585543}
-  m_Component:
+  m_Enabled: 1
-  - component: {fileID: 1274200471}
+  m_EditorHideFlags: 0
-  - component: {fileID: 1274200473}
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
-  - component: {fileID: 1274200472}
+  m_Name: 
-  - component: {fileID: 1274200474}
+  m_EditorClassIdentifier: 
-  m_Layer: 0
+  m_RenderShadows: 1
-  m_Name: APIManager
+  m_RequiresDepthTextureOption: 0
-  m_TagString: Untagged
+  m_RequiresOpaqueTextureOption: 0
-  m_Icon: {fileID: 0}
+  m_CameraType: 0
-  m_NavMeshLayer: 0
+  m_Cameras: []
-  m_StaticEditorFlags: 0
+  m_RendererIndex: -1
-  m_IsActive: 1
+  m_VolumeLayerMask:
---- !u!4 &1274200471
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1274200469}
     serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+    m_Bits: 1
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_VolumeTrigger: {fileID: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_VolumeFrameworkUpdateModeOption: 2
-  m_ConstrainProportionsScale: 0
+  m_RenderPostProcessing: 0
-  m_Children: []
+  m_Antialiasing: 0
-  m_Father: {fileID: 0}
+  m_AntialiasingQuality: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_StopNaN: 0
---- !u!23 &1274200472
+  m_Dithering: 0
-MeshRenderer:
+  m_ClearDepth: 1
-  m_ObjectHideFlags: 0
+  m_AllowXRRendering: 1
-  m_CorrespondingSourceObject: {fileID: 0}
+  m_AllowHDROutput: 1
-  m_PrefabInstance: {fileID: 0}
+  m_UseScreenCoordOverride: 0
-  m_PrefabAsset: {fileID: 0}
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_GameObject: {fileID: 1274200469}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
-  m_Enabled: 1
+  m_RequiresDepthTexture: 0
-  m_CastShadows: 1
+  m_RequiresColorTexture: 0
-  m_ReceiveShadows: 1
+  m_TaaSettings:
-  m_DynamicOccludee: 1
+    m_Quality: 3
-  m_StaticShadowCaster: 0
+    m_FrameInfluence: 0.1
-  m_MotionVectors: 1
+    m_JitterScale: 1
-  m_LightProbeUsage: 1
+    m_MipBias: 0
-  m_ReflectionProbeUsage: 1
+    m_VarianceClampScale: 0.9
-  m_RayTracingMode: 2
+    m_ContrastAdaptiveSharpening: 0
-  m_RayTraceProcedural: 0
+  m_Version: 2
-  m_RayTracingAccelStructBuildFlagsOverride: 0
+--- !u!1 &410087039
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
-  m_ForceMeshLod: -1
-  m_MeshLodSelectionBias: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 283cf727b4c3ac64c94d59598e221b10, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_GlobalIlluminationMeshLod: 0
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &1274200473
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1274200469}
-  m_Mesh: {fileID: 0}
---- !u!114 &1274200474
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1274200469}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a58b19ca2646e434ea88b8112260362b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::MapRenderer
-  queryRadiusMeters: 1000
-  gpsManager: {fileID: 1539417978}
-  buildingMaterial: {fileID: 2100000, guid: 283cf727b4c3ac64c94d59598e221b10, type: 2}
-  defaultFloorHeight: 3
-  defaultBuildingHeight: 6
-  roadMaterial: {fileID: 2100000, guid: 283cf727b4c3ac64c94d59598e221b10, type: 2}
-  defaultRoadWidth: 4
-  motorwayWidth: 10
-  primaryWidth: 8
-  secondaryWidth: 6
-  tertiaryWidth: 5
-  metersPerUnit: 1
---- !u!1 &1539417977
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -333,123 +360,9 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1539417979}
+  - component: {fileID: 410087041}
-  - component: {fileID: 1539417978}
+  - component: {fileID: 410087040}
-  m_Layer: 0
+  - component: {fileID: 410087042}
-  m_Name: currentGPS
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1539417978
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1539417977}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6b892bed07e5c4d45ad23b4a9b108e08, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::GPSManager
-  Accuracy: 10
-  UpdateDistance: 5
-  MaxWait: 20
---- !u!4 &1539417979
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1539417977}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -18.75082, y: 0, z: 46.79584}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1865882987
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1865882990}
-  - component: {fileID: 1865882989}
-  - component: {fileID: 1865882988}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1865882988
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1865882987}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.StandaloneInputModule
-  m_SendPointerHoverToParent: 1
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
---- !u!114 &1865882989
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1865882987}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.EventSystem
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 10
---- !u!4 &1865882990
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1865882987}
-  serializedVersion: 2
-  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: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1896274046
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1896274048}
-  - component: {fileID: 1896274047}
   m_Layer: 0
   m_Name: Directional Light
   m_TagString: Untagged
@@ -457,18 +370,18 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!108 &1896274047
+--- !u!108 &410087040
 Light:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1896274046}
+  m_GameObject: {fileID: 410087039}
   m_Enabled: 1
   serializedVersion: 11
   m_Type: 1
-  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Intensity: 1
+  m_Intensity: 2
   m_Range: 10
   m_SpotAngle: 30
   m_InnerSpotAngle: 21.80208
@@ -511,8 +424,8 @@ Light:
   m_LightShadowCasterMode: 0
   m_AreaSize: {x: 1, y: 1}
   m_BounceIntensity: 1
-  m_ColorTemperature: 6570
+  m_ColorTemperature: 5000
-  m_UseColorTemperature: 0
+  m_UseColorTemperature: 1
   m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
   m_UseBoundingSphereOverride: 0
   m_UseViewFrustumForShadowCasterCull: 1
@@ -522,13 +435,13 @@ Light:
   m_LightUnit: 1
   m_LuxAtDistance: 1
   m_EnableSpotReflector: 1
---- !u!4 &1896274048
+--- !u!4 &410087041
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1896274046}
+  m_GameObject: {fileID: 410087039}
   serializedVersion: 2
   m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
   m_LocalPosition: {x: 0, y: 3, z: 0}
@@ -537,12 +450,89 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!114 &410087042
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 410087039}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UsePipelineSettings: 1
+  m_AdditionalLightsShadowResolutionTier: 2
+  m_CustomShadowLayers: 0
+  m_LightCookieSize: {x: 1, y: 1}
+  m_LightCookieOffset: {x: 0, y: 0}
+  m_SoftShadowQuality: 1
+  m_RenderingLayersMask:
+    serializedVersion: 0
+    m_Bits: 1
+  m_ShadowRenderingLayersMask:
+    serializedVersion: 0
+    m_Bits: 1
+  m_Version: 4
+  m_LightLayerMask: 1
+  m_ShadowLayerMask: 1
+  m_RenderingLayers: 1
+  m_ShadowRenderingLayers: 1
+--- !u!1 &832575517
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 832575519}
+  - component: {fileID: 832575518}
+  m_Layer: 0
+  m_Name: Global Volume
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &832575518
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 832575517}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IsGlobal: 1
+  priority: 0
+  blendDistance: 0
+  weight: 1
+  sharedProfile: {fileID: 0}
+--- !u!4 &832575519
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 832575517}
+  serializedVersion: 2
+  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: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
-  - {fileID: 564375760}
+  - {fileID: 330585546}
-  - {fileID: 1896274048}
+  - {fileID: 410087041}
-  - {fileID: 1865882990}
+  - {fileID: 832575519}
-  - {fileID: 1274200471}
+  - {fileID: 90211614}
-  - {fileID: 1539417979}

Assets/Scenes/MainScene.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ea777d1556aec75449ed545a887613d2
+guid: ab64ec184fd7fc44f8b0941f67cf4eb2
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scenes/MiniGame-Kabely.unity

@@ -419,8 +419,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4

Assets/Scenes/New Scene.unity

@@ -1,316 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!29 &1
-OcclusionCullingSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_OcclusionBakeSettings:
-    smallestOccluder: 5
-    smallestHole: 0.25
-    backfaceThreshold: 100
-  m_SceneGUID: 00000000000000000000000000000000
-  m_OcclusionCullingData: {fileID: 0}
---- !u!104 &2
-RenderSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 10
-  m_Fog: 0
-  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  m_FogMode: 3
-  m_FogDensity: 0.01
-  m_LinearFogStart: 0
-  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
-  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
-  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
-  m_AmbientIntensity: 1
-  m_AmbientMode: 0
-  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
-  m_HaloStrength: 0.5
-  m_FlareStrength: 1
-  m_FlareFadeSpeed: 3
-  m_HaloTexture: {fileID: 0}
-  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
-  m_DefaultReflectionMode: 0
-  m_DefaultReflectionResolution: 128
-  m_ReflectionBounces: 1
-  m_ReflectionIntensity: 1
-  m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 0}
-  m_UseRadianceAmbientProbe: 0
---- !u!157 &3
-LightmapSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 13
-  m_BakeOnSceneLoad: 0
-  m_GISettings:
-    serializedVersion: 2
-    m_BounceScale: 1
-    m_IndirectOutputScale: 1
-    m_AlbedoBoost: 1
-    m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 1
-    m_EnableRealtimeLightmaps: 0
-  m_LightmapEditorSettings:
-    serializedVersion: 12
-    m_Resolution: 2
-    m_BakeResolution: 40
-    m_AtlasSize: 1024
-    m_AO: 0
-    m_AOMaxDistance: 1
-    m_CompAOExponent: 1
-    m_CompAOExponentDirect: 0
-    m_ExtractAmbientOcclusion: 0
-    m_Padding: 2
-    m_LightmapParameters: {fileID: 0}
-    m_LightmapsBakeMode: 1
-    m_TextureCompression: 1
-    m_ReflectionCompression: 2
-    m_MixedBakeMode: 2
-    m_BakeBackend: 1
-    m_PVRSampling: 1
-    m_PVRDirectSampleCount: 32
-    m_PVRSampleCount: 512
-    m_PVRBounces: 2
-    m_PVREnvironmentSampleCount: 256
-    m_PVREnvironmentReferencePointCount: 2048
-    m_PVRFilteringMode: 1
-    m_PVRDenoiserTypeDirect: 1
-    m_PVRDenoiserTypeIndirect: 1
-    m_PVRDenoiserTypeAO: 1
-    m_PVRFilterTypeDirect: 0
-    m_PVRFilterTypeIndirect: 0
-    m_PVRFilterTypeAO: 0
-    m_PVREnvironmentMIS: 1
-    m_PVRCulling: 1
-    m_PVRFilteringGaussRadiusDirect: 1
-    m_PVRFilteringGaussRadiusIndirect: 1
-    m_PVRFilteringGaussRadiusAO: 1
-    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-    m_PVRFilteringAtrousPositionSigmaIndirect: 2
-    m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ExportTrainingData: 0
-    m_TrainingDataDestination: TrainingData
-    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
-  m_LightingSettings: {fileID: 0}
---- !u!196 &4
-NavMeshSettings:
-  serializedVersion: 2
-  m_ObjectHideFlags: 0
-  m_BuildSettings:
-    serializedVersion: 3
-    agentTypeID: 0
-    agentRadius: 0.5
-    agentHeight: 2
-    agentSlope: 45
-    agentClimb: 0.4
-    ledgeDropHeight: 0
-    maxJumpAcrossDistance: 0
-    minRegionArea: 2
-    manualCellSize: 0
-    cellSize: 0.16666667
-    manualTileSize: 0
-    tileSize: 256
-    buildHeightMesh: 0
-    maxJobWorkers: 0
-    preserveTilesOutsideBounds: 0
-    debug:
-      m_Flags: 0
-  m_NavMeshData: {fileID: 0}
---- !u!1 &229298603
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 229298606}
-  - component: {fileID: 229298605}
-  - component: {fileID: 229298604}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!81 &229298604
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 229298603}
-  m_Enabled: 1
---- !u!20 &229298605
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 229298603}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_Iso: 200
-  m_ShutterSpeed: 0.005
-  m_Aperture: 16
-  m_FocusDistance: 10
-  m_FocalLength: 50
-  m_BladeCount: 5
-  m_Curvature: {x: 2, y: 11}
-  m_BarrelClipping: 0.25
-  m_Anamorphism: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!4 &229298606
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 229298603}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1382320966
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1382320968}
-  - component: {fileID: 1382320967}
-  m_Layer: 0
-  m_Name: Directional Light
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!108 &1382320967
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1382320966}
-  m_Enabled: 1
-  serializedVersion: 11
-  m_Type: 1
-  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
-  m_Intensity: 1
-  m_Range: 10
-  m_SpotAngle: 30
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 2
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 4
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_UseViewFrustumForShadowCasterCull: 1
-  m_ForceVisible: 0
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
-  m_LightUnit: 1
-  m_LuxAtDistance: 1
-  m_EnableSpotReflector: 1
---- !u!4 &1382320968
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1382320966}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
-  m_LocalPosition: {x: 0, y: 3, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!1660057539 &9223372036854775807
-SceneRoots:
-  m_ObjectHideFlags: 0
-  m_Roots:
-  - {fileID: 229298606}
-  - {fileID: 1382320968}

Assets/Scenes/scene.unity.meta

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

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

@@ -5,11 +5,15 @@ Material:
 <<<<<<< HEAD
   serializedVersion: 8
 =======
+<<<<<<< HEAD
+  serializedVersion: 8
+=======
 <<<<<<< HEAD
   serializedVersion: 6
 =======
   serializedVersion: 8
 >>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -19,9 +23,12 @@ Material:
   m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
 <<<<<<< HEAD
 =======
+<<<<<<< HEAD
+=======
 <<<<<<< HEAD
   m_ShaderKeywords: 
 =======
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
@@ -29,6 +36,9 @@ Material:
   m_InvalidKeywords: []
 <<<<<<< HEAD
 =======
+<<<<<<< HEAD
+=======
+>>>>>>> origin/main
 >>>>>>> origin/main
 >>>>>>> origin/main
   m_LightmapFlags: 1
@@ -40,10 +50,14 @@ Material:
 <<<<<<< HEAD
   m_LockedProperties:
 =======
+<<<<<<< HEAD
+  m_LockedProperties: 
+=======
 <<<<<<< HEAD
 =======
   m_LockedProperties: 
 >>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_SavedProperties:
     serializedVersion: 3
@@ -99,10 +113,14 @@ Material:
 <<<<<<< HEAD
     m_Ints: []
 =======
+<<<<<<< HEAD
+    m_Ints: []
+=======
 <<<<<<< HEAD
 =======
     m_Ints: []
 >>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
     m_Floats:
     - _Ambient: 0.5
@@ -188,6 +206,11 @@ Material:
 <<<<<<< HEAD
   m_BuildTextureStacks: []
   m_AllowLocking: 1
+
+=======
+<<<<<<< HEAD
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
 =======
 <<<<<<< HEAD
 =======
@@ -195,6 +218,7 @@ Material:
   m_AllowLocking: 1
 >>>>>>> origin/main
 >>>>>>> origin/main
+>>>>>>> origin/main
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -210,6 +234,8 @@ MonoBehaviour:
   m_Version: 1.1.0
 <<<<<<< HEAD
 =======
+<<<<<<< HEAD
+=======
 <<<<<<< HEAD
   m_Material: {fileID: 2180264}
   m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
@@ -218,6 +244,7 @@ MonoBehaviour:
   InternalDynamicOS: 0
 =======
 >>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_FaceInfo:
     m_FaceIndex: 0
@@ -241,6 +268,16 @@ MonoBehaviour:
     m_StrikethroughOffset: 18
     m_StrikethroughThickness: 6.298828
     m_TabWidth: 24
+<<<<<<< HEAD
+
+  m_Material: {fileID: 2180264}
+  m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
+  m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
+  m_SourceFontFilePath:
+  m_AtlasPopulationMode: 1
+  InternalDynamicOS: 0
+
+=======
 <<<<<<< HEAD
   m_Material: {fileID: 2180264}
   m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
@@ -301,6 +338,7 @@ MonoBehaviour:
   m_Material: {fileID: 2180264}
   m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
 >>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_CreationSettings:
     sourceFontFileName:
@@ -322,6 +360,9 @@ MonoBehaviour:
     renderMode: 4169
     includeFontFeatures: 1
 <<<<<<< HEAD
+
+=======
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -330,6 +371,7 @@ MonoBehaviour:
   m_SourceFontFilePath: 
   m_AtlasPopulationMode: 1
   InternalDynamicOS: 0
+>>>>>>> origin/main
   m_GlyphTable: []
   m_CharacterTable: []
   m_AtlasTextures:
@@ -338,26 +380,34 @@ MonoBehaviour:
   m_IsMultiAtlasTexturesEnabled: 1
   m_GetFontFeatures: 1
   m_ClearDynamicDataOnBuild: 1
+
   m_AtlasWidth: 512
   m_AtlasHeight: 512
   m_AtlasPadding: 9
   m_AtlasRenderMode: 4169
+
   m_UsedGlyphRects: []
   m_FreeGlyphRects:
   - m_X: 0
     m_Y: 0
     m_Width: 511
     m_Height: 511
+
   m_FontFeatureTable:
     m_MultipleSubstitutionRecords: []
     m_LigatureSubstitutionRecords: []
     m_GlyphPairAdjustmentRecords: []
     m_MarkToBaseAdjustmentRecords: []
     m_MarkToMarkAdjustmentRecords: []
+
   m_ShouldReimportFontFeatures: 0
   m_FallbackFontAssetTable: []
 <<<<<<< HEAD
+
 =======
+<<<<<<< HEAD
+=======
+>>>>>>> origin/main
 >>>>>>> origin/main
 >>>>>>> origin/main
   m_FontWeightTable:
@@ -381,6 +431,7 @@ MonoBehaviour:
     italicTypeface: {fileID: 0}
   - regularTypeface: {fileID: 0}
     italicTypeface: {fileID: 0}
+
   fontWeights:
   - regularTypeface: {fileID: 0}
     italicTypeface: {fileID: 0}
@@ -402,6 +453,7 @@ MonoBehaviour:
     italicTypeface: {fileID: 0}
   - regularTypeface: {fileID: 0}
     italicTypeface: {fileID: 0}
+
   normalStyle: 0
   normalSpacingOffset: 0
   boldStyle: 0.75
@@ -409,9 +461,13 @@ MonoBehaviour:
   italicStyle: 35
   tabSize: 10
 <<<<<<< HEAD
+
 =======
 <<<<<<< HEAD
 =======
+<<<<<<< HEAD
+=======
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_fontInfo:
     Name: Liberation Sans
@@ -435,13 +491,20 @@ MonoBehaviour:
     Padding: 9
     AtlasWidth: 1024
     AtlasHeight: 1024
+
   m_glyphInfoList: []
+
   m_KerningTable:
     kerningPairs: []
+
   fallbackFontAssets: []
   atlas: {fileID: 0}
 <<<<<<< HEAD
+
 =======
+<<<<<<< HEAD
+=======
+>>>>>>> origin/main
 >>>>>>> origin/main
 >>>>>>> origin/main
 --- !u!28 &28268798066460806
@@ -451,9 +514,13 @@ Texture2D:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: LiberationSans SDF Atlas
+
   m_ImageContentsHash:
     serializedVersion: 2
     Hash: 00000000000000000000000000000000
+<<<<<<< HEAD
+
+=======
 <<<<<<< HEAD
   m_IsAlphaChannelOptional: 0
   serializedVersion: 4
@@ -482,6 +549,7 @@ Texture2D:
   m_VTOnly: 0
 =======
 =======
+>>>>>>> origin/main
   m_IsAlphaChannelOptional: 0
   serializedVersion: 4
   m_Width: 1
@@ -497,11 +565,16 @@ Texture2D:
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
   m_VTOnly: 0
+<<<<<<< HEAD
+
+=======
+>>>>>>> origin/main
 >>>>>>> origin/main
 >>>>>>> origin/main
   m_AlphaIsTransparency: 0
   m_ImageCount: 1
   m_TextureDimension: 2
+
   m_TextureSettings:
     serializedVersion: 2
     m_FilterMode: 1
@@ -510,8 +583,12 @@ Texture2D:
     m_WrapU: 0
     m_WrapV: 0
     m_WrapW: 0
+
   m_LightmapFormat: 0
   m_ColorSpace: 0
+<<<<<<< HEAD
+  m_PlatformBlob:
+=======
 <<<<<<< HEAD
   m_PlatformBlob: 
   image data: 1
@@ -525,10 +602,15 @@ Texture2D:
   m_StreamData:
 =======
   m_PlatformBlob: 
+>>>>>>> origin/main
   image data: 1
   _typelessdata: 00
+
   m_StreamData:
     serializedVersion: 2
+<<<<<<< HEAD
+=======
+>>>>>>> origin/main
 >>>>>>> origin/main
 >>>>>>> origin/main
     offset: 0

Assets/TextMesh Pro/Resources/TMP Settings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   assetVersion: 2
   m_TextWrappingMode: 1
   m_enableKerning: 1
-  m_ActiveFontFeatures: 00000000
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   m_enableTintAllSprites: 0
   m_enableParseEscapeCharacters: 1
@@ -33,20 +33,18 @@ MonoBehaviour:
   m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50}
   m_autoSizeTextContainer: 0
   m_IsTextObjectScaleStatic: 0
-  m_fallbackFontAssets: []
+  m_fallbackFontAssets:
+  - {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2}
   m_matchMaterialPreset: 1
   m_HideSubTextObjects: 0
-  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45,
+  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, type: 2}
-    type: 2}
   m_defaultSpriteAssetPath: Sprite Assets/
   m_enableEmojiSupport: 1
   m_MissingCharacterSpriteUnicode: 0
   m_EmojiFallbackTextAssets: []
   m_defaultColorGradientPresetsPath: Color Gradient Presets/
-  m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e,
+  m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, type: 2}
-    type: 2}
   m_StyleSheetsResourcePath: 
   m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3}
-  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b,
+  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3}
-    type: 3}
   m_UseModernHangulLineBreakingRules: 0

Packages/packages-lock.json

@@ -112,6 +112,19 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.remote-config-runtime": {
+      "version": "4.0.4",
+    "com.unity.remote-config": {
+      "version": "4.2.5",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.nuget.newtonsoft-json": "3.0.2",
+        "com.unity.remote-config-runtime": "4.0.4",
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.remote-config-runtime": {
       "version": "4.0.4",
       "depth": 1,
@@ -233,6 +246,14 @@
         "com.unity.modules.jsonserialize": "1.0.0"
       }
     },
+    "com.unity.textmeshpro": {
+      "version": "5.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.ugui": "2.0.0"
+      }
+    },
     "com.unity.test-framework.performance": {
       "version": "3.2.0",
       "depth": 3,
@@ -243,14 +264,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.textmeshpro": {
-      "version": "5.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.ugui": "2.0.0"
-      }
-    },
     "com.unity.toolchain.linux-x86_64": {
       "version": "2.0.11",
       "depth": 0,
@@ -263,7 +276,7 @@
     },
     "com.unity.ugui": {
       "version": "2.0.0",
-      "depth": 0,
+      "depth": 2,
       "source": "builtin",
       "dependencies": {
         "com.unity.modules.ui": "1.0.0",
@@ -529,3 +542,4 @@
     }
   }
 }
+}

ProjectSettings/EditorBuildSettings.asset

@@ -5,8 +5,8 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 0
+  - enabled: 1
-    path: Assets/Scenes/SampleScene.unity
+    path: Assets/Scenes/MainScene.unity
     guid: 8afa6ce05eb7dba4c894b910786e3baf
   - enabled: 1
     path: Assets/Scenes/Client.unity