From 268b40f03143b9b424f32d0516c63ffce1793ce0 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sun, 26 May 2024 19:05:06 -0400 Subject: [PATCH] test upgrade to unity 2022.3.30 also uses dx12 renderer on windows --- .../Scripts/Editor/BezierPoint3DEditor.cs | 6 +- .../Editor/CUIImageEditor.cs | 2 +- Assets/Resources/Fonts/Kurokane.asset | 6 +- Assets/Resources/Fonts/Rodin DB.asset | 6 +- Assets/Resources/Fonts/WarioWareV2 SDF.asset | 6 +- .../rodin/FOT-Rodin Pro B SDF Dynamic.asset | 6 +- .../FOT-Rodin Pro B SDF Dynamic_Outline.asset | 6 +- .../rodin/FOT-Rodin Pro DB SDF Dynamic.asset | 6 +- .../rodin/FOT-Rodin Pro M SDF Dynamic.asset | 6 +- .../Editor/EditorPreviewTex.renderTexture | 1 + .../Prefabs/GameView/GameTex.renderTexture | 1 + .../Prefabs/GameView/OverlayTex.renderTexture | 1 + .../Sprites/Editor/UI/icons_atlas.spriteatlas | 36 +++++++++ .../Materials/ChickenRodin.asset | 6 +- .../AccuracyRenderTexture.renderTexture | 6 +- .../SkillStarRenderTexture.renderTexture | 6 +- .../UI/Mems/MemRenderTexture.renderTexture | 1 + .../Sprites/UI/Mems/MemsAtlas.spriteatlas | 54 +++++++++++++ Assets/Scripts/AppInfo.cs | 4 +- .../LiberationSans SDF - Fallback.asset | 6 +- Packages/manifest.json | 15 ++-- Packages/packages-lock.json | 39 +++++----- ProjectSettings/ProjectSettings.asset | 78 +++++++++++++------ ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/boot.config | 0 25 files changed, 238 insertions(+), 70 deletions(-) delete mode 100644 ProjectSettings/boot.config diff --git a/Assets/Plugins/NaughtyBezierCurves/Scripts/Editor/BezierPoint3DEditor.cs b/Assets/Plugins/NaughtyBezierCurves/Scripts/Editor/BezierPoint3DEditor.cs index 0fce2762e..d4a995dd4 100644 --- a/Assets/Plugins/NaughtyBezierCurves/Scripts/Editor/BezierPoint3DEditor.cs +++ b/Assets/Plugins/NaughtyBezierCurves/Scripts/Editor/BezierPoint3DEditor.cs @@ -74,7 +74,7 @@ namespace NaughtyBezierCurves.Editor // Draw the center of the control point Handles.color = Color.yellow; - Vector3 newPointPosition = Handles.FreeMoveHandle(point.Position, point.transform.rotation, + var fmh_77_79_638523417839311464 = point.transform.rotation; Vector3 newPointPosition = Handles.FreeMoveHandle(point.Position, HandleUtility.GetHandleSize(point.Position) * BezierPoint3DEditor.pointCapSize, Vector3.one * 0.5f, drawPointFunc); if (point.Position != newPointPosition) @@ -89,7 +89,7 @@ namespace NaughtyBezierCurves.Editor Handles.DrawLine(point.Position, point.RightHandlePosition); Handles.color = Color.cyan; - Vector3 newLeftHandlePosition = Handles.FreeMoveHandle(point.LeftHandlePosition, point.transform.rotation, + var fmh_92_94_638523417839341177 = point.transform.rotation; Vector3 newLeftHandlePosition = Handles.FreeMoveHandle(point.LeftHandlePosition, HandleUtility.GetHandleSize(point.LeftHandlePosition) * BezierPoint3DEditor.handleCapSize, Vector3.zero, drawHandleFunc); if (point.LeftHandlePosition != newLeftHandlePosition) @@ -98,7 +98,7 @@ namespace NaughtyBezierCurves.Editor point.LeftHandlePosition = newLeftHandlePosition; } - Vector3 newRightHandlePosition = Handles.FreeMoveHandle(point.RightHandlePosition, point.transform.rotation, + var fmh_101_96_638523417839345831 = point.transform.rotation; Vector3 newRightHandlePosition = Handles.FreeMoveHandle(point.RightHandlePosition, HandleUtility.GetHandleSize(point.RightHandlePosition) * BezierPoint3DEditor.handleCapSize, Vector3.zero, drawHandleFunc); if (point.RightHandlePosition != newRightHandlePosition) diff --git a/Assets/Plugins/com.unity.uiextensions/Editor/CUIImageEditor.cs b/Assets/Plugins/com.unity.uiextensions/Editor/CUIImageEditor.cs index c961d071c..eb95c2307 100644 --- a/Assets/Plugins/com.unity.uiextensions/Editor/CUIImageEditor.cs +++ b/Assets/Plugins/com.unity.uiextensions/Editor/CUIImageEditor.cs @@ -68,7 +68,7 @@ namespace UnityEngine.UI.Extensions Handles.color = Color.gray; EditorGUI.BeginChangeCheck(); - Vector3 newCornerPos = Handles.FreeMoveHandle(script.transform.TransformPoint(cornerPos), script.transform.rotation, HandleUtility.GetHandleSize(script.transform.TransformPoint(cornerPos)) / 7, Vector3.one, Handles.SphereHandleCap); + var fmh_71_107_638523421300930339 = script.transform.rotation; Vector3 newCornerPos = Handles.FreeMoveHandle(script.transform.TransformPoint(cornerPos), HandleUtility.GetHandleSize(script.transform.TransformPoint(cornerPos)) / 7, Vector3.one, Handles.SphereHandleCap); Handles.Label(newCornerPos, string.Format("Corner Mover")); newCornerPos = script.transform.InverseTransformPoint(newCornerPos); diff --git a/Assets/Resources/Fonts/Kurokane.asset b/Assets/Resources/Fonts/Kurokane.asset index bfb1040a8..968748a59 100644 --- a/Assets/Resources/Fonts/Kurokane.asset +++ b/Assets/Resources/Fonts/Kurokane.asset @@ -150,6 +150,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FOT-KurokaneStd_Megamix_Modified-EB Atlas Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -158,6 +160,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -268,7 +271,8 @@ Texture2D: m_MipCount: 1 m_IsReadable: 1 m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 + m_IgnoreMipmapLimit: 0 + m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 m_VTOnly: 0 diff --git a/Assets/Resources/Fonts/Rodin DB.asset b/Assets/Resources/Fonts/Rodin DB.asset index 291836421..77477c29b 100644 --- a/Assets/Resources/Fonts/Rodin DB.asset +++ b/Assets/Resources/Fonts/Rodin DB.asset @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FOT-Rodin Pro DB Atlas Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -274,7 +277,8 @@ Texture2D: m_MipCount: 1 m_IsReadable: 1 m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 + m_IgnoreMipmapLimit: 0 + m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 m_VTOnly: 0 diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF.asset b/Assets/Resources/Fonts/WarioWareV2 SDF.asset index 7c0dbce66..5847c449f 100644 --- a/Assets/Resources/Fonts/WarioWareV2 SDF.asset +++ b/Assets/Resources/Fonts/WarioWareV2 SDF.asset @@ -22,7 +22,8 @@ Texture2D: m_MipCount: 1 m_IsReadable: 1 m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 + m_IgnoreMipmapLimit: 0 + m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 m_VTOnly: 0 @@ -197,6 +198,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: WarioWareV2 Atlas Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -205,6 +208,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic.asset b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic.asset index 1a99bc5be..47822e5c0 100644 --- a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic.asset +++ b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic.asset @@ -22,7 +22,8 @@ Texture2D: m_MipCount: 1 m_IsReadable: 1 m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 + m_IgnoreMipmapLimit: 0 + m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 m_VTOnly: 0 @@ -56,6 +57,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FOT-Rodin Pro B Atlas Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -64,6 +67,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic_Outline.asset b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic_Outline.asset index 040f02cca..301176fb4 100644 --- a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic_Outline.asset +++ b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic_Outline.asset @@ -22,7 +22,8 @@ Texture2D: m_MipCount: 1 m_IsReadable: 1 m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 + m_IgnoreMipmapLimit: 0 + m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 m_VTOnly: 0 @@ -56,6 +57,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FOT-Rodin Pro B Atlas Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - UNDERLAY_ON m_InvalidKeywords: [] @@ -65,6 +68,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF Dynamic.asset b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF Dynamic.asset index 9c10b4481..ad6ce44d4 100644 --- a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF Dynamic.asset +++ b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF Dynamic.asset @@ -22,7 +22,8 @@ Texture2D: m_MipCount: 1 m_IsReadable: 1 m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 + m_IgnoreMipmapLimit: 0 + m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 m_VTOnly: 0 @@ -197,6 +198,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FOT-Rodin Pro DB Atlas Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -205,6 +208,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro M SDF Dynamic.asset b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro M SDF Dynamic.asset index fb43051c4..99665ced6 100644 --- a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro M SDF Dynamic.asset +++ b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro M SDF Dynamic.asset @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FOT-Rodin Pro M Atlas Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -127,7 +130,8 @@ Texture2D: m_MipCount: 1 m_IsReadable: 1 m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 + m_IgnoreMipmapLimit: 0 + m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 m_VTOnly: 0 diff --git a/Assets/Resources/Prefabs/Editor/EditorPreviewTex.renderTexture b/Assets/Resources/Prefabs/Editor/EditorPreviewTex.renderTexture index eadd01125..ea41b7b3f 100644 --- a/Assets/Resources/Prefabs/Editor/EditorPreviewTex.renderTexture +++ b/Assets/Resources/Prefabs/Editor/EditorPreviewTex.renderTexture @@ -26,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 diff --git a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture index 7b61f2944..f3c8709aa 100644 --- a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture +++ b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture @@ -26,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 1 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 diff --git a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture index 994f54231..18c1bbac8 100644 --- a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture +++ b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture @@ -26,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 1 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 diff --git a/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas b/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas index 7342ba145..2622474ee 100644 --- a/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas +++ b/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas @@ -31,6 +31,7 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 m_ForceMaximumCompressionQuality_BC6H_BC7: 0 packingSettings: @@ -48,6 +49,41 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - 49e59e302f4a24a4da56bd63185fcb01: 21300000 + - 93df82601dc3b8a4caf887fc1999707d: 21300000 + - ca006d807d515ab4e8af218e7474f442: 21300000 + - 6f76ee0157ff5854295d8d0b12b5f165: 21300000 + - 9ae7ecf2cc001d14595ec03e1d4d86a6: 21300000 + - 6dd981c3e3319f243b56549e3f26fb72: 21300000 + - 99dd78d3f365c0b498bc65b192951aa7: 21300000 + - c158bbf3be7618c468e696e8c2c54e95: 21300000 + - 3d580e6535635714a9e8b5d2c426f6d6: 21300000 + - 348825b5c77b9d143961119fc008e631: 21300000 + - 44c391c5df20f2844b9437c0f3138355: 21300000 + - 4ea196d68cba90a4d8b08ad6fe012f49: 21300000 + - 55bb46a7614176b4c941a5caf846f7e8: 21300000 + - 57971d0838f02124080be29466f8f638: 21300000 + - e85d5d286a8191b499c570d33dd0899c: 21300000 + - 39656548c069d5541a9d9d1a808a76e4: 21300000 + - 21da6678ec5624a439f87f3487819ac0: 21300000 + - 3778df98d84dafe4dbc912dcab3598c3: 21300000 + - b7a1fac8b59b4d14289fa198206ef47e: 21300000 + - 0c4626a9a4642554684b85376bc236eb: 21300000 + - 6e7b88d9d62ed1b429c63b83745e3672: 21300000 + - dd516f1a3380ca642939d4fa86603249: 21300000 + - e63dfe3b432d7404bab9ef307426a0bf: 21300000 + - 1256a95b617ffc0458b3aec7fba83afe: 21300000 + - ba34210de39bafc4d9bc0bb9163d83c7: 21300000 + - 5562630d3cb1e1b439e6f0d06c45b14a: 21300000 + - 05e0181d5d7f7144f9263d1ccca41112: 21300000 + - 8dce25bd7de8cb7409d9043e6735bda5: 21300000 + - 0c2c8bed0306b7d408a268884c6af79b: 21300000 + - 9d635a6edbcd76549a58fd1b4640cc99: 21300000 + - 42ffabfe4c37e104d8e9d884fe7db980: 21300000 + - 8ae7d31f585b0cf4483963e20305e4f8: 21300000 + - a851bc8ff871b2e4a8101d0ffab93164: 21300000 + - b29210cf5b7b8234984ec842a3110005: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: 49e59e302f4a24a4da56bd63185fcb01, type: 3} diff --git a/Assets/Resources/Sprites/Games/ChargingChicken/Materials/ChickenRodin.asset b/Assets/Resources/Sprites/Games/ChargingChicken/Materials/ChickenRodin.asset index e708f73e9..61142057b 100644 --- a/Assets/Resources/Sprites/Games/ChargingChicken/Materials/ChickenRodin.asset +++ b/Assets/Resources/Sprites/Games/ChargingChicken/Materials/ChickenRodin.asset @@ -22,7 +22,8 @@ Texture2D: m_MipCount: 1 m_IsReadable: 1 m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 + m_IgnoreMipmapLimit: 0 + m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 m_VTOnly: 0 @@ -56,6 +57,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FOT-Rodin Pro B Atlas Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - UNDERLAY_ON m_InvalidKeywords: [] @@ -65,6 +68,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/AccuracyRenderTexture.renderTexture b/Assets/Resources/Sprites/UI/Common/GameOverlays/AccuracyRenderTexture.renderTexture index 09c5538ab..06e542402 100644 --- a/Assets/Resources/Sprites/UI/Common/GameOverlays/AccuracyRenderTexture.renderTexture +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/AccuracyRenderTexture.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 1024 m_Height: 1024 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -26,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 @@ -36,3 +37,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/SkillStarRenderTexture.renderTexture b/Assets/Resources/Sprites/UI/Common/GameOverlays/SkillStarRenderTexture.renderTexture index 306bd9c64..868bc26a4 100644 --- a/Assets/Resources/Sprites/UI/Common/GameOverlays/SkillStarRenderTexture.renderTexture +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/SkillStarRenderTexture.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 1024 m_Height: 1024 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -26,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 @@ -36,3 +37,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Resources/Sprites/UI/Mems/MemRenderTexture.renderTexture b/Assets/Resources/Sprites/UI/Mems/MemRenderTexture.renderTexture index 728da3d4f..2d8fede7b 100644 --- a/Assets/Resources/Sprites/UI/Mems/MemRenderTexture.renderTexture +++ b/Assets/Resources/Sprites/UI/Mems/MemRenderTexture.renderTexture @@ -26,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 diff --git a/Assets/Resources/Sprites/UI/Mems/MemsAtlas.spriteatlas b/Assets/Resources/Sprites/UI/Mems/MemsAtlas.spriteatlas index 6c95826ee..43f17754e 100644 --- a/Assets/Resources/Sprites/UI/Mems/MemsAtlas.spriteatlas +++ b/Assets/Resources/Sprites/UI/Mems/MemsAtlas.spriteatlas @@ -31,6 +31,7 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 m_ForceMaximumCompressionQuality_BC6H_BC7: 0 packingSettings: @@ -48,6 +49,59 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - f4d4464008fb076499941ccbb5771b7e: 21300000 + - 4c2582e07d145514a8b9d0b70631107d: 21300000 + - 3919f0f0b00e75e429634eb350867f75: 21300000 + - c7992131e7961984881ada55a006adab: 21300000 + - 3415c44124ae23848b87fd54e89c311a: 21300000 + - e7b9015144420b74093dfcdae6fc2025: 21300000 + - 06ea2c61f8b729a49b66811462eef046: 21300000 + - b6d307b220e58f04d80f3189f1603ea6: 21300000 + - 7aded0c2c3cd1af4181b9543c7da53ad: 21300000 + - 2e20ecf23d52f0140af1a8d12e2ed72c: 21300000 + - ec2d41042f712874a8721e07a320c3af: 21300000 + - 35adc4a4ed9acd64586224c543087750: 21300000 + - 8a3928e46572d304e9b7f2af9bbd124f: 21300000 + - 38fbeef49dd190d44b7bb92d20cdeb6b: 21300000 + - 0e997025dc553d747b54986affb43e0b: 21300000 + - b74b7295c7cef6b4f8afdf1a8f62ebe4: 21300000 + - 462f51e57440ce04683eddf02f93828e: 21300000 + - 5b10521627a28dc4fa0d27c059a30460: 21300000 + - 09e4606688e62194e81806be50e37044: 21300000 + - 3c52f067a452056439b04c39a9471256: 21300000 + - d983dbf732fce6240afe235731158773: 21300000 + - 31dea058f4aad8c44a6ca40f23df41c6: 21300000 + - 17d3a1888e5a433479376ffd2a0c5c6e: 21300000 + - 59b333a8d2f1d8e48aed4f8e86e22ffc: 21300000 + - 192f8cb819361dc41aac5521ac5cf160: 21300000 + - 622e94d9349db0044a964cee7475339f: 21300000 + - f0babdd951b25ae45932179436bac3a6: 21300000 + - f376741a7636451429e36a15ac7c1132: 21300000 + - 60b4404aa3a3ec14ca54e78f68b8a524: 21300000 + - 2200427a461399943bed21135a6a18de: 21300000 + - 2d5bfadab56ab5b43b2a7a84a73e97ac: 21300000 + - 13a88ddae4d95364bb72e60870b4ef85: 21300000 + - 1f6de50bdf4265e4e8906a0a4e444626: 21300000 + - 2fdbad2b0c5fde04dbcdbf48482a6dfa: 21300000 + - 5efd2c3bac5a34d469ed53bf16a22e54: 21300000 + - 52673fcbc6b4db4448c9eb3767e6ba0f: 21300000 + - b51ca4aca08a087439351021868bb0f5: 21300000 + - 3e22d5bc0b3a95a44a16b91bd3d09737: 21300000 + - 7eb866bc8d2ba5e4aa81a885cecec918: 21300000 + - ad77917ddeeedd74293952d9e87894d5: 21300000 + - f793948d79e4bee40809969894a8c0a9: 21300000 + - 2acc60bd97b14934ab4acb6078ea10e2: 21300000 + - 7a1d7fbddff537f4192fb1cf490aac45: 21300000 + - c2f3dbddb44f60e4f8a2f440fbba4a3d: 21300000 + - 6f9683fd696c5224aa751b32b5bb4766: 21300000 + - 8732049eacd431d44bcd7b6d2614b91a: 21300000 + - 624337aeaa6892a4c94de412e04f249c: 21300000 + - 679a06be93954df4aba6c2d71452efa6: 21300000 + - 75f4f6be138227941916e3d0c0ed99f6: 21300000 + - 9610042f7ac74b644b9db492d118e6b3: 21300000 + - db13004f4701e1c4a83f2e3a6d845723: 21300000 + - 022362afe11b563419cb8821d1486b89: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: f4d4464008fb076499941ccbb5771b7e, type: 3} diff --git a/Assets/Scripts/AppInfo.cs b/Assets/Scripts/AppInfo.cs index 0b398ee3a..a0968f671 100644 --- a/Assets/Scripts/AppInfo.cs +++ b/Assets/Scripts/AppInfo.cs @@ -6,8 +6,8 @@ using UnityEditor.Build.Reporting; #endif public static class AppInfo { - public const string Version = "1.0.9"; - public static readonly DateTime Date = new DateTime(2024, 03, 29, 20, 52, 02, 483, DateTimeKind.Utc); + public const string Version = "1.0.11"; + public static readonly DateTime Date = new DateTime(2024, 05, 26, 22, 36, 31, 198, DateTimeKind.Utc); } diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset index d02d83473..5940a2077 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: LiberationSans SDF Material m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 1 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -334,7 +337,8 @@ Texture2D: m_MipCount: 1 m_IsReadable: 1 m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 + m_IgnoreMipmapLimit: 0 + m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 m_VTOnly: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index db96c52b7..c031de285 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -11,17 +11,18 @@ "com.starasgames.tmpro-dynamic-data-cleaner": "https://github.com/STARasGAMES/tmpro-dynamic-data-cleaner.git#upm", "com.tayx.graphy": "https://github.com/Tayx94/graphy.git", "com.unity.2d.sprite": "1.0.0", + "com.unity.ai.navigation": "1.1.5", "com.unity.assetbundlebrowser": "https://github.com/Unity-Technologies/AssetBundles-Browser.git", - "com.unity.burst": "1.6.6", + "com.unity.burst": "1.8.13", "com.unity.collections": "1.2.4", - "com.unity.ide.rider": "3.0.18", + "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.postprocessing": "3.2.2", - "com.unity.recorder": "3.0.3", - "com.unity.test-framework": "1.1.31", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.postprocessing": "3.4.0", + "com.unity.recorder": "4.0.2", + "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.2.0-pre.5", - "com.unity.timeline": "1.6.5", + "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.zigurous.shaders.blending": "https://github.com/zigurous/unity-blend-shaders.git", "jillejr.newtonsoft.json-for-unity.converters": "1.3.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 5a880417b..f9ef00b1d 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -52,7 +52,7 @@ "dependencies": { "com.unity.modules.uielements": "1.0.0" }, - "hash": "4fcd4088cda76e117e76780cea7d85c484a69d94" + "hash": "0bb22a2fb7510bc3defc8c15d304e34b43afb0fd" }, "com.sr4dev.unity-spriteassist": { "version": "https://github.com/sr4dev/Unity-SpriteAssist.git?path=Assets/SpriteAssist", @@ -81,6 +81,15 @@ "source": "builtin", "dependencies": {} }, + "com.unity.ai.navigation": { + "version": "1.1.5", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.assetbundlebrowser": { "version": "https://github.com/Unity-Technologies/AssetBundles-Browser.git", "depth": 0, @@ -89,11 +98,12 @@ "hash": "b7c279278d1a343c6957c9f15b45173d3211f01c" }, "com.unity.burst": { - "version": "1.6.6", + "version": "1.8.13", "depth": 0, "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" }, @@ -115,7 +125,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.18", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": { @@ -141,13 +151,13 @@ }, "com.unity.nuget.newtonsoft-json": { "version": "3.2.1", - "depth": 1, + "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.postprocessing": { - "version": "3.2.2", + "version": "3.4.0", "depth": 0, "source": "registry", "dependencies": { @@ -156,7 +166,7 @@ "url": "https://packages.unity.com" }, "com.unity.recorder": { - "version": "3.0.3", + "version": "4.0.2", "depth": 0, "source": "registry", "dependencies": { @@ -165,7 +175,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -185,7 +195,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.5", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { @@ -352,17 +362,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "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.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e24fa8dc4..9371329dc 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 24 + serializedVersion: 26 productGUID: d61bcab4666c19649899ee123941bcb9 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,16 @@ PlayerSettings: defaultScreenHeightWeb: 360 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 1 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -74,6 +76,7 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -85,6 +88,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 1 useFlipModelSwapchain: 1 @@ -119,8 +123,12 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -128,13 +136,10 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 - bundleVersion: 1.0.10 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 + bundleVersion: 1.0.11 preloadedAssets: - {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3} metroInputSource: 0 @@ -147,8 +152,9 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -158,11 +164,12 @@ PlayerSettings: applicationIdentifier: Standalone: com.RHeavenStudio.Heaven-Studio buildNumber: - Standalone: 100010 + Standalone: 100011 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 - AndroidBundleVersionCode: 100010 + AndroidBundleVersionCode: 100011 AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 @@ -176,12 +183,15 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -224,13 +234,16 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -245,6 +258,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 @@ -252,6 +266,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -265,7 +280,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -408,6 +422,9 @@ PlayerSettings: - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 + - m_BuildTarget: WindowsStandaloneSupport + m_APIs: 1200000002000000 + m_Automatic: 0 m_BuildTargetVRSettings: [] m_DefaultShaderChunkSizeInMB: 16 m_DefaultShaderChunkCount: 0 @@ -422,7 +439,9 @@ PlayerSettings: m_BuildTargetGroupLightmapEncodingQuality: - m_BuildTarget: Standalone m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 @@ -435,6 +454,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -442,10 +462,11 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -571,7 +592,6 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 @@ -661,6 +681,7 @@ PlayerSettings: webGLMemorySize: 32 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -673,6 +694,12 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: Android: UNITY_POST_PROCESSING_STACK_V2 @@ -683,8 +710,10 @@ PlayerSettings: Nintendo Switch: UNITY_POST_PROCESSING_STACK_V2 PS4: UNITY_POST_PROCESSING_STACK_V2 PS5: UNITY_POST_PROCESSING_STACK_V2 + QNX: UNITY_POST_PROCESSING_STACK_V2 Stadia: UNITY_POST_PROCESSING_STACK_V2 Standalone: UNITY_POST_PROCESSING_STACK_V2 + VisionOS: UNITY_POST_PROCESSING_STACK_V2 WebGL: UNITY_POST_PROCESSING_STACK_V2 Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2 XboxOne: UNITY_POST_PROCESSING_STACK_V2 @@ -697,6 +726,7 @@ PlayerSettings: platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} + il2cppCodeGeneration: {} managedStrippingLevel: EmbeddedLinux: 1 GameCoreScarlett: 1 @@ -716,12 +746,9 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 - selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: Standalone: 3 @@ -748,6 +775,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: @@ -794,6 +822,11 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 windowsGamepadBackendHint: 0 @@ -804,6 +837,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index bca3d022a..d8a335890 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.21f1 -m_EditorVersionWithRevision: 2021.3.21f1 (1b156197d683) +m_EditorVersion: 2022.3.30f1 +m_EditorVersionWithRevision: 2022.3.30f1 (70558241b701) diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb..000000000