From e6d356d323a010fd06b23990d5b2eb8a23b6f789 Mon Sep 17 00:00:00 2001 From: kurone-kito Date: Fri, 17 May 2024 21:41:14 +0900 Subject: [PATCH] chore!: migrated the Unity Editor from 2022.3.6f1 to 2022.3.22f1 --- Documentation/index.md | 2 +- .../Examples/Prefabs/CommonFloor.prefab | 2 +- .../Examples/Scenes/GlobalScroll.unity | 3 ++- .../Examples/Scenes/GlobalSlider.unity | 1 + .../Examples/Scenes/GlobalToggle.unity | 1 + .../Examples/Scenes/GlobalToggles.unity | 1 + .../Examples/Scenes/PositionAnchor.unity | 1 + .../Scenes/SequenceActiveRelayToAnimator.unity | 1 + .../Examples/Scenes/ToggleWithAnimator.unity | 9 +++++---- Packages/black.kit.toybox/package.json | 1 + Packages/manifest.json | 2 +- Packages/packages-lock.json | 13 +++++++------ ProjectSettings/DynamicsManager.asset | 3 ++- ProjectSettings/ProjectSettings.asset | 12 +++++++++--- ProjectSettings/ProjectVersion.txt | 4 ++-- ProjectSettings/TagManager.asset | 10 +++++----- README.md | 2 +- 17 files changed, 42 insertions(+), 26 deletions(-) diff --git a/Documentation/index.md b/Documentation/index.md index b9b2288..5f55c00 100644 --- a/Documentation/index.md +++ b/Documentation/index.md @@ -15,7 +15,7 @@ My utilities library for the UdonSharp / VRChat ## 💻 System Requirements - [VRChat Creator Companion](https://vrchat.com/home/download) -- Unity 2022.3.6f1 +- Unity 2022.3.22f1 - 🏝 Project of your world ## ▶ Getting Started diff --git a/Packages/black.kit.toybox/Examples/Prefabs/CommonFloor.prefab b/Packages/black.kit.toybox/Examples/Prefabs/CommonFloor.prefab index 418573d..648deb1 100644 --- a/Packages/black.kit.toybox/Examples/Prefabs/CommonFloor.prefab +++ b/Packages/black.kit.toybox/Examples/Prefabs/CommonFloor.prefab @@ -195,7 +195,7 @@ MonoBehaviour: contentGore: 0 contentOther: 0 releasePublic: 0 - unityVersion: 2022.3.6f1 + unityVersion: 2022.3.22f1 udonProducts: [] Name: NSFW: 0 diff --git a/Packages/black.kit.toybox/Examples/Scenes/GlobalScroll.unity b/Packages/black.kit.toybox/Examples/Scenes/GlobalScroll.unity index 88b3ba5..eb42757 100644 --- a/Packages/black.kit.toybox/Examples/Scenes/GlobalScroll.unity +++ b/Packages/black.kit.toybox/Examples/Scenes/GlobalScroll.unity @@ -4785,7 +4785,7 @@ PrefabInstance: - target: {fileID: 7496660487265934202, guid: 2947e17e95b036b49b40bc16c5d41cc6, type: 3} propertyPath: m_AnchoredPosition.y - value: 557 + value: 557.00586 objectReference: {fileID: 0} - target: {fileID: 8314906759889945362, guid: 2947e17e95b036b49b40bc16c5d41cc6, type: 3} @@ -5121,6 +5121,7 @@ MonoBehaviour: m_Script: {fileID: -1533785930, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} m_Name: m_EditorClassIdentifier: + AllowFocusView: 1 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Packages/black.kit.toybox/Examples/Scenes/GlobalSlider.unity b/Packages/black.kit.toybox/Examples/Scenes/GlobalSlider.unity index dba0dc0..2ed76b0 100644 --- a/Packages/black.kit.toybox/Examples/Scenes/GlobalSlider.unity +++ b/Packages/black.kit.toybox/Examples/Scenes/GlobalSlider.unity @@ -4837,6 +4837,7 @@ MonoBehaviour: m_Script: {fileID: -1533785930, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} m_Name: m_EditorClassIdentifier: + AllowFocusView: 1 --- !u!1001 &1773432074 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Packages/black.kit.toybox/Examples/Scenes/GlobalToggle.unity b/Packages/black.kit.toybox/Examples/Scenes/GlobalToggle.unity index 010f82f..a259111 100644 --- a/Packages/black.kit.toybox/Examples/Scenes/GlobalToggle.unity +++ b/Packages/black.kit.toybox/Examples/Scenes/GlobalToggle.unity @@ -278,6 +278,7 @@ MonoBehaviour: m_Script: {fileID: -1533785930, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} m_Name: m_EditorClassIdentifier: + AllowFocusView: 1 --- !u!1001 &1163263831 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Packages/black.kit.toybox/Examples/Scenes/GlobalToggles.unity b/Packages/black.kit.toybox/Examples/Scenes/GlobalToggles.unity index 7848470..ce36f36 100644 --- a/Packages/black.kit.toybox/Examples/Scenes/GlobalToggles.unity +++ b/Packages/black.kit.toybox/Examples/Scenes/GlobalToggles.unity @@ -449,6 +449,7 @@ MonoBehaviour: m_Script: {fileID: -1533785930, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} m_Name: m_EditorClassIdentifier: + AllowFocusView: 1 --- !u!114 &162190575 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/black.kit.toybox/Examples/Scenes/PositionAnchor.unity b/Packages/black.kit.toybox/Examples/Scenes/PositionAnchor.unity index dc668e7..03fa545 100644 --- a/Packages/black.kit.toybox/Examples/Scenes/PositionAnchor.unity +++ b/Packages/black.kit.toybox/Examples/Scenes/PositionAnchor.unity @@ -5314,6 +5314,7 @@ MonoBehaviour: m_Script: {fileID: -1533785930, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} m_Name: m_EditorClassIdentifier: + AllowFocusView: 1 --- !u!1001 &1623600363 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Packages/black.kit.toybox/Examples/Scenes/SequenceActiveRelayToAnimator.unity b/Packages/black.kit.toybox/Examples/Scenes/SequenceActiveRelayToAnimator.unity index ee22d7d..cfc5008 100644 --- a/Packages/black.kit.toybox/Examples/Scenes/SequenceActiveRelayToAnimator.unity +++ b/Packages/black.kit.toybox/Examples/Scenes/SequenceActiveRelayToAnimator.unity @@ -369,6 +369,7 @@ MonoBehaviour: m_Script: {fileID: -1533785930, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} m_Name: m_EditorClassIdentifier: + AllowFocusView: 1 --- !u!114 &1924672405 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/black.kit.toybox/Examples/Scenes/ToggleWithAnimator.unity b/Packages/black.kit.toybox/Examples/Scenes/ToggleWithAnimator.unity index 7b50784..f1c615e 100644 --- a/Packages/black.kit.toybox/Examples/Scenes/ToggleWithAnimator.unity +++ b/Packages/black.kit.toybox/Examples/Scenes/ToggleWithAnimator.unity @@ -173,7 +173,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -384,6 +384,7 @@ MonoBehaviour: m_Script: {fileID: -1533785930, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} m_Name: m_EditorClassIdentifier: + AllowFocusView: 1 --- !u!1001 &1347439711 PrefabInstance: m_ObjectHideFlags: 0 @@ -5030,7 +5031,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 0.4} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -5146,7 +5147,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} m_Color: {r: 1, g: 0.5, b: 0.5, a: 0.8} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -5385,7 +5386,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} diff --git a/Packages/black.kit.toybox/package.json b/Packages/black.kit.toybox/package.json index e504c4a..a9d195c 100644 --- a/Packages/black.kit.toybox/package.json +++ b/Packages/black.kit.toybox/package.json @@ -3,6 +3,7 @@ "displayName": "UdonSharp Toybox", "version": "0.6.0", "unity": "2022.3", + "unityRelease": "22f1", "description": "UdonSharp Toybox by Kuroné Kito", "keywords": [ "utils" diff --git a/Packages/manifest.json b/Packages/manifest.json index 7934dfc..8300e72 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,7 +5,7 @@ "com.unity.textmeshpro": "3.0.8", "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", - "com.unity.xr.oculus": "4.0.0", + "com.unity.xr.oculus": "4.2.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/Packages/packages-lock.json b/Packages/packages-lock.json index 95d7434..c1060b7 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,11 +7,12 @@ "dependencies": {} }, "com.unity.burst": { - "version": "1.8.7", + "version": "1.8.12", "depth": 1, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -52,7 +53,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.6.3", + "version": "1.7.0", "depth": 1, "source": "registry", "dependencies": { @@ -82,7 +83,7 @@ "url": "https://packages.unity.com" }, "com.unity.postprocessing": { - "version": "3.2.2", + "version": "3.4.0", "depth": 1, "source": "registry", "dependencies": { @@ -154,11 +155,11 @@ "url": "https://packages.unity.com" }, "com.unity.xr.oculus": { - "version": "4.0.0", + "version": "4.2.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.xr.management": "4.2.0" + "com.unity.xr.management": "4.4.0" }, "url": "https://packages.unity.com" }, diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 0ead599..8fe12f2 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -18,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0 m_ClothInterCollisionStiffness: 0 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: dfafffffdfafffffdfafffffffffffffdfafffffc800c0ffffffffffffffffffdfafffffdf09fcffdf09fcffdfafffffc800c0ffdfe9c3ffc820c0ffdfa9ffffdfa9ffffdfa9ffffdf8fffffdf8fffffdf8fffffdf8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: dfaff7ffdfaff7ffdfaff7ffffffffffdfaff7ffc800c0ffffffffffffffffffdfaff7ffdf09f4ffdf09f4ffdfaff7ffc800c0ffdfe9c3ffc820c0ffdfa9f7ffdfa9f7ffdfa9f7ffdf8ff7ffc800c0ffdf8ff7ffdf8ff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 @@ -37,3 +37,4 @@ PhysicsManager: m_ImprovedPatchFriction: 0 m_SolverType: 0 m_DefaultMaxAngularSpeed: 7 + m_FastMotionThreshold: 3.4028235e+38 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8dfacf1..0974d3b 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -48,6 +48,7 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 1 m_ActiveColorSpace: 1 + unsupportedMSAAFallback: 0 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -75,6 +76,7 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -86,6 +88,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -125,6 +128,7 @@ PlayerSettings: switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -133,6 +137,8 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 @@ -145,6 +151,7 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 hdrBitDepth: 0 m_ColorGamuts: 00000000 @@ -405,7 +412,7 @@ PlayerSettings: - m_BuildTarget: iOSSupport m_GraphicsJobs: 0 - m_BuildTarget: WindowsStandaloneSupport - m_GraphicsJobs: 0 + m_GraphicsJobs: 1 - m_BuildTarget: XboxOnePlayer m_GraphicsJobs: 1 - m_BuildTarget: LuminSupport @@ -480,7 +487,7 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: @@ -610,7 +617,6 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 1 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 105db72..c47c8be 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.6f1 -m_EditorVersionWithRevision: 2022.3.6f1 (b9e6e7e9fa2d) +m_EditorVersion: 2022.3.22f1 +m_EditorVersionWithRevision: 2022.3.22f1 (887be4894c44) diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 6b6fb7f..8cec94b 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -8,11 +8,11 @@ TagManager: - Default - TransparentFX - Ignore Raycast - - + - reserved3 - Water - UI - - - - + - reserved6 + - reserved7 - Interactive - Player - PlayerLocal @@ -24,8 +24,8 @@ TagManager: - StereoRight - Walkthrough - MirrorReflection - - reserved2 - - reserved3 + - InternalUI + - HardwareObjects - reserved4 - - diff --git a/README.md b/README.md index 3891198..4a19073 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ My utilities library for the UdonSharp / VRChat ## 💻 System Requirements - [VRChat Creator Companion](https://vrchat.com/home/download) -- Unity 2022.3.6f1 +- Unity 2022.3.22f1 - 🏝 Project of your world ## ▶ Getting Started