From e1fbf04542ab37ef29fecdd0b9b0c14f4989cd0a Mon Sep 17 00:00:00 2001 From: RohithKannan <51419779+RohithKKannan@users.noreply.github.com> Date: Tue, 4 Apr 2023 14:14:11 +0530 Subject: [PATCH] Added two player game controls --- Assets/Prefabs/Player/BluePlayer.prefab | 3 +- Assets/Prefabs/Player/RedPlayer.prefab | 3 +- Assets/Scenes/Levels/Level1.unity | 1 + Assets/Scenes/Levels/Level2.unity | 9 + Assets/Scenes/Levels/Level3.unity | 8 + Assets/Scenes/Levels/Level4.unity | 8 + Assets/Scenes/Levels/Level5.unity | 8 + Assets/Scenes/MainMenu.unity | 551 ++++++++- Assets/Scripts/GameManager.cs | 31 +- Assets/Scripts/LevelManager.cs | 13 + Assets/Scripts/LobbyController.cs | 32 + Assets/Scripts/PlayerController.cs | 38 +- Assets/Scripts/TutorialText.cs | 8 + UserSettings/EditorUserSettings.asset | 18 +- .../Layouts/CurrentMaximizeLayout.dwlt | 70 +- UserSettings/Layouts/default-2021.dwlt | 1091 +---------------- 16 files changed, 775 insertions(+), 1117 deletions(-) diff --git a/Assets/Prefabs/Player/BluePlayer.prefab b/Assets/Prefabs/Player/BluePlayer.prefab index 48c7842..c16936e 100644 --- a/Assets/Prefabs/Player/BluePlayer.prefab +++ b/Assets/Prefabs/Player/BluePlayer.prefab @@ -137,7 +137,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 45fbc8a0caa91db4881fe19c9cdb8471, type: 3} m_Name: m_EditorClassIdentifier: - jumpHeight: 20 + jumpHeight: 22 speed: 7 distance: 1 groundLayer: @@ -145,6 +145,7 @@ MonoBehaviour: m_Bits: 64 ballType: 0 lightComponent: {fileID: 3528554601288459327} + gameManager: {fileID: 0} --- !u!1 &3528554601288459313 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player/RedPlayer.prefab b/Assets/Prefabs/Player/RedPlayer.prefab index 9742a16..5e95b1b 100644 --- a/Assets/Prefabs/Player/RedPlayer.prefab +++ b/Assets/Prefabs/Player/RedPlayer.prefab @@ -247,7 +247,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 45fbc8a0caa91db4881fe19c9cdb8471, type: 3} m_Name: m_EditorClassIdentifier: - jumpHeight: 20 + jumpHeight: 22 speed: 7 distance: 1 groundLayer: @@ -255,3 +255,4 @@ MonoBehaviour: m_Bits: 64 ballType: 1 lightComponent: {fileID: 4114858133504657459} + gameManager: {fileID: 0} diff --git a/Assets/Scenes/Levels/Level1.unity b/Assets/Scenes/Levels/Level1.unity index 6321961..cdde836 100644 --- a/Assets/Scenes/Levels/Level1.unity +++ b/Assets/Scenes/Levels/Level1.unity @@ -12752,6 +12752,7 @@ MonoBehaviour: m_EditorClassIdentifier: timeBetweenChars: 0.1 timeAfterText: 3 + firstLevel: 1 --- !u!1 &1757397730 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Levels/Level2.unity b/Assets/Scenes/Levels/Level2.unity index ea7c23d..f9d9332 100644 --- a/Assets/Scenes/Levels/Level2.unity +++ b/Assets/Scenes/Levels/Level2.unity @@ -294,6 +294,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3} + propertyPath: jumpHeight + value: 20 + objectReference: {fileID: 0} - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3} propertyPath: gameManager value: @@ -11965,6 +11969,7 @@ MonoBehaviour: m_EditorClassIdentifier: timeBetweenChars: 0.05 timeAfterText: 3 + firstLevel: 0 --- !u!1 &1407298145 GameObject: m_ObjectHideFlags: 0 @@ -13338,6 +13343,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3} + propertyPath: jumpHeight + value: 20 + objectReference: {fileID: 0} - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3} propertyPath: gameManager value: diff --git a/Assets/Scenes/Levels/Level3.unity b/Assets/Scenes/Levels/Level3.unity index 4d9211b..900d8c8 100644 --- a/Assets/Scenes/Levels/Level3.unity +++ b/Assets/Scenes/Levels/Level3.unity @@ -294,6 +294,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3} + propertyPath: jumpHeight + value: 20 + objectReference: {fileID: 0} - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3} propertyPath: gameManager value: @@ -13379,6 +13383,10 @@ PrefabInstance: propertyPath: m_Name value: BluePlayer objectReference: {fileID: 0} + - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3} + propertyPath: jumpHeight + value: 20 + objectReference: {fileID: 0} - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3} propertyPath: gameManager value: diff --git a/Assets/Scenes/Levels/Level4.unity b/Assets/Scenes/Levels/Level4.unity index 8707388..7d62d21 100644 --- a/Assets/Scenes/Levels/Level4.unity +++ b/Assets/Scenes/Levels/Level4.unity @@ -294,6 +294,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3} + propertyPath: jumpHeight + value: 20 + objectReference: {fileID: 0} - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3} propertyPath: gameManager value: @@ -13762,6 +13766,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3} + propertyPath: jumpHeight + value: 20 + objectReference: {fileID: 0} - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3} propertyPath: gameManager value: diff --git a/Assets/Scenes/Levels/Level5.unity b/Assets/Scenes/Levels/Level5.unity index fad9a27..38b2d2a 100644 --- a/Assets/Scenes/Levels/Level5.unity +++ b/Assets/Scenes/Levels/Level5.unity @@ -294,6 +294,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3} + propertyPath: jumpHeight + value: 20 + objectReference: {fileID: 0} - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3} propertyPath: gameManager value: @@ -15781,6 +15785,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3} + propertyPath: jumpHeight + value: 20 + objectReference: {fileID: 0} - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3} propertyPath: gameManager value: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 03e4db5..8d1c522 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -806,6 +806,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 296397963} m_CullTransparentMesh: 1 +--- !u!1 &371286123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 371286124} + - component: {fileID: 371286126} + - component: {fileID: 371286125} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &371286124 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371286123} + 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: 1600334453} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &371286125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371286123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Two Player + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 1d5eae42ef8f478458264215cc978ab1, type: 2} + m_sharedMaterial: {fileID: -8576749230410582768, guid: 1d5eae42ef8f478458264215cc978ab1, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &371286126 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371286123} + m_CullTransparentMesh: 1 --- !u!1 &394033985 GameObject: m_ObjectHideFlags: 0 @@ -1463,7 +1598,7 @@ RectTransform: - {fileID: 1804071033} - {fileID: 2032600557} m_Father: {fileID: 1858516767} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2237,6 +2372,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2d4deda6ac1a69a42ac99b0a38bcdcaf, type: 3} m_Name: m_EditorClassIdentifier: + playerControl: 0 --- !u!4 &775470519 Transform: m_ObjectHideFlags: 0 @@ -11268,6 +11404,8 @@ MonoBehaviour: soundText: {fileID: 728989207} animator: {fileID: 1036503590} titleAnimator: {fileID: 732701562} + onePlayer: {fileID: 1342976246} + twoPlayer: {fileID: 1600334455} --- !u!95 &1036503590 Animator: serializedVersion: 4 @@ -12060,6 +12198,275 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1304556704} m_CullTransparentMesh: 1 +--- !u!1 &1310800441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1310800442} + - component: {fileID: 1310800444} + - component: {fileID: 1310800443} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1310800442 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1310800441} + 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: 1342976244} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1310800443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1310800441} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: One Player + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 1d5eae42ef8f478458264215cc978ab1, type: 2} + m_sharedMaterial: {fileID: -8576749230410582768, guid: 1d5eae42ef8f478458264215cc978ab1, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1310800444 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1310800441} + m_CullTransparentMesh: 1 +--- !u!1 &1342976243 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1342976244} + - component: {fileID: 1342976247} + - component: {fileID: 1342976246} + - component: {fileID: 1342976245} + m_Layer: 5 + m_Name: 1P + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1342976244 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1342976243} + 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: 1310800442} + m_Father: {fileID: 1858516767} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -100, y: -75} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1342976245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1342976243} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1342976246} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1036503589} + m_TargetAssemblyTypeName: LobbyController, Assembly-CSharp + m_MethodName: SelectOnePlayer + 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 &1342976246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1342976243} + 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: 1} + 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: 21300000, guid: 0800cc9d4da0323489f4d25c65194aa5, type: 3} + m_Type: 0 + 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 &1342976247 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1342976243} + m_CullTransparentMesh: 1 --- !u!1 &1424896388 GameObject: m_ObjectHideFlags: 0 @@ -12777,6 +13184,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1591175600} m_CullTransparentMesh: 1 +--- !u!1 &1600334452 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1600334453} + - component: {fileID: 1600334456} + - component: {fileID: 1600334455} + - component: {fileID: 1600334454} + m_Layer: 5 + m_Name: 2P + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1600334453 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600334452} + 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: 371286124} + m_Father: {fileID: 1858516767} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 100, y: -75} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1600334454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600334452} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1600334455} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1036503589} + m_TargetAssemblyTypeName: LobbyController, Assembly-CSharp + m_MethodName: SelectTwoPlayer + 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 &1600334455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600334452} + m_Enabled: 0 + 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: 1} + 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: 21300000, guid: 0800cc9d4da0323489f4d25c65194aa5, type: 3} + m_Type: 0 + 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 &1600334456 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600334452} + m_CullTransparentMesh: 1 --- !u!1 &1608195756 GameObject: m_ObjectHideFlags: 0 @@ -12811,11 +13352,11 @@ RectTransform: m_Children: - {fileID: 2045258057} m_Father: {fileID: 1858516767} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -80} + m_AnchoredPosition: {x: 0, y: -120} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1608195758 @@ -13454,6 +13995,8 @@ RectTransform: m_Children: - {fileID: 1448896245} - {fileID: 420594649} + - {fileID: 1342976244} + - {fileID: 1600334453} - {fileID: 1608195757} - {fileID: 502193824} - {fileID: 2139858775} @@ -14528,7 +15071,7 @@ RectTransform: - {fileID: 1304556705} - {fileID: 619579470} m_Father: {fileID: 1858516767} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index b67f81f..2e61add 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -20,7 +20,10 @@ public class GameManager : MonoBehaviour int coins; void Start() { - PlayerSelect(BallType.BlueBall); + if (LevelManager.Instance.playerControl == PlayerControl.singlePlayer) + { + PlayerSelect(BallType.BlueBall); + } coins = 0; SetCoinCount(); } @@ -80,15 +83,18 @@ public void PlayerFinished(BallType ballType) AudioManager.Instance.PlaySound(SoundType.FinishLevel); return; } - if (BlueFinished) - { - PlayerSelect(BallType.RedBall); - noSwitching = true; - } - else + if (LevelManager.Instance.playerControl == PlayerControl.singlePlayer) { - PlayerSelect(BallType.BlueBall); - noSwitching = true; + if (BlueFinished) + { + PlayerSelect(BallType.RedBall); + noSwitching = true; + } + else + { + PlayerSelect(BallType.BlueBall); + noSwitching = true; + } } } [ContextMenu("Switch Player")] @@ -104,9 +110,12 @@ void SwitchPlayer() } void Update() { - if (Input.GetKeyDown(KeyCode.Space)) + if (LevelManager.Instance.playerControl == PlayerControl.singlePlayer) { - SwitchPlayer(); + if (Input.GetKeyDown(KeyCode.Space)) + { + SwitchPlayer(); + } } } public void PauseGame() diff --git a/Assets/Scripts/LevelManager.cs b/Assets/Scripts/LevelManager.cs index 2609be9..3579199 100644 --- a/Assets/Scripts/LevelManager.cs +++ b/Assets/Scripts/LevelManager.cs @@ -4,8 +4,13 @@ public enum LevelStatus { locked, unlocked, completed } +public enum PlayerControl +{ + singlePlayer, twoPlayer +} public class LevelManager : MonoBehaviour { + public PlayerControl playerControl; private static LevelManager instance = null; public static LevelManager Instance { get { return instance; } } private void Awake() @@ -23,6 +28,7 @@ private void Awake() } private void Start() { + playerControl = PlayerControl.singlePlayer; if (GetLevelStatus(0) == LevelStatus.locked) SetLevelStatus(0, LevelStatus.unlocked); if (GetLevelStatus(1) == LevelStatus.locked) @@ -90,4 +96,11 @@ public void QuitGame() Application.Quit(); AudioManager.Instance.PlaySound(SoundType.ButtonClick); } + public void SwitchPlayerControl() + { + if (playerControl == PlayerControl.singlePlayer) + playerControl = PlayerControl.twoPlayer; + else + playerControl = PlayerControl.singlePlayer; + } } diff --git a/Assets/Scripts/LobbyController.cs b/Assets/Scripts/LobbyController.cs index 3fda165..95232bf 100644 --- a/Assets/Scripts/LobbyController.cs +++ b/Assets/Scripts/LobbyController.cs @@ -1,5 +1,6 @@ using UnityEngine; using System.Collections; +using UnityEngine.UI; using TMPro; public class LobbyController : MonoBehaviour { @@ -10,10 +11,23 @@ public class LobbyController : MonoBehaviour [SerializeField] private TMP_Text soundText; [SerializeField] private Animator animator; [SerializeField] private Animator titleAnimator; + [SerializeField] private Image onePlayer; + [SerializeField] private Image twoPlayer; + private float musicVol; float effectsVol; void Start() { + if (LevelManager.Instance.playerControl == PlayerControl.singlePlayer) + { + onePlayer.enabled = true; + twoPlayer.enabled = false; + } + else + { + onePlayer.enabled = false; + twoPlayer.enabled = true; + } musicVol = AudioManager.Instance.GetMusicVolume() * 10; effectsVol = AudioManager.Instance.GetSfxVolume() * 10; UpdateEffectsVolText(); @@ -99,4 +113,22 @@ IEnumerator TitleLoopAnim() titleAnimator.SetTrigger("StartLoop"); AudioManager.Instance.PlaySound(SoundType.MenuMusic); } + public void SelectOnePlayer() + { + if (LevelManager.Instance.playerControl == PlayerControl.twoPlayer) + { + LevelManager.Instance.SwitchPlayerControl(); + onePlayer.enabled = true; + twoPlayer.enabled = false; + } + } + public void SelectTwoPlayer() + { + if (LevelManager.Instance.playerControl == PlayerControl.singlePlayer) + { + LevelManager.Instance.SwitchPlayerControl(); + onePlayer.enabled = false; + twoPlayer.enabled = true; + } + } } diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 3b5e639..50417c1 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -2,7 +2,7 @@ using UnityEngine.Rendering.Universal; public class PlayerController : MonoBehaviour { - [SerializeField] private float jumpHeight = 5f; + [SerializeField] private float jumpHeight = 22f; [SerializeField] private float speed = 5f; [SerializeField] private float distance = 0.4f; [SerializeField] private LayerMask groundLayer; @@ -20,10 +20,42 @@ void Start() void Update() { isGrounded = Physics2D.Raycast(transform.position, Vector2.down, distance, groundLayer); + if (LevelManager.Instance.playerControl == PlayerControl.twoPlayer) + { + if (ballType == BallType.BlueBall) + { + if (Input.GetKey(KeyCode.A)) + horizontal = -1f; + else if (Input.GetKey(KeyCode.D)) + horizontal = 1f; + else + horizontal = 0f; - horizontal = Input.GetAxisRaw("Horizontal"); - vertical = Input.GetAxisRaw("Vertical"); + if (Input.GetKeyDown(KeyCode.W)) + vertical = 1f; + else + vertical = 0f; + } + else if (ballType == BallType.RedBall) + { + if (Input.GetKey(KeyCode.LeftArrow)) + horizontal = -1f; + else if (Input.GetKey(KeyCode.RightArrow)) + horizontal = 1f; + else + horizontal = 0f; + if (Input.GetKeyDown(KeyCode.UpArrow)) + vertical = 1f; + else + vertical = 0f; + } + } + else + { + horizontal = Input.GetAxisRaw("Horizontal"); + vertical = Input.GetAxisRaw("Vertical"); + } if (vertical == 1f && isGrounded) { AudioManager.Instance.PlaySound(SoundType.Jump); diff --git a/Assets/Scripts/TutorialText.cs b/Assets/Scripts/TutorialText.cs index 2a78748..603b937 100644 --- a/Assets/Scripts/TutorialText.cs +++ b/Assets/Scripts/TutorialText.cs @@ -8,9 +8,17 @@ public class TutorialText : MonoBehaviour private int maxVisibleCount; [SerializeField] private float timeBetweenChars = 0.1f; [SerializeField] private float timeAfterText = 3f; + [SerializeField] private bool firstLevel = false; void Start() { tutorialText = GetComponent(); + if (firstLevel) + { + if (LevelManager.Instance.playerControl == PlayerControl.singlePlayer) + tutorialText.text = "WASD to move\nSPACE to switch between Aqua and Flamo"; + else + tutorialText.text = "WASD to move Aqua\nArrow keys to move Flamo"; + } maxCount = tutorialText.text.Length; tutorialText.maxVisibleCharacters = 0; maxVisibleCount = 0; diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index a79bd60..5f5dfae 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,31 +6,31 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 5b50050751575f0f5b57542315720944424f1c7c2f2c70342b7a1862e4b8306a + value: 5452000555020c0f5f08097546715c44174e41292e2974367f2a1c35e4b3326b flags: 0 RecentlyUsedSceneGuid-1: - value: 5452000555020c0f5f08097546715c44174e41292e2974367f2a1c35e4b3326b + value: 060356045204085d0b0a597544775e44134f4a7d2a2a24632f2f196be0b0353c flags: 0 RecentlyUsedSceneGuid-2: - value: 060356045204085d0b0a597544775e44134f4a7d2a2a24632f2f196be0b0353c + value: 0000510004010b0e5c0d097a12720f444416407b782d7f672c7b4e61b3e6653c flags: 0 RecentlyUsedSceneGuid-3: - value: 5a57525f550c5f5d0f08557545740d44424f482f2d7d25637f7d4a31e0b8323e + value: 505752055607590a59575a7547730b4445164d29297173622c7f196bbbe4323c flags: 0 RecentlyUsedSceneGuid-4: - value: 5b53565e51065c0f0f5f082347765a444f4f1a792e7a7268282d4c32b4b26368 + value: 5a57525f550c5f5d0f08557545740d44424f482f2d7d25637f7d4a31e0b8323e flags: 0 RecentlyUsedSceneGuid-5: - value: 5a06515e51565d5a580f5f7143270a441016482f287c7e357d7c4a62e0e3633e + value: 5101520257560d09545d5a26477b0d44124e49727f702460292c1b62e4b2316c flags: 0 RecentlyUsedSceneGuid-6: - value: 5101520257560d09545d5a26477b0d44124e49727f702460292c1b62e4b2316c + value: 5a06515e51565d5a580f5f7143270a441016482f287c7e357d7c4a62e0e3633e flags: 0 RecentlyUsedSceneGuid-7: - value: 505752055607590a59575a7547730b4445164d29297173622c7f196bbbe4323c + value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 RecentlyUsedSceneGuid-8: - value: 0000510004010b0e5c0d097a12720f444416407b782d7f672c7b4e61b3e6653c + value: 5b53565e51065c0f0f5f082347765a444f4f1a792e7a7268282d4c32b4b26368 flags: 0 RecentlyUsedSceneGuid-9: value: 05070d045d03595e0b0a08234970064413161b79792c25367e2c4466b4e6616e diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 955ad01..f1ce05f 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -25,7 +25,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 88915 + controlID: 20738 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -142,7 +142,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 88916 + controlID: 20739 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -170,7 +170,7 @@ MonoBehaviour: - {fileID: 6} - {fileID: 7} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 2 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -204,8 +204,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -100, y: -25.600006} + snapOffset: {x: -100, y: -25.600006} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings index: 0 @@ -215,9 +215,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -141, y: 149} + snapOffset: {x: -141, y: -165.4} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 + snapCorner: 3 id: unity-grid-and-snap-toolbar index: 1 layout: 1 @@ -226,7 +226,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 24.8} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -259,7 +259,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 24.8} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Tilemap Focus @@ -418,9 +418,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 911.0761, y: 534.0531, z: 14.070202} + m_Target: {x: 992.0368, y: 286.1475, z: 16.873648} speed: 2 - m_Value: {x: 911.0761, y: 534.0531, z: 14.070202} + m_Value: {x: 992.0368, y: 286.1475, z: 16.873648} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -471,9 +471,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 585.5756 + m_Target: 230.80693 speed: 2 - m_Value: 585.5756 + m_Value: 230.80693 m_Ortho: m_Target: 1 speed: 2 @@ -711,8 +711,8 @@ MonoBehaviour: y: 360 width: 765.6 height: 362.8 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -720,7 +720,7 @@ MonoBehaviour: - {fileID: 10} - {fileID: 11} m_Selected: 0 - m_LastSelected: 3 + m_LastSelected: 1 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -751,7 +751,7 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 147952 + m_LastSelectedObjectID: 63888 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -819,7 +819,7 @@ MonoBehaviour: m_MipLevel: 0 m_Zoom: -1 m_ScrollPosition: {x: 0, y: 0} - m_SelectedObject: {fileID: 0} + m_SelectedObject: {fileID: 102900000, guid: f69b860efdda9394eac35dcf3e956f56, type: 3} m_SelectedSpriteRectGUID: 00000000000000000000000000000000 m_LastUsedModuleTypeName: --- !u!114 &12 @@ -846,7 +846,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 88832 + controlID: 20660 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -866,8 +866,8 @@ MonoBehaviour: y: 0 width: 397.59998 height: 360 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -904,9 +904,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 128b0000 m_LastClickedID: 0 - m_ExpandedIDs: 3a13faffe413faff0014faff1016faff0418fafff819faffe01bfaffb81dfaffe41dfaffd41ffaff8020faff7c24faff7426faff6c28faff5c2afaff402cfaff702cfaff7642faff2043faff1c47faff1449faff0c4bfafffc4cfaffe04efaff104ffaffee83faffa284faffe485faff8a89faff929bfaff3e9cfaffec9cfaffe0a8faff8ea9faff72cefaff32d1faff16d4faff10d7fafff4d9faffd4dcfaff9adffaff5ae2faff2ae5faff00e8faffe4eafaffdeedfaffb2f0faffbcf0fafffef0faff28f4faff32f4faff74f4fafff2f7fafffcf7faff3ef8faff4afbfaff54fbfaff06fcfaffaa03fbff6a06fbff0e0bfbff5a0bfbff1a0efbffea10fbffaa13fbff8a16fbffaa23fbffb423fbff6624fbff6627fbffb227fbffb22cfbffbc2cfbff6e2dfbff5431fbff1634fbffce55fbffd855fbff1a56fbff3065fbff3a65fbff7c65fbff6269fbff447efbff4e7efbff007ffbff8ab9fbffccb9fbff36dcfbff40dcfbfff2dcfbffa636fcff4c47fcff8e47fcffa070fcffb479fcff1cb7fcff58b9fcff0abafcff78bbfcff12cffcff4ccffcfffecffcfffaebfcff8c5cfdff78a3fdff64a7fdff62b2fdff2aebfdffe2ecfdff18f0fdff1ef4fdffeaf8fdffce3dfeffbe40feff1847feff804dfeffaa57feff7e5afeff4460feffc86cfeffd689feff969efeff9caafefff4bcfeff4227ffffec28ffffbc2bffff7c2effff6c33ffff8436ffffcc3cffff763effff7048ffff9887ffff8c95ffff4ca5ffff80b1ffff24b6ffffb8b9ffff62bcffffe8c4fffff6ceffffbae1ffffc6f4ffffaef7ffff2afbfffff4ffffff046b000090cb000092d800006eda0000a2e3000088ef00001af00000f2fe0000f41801003a390100a63c0100f23e0100184101005041010086410100ae4101003c4201009c48010052490100d44a0100784b0100584d0100a04e0100b24e0100604f010046650100b6650100ac660100bca0010034b20100eeb20100b8bd0100dcbd010078be0100f2d30100324102008e410200b4410200f0410200a84202007c47020026490200e850020044510200a65102002a520200 + m_ExpandedIDs: 3a13faffe413faff0014faff1016faff0418fafff819faffe01bfaffb81dfaffe41dfaffd41ffaff8020faff7c24faff7426faff6c28faff5c2afaff402cfaff702cfaff7642faff2043faff1c47faff1449faff0c4bfafffc4cfaffe04efaff104ffaffee83faffa284faffe485faff8a89faff929bfaff3e9cfaffec9cfaffe0a8faff8ea9faff72cefaff32d1faff16d4faff10d7fafff4d9faffd4dcfaff9adffaff5ae2faff2ae5faff00e8faffe4eafaffdeedfaffb2f0faffbcf0fafffef0faff28f4faff32f4faff74f4fafff2f7fafffcf7faff3ef8faff4afbfaff54fbfaff06fcfaffaa03fbff6a06fbff0e0bfbff5a0bfbff1a0efbffea10fbffaa13fbff8a16fbffaa23fbffb423fbff6624fbff6627fbffb227fbffb22cfbffbc2cfbff6e2dfbff5431fbff1634fbffce55fbffd855fbff1a56fbff3065fbff3a65fbff7c65fbff6269fbff447efbff4e7efbff007ffbff8ab9fbffccb9fbff36dcfbff40dcfbfff2dcfbffa636fcff4c47fcff8e47fcffa070fcffb479fcff1cb7fcff58b9fcff0abafcff78bbfcff12cffcff4ccffcfffecffcfffaebfcff8c5cfdff78a3fdff64a7fdff62b2fdff2aebfdffe2ecfdff18f0fdff1ef4fdffeaf8fdffce3dfeffbe40feff1847feff804dfeffaa57feff7e5afeff4460feffc86cfeffd689feff969efeff9caafefff4bcfeff6cdbfeff12dcfeffcae0feffeee5feffd2eafeff68f0feff7af5feff9a00ffff200affff2a0affff6c0affff8c15ffff0a24ffff1424ffffc624ffff4227ffffec28ffffbc2bffff3c2dffff7c2effff6c33ffff8436ffffcc3cffff763effff7048ffffd481ffff8c86ffff9887ffff8c95ffff5a9cffffd8a0ffff3aa5ffff4ca5ffffe4a9ffff80b1ffff24b6ffffb6b6ffffb8b9ffff62bcffffe8c4ffff68c6ffff0accfffff6ceffffbae1ffff02e7ffffdaefffffc6f4ffffaef7ffff2afbfffff4ffffff046b000090cb000092d8000064d900006eda0000a2e3000088ef00001af00000f2fe0000f41801003a390100a63c0100f23e0100184101005041010086410100ae4101003c4201009c48010052490100d44a0100784b0100584d0100a04e0100b24e0100604f010046650100b6650100ac660100bca0010034b20100eeb20100b8bd0100dcbd010078be0100f2d30100324102008e410200b4410200f0410200a84202007c47020026490200e850020044510200a65102002a520200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1010,9 +1010,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 50.200012} - m_SelectedIDs: e28a0000 - m_LastClickedID: 35554 - m_ExpandedIDs: 00000000a08a0000a28a0000a48a0000a68a0000a88a0000aa8a0000ac8a0000ae8a0000b08a0000e28a000000ca9a3b + m_SelectedIDs: 028b0000 + m_LastClickedID: 35586 + m_ExpandedIDs: 00000000ce8a0000d08a0000d28a0000d48a0000d68a0000d88a0000da8a0000dc8a0000de8a0000028b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1040,7 +1040,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000a08a0000a28a0000a48a0000a68a0000a88a0000aa8a0000ac8a0000ae8a0000b08a000000ca9a3b + m_ExpandedIDs: 00000000ce8a0000d08a0000d28a0000d48a0000d68a0000d88a0000da8a0000dc8a0000de8a000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1065,24 +1065,24 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 128b0000 + m_LastClickedInstanceID: 35602 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c62300008cce00006e9e00004c6c00002e840000286c0000686c0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: FinishLevel - m_OriginalName: FinishLevel + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 148208 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 15} m_CreateAssetUtility: @@ -1115,8 +1115,8 @@ MonoBehaviour: y: 0 width: 372.80005 height: 722.8 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 68fe97e..350a462 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -20,11 +20,33 @@ MonoBehaviour: height: 772.8 m_ShowMode: 4 m_Title: Game - m_RootView: {fileID: 2} + m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 +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: 12060, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1536 + height: 722.8 + m_MinSize: {x: 200, y: 223} + m_MaxSize: {x: 4000, y: 4023} + m_ActualView: {fileID: 6} +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,9 +59,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 3} - - {fileID: 5} - {fileID: 4} + - {fileID: 2} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 @@ -52,7 +74,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &3 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -74,7 +96,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &4 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -95,218 +117,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - - {fileID: 9} - - {fileID: 12} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1536 - height: 722.8 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: 11788 --- !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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 7} - - {fileID: 8} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 765.6 - height: 722.8 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 11822 ---- !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: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 765.6 - height: 348 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} - m_Panes: - - {fileID: 14} - - {fileID: 15} - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 348 - width: 765.6 - height: 374.8 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 13} - - {fileID: 17} - - {fileID: 18} - - {fileID: 19} - m_Selected: 0 - m_LastSelected: 2 ---- !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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 10} - - {fileID: 11} - m_Position: - serializedVersion: 2 - x: 765.6 - y: 0 - width: 397.59998 - height: 722.8 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 11789 ---- !u!114 &10 -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: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 397.59998 - height: 360 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 20} - m_Panes: - - {fileID: 20} - 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: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 360 - width: 397.59998 - height: 362.8 - m_MinSize: {x: 232, y: 271} - m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 21} - m_Panes: - - {fileID: 21} - m_Selected: 0 - m_LastSelected: 0 ---- !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: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1163.2 - y: 0 - width: 372.80005 - height: 722.8 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 22} - m_Panes: - - {fileID: 22} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -327,9 +138,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 421.6 - width: 764.6 - height: 353.8 + y: 73.6 + width: 1536 + height: 703.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -376,851 +187,25 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 764.6 - height: 332.8 - m_Scale: {x: 0.38518518, y: 0.38518518} - m_Translation: {x: 382.3, y: 166.4} + width: 1536 + height: 682.8 + m_Scale: {x: 0.7902778, y: 0.7902778} + m_Translation: {x: 768, y: 341.4} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -992.5096 + x: -971.8102 y: -432 - width: 1985.0192 + width: 1943.6204 height: 864 m_MinimalGUI: 1 - m_defaultScale: 0.38518518 - m_LastWindowPixelSize: {x: 955.75, y: 442.25} + m_defaultScale: 0.7902778 + m_LastWindowPixelSize: {x: 1920, y: 879.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !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: 1 - m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 73.6 - width: 764.6 - height: 327 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: - - dockPosition: 0 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -100, y: -25.600006} - snapCorner: 3 - id: Tool Settings - index: 0 - layout: 1 - - dockPosition: 0 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: -141, y: 149} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 - id: unity-grid-and-snap-toolbar - index: 1 - layout: 1 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-scene-view-toolbar - index: 0 - layout: 1 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 - id: unity-search-toolbar - index: 1 - layout: 1 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Open Tile Palette - index: 2 - layout: 4 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Tilemap Focus - index: 3 - layout: 4 - - dockPosition: 0 - containerId: overlay-container--left - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-transform-toolbar - index: 0 - layout: 2 - - dockPosition: 0 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 67.5, y: 86} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Orientation - index: 0 - 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/Light Settings - index: 0 - 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/Camera - index: 1 - 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/Cloth Constraints - index: 2 - 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/Cloth Collisions - index: 3 - 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/Navmesh Display - index: 4 - 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/Agent Display - index: 5 - 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/Obstacle Display - index: 6 - 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/Occlusion Culling - index: 7 - 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/Physics Debugger - index: 8 - 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/Scene Visibility - index: 9 - 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/Particles - index: 10 - layout: 4 - m_WindowGUID: 85be69c56b31fe444bd8b4d8ec78055e - m_Gizmos: 0 - m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 - m_SceneLighting: 1 - m_2DMode: 1 - m_isRotationLocked: 0 - m_PlayAudio: 0 - m_AudioPlay: 0 - m_Position: - m_Target: {x: -1.7037956, y: -0.07815198, z: 0.5037025} - speed: 2 - m_Value: {x: -1.7037956, y: -0.07815198, z: 0.5037025} - m_RenderMode: 0 - m_CameraMode: - drawMode: 0 - name: Shaded - section: Shading Mode - m_ValidateTrueMetals: 0 - m_DoValidateTrueMetals: 0 - m_ExposureSliderValue: 0 - m_SceneViewState: - m_AlwaysRefresh: 0 - showFog: 1 - showSkybox: 1 - showFlares: 1 - showImageEffects: 1 - showParticleSystems: 1 - showVisualEffectGraphs: 1 - m_FxEnabled: 1 - m_Grid: - xGrid: - m_Fade: - m_Target: 0 - speed: 2 - 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} - yGrid: - m_Fade: - m_Target: 0 - speed: 2 - 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: 1, y: 1} - zGrid: - m_Fade: - m_Target: 0 - speed: 2 - 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: 1, y: 1} - m_ShowGrid: 0 - m_GridAxis: 1 - m_gridOpacity: 0.5 - m_Rotation: - m_Target: {x: 0, y: 0, z: 0, w: 1} - speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} - m_Size: - m_Target: 7.4230366 - speed: 2 - m_Value: 7.4230366 - m_Ortho: - m_Target: 1 - speed: 2 - m_Value: 1 - m_CameraSettings: - m_Speed: 1 - m_SpeedNormalized: 0.5 - m_SpeedMin: 0.01 - m_SpeedMax: 2 - m_EasingEnabled: 1 - m_EasingDuration: 0.4 - m_AccelerationEnabled: 1 - m_FieldOfViewHorizontalOrVertical: 60 - m_NearClip: 0.03 - m_FarClip: 10000 - m_DynamicClip: 1 - m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} - m_LastSceneViewOrtho: 0 - m_ReplacementShader: {fileID: 0} - m_ReplacementString: - m_SceneVisActive: 1 - m_LastLockedObject: {fileID: 0} - m_ViewIsLockedToObject: 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: 12914, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 73.6 - width: 764.6 - height: 327 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: -2178133467811935789, guid: 244da77500483d9418ab5244044aa249, type: 2} - - {fileID: -8906226921655523406, guid: a6ea2af764a34bf4aa677ae28e4529c9, type: 2} - - {fileID: -8101498314046376274, guid: d3673496f7804864a83427c7731a167f, type: 2} - - {fileID: 6255911317906815133, guid: aca8697a231aa1b449b8eb306fced8e9, type: 2} - - {fileID: -4176286316788427869, guid: afa91bec0398f384e96e68f485ffa1bf, 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 - - e00: 0.7149295 - e01: 0 - e02: 0 - e03: -6.447876 - e10: 0 - e11: 0.7149295 - e12: 0 - e13: 19.244797 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.5232989 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 0.5232989 - e12: 0 - e13: 41.95675 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.50759995 - e01: 0 - e02: 0 - e03: 218.04 - e10: 0 - e11: 0.50759995 - e12: 0 - e13: 9.486008 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.53431576 - e01: 0 - e02: 0 - e03: -11.71579 - e10: 0 - e11: 0.53431576 - e12: 0 - e13: 93.240005 - 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: a6ea2af764a34bf4aa677ae28e4529c9, type: 2} - m_BreadCrumbs: - - m_Target: {fileID: -8906226921655523406, guid: a6ea2af764a34bf4aa677ae28e4529c9, 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} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 13953, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 800, y: 250} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Package Manager - m_Image: {fileID: 5076950121296946556, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 73.6 - width: 764.6 - height: 335.8 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] ---- !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: 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: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 421.6 - width: 764.6 - height: 353.8 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: -44358 ---- !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: 0 - m_Script: {fileID: 11500000, guid: 3f683d99f24875748a6656966ca9cea0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 240, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Tile Palette - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 421.6 - width: 764.6 - height: 353.8 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_PreviewResizer: - m_CachedPref: 70 - m_ControlHash: 1964396721 - m_PrefName: Preview_TilemapBrushInspector - m_Palette: {fileID: 140415018358197914, guid: ad39f019b91684c46853ea1981bbf757, type: 3} - m_DrawGridGizmo: 1 - m_DrawGizmos: 0 ---- !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: 687acdc95675db149bf5de5771ecac18, type: 3} - m_Name: SpriteEditorWindow - m_EditorClassIdentifier: - m_MinSize: {x: 360, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Sprite Editor - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 421.6 - width: 764.6 - height: 353.8 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ShowAlpha: 0 - m_MipLevel: 0 - m_Zoom: -1 - m_ScrollPosition: {x: 0, y: 0} - m_SelectedObject: {fileID: 0} - m_SelectedSpriteRectGUID: 5e97eb03825dee720800000000000000 - m_LastUsedModuleTypeName: ---- !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: 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: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 765.60004 - y: 73.6 - width: 395.59998 - height: 339 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: e09d0000 - m_LastClickedID: 0 - m_ExpandedIDs: 009afeff62a5feff94affeff7a54fffff061ffff5681ffffe4a2ffff92a5ffff60a8ffffa2abffffb0b8ffffa2bbffff5ebfffff6abfffff6ebfffff08c0ffff20d2ffff2cd2ffff30d2ffffccd3ffff14eaffff1eeaffffd4eaffff50edffffc2efffff2afbffff006b0000a4d0000056d30000b8d6000072d9000078f50000 - 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: 10} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 40632b6a420225e43a117905ee9b108c ---- !u!114 &21 -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: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 765.60004 - y: 433.6 - width: 395.59998 - height: 341.8 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Scenes - m_Globs: [] - m_OriginalText: - m_ViewMode: 1 - m_StartGridSize: 16 - m_LastFolders: - - Assets/Scenes - m_LastFoldersGridSize: 16 - m_LastProjectPath: C:\Users\ADMIN\UnityProjects\2D-Ball-Game - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 50.200012} - m_SelectedIDs: b88a0000 - m_LastClickedID: 35512 - m_ExpandedIDs: 000000009a8a00009c8a00009e8a0000a08a0000a28a0000a48a0000a68a0000ac8a0000b88a00001ce2000000ca9a3b - 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: 1 - m_ClientGUIView: {fileID: 11} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 000000009a8a00009c8a00009e8a0000a08a0000a28a0000a48a0000a68a000000ca9a3b - 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: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c62300008cce00006e9e00004c6c00002e840000286c0000 - 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: 1 - m_ClientGUIView: {fileID: 11} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 16 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 149 ---- !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: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1163.2001 - y: 73.6 - width: 371.80005 - height: 701.8 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: 184 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0}