1

.gitignore

@@ -16,8 +16,6 @@
 /.vs
 /Assets/TextMesh Pro
 /1.app
-/Assets/Scenes/MainHallGame.unity
-/Assets/Scenes/MainHallGame.unity.meta
 /TMPro
 /UserSettings/Layouts/default-2022.dwlt
 /obj

UserSettings/EditorUserSettings.asset

@@ -5,38 +5,6 @@ EditorUserSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 4
   m_ConfigSettings:
-    RecentlyUsedSceneGuid-0:
-<<<<<<< HEAD
-      value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
-      flags: 0
-    RecentlyUsedSceneGuid-1:
-      value: 0752045f560d5a025a0b5f7b12250e44424f407b757b7e612b7d4e61b3e13061
-=======
-      value: 5b04565656070c025e0a547743270744174f4a73292c7f64782b4e62b1b1616a
-      flags: 0
-    RecentlyUsedSceneGuid-1:
-      value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
->>>>>>> 1070cad... 1
-      flags: 0
-    RecentlyUsedSceneGuid-2:
-<<<<<<< HEAD
-      value: 0009045f50565e0b0b0d5c7a42270a44134f412e747a74647f7c4c61e1b7626e
-=======
-      value: 0752045f560d5a025a0b5f7b12250e44424f407b757b7e612b7d4e61b3e13061
->>>>>>> b1b7842439554a76566c99c79a6d989a2b093488
-      flags: 0
-    RecentlyUsedSceneGuid-3:
-      value: 5b04565656070c025e0a547743270744174f4a73292c7f64782b4e62b1b1616a
-      flags: 0
-    RecentlyUsedSceneGuid-4:
-      value: 520650505353510d59560e7046775946454e4d2e7f7d76322c2b4562e7e66760
-      flags: 0
-    RecentlyUsedSceneGuid-5:
-      value: 5350045f5c07085d085b5a2013205a4444154f7a7e7e7f342e281866e1b7676e
-      flags: 0
-    RecentlyUsedSceneGuid-6:
-      value: 5452030553560f580b0f087415270f44444f417a7d2a76322f701e64e7e16d60
-      flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0
@@ -45,7 +13,7 @@ EditorUserSettings:
   m_VCDebugCmd: 0
   m_VCDebugOut: 0
   m_SemanticMergeMode: 2
-  m_DesiredImportWorkerCount: 2
+  m_DesiredImportWorkerCount: 3
   m_StandbyImportWorkerCount: 2
   m_IdleImportWorkerShutdownDelay: 60000
   m_VCShowFailedCheckout: 1