merge resolved, final

2024-08-29 20:22:14 +05:30
parent 2cd22098ba
commit dfe47c1fb8
7 changed files with 780434 additions and 7 deletions
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -5,13 +5,13 @@ EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
-  - enabled: 1
+  - enabled: 0
    path: Assets/Scenes/GameLogin.unity
    guid: 8f7fc7ae237f341739c369fc7d9f4b75
-  - enabled: 1
+  - enabled: 0
    path: Assets/Scenes/MenuScene.unity
    guid: a141cf40801414f09a4017e4a9f84683
  - enabled: 1
    path: Assets/Scenes/Game.unity
-    guid: f67c5f21bc54e472eb51221ed738816d
+    guid: 2b2559cffabdc0048a9735fe802336e4
  m_configObjects: {}
--- a/ProjectSettings/GvhProjectSettings.xml
+++ b/ProjectSettings/GvhProjectSettings.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <projectSettings>
  <projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
+  <projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
+  <projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
 </projectSettings>
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.33f1
-m_EditorVersionWithRevision: 2022.3.33f1 (b2c853adf198)
+m_EditorVersion: 2022.3.7f1
+m_EditorVersionWithRevision: 2022.3.7f1 (b16b3b16c7a0)