From 75f08b031f935db1b16666dc8b4d314ca3a790fe Mon Sep 17 00:00:00 2001 From: playmaker1210 Date: Thu, 9 Mar 2023 14:07:44 +0100 Subject: [PATCH] destroy wall --- ...rePack_HDRP_2018.4_v1.22.unitypackage.meta | 7 + ...rePack_LWRP_2018.4_v1.22.unitypackage.meta | 7 + ...urePack_URP_2019.3_v1.22.unitypackage.meta | 7 + Assets/Scenes/EndlessRunnerTest.unity | 295 +++++++++++++++++- Assets/Scripts/CoinCounter.cs | 4 + Assets/Scripts/DestroyObjects.cs | 11 + Assets/Scripts/DestroyObjects.cs.meta | 11 + Assets/Scripts/GroundController.cs | 4 +- Assets/Scripts/PlayerController.cs | 43 ++- UserSettings/Layouts/default-2021.dwlt | 168 +++++----- 10 files changed, 451 insertions(+), 106 deletions(-) create mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta create mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta create mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta create mode 100644 Assets/Scripts/DestroyObjects.cs create mode 100644 Assets/Scripts/DestroyObjects.cs.meta diff --git a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta new file mode 100644 index 0000000..9a23bc2 --- /dev/null +++ b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3b4dc5f685f8edc4bbba6fb0c8ea39ba +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta new file mode 100644 index 0000000..552dc86 --- /dev/null +++ b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8851c5995be5f704babebf752d60b4e2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta new file mode 100644 index 0000000..f481ade --- /dev/null +++ b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 88c6da05db186cb44a4453fd624b31b2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/EndlessRunnerTest.unity b/Assets/Scenes/EndlessRunnerTest.unity index 5c723f8..1c8b44e 100644 --- a/Assets/Scenes/EndlessRunnerTest.unity +++ b/Assets/Scenes/EndlessRunnerTest.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.5615895, g: 0.72180885, b: 0.81785697, a: 1} + m_IndirectSpecularColor: {r: 0.56158954, g: 0.7218083, b: 0.8178571, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -239,7 +239,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2129484389} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1201779184} + m_TargetAssemblyTypeName: PlayerController, Assembly-CSharp + m_MethodName: jump + 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 &284201301 MonoBehaviour: m_ObjectHideFlags: 0 @@ -309,6 +321,141 @@ Transform: m_Father: {fileID: 7917514869596290071} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &788008816 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 788008817} + - component: {fileID: 788008819} + - component: {fileID: 788008818} + m_Layer: 5 + m_Name: CoinCounter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &788008817 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788008816} + 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: 871711471} + 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: -103.16, y: 698} + m_SizeDelta: {x: 506.3254, y: 168.2041} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &788008818 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788008816} + 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: 'Coins: 0' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 100 + m_fontSizeBase: 60 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 + m_fontSizeMax: 100 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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 &788008819 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788008816} + m_CullTransparentMesh: 1 --- !u!1 &871711467 GameObject: m_ObjectHideFlags: 0 @@ -405,6 +552,7 @@ RectTransform: - {fileID: 2129484387} - {fileID: 284201299} - {fileID: 2069815690} + - {fileID: 788008817} m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -470,6 +618,116 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3} +--- !u!1 &965562366 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 965562370} + - component: {fileID: 965562369} + - component: {fileID: 965562368} + - component: {fileID: 965562367} + - component: {fileID: 965562371} + m_Layer: 0 + m_Name: DestroyWall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &965562367 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965562366} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &965562368 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965562366} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &965562369 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965562366} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &965562370 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965562366} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -120} + m_LocalScale: {x: 1000, y: 1000, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &965562371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965562366} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c20965817cd66496b3cdc8cd79092d1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1201779180 GameObject: m_ObjectHideFlags: 0 @@ -549,9 +807,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: rb: {fileID: 7917514869596290073} - jumpforce: 10 + jumpforce: 5 holdTime: 0.2 - activeControllType: 0 + activeControllType: 1 leftButton: {fileID: 2129484388} jumpButton: {fileID: 284201300} rightButton: {fileID: 2069815691} @@ -568,6 +826,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: coin: 0 + coinCounterUI: {fileID: 788008818} --- !u!114 &1201779186 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1384,7 +1643,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2129484389} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1201779184} + m_TargetAssemblyTypeName: PlayerController, Assembly-CSharp + m_MethodName: goRight + 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 &2069815692 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1505,7 +1776,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2129484389} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1201779184} + m_TargetAssemblyTypeName: PlayerController, Assembly-CSharp + m_MethodName: goLeft + 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 &2129484389 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CoinCounter.cs b/Assets/Scripts/CoinCounter.cs index 56bb99c..2cfd9a1 100644 --- a/Assets/Scripts/CoinCounter.cs +++ b/Assets/Scripts/CoinCounter.cs @@ -1,10 +1,12 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using TMPro; public class CoinCounter : MonoBehaviour { public ulong coin = 0; //szedje le db-bol a playerhez a coint + public TMP_Text coinCounterUI; private DatabaseData dd; @@ -17,9 +19,11 @@ public class CoinCounter : MonoBehaviour public void AddCoin(ulong number){ coin += number; + coinCounterUI.text = coin.ToString(); } public void RemoveCoin(ulong number){ coin -= number; + coinCounterUI.text = coin.ToString(); } } diff --git a/Assets/Scripts/DestroyObjects.cs b/Assets/Scripts/DestroyObjects.cs new file mode 100644 index 0000000..66f6bf8 --- /dev/null +++ b/Assets/Scripts/DestroyObjects.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DestroyObjects : MonoBehaviour +{ + private void OnTriggerEnter(Collider other) { + Debug.Log("destroy wall trigger"); + Destroy(other.gameObject); + } +} diff --git a/Assets/Scripts/DestroyObjects.cs.meta b/Assets/Scripts/DestroyObjects.cs.meta new file mode 100644 index 0000000..81e389e --- /dev/null +++ b/Assets/Scripts/DestroyObjects.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6c20965817cd66496b3cdc8cd79092d1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GroundController.cs b/Assets/Scripts/GroundController.cs index fa5e2bc..92be471 100644 --- a/Assets/Scripts/GroundController.cs +++ b/Assets/Scripts/GroundController.cs @@ -42,11 +42,11 @@ public class GroundController : MonoBehaviour } //ellenorzi hogy torolheto e az object - foreach (var item in ground){ + /*foreach (var item in ground){ if(CheckGroundToDestroy(item)){ Destroy(item); } - } + }*/ //cs.SpawnCoin(); } diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 2db08f5..85f68f6 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -17,7 +17,7 @@ public class PlayerController : MonoBehaviour private Vector2 startTouchPosition; //erintes kezdo pozicio private Vector2 endTouchPosition; //erintes vegpozicio - public ControllType activeControllType; + public ControllType activeControllType; //ezt kell atallitani hogy swipe-os vagy button-os legyen a mozgas public Button leftButton; public Button jumpButton; @@ -31,7 +31,7 @@ public class PlayerController : MonoBehaviour private void Awake() { cc = FindObjectOfType(); //kamera vezerlo referencia - activeControllType = ControllType.Button; + activeControllType = ControllType.Swipe; } public void setControllType(ControllType controlltype){ @@ -86,25 +86,40 @@ public class PlayerController : MonoBehaviour } }else if(activeControllType == ControllType.Button){ jumpforce = 2; - leftButton.onClick.AddListener(goRight); + /*leftButton.onClick.AddListener(goRight); jumpButton.onClick.AddListener(jump); - rightButton.onClick.AddListener(goLeft); + rightButton.onClick.AddListener(goLeft);*/ } } - private void goLeft(){ //helyezze at a jatekos objektumot a balra levo savba - if(rb.transform.position.x >= 2.5f) return; //ne tudjon kimenni a savbol - cc.xPostion = -3; //kamera xPozicioja - rb.transform.position = new Vector3(rb.transform.position.x + sideMovement, rb.transform.position.y, rb.transform.position.z); - } - - private void goRight(){ //helyezze at a jatekos objektumot a jobbra levo savba + public void goLeft(){ //helyezze at a jatekos objektumot a balra levo savba + Debug.Log("kattintva bal"); if(rb.transform.position.x <= -2.5f) return; //ne tudjon kimenni a savbol - cc.xPostion = 3; //kamera xPozicioja - rb.transform.position = new Vector3(rb.transform.position.x - sideMovement, rb.transform.position.y, rb.transform.position.z); + //cc.xPostion = -3; //kamera xPozicioja + //rb.transform.position = new Vector3(rb.transform.position.x - sideMovement, rb.transform.position.y, rb.transform.position.z); + + if(rb.transform.position.x >= 2.5f){ + rb.transform.position = new Vector3(0, rb.transform.position.y, rb.transform.position.z); + }else if(rb.transform.position.x >= -2.5f){ + rb.transform.position = new Vector3(-3f, rb.transform.position.y, rb.transform.position.z); + } } - private void jump(){ + public void goRight(){ //helyezze at a jatekos objektumot a jobbra levo savba + Debug.Log("kattintva jobb"); + if(rb.transform.position.x >= 2.5f) return; //ne tudjon kimenni a savbol + //cc.xPostion = 3; //kamera xPozicioja + //rb.transform.position = new Vector3(rb.transform.position.x + sideMovement, rb.transform.position.y, rb.transform.position.z); + + if(rb.transform.position.x <= -2.5f){ + rb.transform.position = new Vector3(0, rb.transform.position.y, rb.transform.position.z); + }else if(rb.transform.position.x >= -2.5f){ + rb.transform.position = new Vector3(3f, rb.transform.position.y, rb.transform.position.z); + } + } + + public void jump(){ + Debug.Log("jumped"); rb.AddForce(new Vector3(0, jumpforce, 0)); //ugras } } \ No newline at end of file diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 774d9ab..ba00353 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,11 +15,11 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 43 - width: 1920 - height: 997 + y: 28 + width: 1366 + height: 673 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Console m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -39,10 +39,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 957 + x: 664 y: 0 - width: 477 - height: 550 + width: 344 + height: 414 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} @@ -70,8 +70,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 997 + width: 1366 + height: 673 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -95,7 +95,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1366 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -116,8 +116,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 1920 + y: 653 + width: 1366 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 947 + width: 1366 + height: 623 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 108 + controlID: 53 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1434 - height: 947 + width: 1008 + height: 623 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 109 + controlID: 100 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -191,12 +191,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1434 - height: 550 + width: 1008 + height: 414 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 110 + controlID: 101 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -214,8 +214,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 243 - height: 550 + width: 168 + height: 414 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -238,10 +238,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 243 + x: 168 y: 0 - width: 714 - height: 550 + width: 496 + height: 414 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} @@ -259,22 +259,21 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 550 - width: 1434 - height: 397 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + y: 414 + width: 1008 + height: 209 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} - - {fileID: 16} - m_Selected: 1 + m_Selected: 0 m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: @@ -286,21 +285,22 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1434 + x: 1008 y: 0 - width: 486 - height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 17} + width: 358 + height: 623 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 17} - m_Selected: 0 + - {fileID: 16} + m_Selected: 1 m_LastSelected: 0 --- !u!114 &13 MonoBehaviour: @@ -323,9 +323,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 242 - height: 529 + y: 86 + width: 167 + height: 393 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -333,9 +333,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e2f4ffff - m_LastClickedID: -2846 - m_ExpandedIDs: 9af4ffffe2f4ffff34fbffff425a0000a05a0000 + m_SelectedIDs: dcf8ffff + m_LastClickedID: -1828 + m_ExpandedIDs: e0f8ffff22fbffff3a5a00004c5a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -351,7 +351,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -379,10 +379,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 243 - y: 73 - width: 712 - height: 529 + x: 168 + y: 86 + width: 494 + height: 393 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -617,9 +617,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.70529556, y: 8.58622, z: -58.736225} + m_Target: {x: 700.56055, y: 145.45145, z: 667.6259} speed: 2 - m_Value: {x: -0.70529556, y: 8.58622, z: -58.736225} + m_Value: {x: 700.56055, y: 145.45145, z: 667.6259} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -666,13 +666,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.24836192, y: 0.22615214, z: -0.059745934, w: -0.94} + m_Target: {x: 0.07115192, y: -0.84182006, z: 0.114607, w: 0.52264017} speed: 2 - m_Value: {x: -0.24836217, y: 0.22615236, z: -0.059745993, w: -0.94000095} + m_Value: {x: 0.07002716, y: -0.8435508, z: 0.1135541, w: 0.5202151} m_Size: - m_Target: 30.205072 + m_Target: 707.10693 speed: 2 - m_Value: 30.205072 + m_Value: 707.10693 m_Ortho: m_Target: 0 speed: 2 @@ -718,9 +718,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 623 - width: 1433 - height: 376 + y: 500 + width: 1007 + height: 188 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -746,14 +746,14 @@ MonoBehaviour: m_LastFolders: - Assets/Scripts m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\dev\zarodolgozat\ColorBall + m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 54650000 - m_LastClickedID: 25940 - m_ExpandedIDs: 0000000046650000 + scrollPos: {x: 0, y: 44} + m_SelectedIDs: a6670000 + m_LastClickedID: 26534 + m_ExpandedIDs: 000000005065000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -781,7 +781,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000046650000 + m_ExpandedIDs: 0000000050650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -825,7 +825,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 0} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -833,7 +833,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 66} m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 @@ -857,10 +857,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 623 - width: 1433 - height: 376 + x: 1008 + y: 86 + width: 357 + height: 602 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -885,10 +885,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1434 - y: 73 - width: 485 - height: 926 + x: 1008 + y: 86 + width: 357 + height: 602 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -926,10 +926,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 957 - y: 73 - width: 475 - height: 529 + x: 664 + y: 86 + width: 342 + height: 393 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -958,7 +958,7 @@ MonoBehaviour: - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin pluginStates: - '{}' - scale: 19 + scale: 14 fitToScreenEnabled: 1 rotationDegree: 0 highlightSafeAreaEnabled: 0