diff --git a/Done/Pong/Assets/Scenes/Lobby.unity b/Done/Pong/Assets/Scenes/Lobby.unity index 447104f..cf7ce19 100644 --- a/Done/Pong/Assets/Scenes/Lobby.unity +++ b/Done/Pong/Assets/Scenes/Lobby.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -44,7 +44,6 @@ RenderSettings: LightmapSettings: m_ObjectHideFlags: 0 serializedVersion: 12 - m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 0 @@ -155,7 +151,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1483798408} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -280,6 +275,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 @@ -299,7 +295,6 @@ RectTransform: m_Children: - {fileID: 1243938601} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -338,7 +333,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1243938601} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -434,7 +428,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1243938601} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -582,13 +575,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &561443842 GameObject: @@ -621,7 +614,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1641290674} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -730,13 +722,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 578990539} + 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_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &704595281 GameObject: @@ -776,13 +768,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 704595281} + 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_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &704595284 MonoBehaviour: @@ -798,6 +790,10 @@ MonoBehaviour: m_EditorClassIdentifier: GlobalObjectIdHash: 1056019430 AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 0 + SceneMigrationSynchronization: 1 + SpawnWithObservers: 1 DontDestroyWithOwner: 0 AutoObjectParentSync: 1 --- !u!1 &1243938600 @@ -835,7 +831,6 @@ RectTransform: - {fileID: 1641290674} - {fileID: 1483798408} m_Father: {fileID: 180658008} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -913,7 +908,6 @@ RectTransform: m_Children: - {fileID: 179447328} m_Father: {fileID: 1243938601} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1046,7 +1040,6 @@ RectTransform: m_Children: - {fileID: 561443843} m_Father: {fileID: 1243938601} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1091,3 +1084,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1641290673} m_CullTransparentMesh: 1 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 519420032} + - {fileID: 180658008} + - {fileID: 578990542} + - {fileID: 704595283} diff --git a/Done/Pong/Packages/manifest.json b/Done/Pong/Packages/manifest.json index 0088575..e517e83 100644 --- a/Done/Pong/Packages/manifest.json +++ b/Done/Pong/Packages/manifest.json @@ -9,7 +9,7 @@ "com.unity.ide.visualstudio": "2.0.22", "com.unity.mobile.android-logcat": "1.4.0", "com.unity.netcode.gameobjects": "1.7.1", - "com.unity.test-framework": "1.4.2", + "com.unity.test-framework": "1.3.9", "com.unity.timeline": "1.8.6", "com.unity.ugui": "2.0.0", "com.unity.modules.accessibility": "1.0.0", diff --git a/Done/Pong/Packages/packages-lock.json b/Done/Pong/Packages/packages-lock.json index 1290dec..e93d7d1 100644 --- a/Done/Pong/Packages/packages-lock.json +++ b/Done/Pong/Packages/packages-lock.json @@ -41,14 +41,12 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.4.0-pre.2", + "version": "1.2.4", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.10", - "com.unity.nuget.mono-cecil": "1.11.4", - "com.unity.test-framework": "1.3.8", - "com.unity.test-framework.performance": "3.0.3" + "com.unity.burst": "1.6.6", + "com.unity.test-framework": "1.1.31" }, "url": "https://packages.unity.com" }, @@ -78,7 +76,7 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.3.1", + "version": "1.2.6", "depth": 2, "source": "registry", "dependencies": {}, @@ -109,7 +107,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.4.2", + "version": "1.3.9", "depth": 0, "source": "registry", "dependencies": { @@ -119,16 +117,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.test-framework.performance": { - "version": "3.0.3", - "depth": 3, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.1.31", - "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { "version": "1.8.6", "depth": 0, @@ -142,13 +130,13 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "2.1.0", + "version": "1.4.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.collections": "2.2.1", - "com.unity.burst": "1.8.8", - "com.unity.mathematics": "1.3.1" + "com.unity.collections": "1.2.4", + "com.unity.burst": "1.6.6", + "com.unity.mathematics": "1.2.6" }, "url": "https://packages.unity.com" }, diff --git a/Done/Pong/ProjectSettings/MultiplayerManager.asset b/Done/Pong/ProjectSettings/MultiplayerManager.asset index 2b8e00b..8073753 100644 --- a/Done/Pong/ProjectSettings/MultiplayerManager.asset +++ b/Done/Pong/ProjectSettings/MultiplayerManager.asset @@ -3,6 +3,5 @@ --- !u!655991488 &1 MultiplayerManager: m_ObjectHideFlags: 0 - m_ActiveMultiplayerRoles: 3 m_EnableMultiplayerRoles: 0 - m_StrippingTypes: {} + m_ActiveMultiplayerRole: 0 diff --git a/Done/Pong/ProjectSettings/ProjectVersion.txt b/Done/Pong/ProjectSettings/ProjectVersion.txt index fd034e1..4b379c0 100644 --- a/Done/Pong/ProjectSettings/ProjectVersion.txt +++ b/Done/Pong/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2023.3.0b3 -m_EditorVersionWithRevision: 2023.3.0b3 (205c101ad8b5) +m_EditorVersion: 2023.2.6f1 +m_EditorVersionWithRevision: 2023.2.6f1 (57daeefc879b) diff --git a/Pong/Packages/manifest.json b/Pong/Packages/manifest.json index 376d439..e517e83 100644 --- a/Pong/Packages/manifest.json +++ b/Pong/Packages/manifest.json @@ -2,18 +2,17 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.ai.navigation": "1.1.3", - "com.unity.collab-proxy": "2.0.4", - "com.unity.ext.nunit": "1.0.6", - "com.unity.ide.rider": "3.0.21", - "com.unity.ide.visualstudio": "2.0.18", - "com.unity.ide.vscode": "1.2.5", - "com.unity.mobile.android-logcat": "1.3.2", - "com.unity.netcode.gameobjects": "1.3.1", - "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.4", - "com.unity.ugui": "1.0.0", + "com.unity.ai.navigation": "2.0.0", + "com.unity.collab-proxy": "2.2.0", + "com.unity.ext.nunit": "2.0.5", + "com.unity.ide.rider": "3.0.27", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.mobile.android-logcat": "1.4.0", + "com.unity.netcode.gameobjects": "1.7.1", + "com.unity.test-framework": "1.3.9", + "com.unity.timeline": "1.8.6", + "com.unity.ugui": "2.0.0", + "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Pong/Packages/packages-lock.json b/Pong/Packages/packages-lock.json index 0715fe8..e93d7d1 100644 --- a/Pong/Packages/packages-lock.json +++ b/Pong/Packages/packages-lock.json @@ -16,7 +16,7 @@ } }, "com.unity.ai.navigation": { - "version": "1.1.3", + "version": "2.0.0", "depth": 0, "source": "registry", "dependencies": { @@ -25,7 +25,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.4", + "version": "1.8.11", "depth": 2, "source": "registry", "dependencies": { @@ -34,7 +34,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.4", + "version": "2.2.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -51,14 +51,14 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.6", + "version": "2.0.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.21", + "version": "3.0.27", "depth": 0, "source": "registry", "dependencies": { @@ -67,7 +67,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.18", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -75,13 +75,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.ide.vscode": { - "version": "1.2.5", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.mathematics": { "version": "1.2.6", "depth": 2, @@ -90,19 +83,19 @@ "url": "https://packages.unity.com" }, "com.unity.mobile.android-logcat": { - "version": "1.3.2", + "version": "1.4.0", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.3.1", + "version": "1.7.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.3" + "com.unity.transport": "1.4.0" }, "url": "https://packages.unity.com" }, @@ -114,27 +107,18 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.33", + "version": "1.3.9", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.6", + "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.textmeshpro": { - "version": "3.0.6", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { - "version": "1.7.4", + "version": "1.8.6", "depth": 0, "source": "registry", "dependencies": { @@ -146,7 +130,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.3", + "version": "1.4.0", "depth": 1, "source": "registry", "dependencies": { @@ -157,7 +141,7 @@ "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -165,6 +149,12 @@ "com.unity.modules.imgui": "1.0.0" } }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -212,6 +202,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -300,7 +296,8 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/Pong/ProjectSettings/MultiplayerManager.asset b/Pong/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 0000000..8073753 --- /dev/null +++ b/Pong/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_ActiveMultiplayerRole: 0 diff --git a/Pong/ProjectSettings/ProjectVersion.txt b/Pong/ProjectSettings/ProjectVersion.txt index 9a1a502..4b379c0 100644 --- a/Pong/ProjectSettings/ProjectVersion.txt +++ b/Pong/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.2.17f1 -m_EditorVersionWithRevision: 2022.2.17f1 (54cb9bda89c4) +m_EditorVersion: 2023.2.6f1 +m_EditorVersionWithRevision: 2023.2.6f1 (57daeefc879b)