diff --git a/Assets/MainCanvasScript.cs b/Assets/MainCanvasScript.cs index f250996..7db08b4 100644 --- a/Assets/MainCanvasScript.cs +++ b/Assets/MainCanvasScript.cs @@ -5,6 +5,7 @@ public class MainCanvasScript : MonoBehaviour { [SerializeField] private GameObject _obj; + [SerializeField] private GameObject pausePanel; void Start() { @@ -12,6 +13,7 @@ void Start() { _obj.SetActive(true); gameObject.SetActive(false); + pausePanel.SetActive(true); Time.timeScale = 1; PlayerPrefs.SetInt("destroy", 0); } diff --git a/Assets/TimeScaleFactorMenu.cs b/Assets/TimeScaleFactorMenu.cs index 498a85e..e623943 100644 --- a/Assets/TimeScaleFactorMenu.cs +++ b/Assets/TimeScaleFactorMenu.cs @@ -1,10 +1,11 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; public class TimeScaleFactorMenu : MonoBehaviour { - private void Start() + // AnesVijay: изменил Start на OnEnable, чтобы время останавливалось не только на первой заставке, но и при возникновении экрана паузы (чтобы игра на фоне не шла) + private void OnEnable() { Time.timeScale = 0; } diff --git a/Assets/_Game/Scenes/GameScene.unity b/Assets/_Game/Scenes/GameScene.unity index c820c88..045c8a9 100644 --- a/Assets/_Game/Scenes/GameScene.unity +++ b/Assets/_Game/Scenes/GameScene.unity @@ -824,6 +824,83 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8ce08dbc076252f4b88ae51b57f46d24, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &376525403 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 376525404} + - component: {fileID: 376525406} + - component: {fileID: 376525405} + m_Layer: 5 + m_Name: PauseButton_panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &376525404 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376525403} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 556466633} + m_Father: {fileID: 741547132} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 131.16486, y: -124} + m_SizeDelta: {x: 262.3297, y: 248} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &376525405 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376525403} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &376525406 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376525403} + m_CullTransparentMesh: 1 --- !u!1 &395845782 GameObject: m_ObjectHideFlags: 0 @@ -1518,13 +1595,14 @@ GameObject: - component: {fileID: 556466636} - component: {fileID: 556466635} - component: {fileID: 556466634} + - component: {fileID: 556466638} m_Layer: 5 m_Name: PauseButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &556466633 RectTransform: m_ObjectHideFlags: 0 @@ -1532,13 +1610,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 556466632} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 741547132} - m_RootOrder: 1 + m_Father: {fileID: 376525404} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1625,30 +1703,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 2034160953} - m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine - m_MethodName: set_enabled - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 2034160952} - m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine - m_MethodName: set_enabled - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 --- !u!114 &556466636 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1687,6 +1741,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 556466632} m_CullTransparentMesh: 1 +--- !u!114 &556466638 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 556466632} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2034160952} + m_TargetAssemblyTypeName: FlyControlling, Assembly-CSharp + m_MethodName: ChangePauseButtonToPressed + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 2034160953} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &595044269 GameObject: m_ObjectHideFlags: 0 @@ -1817,6 +1912,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _obj: {fileID: 1004120374} + pausePanel: {fileID: 376525403} --- !u!1 &676747202 GameObject: m_ObjectHideFlags: 0 @@ -1938,6 +2034,30 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 828766194} + m_TargetAssemblyTypeName: TimeScaleFactorMenu, Assembly-CSharp + m_MethodName: DoScaleFactorMagic + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 2034160952} + m_TargetAssemblyTypeName: FlyControlling, Assembly-CSharp + m_MethodName: ChangePauseButtonToUnpressed + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &676747206 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2225,8 +2345,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1387215902} - - {fileID: 556466633} - {fileID: 1004120375} + - {fileID: 376525404} - {fileID: 828766193} - {fileID: 987121519} m_Father: {fileID: 0} @@ -2456,6 +2576,7 @@ GameObject: - component: {fileID: 828766193} - component: {fileID: 828766192} - component: {fileID: 828766191} + - component: {fileID: 828766194} m_Layer: 5 m_Name: PausePanel m_TagString: Untagged @@ -2525,6 +2646,18 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 900, y: 1250} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &828766194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 828766190} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e2cd92cc99a9c484490f0870292c8641, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &857164341 GameObject: m_ObjectHideFlags: 0 @@ -2681,7 +2814,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 - - m_Target: {fileID: 556466632} + - m_Target: {fileID: 376525403} m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_MethodName: SetActive m_Mode: 6 @@ -3294,7 +3427,7 @@ RectTransform: m_Children: - {fileID: 2006875039} m_Father: {fileID: 741547132} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/_Game/Scripts/CheckLanding.cs b/Assets/_Game/Scripts/CheckLanding.cs index 2607c1d..0bfcf25 100644 --- a/Assets/_Game/Scripts/CheckLanding.cs +++ b/Assets/_Game/Scripts/CheckLanding.cs @@ -27,7 +27,11 @@ public void OnWin(GameObject collider) //startPos.position = transform.position; gameObject.GetComponent().enabled = true; Debug.Log(gameObject.GetComponent().ToString()); + + // AnesVijay: 32 строку трогать не стал, добавил 33-ю, чтобы двойной прыжок перезаряжался при приземлении в тостер. + // Также переменную isDoubleJumpPressed сделал публичной, чтобы тут так можно было пробросить gameObject.GetComponent().enabled = false; + gameObject.GetComponent().isDoubleJumpPressed = false; //if (!collider.Equals(PrevCollider)) //PlanesGenerator.GenerateNextPanel(); //PrevCollider = collider; diff --git a/Assets/_Game/Scripts/FlyControlling.cs b/Assets/_Game/Scripts/FlyControlling.cs index a2963c6..f35b820 100644 --- a/Assets/_Game/Scripts/FlyControlling.cs +++ b/Assets/_Game/Scripts/FlyControlling.cs @@ -1,17 +1,20 @@ -using System; +using System; using TMPro; using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; public class FlyControlling : MonoBehaviour { private Rigidbody physics; - private bool isDoubleJumpPressed = false; + public bool isDoubleJumpPressed; private float startTime; private const float MAX_TIME = 5; + private bool pausePressed; + private void Start() { physics = gameObject.GetComponent(); @@ -19,9 +22,22 @@ private void Start() private void OnEnable() { + isDoubleJumpPressed = false; } + // AnesVijay: ChangePauseButtonToPressed и ChangePauseButtonToUnpressed нужны для того, чтобы не срабатывал двойной прыжок при нажатии на паузу, + // переменная pausePressed служит для этого флагом + public void ChangePauseButtonToPressed() + { + pausePressed = true; + } + + public void ChangePauseButtonToUnpressed() + { + pausePressed = false; + } + void Update() { //bool phonePress = Input.touchCount > 0 && (Input.GetTouch(0).phase == TouchPhase.Moved || Input.GetTouch(0).phase == TouchPhase.Stationary); @@ -31,7 +47,7 @@ void Update() //} bool phonePress = Input.touchCount > 0 && Input.GetTouch(0).phase == TouchPhase.Began; - if ((phonePress || Input.GetMouseButtonDown(0)) && !isDoubleJumpPressed) + if ((phonePress || Input.GetMouseButtonDown(0)) && !isDoubleJumpPressed && !pausePressed) { if(physics.velocity.y < 0) physics.velocity = new Vector3(physics.velocity.x, 0f, physics.velocity.z); diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 1a69e15..480606e 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,18 +14,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 11} - - {fileID: 16} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1536 - height: 722.8 + width: 1920 + height: 947 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 48414 + controlID: -1 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -42,22 +41,20 @@ 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: 73.6 - width: 277.4 - height: 440.6 + x: 855 + y: 113 + width: 438 + height: 666 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_SerializedViewNames: - - UnityEditor.DeviceSimulation.SimulatorWindow - m_SerializedViewValues: - - C:\Users\lexke\Documents\Unity3d Projects\BubbleBalls\Library\PlayModeViewStates\5779b17a44acda8468e9c170d96e746e + m_SerializedViewNames: [] + m_SerializedViewValues: [] m_PlayModeViewName: GameView m_ShowGizmos: 0 m_TargetDisplay: 0 @@ -71,16 +68,16 @@ MonoBehaviour: m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 0c000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 07000000000000000000000005000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -432 - m_HBaseRangeMax: 432 - m_VBaseRangeMin: -768 - m_VBaseRangeMax: 768 + m_HBaseRangeMin: -540 + m_HBaseRangeMax: 540 + m_VBaseRangeMin: -960 + m_VBaseRangeMax: 960 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -89,7 +86,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 @@ -98,26 +95,26 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 277.4 - height: 419.6 - m_Scale: {x: 0.2731771, y: 0.2731771} - m_Translation: {x: 138.7, y: 209.8} + width: 438 + height: 645 + m_Scale: {x: 0.3359375, y: 0.3359375} + m_Translation: {x: 219, y: 322.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -507.72925 - y: -768 - width: 1015.4585 - height: 1536 + x: -651.907 + y: -960 + width: 1303.814 + height: 1920 m_MinimalGUI: 1 - m_defaultScale: 0.2731771 - m_LastWindowPixelSize: {x: 346.75, y: 550.75} + m_defaultScale: 0.3359375 + m_LastWindowPixelSize: {x: 438, y: 666} m_ClearInEditMode: 1 m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 00000000000000000000 + m_LowResolutionForAspectRatios: 01000001000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} --- !u!114 &3 @@ -128,23 +125,23 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 + m_EditorHideFlags: 1 m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 9} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 921.6 - height: 722.8 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} + width: 1551 + height: 947 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 48415 + controlID: -1 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -153,23 +150,24 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 + m_EditorHideFlags: 1 m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: - {fileID: 5} - - {fileID: 6} + - {fileID: 7} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 921.6 - height: 461.6 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 8096} + width: 1551 + height: 687 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 48416 + controlID: -1 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -178,52 +176,25 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 + m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 278.4 - height: 461.6 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 2} + width: 855 + height: 687 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 6} m_Panes: - - {fileID: 2} + - {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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 278.4 - y: 0 - width: 643.19995 - height: 461.6 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 7} - m_Panes: - - {fileID: 7} - - {fileID: 8} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -243,10 +214,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 278.4 - y: 73.6 - width: 641.19995 - height: 440.6 + x: 0 + y: 113 + width: 854 + height: 666 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -256,8 +227,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -100, y: -25.600006} - snapOffsetDelta: {x: 0, y: 0} + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -101, y: -26} snapCorner: 3 id: Tool Settings index: 0 @@ -273,16 +244,16 @@ MonoBehaviour: id: unity-grid-and-snap-toolbar index: 1 layout: 1 - - dockPosition: 1 + - dockPosition: 0 containerId: overlay-toolbar__top floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 24.8} + snapOffset: {x: 242, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar - index: 0 + index: 2 layout: 1 - dockPosition: 1 containerId: overlay-toolbar__top @@ -293,19 +264,30 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-search-toolbar - index: 1 + index: 0 layout: 1 - dockPosition: 0 containerId: overlay-container--left floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 24.8} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar index: 0 layout: 2 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 - dockPosition: 0 containerId: overlay-container--right floating: 0 @@ -438,7 +420,29 @@ MonoBehaviour: id: Scene View/Particles index: 10 layout: 4 - m_WindowGUID: 080f4d7f41c627c4da656bcd682a34fc + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 @@ -448,9 +452,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -69.88758, y: 7.5466027, z: -0.18165529} + m_Target: {x: 506.29037, y: 979.458, z: 637.5001} speed: 2 - m_Value: {x: -69.88758, y: 7.5466027, z: -0.18165529} + m_Value: {x: 506.29037, y: 979.458, z: 637.5001} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -497,21 +501,21 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.0653553, y: 0.9268231, z: -0.31653777, w: 0.19146504} + m_Target: {x: 0.015310205, y: 0.0014955673, z: -0.00002272297, w: 0.99989045} speed: 2 - m_Value: {x: 0.06582585, y: 0.9264759, z: -0.31641924, w: 0.19284278} + m_Value: {x: 0.015310071, y: 0.0014955542, z: -0.000022722772, w: 0.99988174} m_Size: - m_Target: 0.79666394 + m_Target: 1213.8341 speed: 2 - m_Value: 0.76235783 + m_Value: 1213.8341 m_Ortho: m_Target: 0 speed: 2 m_Value: 0 m_CameraSettings: - m_Speed: 1 - m_SpeedNormalized: 0.5 - m_SpeedMin: 0.01 + m_Speed: 2 + m_SpeedNormalized: 1 + m_SpeedMin: 0.001 m_SpeedMax: 2 m_EasingEnabled: 1 m_EasingDuration: 0.4 @@ -521,13 +525,39 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: -0.039173484, y: 0.9582835, z: -0.16135234, w: -0.23268099} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 +--- !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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 855 + y: 0 + width: 440 + height: 687 + 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 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -537,62 +567,81 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneHierarchyWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1295 + y: 0 + width: 256 + height: 687 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 9} + m_Panes: + - {fileID: 9} + 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: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} + m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 324.80002 - y: 73.6 - width: 594.8 - height: 491.8 + x: 1295 + y: 113 + width: 254 + height: 666 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: -7517176506569565803, guid: 057d2d3bdcb1d264c93583c56305612c, type: 2} - m_ValueSerializationHelper: - - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - 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: 057d2d3bdcb1d264c93583c56305612c, type: 2} - m_BreadCrumbs: - - m_Target: {fileID: -7517176506569565803, guid: 057d2d3bdcb1d264c93583c56305612c, 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: 0 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &9 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 326c0000 + m_LastClickedID: 0 + m_ExpandedIDs: 92fffeff200dffffd831ffff7c36ffff30fbffff726a0000e26a00006a6b0000f8e80000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: EventSystem + m_OriginalName: EventSystem + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 27350 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 0 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 8} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -600,7 +649,7 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 + m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: ProjectBrowser m_EditorClassIdentifier: @@ -608,17 +657,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 461.6 - width: 921.6 - height: 261.19998 + y: 687 + width: 1551 + height: 260 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 10} + m_ActualView: {fileID: 11} m_Panes: - - {fileID: 10} + - {fileID: 11} + - {fileID: 12} m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &10 + m_LastSelected: 1 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -639,9 +689,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 535.2 - width: 920.6 - height: 240.19998 + y: 800 + width: 1550 + height: 239 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -659,22 +709,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/_Game/prefabs m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/_Game/prefabs m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\lexke\Documents\Unity3d Projects\gameJamVK + m_LastProjectPath: D:\GitHubRepositories\gameJamVK m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 6a700000 - m_LastClickedID: 28778 - m_ExpandedIDs: 00000000ba6e0000bc6e0000be6e0000e6870000f087000000ca9a3b + scrollPos: {x: 0, y: 76} + m_SelectedIDs: 80730000 + m_LastClickedID: 29568 + m_ExpandedIDs: 00000000c4710000c6710000807300008473000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -702,7 +752,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000ba6e0000bc6e0000be6e0000e6870000f087000000ca9a3b + m_ExpandedIDs: 00000000c4710000c6710000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -727,26 +777,26 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: d4defaffccdefaff - m_LastClickedInstanceID: -336172 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: 2a630000ea6f00003c77000000000000e45b0000985c0000 + m_SelectedInstanceIDs: 326c0000 + m_LastClickedInstanceID: 27698 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: SettingsPanel + m_OriginalName: SettingsPanel m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 29676 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -757,59 +807,8 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 167.40002 ---- !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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 12} - - {fileID: 14} - m_Position: - serializedVersion: 2 - x: 921.6 - y: 0 - width: 262.40002 - height: 722.8 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 48347 + m_DirectoriesAreaWidth: 207 --- !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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneHierarchyWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 262.40002 - height: 360.8 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 13} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -818,89 +817,6 @@ MonoBehaviour: 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: 921.60004 - y: 73.6 - width: 260.40002 - height: 339.8 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: d4defaffccdefaff - m_LastClickedID: -336180 - m_ExpandedIDs: dcdefaffe4defaff1a8ffcffce8ffcffd68ffcffe48ffcff3090fcfffa90fcffeca3fcffb4b3fcff9ab9fcffc8bafcffa4e5fcff00e7fcff82e8fcffda12fdff0a14fdff5037fdff5c37fdffd839fdffced9feff2adafeff86dafefff2dafeff6adcfeff74dcfeffdaddfeffe4ddfeff82dffeffb0dffeff5ee0feff52e1feff1444fffff644ffff8655ffffb855ffffc055ffff9056ffff9856ffffa656ffffea56fffff056ffff0457ffff0c57ffffdc57ffffe457fffff257ffff0658ffff0e58ffff9658ffff9e58ffffac58ffffd458ffffdc58fffff858fffffe58ffffe459ffff625bfffff25cffff505dffff329affff28a4ffffc6a4ffff10a5ffff4eaeffff6aafffffdcb6ffff26b7ffff74b7ffffd8b7ffff96baffff96d0ffff9cd0ffffb8d0ffffbed0ffff28d1ffff2ed1ffff98d2ffffa8d7fffff0d7ffffc2e7ffff10e8ffff9ce8ffff0cf1ffff5cf1ffff22f3ffff98f5ffffbcf5ffff36f7ffff64f8ffff6cf8ffff48f9ffff2efbffff32fbfffff4fffffff2590000f6590000fe590000385a00004a5a00000e6100002261000034610000d0640000e4640000f6640000466500004a650000526500008c6500009e650000fe680000026900000a690000446900004a69000056690000106a00001c6b0000906b0000d66b00001a6c0000266c00002e6c0000686c00007a6c0000fc6d00000e6e00001a6e0000266e00002e6e0000706e0000826e00005c7900006e7900006e7c0000807c0000127f00002a7f0000327f00007c7f00008e7f0000568d0000688d00009ad00000dad00000be920100a6b40100fad00100d0d101007cd301009cd3010024f301005af30100200702007c690300c4690300 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: PlayerToast - m_OriginalName: PlayerToast - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: -336164 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 0 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 12} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 29c0cd2cbe51e564ba7a5805b772ccda ---- !u!114 &14 -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: ConsoleWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 360.8 - width: 262.40002 - height: 362 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - 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: 12003, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: @@ -912,15 +828,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 921.60004 - y: 434.4 - width: 260.40002 - height: 341 + x: 0 + y: 800 + width: 1550 + height: 239 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &16 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -935,18 +851,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1184 + x: 1551 y: 0 - width: 352 - height: 722.8 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + width: 369 + height: 947 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 17} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &17 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -962,14 +878,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: 1184 - y: 73.6 - width: 351 - height: 701.8 + x: 1551 + y: 113 + width: 368 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -977,7 +893,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: -160 + m_CachedPref: 228 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1