Merge branch 'Lobby-System'

2025-10-29 12:52:07 +01:00 · 2021-12-16 21:40:56 +01:00
parent 21c03f5b00 acae797f36
commit f19e634ee9
55 changed files with 8377 additions and 9 deletions
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -8,7 +8,13 @@ EditorBuildSettings:
  - enabled: 0
    path: Assets/Scenes/TestOfflineScene.unity
    guid: 20dba395f2cd9824288c340124ce9d6f
+  - enabled: 1
+    path: Assets/Scenes/HomeScene.unity
+    guid: 68e95db5b9c629148994409c6c7f814a
  - enabled: 1
    path: Assets/Scenes/TestScene.unity
    guid: 9fc0d4010bbf28b4594072e72b8655ab
+  - enabled: 1
+    path: Assets/Scenes/Lobby.unity
+    guid: 33f487c6a0f179a4cb0f9cd2f080aca8
  m_configObjects: {}
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.2.3f1
-m_EditorVersionWithRevision: 2021.2.3f1 (32358a8527b4)
+m_EditorVersion: 2021.2.6f1
+m_EditorVersionWithRevision: 2021.2.6f1 (8c4e826ba445)
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -5,6 +5,12 @@ TagManager:
  serializedVersion: 2
  tags:
  - Weapon
+  - MenuPanel
+  - BackBtnMenu
+  - NetManager
+  - VariableSaver
+  - Team1List
+  - Team2List
  layers:
  - Default
  - TransparentFX