diff --git a/Assets/Scenes/Level.unity b/Assets/Scenes/Level.unity index 0be3201e..18d22a88 100644 --- a/Assets/Scenes/Level.unity +++ b/Assets/Scenes/Level.unity @@ -11067,6 +11067,10 @@ PrefabInstance: propertyPath: weaponOverheatUI value: objectReference: {fileID: 1017782199} + - target: {fileID: 3823591937530358882, guid: a9df24e86a219ac458086842d36682f6, type: 3} + propertyPath: overheatIncreaseAmount + value: 15 + objectReference: {fileID: 0} - target: {fileID: 3970204813613353202, guid: a9df24e86a219ac458086842d36682f6, type: 3} propertyPath: screenShake value: diff --git a/Assets/Scriptable Objects/Player/PlayerData.cs b/Assets/Scriptable Objects/Player/PlayerData.cs index 496d0157..411c4f01 100644 --- a/Assets/Scriptable Objects/Player/PlayerData.cs +++ b/Assets/Scriptable Objects/Player/PlayerData.cs @@ -90,7 +90,7 @@ public void ResetPlayerStacks() weaponData[2].damage = 15; weaponData[3].damage = 15; weaponData[4].damage = 50; - weaponData[5].damage = 100; + weaponData[5].damage = 150; weaponData[6].damage = 50; } diff --git a/Assets/Scriptable Objects/Weapons/RPG.asset b/Assets/Scriptable Objects/Weapons/RPG.asset index 46c87035..2d5581d3 100644 --- a/Assets/Scriptable Objects/Weapons/RPG.asset +++ b/Assets/Scriptable Objects/Weapons/RPG.asset @@ -22,7 +22,7 @@ MonoBehaviour: weaponID: 5 bulletSpeed: 10 lifespan: 3 - damage: 100 + damage: 150 bulletPrefab: {fileID: 7942789937546522980, guid: a6f12fb2264106246bd48190cbe3ed3f, type: 3} attackSpeed: 1 multipleShoots: 0 diff --git a/Assets/Scriptable Objects/Weapons/Uzi.asset b/Assets/Scriptable Objects/Weapons/Uzi.asset index c86cc863..1edf8af2 100644 --- a/Assets/Scriptable Objects/Weapons/Uzi.asset +++ b/Assets/Scriptable Objects/Weapons/Uzi.asset @@ -22,7 +22,7 @@ MonoBehaviour: weaponID: 0 bulletSpeed: 20 lifespan: 3 - damage: 15 + damage: 200 bulletPrefab: {fileID: 7942789937546522980, guid: f0dd38f37e49c7849ad18429ca7bb8d9, type: 3} attackSpeed: 12.5 multipleShoots: 0 @@ -74,3 +74,4 @@ MonoBehaviour: empty: EmptyUzi loaded: ShootUzi cooldown: CooldownUzi + explosion: diff --git a/Assets/Scripts/Waves/WaveManager.cs b/Assets/Scripts/Waves/WaveManager.cs index 5acab7c4..919147de 100644 --- a/Assets/Scripts/Waves/WaveManager.cs +++ b/Assets/Scripts/Waves/WaveManager.cs @@ -66,6 +66,7 @@ public class WaveManager : MonoBehaviour private bool _canSpawn = true; private bool _nextWave = false; private bool _finishedWaves = false; + private bool _popUpActive = false; private void OnValidate() { @@ -101,6 +102,7 @@ private void Start() { ResetWaves(); ResetEnemiesValues(); + currentWaveIndex = 3; waveUI.ShowWaveText(waves[currentWaveIndex].waveIndex); } @@ -125,7 +127,14 @@ private void Update() { if (waves[currentWaveIndex].waveIndex == _maxWaves - Constants.ONE && !iAmInShop) { - ActivateShop(); + if (!_popUpActive) + { + if (!AudioManager.muteSFX) + { + audioManager.PlaySound(waveBegins); + } + ActivateShop(); + } return; } @@ -163,11 +172,6 @@ private void WaveUpdater() { if (currentWaveIndex + Constants.ONE != waves.Length && !playerData._isDead) { - if (!AudioManager.muteSFX) - { - audioManager.PlaySound(waveBegins); - } - SpawnNextWave(); } else @@ -196,8 +200,16 @@ private void SpawnNextWave() { abilities.DestroySlowers(); currentWaveIndex++; - shop.ActivatePopUp(); + if (waves[currentWaveIndex].waveIndex != _maxWaves - Constants.ONE - Constants.ROUNDS_BETWEEN_SHOPS && !_popUpActive) + { + if (!AudioManager.muteSFX) + { + audioManager.PlaySound(waveBegins); + } + shop.ActivatePopUp(); + } StartCoroutine(waveUI.ShowWaveUI(waves[currentWaveIndex].waveIndex)); + _popUpActive = false; _canSpawn = true; } @@ -235,10 +247,12 @@ private IEnumerator SpawnWaveCoroutine() /// private void ActivateShop() { + shop.ActivatePopUp(); basket.SetActive(true); door.SetActive(true); baoBasketIndicator.SetActive(true); + _popUpActive = true; StartCoroutine(WaitForBasketToFall()); } diff --git a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset index c38ea0fd..eb3d904d 100644 --- a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset +++ b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset @@ -24,7 +24,7 @@ MonoBehaviour: ParentPath: Virtual Acoustics\Default Work Unit guid: 4223a3686c4109478e7ed29528df1d47 GuidInternal: - m_lastTime: -8585009928231844858 + m_lastTime: -8585034087828136112 List: [] AuxBusWwu: - PhysicalPath: Master-Mixer Hierarchy\Default Work Unit.wwu @@ -38,7 +38,7 @@ MonoBehaviour: ParentPath: Master-Mixer Hierarchy\Default Work Unit guid: 575a9845c542444394dfd29888a832bf GuidInternal: - m_lastTime: -8585009928237854745 + m_lastTime: -8585034087829703651 List: - name: Master Audio Bus guid: d8a41415a61d2a41a17e75ca0c2149f3 @@ -66,7 +66,7 @@ MonoBehaviour: ParentPath: SoundBanks\Default Work Unit guid: 30beb28910178f449ebdc0bc6c1a585e GuidInternal: - m_lastTime: -8585009928231864794 + m_lastTime: -8585011844418850727 List: - name: main guid: 65504061b930a547a54895fa61c9e604 @@ -94,7 +94,7 @@ MonoBehaviour: ParentPath: Events\Default Work Unit guid: 3af410611e2c92469af731b5137fe77a GuidInternal: - m_lastTime: -8584921011380583309 + m_lastTime: -8584921816734801244 List: - name: BaoMumbling guid: 60681b47a562a94592542c31c0dcc178 @@ -1230,7 +1230,7 @@ MonoBehaviour: ParentPath: Game Parameters\Default Work Unit guid: e9be0c57c704234199bd1346d9c03688 GuidInternal: - m_lastTime: -8585009928240697791 + m_lastTime: -8585034087829167692 List: [] StateWwu: - PhysicalPath: States\Default Work Unit.wwu @@ -1244,7 +1244,7 @@ MonoBehaviour: ParentPath: States\Default Work Unit guid: 3591ab73d9acd6499536a6e724806059 GuidInternal: - m_lastTime: -8585009928231854829 + m_lastTime: -8585034087828676102 List: [] SwitchWwu: - PhysicalPath: Switches\Default Work Unit.wwu @@ -1258,7 +1258,7 @@ MonoBehaviour: ParentPath: Switches\Default Work Unit guid: 5740de960ece4f4f8122a79587657419 GuidInternal: - m_lastTime: -8585009928231854829 + m_lastTime: -8585012469004588718 List: - name: Weapons guid: 9fa804b76132a4498c0dbd29ca1d48cf @@ -1388,10 +1388,10 @@ MonoBehaviour: ParentPath: Triggers\Default Work Unit guid: 7c1c60d25133b4489627899fa0359356 GuidInternal: - m_lastTime: -8585009928231854829 + m_lastTime: -8585034087828296152 List: [] ExpandedFileSystemItemIds: - ExpandedWaapiItemIds: + ExpandedWaapiItemIds: 0500000006000000 AutoSyncSelection: 0 autoPopulateEnabled: 1 currentDataSource: 0 diff --git a/Project S_WwiseProject/Project S_WwiseProject.Nico.validationcache b/Project S_WwiseProject/Project S_WwiseProject.Nico.validationcache index a9fd0b3f..0ed39633 100644 --- a/Project S_WwiseProject/Project S_WwiseProject.Nico.validationcache +++ b/Project S_WwiseProject/Project S_WwiseProject.Nico.validationcache @@ -36,7 +36,7 @@ - + diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 4fd57e96..44710c86 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,19 +14,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 7} - - {fileID: 9} - - {fileID: 11} + - {fileID: 20} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1536 - height: 724 - m_MinSize: {x: 400, y: 100} - m_MaxSize: {x: 32384, y: 16192} + width: 2560 + height: 1307 + m_MinSize: {x: 400, y: 150} + m_MaxSize: {x: 32384, y: 24288} vertical: 0 - controlID: 6581 + controlID: 247 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -43,14 +41,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 443.6 - width: 725 - height: 331.4 + x: 1087 + y: 73 + width: 844 + height: 563 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -67,25 +65,25 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1380, y: 776} + m_TargetSize: {x: 1920, y: 1080} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 1 + m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 03000000000000000000000012000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -276 - m_HBaseRangeMax: 276 - m_VBaseRangeMin: -155.2 - m_VBaseRangeMax: 155.2 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -94,7 +92,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -103,26 +101,26 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 725 - height: 310.4 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 362.5, y: 155.2} + width: 844 + height: 542 + m_Scale: {x: 0.43958333, y: 0.4395833} + m_Translation: {x: 422, y: 271} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -362.5 - y: -155.2 - width: 725 - height: 310.4 + x: -960 + y: -616.4929 + width: 1920 + height: 1232.9858 m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1812.5, y: 828.5} + m_defaultScale: 0.43958333 + m_LastWindowPixelSize: {x: 844, y: 563} m_ClearInEditMode: 1 m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 00000000000000000000 + m_LowResolutionForAspectRatios: 01000001000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} --- !u!114 &3 @@ -139,18 +137,44 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 6} + - {fileID: 16} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 726 - height: 724 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 8096, y: 16192} + width: 1933 + height: 1307 + m_MinSize: {x: 300, y: 150} + m_MaxSize: {x: 24288, y: 24288} vertical: 1 - controlID: 6471 + controlID: 248 --- !u!114 &4 +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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 5} + - {fileID: 7} + - {fileID: 12} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1933 + height: 876 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 249 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -160,6 +184,120 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneHierarchyWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 364 + height: 876 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 6} + m_Panes: + - {fileID: 6} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &6 +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: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 73 + width: 363 + height: 855 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: e4620000 + m_LastClickedID: 25316 + m_ExpandedIDs: 5af3ffff28faffffc85e0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 5} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !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: 10} + m_Position: + serializedVersion: 2 + x: 364 + y: 0 + width: 723 + height: 876 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 178 +--- !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: SceneView m_EditorClassIdentifier: m_Children: [] @@ -167,16 +305,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 726 - height: 371.6 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 5} + width: 723 + height: 584 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 9} m_Panes: - - {fileID: 5} + - {fileID: 9} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &5 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -192,14 +330,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 72 - width: 725 - height: 350.6 + x: 364 + y: 73 + width: 721 + height: 563 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -214,8 +352,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -164.39996, y: -26.399994} + snapOffset: {x: -171, y: -26} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings index: 0 @@ -240,7 +378,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -266,7 +404,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar @@ -292,9 +430,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 86} + snapOffset: {x: -166.5, y: 86} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 1 id: Orientation index: 0 layout: 4 @@ -309,7 +447,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Light Settings - index: 2 + index: 1 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -322,7 +460,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Camera - index: 1 + index: 3 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -435,9 +573,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 0 - snapOffset: {x: 0, y: 0} + snapOffset: {x: -231, y: -197} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 3 id: Scene View/Particles index: 8 layout: 4 @@ -477,8 +615,8 @@ MonoBehaviour: snapOffset: {x: 48, y: 48} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 - id: Scene View/Open Tile Palette - index: 0 + id: APV Overlay + index: 8 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -490,8 +628,8 @@ MonoBehaviour: snapOffset: {x: 48, y: 48} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 - id: Scene View/Tilemap Focus - index: 1 + id: Scene View/TrailRenderer + index: 9 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -503,8 +641,8 @@ MonoBehaviour: snapOffset: {x: 48, y: 48} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 - id: Scene View/Path - index: 9 + id: Scene View/Open Tile Palette + index: 0 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -516,14 +654,53 @@ MonoBehaviour: snapOffset: {x: 48, y: 48} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 - id: Scene View/TrailRenderer + id: Scene View/Tilemap Focus + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Path index: 10 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 + - dockPosition: 0 + containerId: Floating + floating: 1 + collapsed: 0 + displayed: 1 + snapOffset: {x: -207, y: -242} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: AINavigationOverlay + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: Floating + floating: 1 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 488} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: UnityEditor.SceneViewCameraOverlay + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 m_OverlaysVisible: 1 - m_WindowGUID: 1a3558e5e5b93324b912da4be6f57188 - m_Gizmos: 1 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 0 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 @@ -532,9 +709,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0, y: 0, z: 0} + m_Target: {x: 2.0976079, y: -2.5772557, z: -4.1075916} speed: 2 - m_Value: {x: 0, y: 0, z: 0} + m_Value: {x: 2.0976079, y: -2.5772557, z: -4.1075916} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -567,7 +744,7 @@ MonoBehaviour: m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} + m_Size: {x: 0.03125, y: 0.03125} zGrid: m_Fade: m_Target: 0 @@ -575,18 +752,18 @@ MonoBehaviour: m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} + m_Size: {x: 0.03125, y: 0.03125} m_ShowGrid: 1 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Target: {x: -0.012394393, y: -0.09233219, z: -0.00031802332, w: -0.99597955} speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Value: {x: -0.01239034, y: -0.092302, z: -0.00031791933, w: -0.99565387} m_Size: - m_Target: 10 + m_Target: 6.6031456 speed: 2 - m_Value: 10 + m_Value: 6.6031456 m_Ortho: m_Target: 0 speed: 2 @@ -594,7 +771,7 @@ MonoBehaviour: m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 - m_SpeedMin: 0.01 + m_SpeedMin: 0.001 m_SpeedMax: 2 m_EasingEnabled: 1 m_EasingDuration: 0.4 @@ -604,14 +781,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} + m_LastSceneViewRotation: {x: -0.016809914, y: 0.0035758289, z: -0.00067934627, w: -1.0001522} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &6 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -619,7 +796,95 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: AnimationWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 584 + width: 723 + height: 292 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 11} + m_Panes: + - {fileID: 11} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &11 +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: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 364 + y: 657 + width: 721 + height: 271 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: 25316 +--- !u!114 &12 +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: 13} + - {fileID: 14} + m_Position: + serializedVersion: 2 + x: 1087 + y: 0 + width: 846 + height: 876 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 250 +--- !u!114 &13 +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: @@ -627,17 +892,17 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 371.6 - width: 726 - height: 352.4 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + y: 0 + width: 846 + height: 584 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &7 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -645,25 +910,25 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: AnimatorControllerTool m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 726 - y: 0 - width: 246.40002 - height: 724 - m_MinSize: {x: 202, y: 221} + x: 0 + y: 584 + width: 846 + height: 292 + m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 8} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 8} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &8 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -671,22 +936,22 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} + m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Animator + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 726 - y: 72 - width: 244.40002 - height: 703 + x: 1087 + y: 657 + width: 844 + height: 271 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -697,36 +962,638 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 5269ffffeefaffff - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 50f221d01d8e598439f4d1594d3d9f2a ---- !u!114 &9 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -7033000290652573980, guid: 65a8ae57b4ab4e7429d73ccbb820ec22, type: 2} + - {fileID: 4641914535537663786, guid: ed597511c5a6f73479cf0cc804918712, type: 2} + - {fileID: 3306769209393565994, guid: f106bcf611182f94b9533193d6544258, type: 2} + - {fileID: 8774817063455454423, guid: c4a4bb3fd5b2fa84d92a6166a80b639e, type: 2} + - {fileID: 4758404313144723451, guid: 01ca0b0b0c6eb7646b9c28f28ebfa85a, type: 2} + - {fileID: -7410855038549236657, guid: 8bffe805e396ffa4ba7e6d2da71c4064, type: 2} + - {fileID: 9051729873383795813, guid: 8a978e35090dc5f4b9fb47e3a18a2b8c, type: 2} + - {fileID: 4043277181223996794, guid: ec7c39cd4c7e4f64e87a10bd43327e63, type: 2} + - {fileID: -5155485087148787094, guid: a217ecc13d45c904a951bc29390547ed, type: 2} + - {fileID: -3243983784349269495, guid: 6fe117e7d06413748a8de934f2ba1e00, type: 2} + - {fileID: 7786551714773084055, guid: c48c5dc587440cd47b3172496fbc19f1, type: 2} + - {fileID: 3493740433870847218, guid: c10ab44114345c147b8a602300441e2f, type: 2} + - {fileID: -5144340586658434559, guid: 421d93db606d61f4081c81d5c0099b11, type: 2} + - {fileID: 3755178220496260011, guid: 62fd44aa62a511b45a77268cabad07bf, type: 2} + - {fileID: 3813360846869388487, guid: 1d1d6d9ab6d76834b98ef1672f0b2a66, type: 2} + - {fileID: -3110844519216310337, guid: 5ed79bc512a4dfe4a9eda8ef8855dbb7, type: 2} + - {fileID: -933801481945268232, guid: 0c61fa4bb4cb4d042b622a11af255bf8, type: 2} + - {fileID: 1055211501971022826, guid: 39a65890d34fd9b4a931006828068c41, type: 2} + - {fileID: 9063102734696491957, guid: 388c48248ed68c74d9a6c9f30146bee0, type: 2} + - {fileID: 2952461019672238873, guid: 4dfcfefbff922194bb77ba112274981e, type: 2} + - {fileID: -6662084014091117153, guid: 5fca47ddace55164aad170783da5216b, type: 2} + - {fileID: -693096745471988302, guid: f1201169697d3c84eb80c0500c4bb279, type: 2} + - {fileID: -6928981918812101487, guid: 61f5edd5d375dc84d9b6e5219c8e4760, type: 2} + - {fileID: -1994567303651951483, guid: 4b1dd6b710736a74bad0d0eee69ed6f5, type: 2} + - {fileID: 2037594438145681937, guid: f53580113ac20d245930caa5047cccd5, type: 2} + - {fileID: 3909917162604790413, guid: 45ca7b380b7c81b4ba87b7693701d17c, type: 2} + - {fileID: 8578941822248607552, guid: 0289c96297d22b745b65c5f2a8aefaec, type: 2} + - {fileID: 6224656476640442610, guid: 16832a925b731754ba60d6dfe5955406, type: 2} + - {fileID: 4793148883747633037, guid: 7233b7c010e0a2346880bbf17da24f87, type: 2} + - {fileID: -5577608960647806616, guid: 98423ddf71332e242b0d99cefa4e454b, type: 2} + - {fileID: -8882137031773911083, guid: 3b43f53014b9724498b61e4e32e6fa07, type: 2} + - {fileID: 3103438983051699549, guid: eb80f7b2c1ee5354cb6a6c972acdfaa0, type: 2} + - {fileID: -2774519622627185806, guid: a505fb1c0321f34408704c7c70fab0f4, type: 2} + - {fileID: 923267752711907670, guid: 5736ebb868acb7d4fad508702ac17f41, type: 2} + - {fileID: -1395988216334669037, guid: aea92a6628268084aa6fcbe49e9f0772, type: 2} + - {fileID: -1863141510750316235, guid: 4afb3c8fe5872b94eb536ce315d477a1, type: 2} + m_ValueSerializationHelper: + - e00: 0.54329896 + e01: 0 + e02: 0 + e03: -1.2989502 + e10: 0 + e11: 0.54329896 + e12: 0 + e13: 20.922684 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 38.336838 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5610526 + e01: 0 + e02: 0 + e03: -13.052612 + e10: 0 + e11: 0.5610526 + e12: 0 + e13: 5.6473694 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5610526 + e01: 0 + e02: 0 + e03: -13.052612 + e10: 0 + e11: 0.5610526 + e12: 0 + e13: 33.7 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.53939396 + e01: 0 + e02: 0 + e03: 41.606056 + e10: 0 + e11: 0.53939396 + e12: 0 + e13: 115.77272 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5610526 + e01: 0 + e02: 0 + e03: -13.052612 + e10: 0 + e11: 0.5610526 + e12: 0 + e13: 39.310528 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.38225806 + e01: 0 + e02: 0 + e03: 106.74194 + e10: 0 + e11: 0.38225806 + e12: 0 + e13: 20.435486 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5610526 + e01: 0 + e02: 0 + e03: 63.94737 + e10: 0 + e11: 0.5610526 + e12: 0 + e13: 95.700005 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.49894738 + e01: 0 + e02: 0 + e03: -9.947388 + e10: 0 + e11: 0.49894738 + e12: 0 + e13: 73.58948 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 32.789474 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 41.110527 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 21.694733 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: aea92a6628268084aa6fcbe49e9f0772, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -1395988216334669037, guid: aea92a6628268084aa6fcbe49e9f0772, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -736,23 +1603,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 972.4 - y: 0 - width: 208 - height: 724 - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_ActualView: {fileID: 10} + x: 0 + y: 876 + width: 1933 + height: 431 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 10} + - {fileID: 17} + - {fileID: 18} + - {fileID: 19} m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &10 + m_LastSelected: 1 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -768,14 +1637,14 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 972.4 - y: 72 - width: 206 - height: 703 + x: 0 + y: 949 + width: 1932 + height: 410 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -797,7 +1666,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scriptable Objects/Boss + - Assets m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -805,17 +1674,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scriptable Objects/Boss + - Assets m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\facus\OneDrive\Escritorio\Desarrollo de videojuegos - 3\Desarrollo3 + m_LastProjectPath: C:\Users\Nico\Desktop\Project S m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 88d10100 - m_LastClickedID: 119176 - m_ExpandedIDs: 000000005c7700005e77000060770000dc770000e277000000ca9a3b + scrollPos: {x: 0, y: 79} + m_SelectedIDs: 66790000 + m_LastClickedID: 31078 + m_ExpandedIDs: 0000000066790000687900006a7900006c7900006e79000070790000727900007479000076790000787900007a7900007c7900007e79000080790000827900008479000086790000887900008a7900008c7900008e79000090790000927900009479000096790000987900009a7900009c7900009e790000a079000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -843,7 +1711,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005c7700005e77000060770000dc77000000ca9a3b + m_ExpandedIDs: 0000000066790000687900006a7900006c7900006e79000070790000727900007479000076790000787900007a7900007c7900007e79000080790000827900008479000086790000887900008a7900008c7900008e79000090790000927900009479000096790000987900009a7900009c7900009e790000a0790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -868,10 +1736,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: b0580000 - m_LastClickedInstanceID: 22704 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: + m_SelectedInstanceIDs: e4620000 + m_LastClickedInstanceID: 25316 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000286100003e62000086640000ee6300008e6400006e6e00006e8600004835010000000000ae6b0000fc6a000044a30300f66a0000c26f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -887,7 +1755,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 16} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -898,8 +1766,8 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 115 ---- !u!114 &11 + m_DirectoriesAreaWidth: 207 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -908,24 +1776,115 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 949 + width: 1932 + height: 410 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 +--- !u!114 &19 +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: 11500000, guid: 7f982e2eb67f0ab48a50411f92eacf0d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Wwise Picker + m_Image: {fileID: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 949 + width: 1931 + height: 410 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_treeViewState: + scrollPos: {x: 0, y: 720} + m_SelectedIDs: 40000000 + m_LastClickedID: 64 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 16} + m_SearchString: +--- !u!114 &20 +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: InspectorWindow + m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1180.4 + x: 1933 y: 0 - width: 355.59998 - height: 724 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 12} + width: 627 + height: 1307 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 12} + - {fileID: 21} + - {fileID: 22} m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &12 + m_LastSelected: 1 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -941,14 +1900,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1180.4 - y: 72 - width: 354.59998 - height: 703 + x: 1933 + y: 73 + width: 626 + height: 1286 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -962,13 +1921,47 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: -160 + m_CachedPref: 394 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 22704 + m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} +--- !u!114 &22 +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: 12079, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 390, y: 390} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Lighting + m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1933 + y: 73 + width: 626 + height: 1286 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index d0e13aad..f5b54c0d 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -8,22 +8,22 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 43 - width: 2560 - height: 1357 - m_ShowMode: 4 - m_Title: Console - m_RootView: {fileID: 7} - m_MinSize: {x: 875, y: 300} - m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + x: 760 + y: 349 + width: 640 + height: 601 + m_ShowMode: 0 + m_Title: Build Settings + m_RootView: {fileID: 4} + m_MinSize: {x: 640, y: 601} + m_MaxSize: {x: 4000, y: 4021} + m_Maximized: 0 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -32,50 +32,23 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimatorControllerTool + m_EditorHideFlags: 1 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] - m_Position: + m_PixelRect: serializedVersion: 2 x: 0 - y: 584 - width: 845 - height: 292 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 21} - m_Panes: - - {fileID: 21} - m_Selected: 0 - m_LastSelected: 0 + y: 43 + width: 2560 + height: 1357 + m_ShowMode: 4 + m_Title: Hierarchy + m_RootView: {fileID: 5} + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_Maximized: 1 --- !u!114 &3 -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: 6} - - {fileID: 2} - m_Position: - serializedVersion: 2 - x: 1087 - y: 0 - width: 845 - height: 876 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 5251 ---- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -85,23 +58,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimationWindow + m_Name: BuildPlayerWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 584 - width: 723 - height: 292 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} + y: 0 + width: 640 + height: 601 + m_MinSize: {x: 640, y: 601} + m_MaxSize: {x: 4000, y: 4021} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &5 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -114,45 +87,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 14} - - {fileID: 4} - m_Position: - serializedVersion: 2 - x: 364 - y: 0 - width: 723 - height: 876 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 1283 ---- !u!114 &6 -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: [] + - {fileID: 3} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 845 - height: 584 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 17} - m_Panes: - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &7 + width: 640 + height: 601 + m_MinSize: {x: 640, y: 601} + m_MaxSize: {x: 4000, y: 4021} + vertical: 0 + controlID: 244 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -165,9 +111,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 6} - {fileID: 8} - - {fileID: 10} - - {fileID: 9} + - {fileID: 7} m_Position: serializedVersion: 2 x: 0 @@ -180,7 +126,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &8 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -202,7 +148,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &9 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -223,7 +169,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &10 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -236,8 +182,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 11} - - {fileID: 16} + - {fileID: 9} + - {fileID: 19} m_Position: serializedVersion: 2 x: 0 @@ -247,8 +193,8 @@ MonoBehaviour: m_MinSize: {x: 400, y: 150} m_MaxSize: {x: 32384, y: 24288} vertical: 0 - controlID: 210 ---- !u!114 &11 + controlID: 223 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -261,19 +207,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 12} - - {fileID: 15} + - {fileID: 10} + - {fileID: 18} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1932 + width: 1933 height: 1307 m_MinSize: {x: 300, y: 150} m_MaxSize: {x: 24288, y: 24288} vertical: 1 - controlID: 973 ---- !u!114 &12 + controlID: 137 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -286,20 +232,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 13} - - {fileID: 5} - - {fileID: 3} + - {fileID: 11} + - {fileID: 12} + - {fileID: 15} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1932 + width: 1933 height: 876 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 974 ---- !u!114 &13 + controlID: 138 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -320,12 +266,37 @@ MonoBehaviour: height: 876 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 22} m_Panes: - - {fileID: 18} + - {fileID: 22} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &14 +--- !u!114 &12 +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: 13} + - {fileID: 14} + m_Position: + serializedVersion: 2 + x: 364 + y: 0 + width: 723 + height: 876 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 67 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -346,12 +317,12 @@ MonoBehaviour: height: 584 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 19} + - {fileID: 21} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &15 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -359,26 +330,49 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: AnimationWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 876 - width: 1932 - height: 431 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} + y: 584 + width: 723 + height: 292 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 23} m_Panes: - - {fileID: 22} - {fileID: 23} - - {fileID: 24} - m_Selected: 1 + m_Selected: 0 m_LastSelected: 0 +--- !u!114 &15 +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: 16} + - {fileID: 17} + m_Position: + serializedVersion: 2 + x: 1087 + y: 0 + width: 846 + height: 876 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 139 --- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 @@ -387,26 +381,79 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1932 + x: 0 y: 0 - width: 628 - height: 1307 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + width: 846 + height: 584 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 24} + m_Panes: + - {fileID: 24} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &17 +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: AnimatorControllerTool + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 584 + width: 846 + height: 292 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 25} m_Panes: - {fileID: 25} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &18 +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: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 876 + width: 1933 + height: 431 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 26} + m_Panes: - {fileID: 26} + - {fileID: 27} + - {fileID: 28} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &17 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -415,96 +462,25 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: InspectorWindow m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: + m_Children: [] + m_Position: serializedVersion: 2 - x: 1087 - y: 73 - width: 843 - height: 563 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 03000000000000000000000012000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -540 - m_VBaseRangeMax: 540 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 843 - height: 542 - m_Scale: {x: 0.4390625, y: 0.4390625} - m_Translation: {x: 421.5, y: 271} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -960 - y: -617.2242 - width: 1920 - height: 1234.4484 - m_MinimalGUI: 1 - m_defaultScale: 0.4390625 - m_LastWindowPixelSize: {x: 843, y: 563} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000001000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} ---- !u!114 &18 + x: 1933 + y: 0 + width: 627 + height: 1307 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 29} + m_Panes: + - {fileID: 29} + - {fileID: 30} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -512,22 +488,22 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} + m_MinSize: {x: 640, y: 580} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Build Settings + m_Image: {fileID: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 73 - width: 363 - height: 855 + x: 760 + y: 349 + width: 640 + height: 580 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -538,36 +514,29 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: ec6f0000 - m_LastClickedID: 28652 - m_ExpandedIDs: dafafffffe6e0000ec6f00002e780000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 13} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &19 + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -962,9 +931,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.8515396, y: -9.934439, z: 214.68307} + m_Target: {x: -11.12018, y: 5.3038254, z: -1.4376562} speed: 2 - m_Value: {x: -4.8515396, y: -9.934439, z: 214.68307} + m_Value: {x: -11.12018, y: 5.3038254, z: -1.4376562} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1010,13 +979,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.009385701, y: -0.105763584, z: -0.00021004827, w: -0.99466115} + m_Target: {x: -0.012394393, y: -0.09233219, z: -0.00031802332, w: -0.99597955} speed: 2 - m_Value: {x: -0.009382769, y: -0.10573055, z: -0.00020998265, w: -0.9943505} + m_Value: {x: -0.012394392, y: -0.09233219, z: -0.00031802332, w: -0.99597955} m_Size: - m_Target: 148.88211 + m_Target: 6.3187995 speed: 2 - m_Value: 148.88211 + m_Value: 6.3187995 m_Ortho: m_Target: 0 speed: 2 @@ -1041,7 +1010,70 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &20 +--- !u!114 &22 +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: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 73 + width: 363 + height: 855 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: e4cfffff42d0ffff7ad2ffffa8d2ffffccd2ffff2ce3ffff94e3ffff00e5ffff2ef9ffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 11} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1077,8 +1109,106 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 28652 ---- !u!114 &21 + m_LastSelectedObjectID: 194018 +--- !u!114 &24 +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: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1087 + y: 73 + width: 844 + height: 563 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 03000000000000000000000012000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 844 + height: 542 + m_Scale: {x: 0.43958333, y: 0.4395833} + m_Translation: {x: 422, y: 271} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -960 + y: -616.4929 + width: 1920 + height: 1232.9858 + m_MinimalGUI: 1 + m_defaultScale: 0.43958333 + m_LastWindowPixelSize: {x: 844, y: 563} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000001000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &25 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1100,7 +1230,7 @@ MonoBehaviour: serializedVersion: 2 x: 1087 y: 657 - width: 843 + width: 844 height: 271 m_SerializedDataModeController: m_DataMode: 0 @@ -1136,15 +1266,27 @@ MonoBehaviour: - {fileID: 2952461019672238873, guid: 4dfcfefbff922194bb77ba112274981e, type: 2} - {fileID: -6662084014091117153, guid: 5fca47ddace55164aad170783da5216b, type: 2} - {fileID: -693096745471988302, guid: f1201169697d3c84eb80c0500c4bb279, type: 2} + - {fileID: -6928981918812101487, guid: 61f5edd5d375dc84d9b6e5219c8e4760, type: 2} + - {fileID: -1994567303651951483, guid: 4b1dd6b710736a74bad0d0eee69ed6f5, type: 2} + - {fileID: 2037594438145681937, guid: f53580113ac20d245930caa5047cccd5, type: 2} + - {fileID: 3909917162604790413, guid: 45ca7b380b7c81b4ba87b7693701d17c, type: 2} + - {fileID: 8578941822248607552, guid: 0289c96297d22b745b65c5f2a8aefaec, type: 2} + - {fileID: 6224656476640442610, guid: 16832a925b731754ba60d6dfe5955406, type: 2} + - {fileID: 4793148883747633037, guid: 7233b7c010e0a2346880bbf17da24f87, type: 2} + - {fileID: -5577608960647806616, guid: 98423ddf71332e242b0d99cefa4e454b, type: 2} + - {fileID: -8882137031773911083, guid: 3b43f53014b9724498b61e4e32e6fa07, type: 2} + - {fileID: 3103438983051699549, guid: eb80f7b2c1ee5354cb6a6c972acdfaa0, type: 2} + - {fileID: -2774519622627185806, guid: a505fb1c0321f34408704c7c70fab0f4, type: 2} + - {fileID: 923267752711907670, guid: 5736ebb868acb7d4fad508702ac17f41, type: 2} m_ValueSerializationHelper: - - e00: 0.46451613 + - e00: 0.54329896 e01: 0 e02: 0 - e03: 42.274185 + e03: -1.2989502 e10: 0 - e11: 0.46451613 + e11: 0.54329896 e12: 0 - e13: 5.7096786 + e13: 20.922684 e20: 0 e21: 0 e22: 1 @@ -1153,14 +1295,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.5610526 + - e00: 0.55473685 e01: 0 e02: 0 - e03: -13.052612 + e03: -12.736847 e10: 0 - e11: 0.5610526 + e11: 0.55473685 e12: 0 - e13: 31.7 + e13: 63.3 e20: 0 e21: 0 e22: 1 @@ -1169,14 +1311,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.49894738 + - e00: 0.55473685 e01: 0 e02: 0 - e03: -9.947388 + e03: -12.736847 e10: 0 - e11: 0.49894738 + e11: 0.55473685 e12: 0 - e13: 46.14737 + e13: 38.336838 e20: 0 e21: 0 e22: 1 @@ -1217,14 +1359,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.5610526 + - e00: 0.55473685 e01: 0 e02: 0 - e03: -13.052612 + e03: -12.736847 e10: 0 - e11: 0.5610526 + e11: 0.55473685 e12: 0 - e13: 33.7 + e13: 63.3 e20: 0 e21: 0 e22: 1 @@ -1297,14 +1439,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.49894738 + - e00: 0.55473685 e01: 0 e02: 0 - e03: -9.947388 + e03: -12.736847 e10: 0 - e11: 0.49894738 + e11: 0.55473685 e12: 0 - e13: 68.6 + e13: 63.3 e20: 0 e21: 0 e22: 1 @@ -1313,14 +1455,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.5610526 + - e00: 0.55473685 e01: 0 e02: 0 - e03: -13.052612 + e03: -12.736847 e10: 0 - e11: 0.5610526 + e11: 0.55473685 e12: 0 - e13: 33.7 + e13: 63.3 e20: 0 e21: 0 e22: 1 @@ -1329,14 +1471,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.49894738 + - e00: 0.55473685 e01: 0 e02: 0 - e03: -9.947388 + e03: -12.736847 e10: 0 - e11: 0.49894738 + e11: 0.55473685 e12: 0 - e13: 73.58948 + e13: 68.84737 e20: 0 e21: 0 e22: 1 @@ -1345,14 +1487,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.5610526 + - e00: 0.55473685 e01: 0 e02: 0 - e03: -13.052612 + e03: -12.736847 e10: 0 - e11: 0.5610526 + e11: 0.55473685 e12: 0 - e13: 31.7 + e13: 63.3 e20: 0 e21: 0 e22: 1 @@ -1377,14 +1519,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.5610526 + - e00: 0.55473685 e01: 0 e02: 0 - e03: -13.052612 + e03: -12.736847 e10: 0 - e11: 0.5610526 + e11: 0.55473685 e12: 0 - e13: 37.310528 + e13: 63.3 e20: 0 e21: 0 e22: 1 @@ -1393,14 +1535,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.49894738 + - e00: 0.55473685 e01: 0 e02: 0 - e03: -9.947388 + e03: -12.736847 e10: 0 - e11: 0.49894738 + e11: 0.55473685 e12: 0 - e13: 73.58948 + e13: 68.84737 e20: 0 e21: 0 e22: 1 @@ -1409,14 +1551,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.49894738 + - e00: 0.55473685 e01: 0 e02: 0 - e03: -9.947388 + e03: -12.736847 e10: 0 - e11: 0.49894738 + e11: 0.55473685 e12: 0 - e13: 68.6 + e13: 63.3 e20: 0 e21: 0 e22: 1 @@ -1441,14 +1583,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.49894738 + - e00: 0.55473685 e01: 0 e02: 0 - e03: -9.947388 + e03: -12.736847 e10: 0 - e11: 0.49894738 + e11: 0.55473685 e12: 0 - e13: 73.58948 + e13: 63.3 e20: 0 e21: 0 e22: 1 @@ -1457,14 +1599,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.49894738 + - e00: 0.55473685 e01: 0 e02: 0 - e03: -9.947388 + e03: -12.736847 e10: 0 - e11: 0.49894738 + e11: 0.55473685 e12: 0 - e13: 68.6 + e13: 63.3 e20: 0 e21: 0 e22: 1 @@ -1473,14 +1615,206 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.49894738 + - e00: 0.55473685 e01: 0 e02: 0 - e03: -9.947388 + e03: -12.736847 e10: 0 - e11: 0.49894738 + e11: 0.55473685 e12: 0 - e13: 73.58948 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 32.789474 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 63.3 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 68.84737 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 41.110527 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.55473685 + e01: 0 + e02: 0 + e03: -12.736847 + e10: 0 + e11: 0.55473685 + e12: 0 + e13: 21.694733 e20: 0 e21: 0 e22: 1 @@ -1490,9 +1824,9 @@ MonoBehaviour: e32: 0 e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 421d93db606d61f4081c81d5c0099b11, type: 2} + m_AnimatorController: {fileID: 9100000, guid: 5736ebb868acb7d4fad508702ac17f41, type: 2} m_BreadCrumbs: - - m_Target: {fileID: -5144340586658434559, guid: 421d93db606d61f4081c81d5c0099b11, type: 2} + - m_Target: {fileID: 923267752711907670, guid: 5736ebb868acb7d4fad508702ac17f41, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} @@ -1505,7 +1839,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &22 +--- !u!114 &26 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1527,7 +1861,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 949 - width: 1931 + width: 1932 height: 410 m_SerializedDataModeController: m_DataMode: 0 @@ -1565,9 +1899,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 79} - m_SelectedIDs: 988a0000 - m_LastClickedID: 35480 - m_ExpandedIDs: 00000000988a00009a8a00009c8a00009e8a0000a08a0000a28a0000a48a0000a68a0000a88a0000aa8a0000ac8a0000ae8a0000b08a0000b28a0000b48a0000b68a00005c8b000000ca9a3bffffff7f + m_SelectedIDs: b2790000 + m_LastClickedID: 31154 + m_ExpandedIDs: 00000000b2790000b4790000b6790000b8790000ba790000bc790000be790000c0790000c2790000c4790000c6790000c8790000ca790000cc790000ce790000d0790000d2790000d4790000d6790000d8790000da790000dc790000de790000e0790000e2790000e4790000e6790000e8790000ea790000ec79000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1595,7 +1929,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000988a00009a8a00009c8a00009e8a0000a08a0000a28a0000a48a0000a68a0000a88a0000aa8a0000ac8a0000ae8a0000b08a0000b28a0000b48a0000b68a0000 + m_ExpandedIDs: 00000000b2790000b4790000b6790000b8790000ba790000bc790000be790000c0790000c2790000c4790000c6790000c8790000ca790000cc790000ce790000d0790000d2790000d4790000d6790000d8790000da790000dc790000de790000e0790000e2790000e4790000e6790000e8790000ea790000ec790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1622,8 +1956,8 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000e4810000286100003e62000086640000ee6300008e6400006e6e00006e8600004835010000000000ae6b0000fc6a000044a30300f66a0000 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c6230000286100003e62000086640000ee6300008e6400006e6e00006e8600004835010000000000ae6b0000fc6a000044a30300f66a0000c26f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1639,7 +1973,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 15} + m_ClientGUIView: {fileID: 18} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1651,7 +1985,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &23 +--- !u!114 &27 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1673,7 +2007,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 949 - width: 1931 + width: 1932 height: 410 m_SerializedDataModeController: m_DataMode: 0 @@ -1685,7 +2019,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &24 +--- !u!114 &28 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1739,9 +2073,9 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 15} + m_ClientGUIView: {fileID: 18} m_SearchString: ---- !u!114 &25 +--- !u!114 &29 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1761,9 +2095,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1932 + x: 1933 y: 73 - width: 627 + width: 626 height: 1286 m_SerializedDataModeController: m_DataMode: 0 @@ -1788,7 +2122,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &26 +--- !u!114 &30 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1808,9 +2142,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1985 + x: 1933 y: 73 - width: 574 + width: 626 height: 1286 m_SerializedDataModeController: m_DataMode: 0