From 7504706c2660f05cc26d9abe62ec1571d3c33b76 Mon Sep 17 00:00:00 2001 From: Geri Date: Sun, 5 Mar 2023 20:36:13 +0100 Subject: [PATCH] =?UTF-8?q?Musica=20men=C3=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Audio/Music/gameOver.mp3 | 3 + Assets/Audio/Music/gameOver.mp3.meta | 22 ++ Assets/Audio/Music/menu.wav | 3 + Assets/Audio/Music/menu.wav.meta | 22 ++ Assets/Audio/Music/victoria.wav | 3 + Assets/Audio/Music/victoria.wav.meta | 22 ++ Assets/Scenes/Game.unity | 5 +- Assets/Scenes/MainMenu.unity | 18 +- Assets/Scripts/Cutscene.cs | 2 + Assets/Scripts/MainMenu.cs | 11 + Assets/Scripts/MainMenu.cs.meta | 11 + Assets/Scripts/Player/PlayerController.cs | 20 ++ Assets/Scripts/SceneLoad.cs | 6 +- Assets/Sounds.asset | 27 +++ ProjectSettings/ProjectSettings.asset | 4 +- UserSettings/EditorUserSettings.asset | 12 +- .../Layouts/CurrentMaximizeLayout.dwlt | 196 +++++++++++------- UserSettings/Layouts/default-2021.dwlt | 190 ++++++++++------- 18 files changed, 420 insertions(+), 157 deletions(-) create mode 100644 Assets/Audio/Music/gameOver.mp3 create mode 100644 Assets/Audio/Music/gameOver.mp3.meta create mode 100644 Assets/Audio/Music/menu.wav create mode 100644 Assets/Audio/Music/menu.wav.meta create mode 100644 Assets/Audio/Music/victoria.wav create mode 100644 Assets/Audio/Music/victoria.wav.meta create mode 100644 Assets/Scripts/MainMenu.cs create mode 100644 Assets/Scripts/MainMenu.cs.meta diff --git a/Assets/Audio/Music/gameOver.mp3 b/Assets/Audio/Music/gameOver.mp3 new file mode 100644 index 0000000..fe6fbb9 --- /dev/null +++ b/Assets/Audio/Music/gameOver.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10abb661e87d30cdaecd0e9d46a7cf65ba0ab1e30631be5be91ffa6b7f178319 +size 114856 diff --git a/Assets/Audio/Music/gameOver.mp3.meta b/Assets/Audio/Music/gameOver.mp3.meta new file mode 100644 index 0000000..7e162fd --- /dev/null +++ b/Assets/Audio/Music/gameOver.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7ad8095769c191d4b8b32ff4457745db +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.59999996 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Music/menu.wav b/Assets/Audio/Music/menu.wav new file mode 100644 index 0000000..67e43ab --- /dev/null +++ b/Assets/Audio/Music/menu.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1865d1343016be79c87011b0f9346cf488609085849ed430feb1d9bc22367501 +size 2385724 diff --git a/Assets/Audio/Music/menu.wav.meta b/Assets/Audio/Music/menu.wav.meta new file mode 100644 index 0000000..b943956 --- /dev/null +++ b/Assets/Audio/Music/menu.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6525d245e5e1be040852edaeeb9923bc +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.59999996 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Music/victoria.wav b/Assets/Audio/Music/victoria.wav new file mode 100644 index 0000000..8355370 --- /dev/null +++ b/Assets/Audio/Music/victoria.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c15c6a67082435886d4e7144517c314d17ad894f3e2ec6967d160ea788600e0 +size 2726400 diff --git a/Assets/Audio/Music/victoria.wav.meta b/Assets/Audio/Music/victoria.wav.meta new file mode 100644 index 0000000..cae0f41 --- /dev/null +++ b/Assets/Audio/Music/victoria.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3e348e8acc8161d499c279e87ab9f5bb +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.59999996 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 9de10dd..5bc7cf9 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -4360,8 +4360,8 @@ Camera: serializedVersion: 2 x: 0.06953437 y: 0 - width: 0.8611618 - height: 1.0003641 + width: 0.86053514 + height: 0.999636 near clip plane: 0.3 far clip plane: 1000 field of view: 60 @@ -37910,6 +37910,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 775b962b28fe0d149927748937e2e8c2, type: 3} m_Name: m_EditorClassIdentifier: + stopMusic: 1 --- !u!1 &1703826472 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 6a66c5b..fd482e4 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -828,6 +828,7 @@ GameObject: - component: {fileID: 338094509} - component: {fileID: 338094508} - component: {fileID: 338094513} + - component: {fileID: 338094514} m_Layer: 0 m_Name: Canvas m_TagString: Untagged @@ -968,6 +969,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 775b962b28fe0d149927748937e2e8c2, type: 3} m_Name: m_EditorClassIdentifier: + stopMusic: 0 +--- !u!114 &338094514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338094507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 23f106f043aa58846875bf806d6377cd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &406352228 GameObject: m_ObjectHideFlags: 0 @@ -4485,8 +4499,8 @@ Camera: serializedVersion: 2 x: 0.06953437 y: 0 - width: 0.8611618 - height: 1.0003641 + width: 0.86053514 + height: 0.999636 near clip plane: 0.3 far clip plane: 1000 field of view: 60 diff --git a/Assets/Scripts/Cutscene.cs b/Assets/Scripts/Cutscene.cs index f41c6d0..b4de813 100644 --- a/Assets/Scripts/Cutscene.cs +++ b/Assets/Scripts/Cutscene.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using MyBox; +using SimpleTools.AudioManager; using SimpleTools.DialogueSystem; using SimpleTools.SceneManagement; using UnityEngine; @@ -31,6 +32,7 @@ public class Cutscene : MonoBehaviour { _start = Time.time; yield return new WaitForSeconds(fadeDuration); } + AudioManager.instance.Stop("menu"); Loader.Load(2); } diff --git a/Assets/Scripts/MainMenu.cs b/Assets/Scripts/MainMenu.cs new file mode 100644 index 0000000..0cc2058 --- /dev/null +++ b/Assets/Scripts/MainMenu.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using SimpleTools.AudioManager; +using UnityEngine; + +public class MainMenu : MonoBehaviour{ + // Start is called before the first frame update + void Start(){ + AudioManager.instance.Play("menu"); + } +} diff --git a/Assets/Scripts/MainMenu.cs.meta b/Assets/Scripts/MainMenu.cs.meta new file mode 100644 index 0000000..7b6d2fe --- /dev/null +++ b/Assets/Scripts/MainMenu.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 23f106f043aa58846875bf806d6377cd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 71214d8..b2c9efa 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -178,6 +178,16 @@ public class PlayerController : MonoBehaviour { ghost.Kill(); if(_stepsRoutine != null) StopCoroutine(_stepsRoutine); fadeImage.DOFade(1, 1f); + AudioManager.instance.FadeOut("intro", 1f); + AudioManager.instance.FadeOut("azul", 1f); + AudioManager.instance.FadeOut("rojo", 1f); + AudioManager.instance.FadeOut("ambos", 1f); + AudioManager.instance.FadeOut("invertido", 1f); + AudioManager.instance.FadeOut("alta", 1f); + AudioManager.instance.FadeOut("baja", 1f); + AudioManager.instance.FadeOut("oscuro", 1f); + AudioManager.instance.FadeOut("rojo", 1f); + AudioManager.instance.FadeIn("victoria", 1f); yield return new WaitForSeconds(1f); AudioManager.instance.FadeOut("Viento", 1f); Loader.Load(3); @@ -187,6 +197,16 @@ public class PlayerController : MonoBehaviour { public void Kill(GhostController ghost) { if (_dead || _won) return; AudioManager.instance.PlayOneShot("Congela"); + AudioManager.instance.FadeOut("intro", 1f); + AudioManager.instance.FadeOut("azul", 1f); + AudioManager.instance.FadeOut("rojo", 1f); + AudioManager.instance.FadeOut("ambos", 1f); + AudioManager.instance.FadeOut("invertido", 1f); + AudioManager.instance.FadeOut("alta", 1f); + AudioManager.instance.FadeOut("baja", 1f); + AudioManager.instance.FadeOut("oscuro", 1f); + AudioManager.instance.FadeOut("rojo", 1f); + AudioManager.instance.Play("gameOver"); ghost.Kill(); if(_stepsRoutine != null) StopCoroutine(_stepsRoutine); group.DOFade(1, 1f); diff --git a/Assets/Scripts/SceneLoad.cs b/Assets/Scripts/SceneLoad.cs index 14343dd..61eca99 100644 --- a/Assets/Scripts/SceneLoad.cs +++ b/Assets/Scripts/SceneLoad.cs @@ -4,10 +4,12 @@ using SimpleTools.AudioManager; using SimpleTools.SceneManagement; using UnityEngine; -public class SceneLoad : MonoBehaviour{ +public class SceneLoad : MonoBehaviour { + [SerializeField] bool stopMusic = true; + public void LoadScene(int sceneIndex) { - AudioManager.instance.StopAll(); + if(stopMusic) AudioManager.instance.StopAll(); Loader.Load(sceneIndex); } } diff --git a/Assets/Sounds.asset b/Assets/Sounds.asset index 3234e99..0aebd00 100644 --- a/Assets/Sounds.asset +++ b/Assets/Sounds.asset @@ -195,3 +195,30 @@ MonoBehaviour: pitchVariance: 0 loop: 0 source: {fileID: 0} + - name: gameOver + clip: {fileID: 8300000, guid: 7ad8095769c191d4b8b32ff4457745db, type: 3} + type: 0 + volume: 1 + volumeVariance: 0 + pitch: 1 + pitchVariance: 0 + loop: 0 + source: {fileID: 0} + - name: menu + clip: {fileID: 8300000, guid: 6525d245e5e1be040852edaeeb9923bc, type: 3} + type: 0 + volume: 1 + volumeVariance: 0 + pitch: 1 + pitchVariance: 0 + loop: 1 + source: {fileID: 0} + - name: victoria + clip: {fileID: 8300000, guid: 3e348e8acc8161d499c279e87ab9f5bb, type: 3} + type: 0 + volume: 1 + volumeVariance: 0 + pitch: 1 + pitchVariance: 0 + loop: 1 + source: {fileID: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 0170f91..b6a733e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: ListJam 2 + companyName: Froglake + productName: TRORB defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 41a08bc..e6e75da 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,22 +15,22 @@ EditorUserSettings: value: 5704065207060c08540f5c2645210844124f497e797871697f2b4e67b0b3626d flags: 0 RecentlyUsedSceneGuid-3: - value: 500102025056580a5f0b587a44735b4445151b297a717064797c1e66b2b2356e - flags: 0 - RecentlyUsedSceneGuid-4: value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 + RecentlyUsedSceneGuid-4: + value: 565404560306595a590d0d2044215a4414164b2c797924692b7b1936b3b4613a + flags: 0 RecentlyUsedSceneGuid-5: - value: 020957555d000f5f580c087715200a4444164a292d717e6179791832e1b7623e + value: 500102025056580a5f0b587a44735b4445151b297a717064797c1e66b2b2356e flags: 0 RecentlyUsedSceneGuid-6: value: 5a05575054505e025c5f5c7544770844434f1d7d7879743178711f31b2b9313c flags: 0 RecentlyUsedSceneGuid-7: - value: 565404560306595a590d0d2044215a4414164b2c797924692b7b1936b3b4613a + value: 0000045255025a5a5a0c587012700d44454f1b7e792d73682c701f63bbb9323c flags: 0 RecentlyUsedSceneGuid-8: - value: 0000045255025a5a5a0c587012700d44454f1b7e792d73682c701f63bbb9323c + value: 020957555d000f5f580c087715200a4444164a292d717e6179791832e1b7623e flags: 0 RecentlyUsedSceneGuid-9: value: 540802035d055a5f5b595f2449200d4447154a79297b2365287e4d6ae6b96668 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 9d408be..3182802 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 15} + - {fileID: 17} m_Position: serializedVersion: 2 x: 0 @@ -45,9 +45,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 + x: 1504 y: 73.6 - width: 2255 + width: 750 height: 1119.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 2818.75, y: 1373.5} + m_TargetSize: {x: 937.5, y: 1373.5} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,8 +74,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -1127.5 - m_HBaseRangeMax: 1127.5 + m_HBaseRangeMin: -375 + m_HBaseRangeMax: 375 m_VBaseRangeMin: -549.4 m_VBaseRangeMax: 549.4 m_HAllowExceedBaseRangeMin: 1 @@ -86,7 +86,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 2255 + width: 750 height: 1098.8 m_Scale: {x: 1, y: 1} - m_Translation: {x: 1127.5, y: 549.4} + m_Translation: {x: 375, y: 549.4} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1127.5 + x: -375 y: -549.4 - width: 2255 + width: 750 height: 1098.8 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 2818.75, y: 1399.75} + m_LastWindowPixelSize: {x: 937.5, y: 1399.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -131,7 +131,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 7} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 @@ -150,27 +150,51 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 5} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 y: 0 width: 2256 height: 1140.8 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 2} - m_Panes: - - {fileID: 5} - - {fileID: 6} - - {fileID: 2} - m_Selected: 2 - m_LastSelected: 0 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: -1 --- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1504 + height: 1140.8 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 6} + m_Panes: + - {fileID: 6} + - {fileID: 7} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -192,7 +216,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 2255 + width: 1503 height: 1119.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -268,7 +292,7 @@ MonoBehaviour: containerId: overlay-toolbar__top floating: 0 collapsed: 0 - displayed: 0 + displayed: 1 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -428,9 +452,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 3.651324, y: 2.8580036, z: 1.2878327} + m_Target: {x: 26.346184, y: 11.261685, z: 0.9544994} speed: 2 - m_Value: {x: 3.651324, y: 2.8580036, z: 1.2878327} + m_Value: {x: 26.346184, y: 11.261685, z: 0.9544994} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -481,9 +505,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 9.022092 + m_Target: 53.50349 speed: 2 - m_Value: 9.022092 + m_Value: 53.50349 m_Ortho: m_Target: 1 speed: 2 @@ -508,7 +532,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &6 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -543,7 +567,33 @@ MonoBehaviour: m_Palette: {fileID: 2339828753407120525, guid: 1b320396a14f42c4b9a291cb8d917020, type: 3} m_DrawGridGizmo: 1 m_DrawGizmos: 0 ---- !u!114 &7 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1504 + y: 0 + width: 752 + height: 1140.8 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 2} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -556,8 +606,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - {fileID: 10} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 @@ -567,8 +617,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 16395 ---- !u!114 &8 + controlID: 2293 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -589,12 +639,12 @@ MonoBehaviour: height: 446 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 9} + m_ActualView: {fileID: 11} m_Panes: - - {fileID: 9} + - {fileID: 11} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -625,9 +675,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 56e20000 - m_LastClickedID: 57942 - m_ExpandedIDs: 0463ffff8c63ffff6664fffff264ffff8065ffff0afbffff64e2000008e40000 + m_SelectedIDs: f8cf0000 + m_LastClickedID: 53240 + m_ExpandedIDs: 84c0ffff02c1ffffe2c2ffffeec2fffff8c2ffff04c3ffff26c3fffffec9ffff80caffff68ccffff74ccffff7eccffff8accffffacccffff9af7ffff0afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -643,7 +693,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 10} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -651,7 +701,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 27e94af659725fe46a2be14c6586193e ---- !u!114 &10 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -672,15 +722,15 @@ MonoBehaviour: height: 446 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 11} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 11} - - {fileID: 12} - {fileID: 13} - {fileID: 14} + - {fileID: 15} + - {fileID: 16} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &11 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -721,22 +771,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Sprites + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Sprites + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\ggasc\GitHub\ListJam2 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 27} - m_SelectedIDs: 0e620000 - m_LastClickedID: 25102 - m_ExpandedIDs: 000000000a6200000c6200000e62000010620000126200001462000016620000186200001a6200001c6200001e6200002062000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: c65e0000 + m_LastClickedID: 24262 + m_ExpandedIDs: 00000000b05e0000b25e0000b45e0000b65e0000b85e0000ba5e0000bc5e0000be5e0000c05e0000c25e0000c45e0000c65e0000c85e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -752,7 +802,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 12} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -764,7 +814,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000000a6200000c6200000e62000010620000126200001462000016620000186200001a6200001c6200001e6200002062000000ca9a3b + m_ExpandedIDs: 00000000b05e0000b25e0000b45e0000b65e0000b85e0000ba5e0000bc5e0000be5e0000c05e0000c25e0000c45e0000c65e0000c85e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -789,9 +839,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 56e20000 - m_LastClickedInstanceID: 57942 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: f8cf0000 + m_LastClickedInstanceID: 53240 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000a86c0000c2600000b6aa0000f25d0000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -808,7 +858,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 12} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -820,7 +870,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 129 ---- !u!114 &12 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -848,7 +898,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &13 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -878,8 +928,8 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 23360 ---- !u!114 &14 + m_LastSelectedObjectID: 23370 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -927,7 +977,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 4} + m_ClientGUIView: {fileID: 5} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1055,7 +1105,7 @@ MonoBehaviour: m_ShowReferencedBuses: 1 m_ShowBusConnections: 0 m_ShowBusConnectionsOfSelection: 0 ---- !u!114 &15 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1074,14 +1124,14 @@ MonoBehaviour: y: 0 width: 816 height: 1586.8 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 16} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &16 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1112,7 +1162,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 383 + m_CachedPref: -562 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 024ba43..fa10ca8 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 3072 height: 1636.8 m_ShowMode: 4 - m_Title: Project + m_Title: Hierarchy m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -109,7 +109,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 6} - - {fileID: 11} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 89 + controlID: 4694 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -134,7 +134,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 7} - - {fileID: 8} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 @@ -144,8 +144,33 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 90 + controlID: 4695 --- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 8} + - {fileID: 9} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 2256 + height: 1140.8 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 4672 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -162,18 +187,43 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2256 + width: 1504 height: 1140.8 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1504 + y: 0 + width: 752 + height: 1140.8 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 13} - - {fileID: 12} - {fileID: 14} m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &8 + m_LastSelected: 0 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -186,8 +236,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 10} + - {fileID: 11} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 @@ -197,8 +247,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 22 ---- !u!114 &9 + controlID: 4696 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -219,12 +269,12 @@ MonoBehaviour: height: 446 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 15} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -245,15 +295,15 @@ MonoBehaviour: height: 446 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 16} - - {fileID: 17} - {fileID: 18} - {fileID: 19} + - {fileID: 20} + - {fileID: 21} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &11 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -274,12 +324,12 @@ MonoBehaviour: height: 1586.8 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 22} m_Panes: - - {fileID: 20} + - {fileID: 22} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -299,9 +349,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 + x: 1504 y: 73.6 - width: 2255 + width: 750 height: 1119.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -313,7 +363,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 2818.75, y: 1373.5} + m_TargetSize: {x: 937.5, y: 527} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -322,16 +372,16 @@ MonoBehaviour: m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -1127.5 - m_HBaseRangeMax: 1127.5 - m_VBaseRangeMin: -549.4 - m_VBaseRangeMax: 549.4 + m_HBaseRangeMin: -375 + m_HBaseRangeMax: 375 + m_VBaseRangeMin: -210.8 + m_VBaseRangeMax: 210.8 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -349,29 +399,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 2255 + width: 750 height: 1098.8 m_Scale: {x: 1, y: 1} - m_Translation: {x: 1127.5, y: 549.4} + m_Translation: {x: 375, y: 549.4} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1127.5 + x: -375 y: -549.4 - width: 2255 + width: 750 height: 1098.8 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 2818.75, y: 1399.75} + m_LastWindowPixelSize: {x: 937.5, y: 1399.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &13 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -393,7 +443,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 2255 + width: 1503 height: 1119.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -513,7 +563,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 0 + displayed: 1 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -629,9 +679,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 36.62839, y: -5.2732716, z: 0.8353911} + m_Target: {x: 1, y: 0, z: 0} speed: 2 - m_Value: {x: 34.808437, y: -6.6015096, z: 0.85588425} + m_Value: {x: 1.0000015, y: 0.00000067124876, z: 0.0000000568926} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -682,9 +732,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 47.58983 + m_Target: 74.65253 speed: 2 - m_Value: 45.540504 + m_Value: 74.65253 m_Ortho: m_Target: 1 speed: 2 @@ -709,7 +759,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &14 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -744,7 +794,7 @@ MonoBehaviour: m_Palette: {fileID: 2339828753407120525, guid: 1b320396a14f42c4b9a291cb8d917020, type: 3} m_DrawGridGizmo: 1 m_DrawGizmos: 0 ---- !u!114 &15 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -775,9 +825,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 32600000 - m_LastClickedID: 0 - m_ExpandedIDs: a4f4ffff44f5ffffd4f5ffff44f7ffff0afbffff1a810000 + m_SelectedIDs: a4d00000 + m_LastClickedID: 53412 + m_ExpandedIDs: 84c0ffff02c1ffffe2c2ffffeec2fffff8c2ffff04c3ffff26c3fffffec9ffff80caffff68ccffff74ccffff7eccffff8accffffacccffff9af7ffff0afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -793,7 +843,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 11} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -801,7 +851,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 27e94af659725fe46a2be14c6586193e ---- !u!114 &16 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -842,22 +892,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Sprites + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Sprites + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\ggasc\GitHub\ListJam2 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: f65f0000 - m_LastClickedID: 24566 - m_ExpandedIDs: 00000000f25f0000f45f0000f65f0000f85f0000fa5f0000fc5f0000fe5f0000006000000260000004600000066000000860000000ca9a3b + m_SelectedIDs: c65e0000 + m_LastClickedID: 24262 + m_ExpandedIDs: 00000000b05e0000b25e0000b45e0000b65e0000b85e0000ba5e0000bc5e0000be5e0000c05e0000c25e0000c45e0000c65e0000c85e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -873,7 +923,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 12} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -885,7 +935,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f25f0000f45f0000f65f0000f85f0000fa5f0000fc5f0000fe5f00000060000002600000046000000660000008600000 + m_ExpandedIDs: 00000000b05e0000b25e0000b45e0000b65e0000b85e0000ba5e0000bc5e0000be5e0000c05e0000c25e0000c45e0000c65e0000c85e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -912,7 +962,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000a86c0000c2600000b6aa0000f25d0000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -929,7 +979,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 12} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -941,7 +991,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 129 ---- !u!114 &17 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -961,15 +1011,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 443.2 + x: 442.4 y: 1214.4 - width: 1817.2 + width: 1811.6 height: 425 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &18 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -999,8 +1049,8 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 63040 ---- !u!114 &19 + m_LastSelectedObjectID: 53240 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1048,7 +1098,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 7} + m_ClientGUIView: {fileID: 8} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1176,7 +1226,7 @@ MonoBehaviour: m_ShowReferencedBuses: 1 m_ShowBusConnections: 0 m_ShowBusConnectionsOfSelection: 0 ---- !u!114 &20 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1207,7 +1257,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 383 + m_CachedPref: -562 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1