diff --git a/Assets/000_assets/material/M_SquareFrame 1.mat b/Assets/000_assets/material/M_SquareFrame 1.mat index 8a59e76e..3f90ff22 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.55675477 + - _EdgeValue: 0.76990294 - _EnvironmentReflections: 1 - _FNLfanxiangkaiguan: 0 - _Face: 1 @@ -258,7 +258,7 @@ Material: - _Mask_scale: 1 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 0.44324523 + - _Opacity: 0.23009706 - _Parallax: 0.005 - _Pass: 0 - _QueueOffset: 0 diff --git a/Assets/FR2_Cache.asset b/Assets/FR2_Cache.asset index 0c8ac835..1c96095a 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:4f85ef1fcecf8352baa80daf38c30e4555fb24f98cea08219a21a395a4e97e40 -size 7021076 +oid sha256:f6aa997e33857efa64df6980d0348d4191edbb14bc174d1965c79d5dec4a6509 +size 7043517 diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 index 0a96238b..d7e8c276 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 aa9c6d97..fa562c5d 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 2057219569 +CRC: 3651626393 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse index ddf934a8..b2cabc7e 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse and b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse differ diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest index 760b49fc..02562ad4 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: 3950008583 +CRC: 3493843915 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 91030f54d55f213fddf88976ba5f99a4 + Hash: b83a70f98dab7639eabb8a7252d8a2ad TypeTreeHash: serializedVersion: 2 Hash: 8b453097cf816e7e6fe791950bd1564f IncrementalBuildHash: serializedVersion: 2 - Hash: 216c7bd76d03220c9f9ae53bfbafa6af + Hash: 6b1fc4a47cbe62f4b9b11bf69bc4aa5a HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail2_Sparks_02.mat b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail2_Sparks_02.mat index db6bb52f..3952bef4 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail2_Sparks_02.mat +++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail2_Sparks_02.mat @@ -13,11 +13,12 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BLENDMODE_ADDITIVE - - _EMISSION_ON m_InvalidKeywords: - _ALPHAPREMULTIPLY_ON - _CUSTOMDATA - _CUSTOMDATA_OFF + - _EMISSION_ON + - _ENABLEEMISSION_ON - _FLIPBOOKBLENDING_OFF - _FX_LIGHT_MODE_UNLIT m_LightmapFlags: 4 @@ -81,7 +82,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: f4c14c8a739195b49ae7277a44426f2a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTexture: @@ -345,6 +346,8 @@ Material: - _TransparentMode: 1 - _UIEffect_Toggle: 0 - _UTwirlEnabled: 0 + - _UseParticleDataForEmission: 0 + - _UseParticleDataForUV: 0 - _UseRedAsAlpha: 0 - _UseUV1_Toggle: 0 - _VertexOffset_Mask_Toggle: 0 diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail2_Sparks_03.mat b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail2_Sparks_03.mat index 10c67fb0..8b1db531 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail2_Sparks_03.mat +++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail2_Sparks_03.mat @@ -13,11 +13,12 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BLENDMODE_ADDITIVE - - _EMISSION_ON m_InvalidKeywords: - _ALPHAPREMULTIPLY_ON - _CUSTOMDATA - _CUSTOMDATA_OFF + - _EMISSION_ON + - _ENABLEEMISSION_ON - _FLIPBOOKBLENDING_OFF - _FX_LIGHT_MODE_UNLIT m_LightmapFlags: 4 @@ -81,7 +82,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 505bbb3b422a41f44b0bbea401e13fdc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTexture: @@ -345,6 +346,8 @@ Material: - _TransparentMode: 1 - _UIEffect_Toggle: 0 - _UTwirlEnabled: 0 + - _UseParticleDataForEmission: 0 + - _UseParticleDataForUV: 0 - _UseRedAsAlpha: 0 - _UseUV1_Toggle: 0 - _VertexOffset_Mask_Toggle: 0 diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail2_TrailBody_02.mat b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail2_TrailBody_02.mat index a887b479..9d7d2a86 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail2_TrailBody_02.mat +++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail2_TrailBody_02.mat @@ -13,10 +13,10 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BLENDMODE_ADDITIVE - - _EMISSION_ON - - _USEREDASALPHA_ON m_InvalidKeywords: - _ALPHAPREMULTIPLY_ON + - _EMISSION_ON + - _ENABLEEMISSION_ON - _FLIPBOOKBLENDING_OFF - _RECEIVE_SHADOWS_OFF m_LightmapFlags: 4 @@ -58,8 +58,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: fe0f51232d3c144e98a40dcef497dca2, type: 3} - m_Scale: {x: 1, y: 1} + m_Texture: {fileID: 2800000, guid: f7c43c04eaf5cc94da06bd3230b69ee0, type: 3} + m_Scale: {x: -1, y: 1} m_Offset: {x: 0, y: 0} - _MainTexture: m_Texture: {fileID: 2800000, guid: f7c43c04eaf5cc94da06bd3230b69ee0, type: 3} @@ -164,7 +164,9 @@ Material: - _SrcBlendAlpha: 1 - _SrcBlendRGB: 5 - _Surface: 0 - - _UseRedAsAlpha: 1 + - _UseParticleDataForEmission: 0 + - _UseParticleDataForUV: 0 + - _UseRedAsAlpha: 0 - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab index 7e25baa4..3064c2c2 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab +++ b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab @@ -28,7 +28,7 @@ Transform: m_GameObject: {fileID: 642168045599276256} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.007, y: -0.082, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5047,7 +5047,7 @@ TrailRenderer: m_RotationOrder: 4 colorGradient: serializedVersion: 2 - key0: {r: 0, g: 0.5833335, b: 1, a: 1} + key0: {r: 1, g: 1, b: 1, a: 1} key1: {r: 1, g: 1, b: 1, a: 0} key2: {r: 0, g: 0, b: 0, a: 0} key3: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail2.prefab b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail2.prefab index 6214df2e..0f56ffc4 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail2.prefab +++ b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail2.prefab @@ -28,7 +28,7 @@ Transform: m_GameObject: {fileID: 642168045599276256} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.166} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5002,7 +5002,7 @@ TrailRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: aaa6158cbeef09e4394d93f416a73b57, type: 2} + - {fileID: 2100000, guid: 66f6d7e839b1e9a4f8ab035d1d8f0d40, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5036,12 +5036,12 @@ TrailRenderer: - serializedVersion: 3 time: 0 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: -2.5713863 + outSlope: -2.5713863 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.048956666 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -9938,7 +9938,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 11cb78d9ba45bcb429fc301496bd1220, type: 2} + - {fileID: 2100000, guid: 2963d64e3909e46498c95f4ffb49faa9, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19696,7 +19696,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 086b50be84c730742a6269a5003ad7d2, type: 2} + - {fileID: 2100000, guid: eff1a22a82b55bb458312e919faef016, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -24553,7 +24553,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 11cb78d9ba45bcb429fc301496bd1220, type: 2} + - {fileID: 2100000, guid: 2963d64e3909e46498c95f4ffb49faa9, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index 210db3ca..1568be33 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1706.6667 height: 869.3334 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Inspector m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -118,7 +118,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 120 + controlID: 55 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 121 + controlID: 56 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -292,7 +292,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: LightingWindow + m_Name: InspectorWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -301,16 +301,16 @@ MonoBehaviour: y: 0 width: 511.33325 height: 813.3333 - m_MinSize: {x: 391, y: 416} + m_MinSize: {x: 276, y: 76} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 26} + m_ActualView: {fileID: 23} m_Panes: - {fileID: 23} - {fileID: 24} - {fileID: 25} - {fileID: 26} - m_Selected: 3 - m_LastSelected: 2 + m_Selected: 0 + m_LastSelected: 3 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -729,11 +729,9 @@ MonoBehaviour: m_LastClickedID: m_Data: 0 m_ExpandedIDs: - - m_Data: -13450 - - m_Data: -13040 - - m_Data: -10912 - - m_Data: -8398 - - m_Data: -1328 + - m_Data: -5200 + - m_Data: 68580 + - m_Data: 68598 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -897,11 +895,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Light Settings index: 5 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -925,11 +923,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Cloth Constraints index: 6 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -939,11 +937,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Cloth Collisions index: 7 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -995,11 +993,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Occlusion Culling index: 8 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1009,11 +1007,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Physics Debugger index: 9 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1023,11 +1021,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Scene Visibility index: 10 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1233,11 +1231,11 @@ MonoBehaviour: displayed: 0 id: Brush Attributes index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1247,11 +1245,11 @@ MonoBehaviour: displayed: 0 id: unity-tool-contexts-toolbar index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1275,11 +1273,11 @@ MonoBehaviour: displayed: 0 id: Terrain Tools index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1289,11 +1287,11 @@ MonoBehaviour: displayed: 0 id: Brush Masks index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1303,11 +1301,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Lighting Visualization Colors index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1331,11 +1329,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Tile Palette Clipboard index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1345,11 +1343,11 @@ MonoBehaviour: displayed: 0 id: Scene View/PBR Validation Settings index: 2 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1359,11 +1357,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Tile Palette Brush Pick index: 4 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1373,11 +1371,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Sprite Swap index: 15 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1387,11 +1385,11 @@ MonoBehaviour: displayed: 0 id: SceneView/CamerasOverlay index: 16 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25.333332} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1441,7 +1439,7 @@ MonoBehaviour: m_Position: m_Target: {x: -4.9583726, y: 41.911694, z: -67.22179} speed: 2 - m_Value: {x: -4.9583726, y: 41.911694, z: -67.22179} + m_Value: {x: 0.0961701, y: -0.025038881, z: -0.73378515} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1489,15 +1487,15 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0.003131636, y: -0.99237376, z: -0.12167186, w: -0.025189295} speed: 2 - m_Value: {x: -0.0031316357, y: 0.9923737, z: 0.12167186, w: 0.025189295} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: m_Target: 47.974464 speed: 2 - m_Value: 47.974464 + m_Value: 0.7283937 m_Ortho: m_Target: 0 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -1511,7 +1509,7 @@ MonoBehaviour: m_FarClip: 1000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.23471156, y: -0.026415598, z: 0.0064268056, w: 0.9717362} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_Viewpoint: m_SceneView: {fileID: 16} @@ -1747,7 +1745,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/Game/Animations/Transform + - Assets/ThemeBundles/DepartureToMultiverse/Materials/Track m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1757,25 +1755,20 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Scripts/Game/Animations/Transform + - Assets/ThemeBundles/DepartureToMultiverse/Materials/Track m_LastFoldersGridSize: 16 m_LastProjectPath: D:\Projects\ichni Official m_LockTracker: m_IsLocked: 0 m_LastLocalAssetsSearchArea: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 580.6667} + scrollPos: {x: 0, y: 587} m_SelectedIDs: - - m_Data: 68196 + - m_Data: 68246 m_LastClickedID: - m_Data: 68196 + m_Data: 68246 m_ExpandedIDs: - m_Data: 0 - - m_Data: 67506 - - m_Data: 67508 - - m_Data: 67510 - - m_Data: 67512 - - m_Data: 67514 - m_Data: 67516 - m_Data: 67518 - m_Data: 67520 @@ -1836,6 +1829,8 @@ MonoBehaviour: - m_Data: 67630 - m_Data: 67632 - m_Data: 67634 + - m_Data: 67636 + - m_Data: 67638 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1868,11 +1863,6 @@ MonoBehaviour: m_Data: 0 m_ExpandedIDs: - m_Data: 0 - - m_Data: 67506 - - m_Data: 67508 - - m_Data: 67510 - - m_Data: 67512 - - m_Data: 67514 - m_Data: 67516 - m_Data: 67518 - m_Data: 67520 @@ -1933,6 +1923,8 @@ MonoBehaviour: - m_Data: 67630 - m_Data: 67632 - m_Data: 67634 + - m_Data: 67636 + - m_Data: 67638 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2137,10 +2129,10 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1195.3334 - y: 78.66667 - width: 510.33337 - height: 787.3334 + x: 1196.3334 + y: 24 + width: 510.33325 + height: 787.3333 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2293,8 +2285,8 @@ MonoBehaviour: m_TextWithWhitespace: "Lighting\u200B" m_Pos: serializedVersion: 2 - x: 1196.3334 - y: 24 + x: 1195.3334 + y: 78.66667 width: 510.33325 height: 787.3333 m_SerializedDataModeController: