diff --git a/Assets/000_assets/material/M_SquareFrame 1.mat b/Assets/000_assets/material/M_SquareFrame 1.mat index 86b99e71..cc43f63b 100644 --- a/Assets/000_assets/material/M_SquareFrame 1.mat +++ b/Assets/000_assets/material/M_SquareFrame 1.mat @@ -213,7 +213,7 @@ Material: - _Dst: 10 - _DstBlend: 0 - _DstBlendAlpha: 0 - - _EdgeValue: 0.206462 + - _EdgeValue: 0.9710676 - _EnvironmentReflections: 1 - _FNLfanxiangkaiguan: 0 - _Face: 1 @@ -258,7 +258,7 @@ Material: - _Mask_scale: 1 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 0.793538 + - _Opacity: 0.028932393 - _Parallax: 0.005 - _Pass: 0 - _QueueOffset: 0 diff --git a/Assets/000_assets/prefab/NEW/tap.prefab b/Assets/000_assets/prefab/NEW/tap.prefab index f802001d..3405e576 100644 --- a/Assets/000_assets/prefab/NEW/tap.prefab +++ b/Assets/000_assets/prefab/NEW/tap.prefab @@ -59,6 +59,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -80,9 +85,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &3874549754672258447 MeshCollider: @@ -101,7 +108,7 @@ MeshCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 diff --git a/Assets/FR2_Cache.asset b/Assets/FR2_Cache.asset index 95890627..f08c0261 100644 --- a/Assets/FR2_Cache.asset +++ b/Assets/FR2_Cache.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45d5de2f81338b8b82a58210e132cac0a41bcaa6d438b3843f1cd4d78754ff02 -size 8593081 +oid sha256:2da17490047da49bf815771e8ef11cbd3fa00d4db57f69625b4a671e453729da +size 8743187 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/Android b/Assets/StreamingAssets/ThemeBundles/Android/Android index 643a5a51..f40241e6 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Android/Android and b/Assets/StreamingAssets/ThemeBundles/Android/Android differ diff --git a/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest b/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest index 4ebf3c5a..60608bc8 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest @@ -1,21 +1,21 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 382504586 +CRC: 3502675414 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: Info_0: - Name: unifiedraytracing + Name: shapes Dependencies: {} Info_1: Name: basic Dependencies: {} Info_2: - Name: departure_to_multiverse - Dependencies: {} - Info_3: Name: metropolis_on_orbit Dependencies: {} - Info_4: - Name: shapes + Info_3: + Name: departure_to_multiverse + Dependencies: {} + Info_4: + Name: unifiedraytracing Dependencies: {} diff --git a/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest b/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest index b4160088..715873f8 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest @@ -10,7 +10,7 @@ Hashes: Hash: dfed41e3b38758e5f34df30221d719dc IncrementalBuildHash: serializedVersion: 2 - Hash: 778742053aa9e9d5a2b30b0b4c13935b + Hash: 2fc84aafa10273fada9abacc94cc0ec8 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse index feb69867..ff0b9f58 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse +++ b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6776c0c16c3454fe01a7d16dc3b57c44ee3839447a7bc335d7ab32e80556139 -size 1431295 +oid sha256:406bbde7fe5e1cd08d3fd1c754799c64f015cc151c2d9aaf2e5768ddc9f10df5 +size 1432533 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest index 5c03f1ed..8229795d 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 3160051067 +CRC: 3814763255 Hashes: AssetFileHash: serializedVersion: 2 - Hash: a699113bc73eabbdebc7d76752a38a4b + Hash: b67223887fe2f824117e4b27a9358f9c TypeTreeHash: serializedVersion: 2 Hash: 8111ab10d600eaa1a60bd178b1bcf4cf IncrementalBuildHash: serializedVersion: 2 - Hash: 078b90de59fa16fc774acd05719871eb + Hash: 85f89324f6067e3b6b212baf51e9b101 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/metropolis_on_orbit.manifest b/Assets/StreamingAssets/ThemeBundles/Android/metropolis_on_orbit.manifest index 96d0acbe..d86a77cb 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/metropolis_on_orbit.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/metropolis_on_orbit.manifest @@ -10,7 +10,7 @@ Hashes: Hash: 8ab77e54d824a64c30bc20496c5f5926 IncrementalBuildHash: serializedVersion: 2 - Hash: 8e11d161dc63b75b8bce9c62459812ae + Hash: cb0fdc66431f09d69236a0e556b74895 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/shapes.manifest b/Assets/StreamingAssets/ThemeBundles/Android/shapes.manifest index 100171a4..de602b31 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/shapes.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/shapes.manifest @@ -10,7 +10,7 @@ Hashes: Hash: bc9f87c7e64ff656997db0f2b2a91703 IncrementalBuildHash: serializedVersion: 2 - Hash: 98313c8eb74f89178044a9a994c30a81 + Hash: 612a23b0b40c16e3e1e3cbbf90636bd0 HashAppended: 0 ClassTypes: - Class: 28 diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 index b91bad76..2cfda947 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 and b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 differ diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest index 7daaa436..88d26e3c 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest @@ -1,21 +1,21 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 2905049333 +CRC: 1827843157 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: Info_0: - Name: unifiedraytracing + Name: shapes Dependencies: {} Info_1: Name: basic Dependencies: {} Info_2: - Name: departure_to_multiverse - Dependencies: {} - Info_3: Name: metropolis_on_orbit Dependencies: {} - Info_4: - Name: shapes + Info_3: + Name: departure_to_multiverse + Dependencies: {} + Info_4: + Name: unifiedraytracing Dependencies: {} diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/basic b/Assets/StreamingAssets/ThemeBundles/Windows64/basic index 13219106..9781c1ab 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Windows64/basic and b/Assets/StreamingAssets/ThemeBundles/Windows64/basic differ diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest index 1b0ba021..c09e50fb 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 3067715901 +CRC: 1417067847 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 6abcdfd9cae8dff022735fc0aa0fb26c + Hash: 9569b9152ada4725228ecf5c0e9b70ed TypeTreeHash: serializedVersion: 2 Hash: dfed41e3b38758e5f34df30221d719dc IncrementalBuildHash: serializedVersion: 2 - Hash: 0ab33123143c01f5eb0e9aa22fd03e8a + Hash: e709b64052be63f01aab1f568bc1bf93 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse index ad40c786..84083b54 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6cb1e3c2c7753ba36884c37b812da704f79ed5f9fc9373196113562711a514d -size 810740 +oid sha256:c6683ccabf466542ee7616d3c28270edad09fd4a68ac562f2cbcce22b00b6458 +size 804500 diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest index 65ab604d..7e381a3f 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 3295815566 +CRC: 2418133339 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 07cff5c8154805764b06f2fe2767068e + Hash: b58060f9e67781133200f6ed0847b490 TypeTreeHash: serializedVersion: 2 Hash: 8111ab10d600eaa1a60bd178b1bcf4cf IncrementalBuildHash: serializedVersion: 2 - Hash: 546961a5e6af722d6acc755d8205b134 + Hash: bf1d6e125f661f84ad73441e2f5070c9 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest index a0381cbc..1e2a8acb 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest @@ -10,7 +10,7 @@ Hashes: Hash: 8ab77e54d824a64c30bc20496c5f5926 IncrementalBuildHash: serializedVersion: 2 - Hash: 5e819db50aed0e719f9213a0533db890 + Hash: 224a60d7115999b0f239237845cad24e HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/shapes.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/shapes.manifest index 29147af3..b9d5d4b4 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/shapes.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/shapes.manifest @@ -10,7 +10,7 @@ Hashes: Hash: bc9f87c7e64ff656997db0f2b2a91703 IncrementalBuildHash: serializedVersion: 2 - Hash: a6eece82ca305268802891f3699999ab + Hash: 6f6f4db93d0807c90d4be79ef8de5d45 HashAppended: 0 ClassTypes: - Class: 28 diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_NoteVisualHold.prefab b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_NoteVisualHold.prefab index 9214fa7c..9f0003d7 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_NoteVisualHold.prefab +++ b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_NoteVisualHold.prefab @@ -474,7 +474,7 @@ SphereCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} @@ -641,7 +641,6 @@ MonoBehaviour: meshGenerator: {fileID: 3749440688852897166} headPoint: {fileID: 4280273939034235032} tailPoint: {fileID: 4319407568721311756} - extrude: {fileID: 0} --- !u!1 &4591335795006963298 GameObject: m_ObjectHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index 522de394..721248fd 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -11,6 +11,7 @@ "com.unity.ide.visualstudio": "2.0.26", "com.unity.inputsystem": "1.18.0", "com.unity.localization": "1.5.12", + "com.unity.memoryprofiler": "1.1.12", "com.unity.multiplayer.center": "1.0.1", "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.render-pipelines.universal": "17.3.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index e01dfdeb..eb1e38c8 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -195,6 +195,13 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.editorcoroutines": { + "version": "1.0.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { "version": "2.0.5", "depth": 1, @@ -261,6 +268,19 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.memoryprofiler": { + "version": "1.1.12", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.0", + "com.unity.collections": "1.2.3", + "com.unity.mathematics": "1.2.1", + "com.unity.profiling.core": "1.0.0", + "com.unity.editorcoroutines": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.multiplayer.center": { "version": "1.0.1", "depth": 0, diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 8c6dcb1c..634f74e6 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -23,7 +23,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 42237 + controlID: 42468 draggingID: 0 --- !u!114 &2 MonoBehaviour: @@ -155,7 +155,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 42238 + controlID: 42469 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -181,7 +181,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 112} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 42239 + controlID: 42470 draggingID: 0 --- !u!114 &5 MonoBehaviour: @@ -207,7 +207,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 56} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 42240 + controlID: 42471 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -228,8 +228,8 @@ MonoBehaviour: y: 0 width: 247 height: 526 - m_MinSize: {x: 201, y: 226} - m_MaxSize: {x: 4001, y: 4026} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} @@ -281,6 +281,18 @@ MonoBehaviour: m_LastClickedID: m_Data: 0 m_ExpandedIDs: + - m_Data: -2050510 + - m_Data: -2050174 + - m_Data: -2047884 + - m_Data: -2045290 + - m_Data: -2037226 + - m_Data: -2036904 + - m_Data: -2034598 + - m_Data: -2031988 + - m_Data: -1901384 + - m_Data: -1901062 + - m_Data: -1898756 + - m_Data: -1896146 - m_Data: -1199280 - m_Data: -1098744 - m_Data: -1098662 @@ -384,8 +396,8 @@ MonoBehaviour: y: 0 width: 760 height: 526 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 226} + m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 2} m_Panes: - {fileID: 9} @@ -1087,9 +1099,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: -26.095776, y: -16.051174, z: 261.14813} + m_Target: {x: -49.064266, y: -31.66663, z: 254.82935} speed: 2 - m_Value: {x: -26.095776, y: -16.051174, z: 261.14813} + m_Value: {x: -49.064266, y: -31.66663, z: 254.82935} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1135,9 +1147,9 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.047870737, y: -0.064884216, z: 0.003383693, w: 0.9968884} + m_Target: {x: 0.08181971, y: -0.11683442, z: 0.009928506, w: 0.98987687} speed: 2 - m_Value: {x: 0.04786357, y: -0.0648745, z: 0.0033831864, w: 0.99673915} + m_Value: {x: 0.081807464, y: -0.11681692, z: 0.0099270195, w: 0.9897287} m_Size: m_Target: 114.11437 speed: 2 @@ -1352,7 +1364,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 m_SearchFilter: - m_NameFilter: + m_NameFilter: TAP m_ClassNames: [] m_AssetLabels: [] m_AssetBundleNames: [] @@ -1366,7 +1378,7 @@ MonoBehaviour: m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 - m_OriginalText: + m_OriginalText: TAP m_ImportLogFlags: 0 m_FilterByTypeIntersection: 0 m_ViewMode: 1 @@ -1390,6 +1402,10 @@ MonoBehaviour: - m_Data: 82470 - m_Data: 82472 - m_Data: 82474 + - m_Data: 82988 + - m_Data: 198598 + - m_Data: 198600 + - m_Data: 198602 - m_Data: 1000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1456,7 +1472,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: [] m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: - m_Data: 0 - m_Data: 80838 @@ -1466,8 +1482,8 @@ MonoBehaviour: - m_Data: 74112 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: DTM_NoteVisualHold + m_OriginalName: DTM_NoteVisualHold m_EditFieldRect: serializedVersion: 2 x: 0 @@ -1475,10 +1491,10 @@ MonoBehaviour: width: 0 height: 0 m_UserData: - m_Data: 0 + m_Data: 392614 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 m_ClientGUIView: {fileID: 11} @@ -1489,7 +1505,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 326} m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 209