diff --git a/.gitignore b/.gitignore index 2c33071..92c8b32 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ MeuTetris/Temp/ MeuTetris/Library/ + +MeuTetris/.vs/MeuTetris/v16/ diff --git a/MeuTetris/.vs/MeuTetris/v16/.suo b/MeuTetris/.vs/MeuTetris/v16/.suo index 79c57f9..90d4df9 100644 Binary files a/MeuTetris/.vs/MeuTetris/v16/.suo and b/MeuTetris/.vs/MeuTetris/v16/.suo differ diff --git a/MeuTetris/Assets/Scenes/GameOver.unity b/MeuTetris/Assets/Scenes/GameOver.unity new file mode 100644 index 0000000..98f3d74 --- /dev/null +++ b/MeuTetris/Assets/Scenes/GameOver.unity @@ -0,0 +1,449 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &816381951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 816381954} + - component: {fileID: 816381953} + - component: {fileID: 816381952} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &816381952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 816381951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &816381953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 816381951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &816381954 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 816381951} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &885280618 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 885280619} + - component: {fileID: 885280621} + - component: {fileID: 885280620} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &885280619 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 885280618} + 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_Children: [] + m_Father: {fileID: 1625522051} + m_RootOrder: 0 + 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.00000095367, y: 2.8} + m_SizeDelta: {x: 196, y: 106.47467} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &885280620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 885280618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "Voc\xEA Perdeu" +--- !u!222 &885280621 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 885280618} + m_CullTransparentMesh: 0 +--- !u!1 &1528364314 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1528364317} + - component: {fileID: 1528364316} + - component: {fileID: 1528364315} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1528364315 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1528364314} + m_Enabled: 1 +--- !u!20 &1528364316 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1528364314} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1528364317 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1528364314} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1625522047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1625522051} + - component: {fileID: 1625522050} + - component: {fileID: 1625522049} + - component: {fileID: 1625522048} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1625522048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625522047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1625522049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625522047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1625522050 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625522047} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1528364316} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1625522051 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625522047} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 885280619} + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} diff --git a/MeuTetris/Assets/Scenes/GameOver.unity.meta b/MeuTetris/Assets/Scenes/GameOver.unity.meta new file mode 100644 index 0000000..46a91a5 --- /dev/null +++ b/MeuTetris/Assets/Scenes/GameOver.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b390b7ac5568ce6498dfc9f476e8f9d5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MeuTetris/Assets/Scenes/mainTetris.unity b/MeuTetris/Assets/Scenes/mainTetris.unity index 9e00e6d..1b0982a 100644 --- a/MeuTetris/Assets/Scenes/mainTetris.unity +++ b/MeuTetris/Assets/Scenes/mainTetris.unity @@ -442,7 +442,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.49, y: 5.87, z: -10} + m_LocalPosition: {x: 4.49, y: 5.76, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/MeuTetris/Assets/Scripts/Moving.cs b/MeuTetris/Assets/Scripts/Moving.cs index f3d4158..96930dc 100644 --- a/MeuTetris/Assets/Scripts/Moving.cs +++ b/MeuTetris/Assets/Scripts/Moving.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SceneManagement; public class Moving : MonoBehaviour{ @@ -32,7 +33,6 @@ void Update(){ counter = Time.time; if (!con.InsideBorders(this)) { - Debug.Log("Estou aqui"); transform.position += new Vector3(0, speed, 0); SetMoving(false); rotating = false; @@ -40,12 +40,12 @@ void Update(){ Control.UpdatePosition(this); } else if (con.Collided(this)) { - Debug.Log("E aqui"); transform.position += new Vector3(0, speed, 0); SetMoving(false); rotating = false; newer.GetNewBlock(); Control.UpdatePosition(this); + GameOver(); } } @@ -103,6 +103,7 @@ public void GoDown() rotating = false; newer.GetNewBlock(); Control.UpdatePosition(this); + GameOver(); } } } @@ -127,5 +128,18 @@ public void SetRotation(bool active) { this.rotating = active; } - + + public void GameOver() + { + if (!moving) + { + foreach (Transform block in transform) + { + if (block.position.y > heigth - 1) + { + SceneManager.LoadScene("GameOver"); + } + } + } + } } diff --git a/MeuTetris/Library/ArtifactDB b/MeuTetris/Library/ArtifactDB index ed2b083..f142c07 100644 Binary files a/MeuTetris/Library/ArtifactDB and b/MeuTetris/Library/ArtifactDB differ diff --git a/MeuTetris/Library/CurrentLayout-default.dwlt b/MeuTetris/Library/CurrentLayout-default.dwlt index aaa5602..cc1f409 100644 --- a/MeuTetris/Library/CurrentLayout-default.dwlt +++ b/MeuTetris/Library/CurrentLayout-default.dwlt @@ -17,7 +17,7 @@ MonoBehaviour: x: 8 y: 56 width: 1584 - height: 812 + height: 796 m_ShowMode: 4 m_Title: m_RootView: {fileID: 8} @@ -42,7 +42,7 @@ MonoBehaviour: x: 0 y: 0 width: 682 - height: 327 + height: 320 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} @@ -68,9 +68,9 @@ MonoBehaviour: x: 682 y: 0 width: 573 - height: 327 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + height: 320 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -94,13 +94,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 435 + y: 426 width: 1255 - height: 327 - m_MinSize: {x: 331, y: 271} - m_MaxSize: {x: 14001, y: 10021} + height: 320 + m_MinSize: {x: 333, y: 271} + m_MaxSize: {x: 14003, y: 10021} vertical: 0 - controlID: 124 + controlID: 125 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -121,11 +121,11 @@ MonoBehaviour: x: 0 y: 30 width: 1584 - height: 762 - m_MinSize: {x: 677, y: 492} - m_MaxSize: {x: 18001, y: 14042} + height: 746 + m_MinSize: {x: 678, y: 492} + m_MaxSize: {x: 18004, y: 14042} vertical: 0 - controlID: 161 + controlID: 162 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,9 +144,9 @@ MonoBehaviour: x: 1255 y: 0 width: 329 - height: 762 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + height: 746 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -170,7 +170,7 @@ MonoBehaviour: x: 0 y: 0 width: 240 - height: 435 + height: 426 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} @@ -199,7 +199,7 @@ MonoBehaviour: x: 0 y: 0 width: 1584 - height: 812 + height: 796 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &9 @@ -240,7 +240,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 792 + y: 776 width: 1584 height: 20 m_MinSize: {x: 0, y: 0} @@ -265,11 +265,11 @@ MonoBehaviour: x: 0 y: 0 width: 1255 - height: 762 + height: 746 m_MinSize: {x: 402, y: 492} - m_MaxSize: {x: 14001, y: 14042} + m_MaxSize: {x: 14003, y: 14042} vertical: 1 - controlID: 57 + controlID: 58 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -290,11 +290,11 @@ MonoBehaviour: x: 0 y: 0 width: 1255 - height: 435 + height: 426 m_MinSize: {x: 402, y: 221} m_MaxSize: {x: 8002, y: 4021} vertical: 0 - controlID: 58 + controlID: 59 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -313,7 +313,7 @@ MonoBehaviour: x: 240 y: 0 width: 1015 - height: 435 + height: 426 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} @@ -371,9 +371,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 8 - y: 521 + y: 512 width: 681 - height: 306 + height: 299 m_ViewDataDictionary: {fileID: 0} m_SearchFilter: m_NameFilter: @@ -388,20 +388,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Scenes m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\Gabriel de Freitas\OneDrive\Documentos\Jogos\meuTetris\MeuTetris m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: aa3c0000 - m_LastClickedID: 15530 - m_ExpandedIDs: 000000009a3c000000ca9a3b + m_SelectedIDs: 8e3b0000 + m_LastClickedID: 15246 + m_ExpandedIDs: 000000007c3b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -429,7 +429,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009a3c0000 + m_ExpandedIDs: 000000007c3b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -457,7 +457,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c623000064390000f43c0000 + m_ExpandedInstanceIDs: c623000064390000f43c000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -509,7 +509,7 @@ MonoBehaviour: x: 1263 y: 86 width: 328 - height: 741 + height: 725 m_ViewDataDictionary: {fileID: 0} m_OpenAddComponentMenu: 0 m_ObjectsLockedBeforeSerialization: [] @@ -547,14 +547,14 @@ MonoBehaviour: x: 8 y: 86 width: 239 - height: 414 + height: 405 m_ViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: aa46feff - m_LastClickedID: -112982 - m_ExpandedIDs: 5cccffff00ceffff3adfffff1ee1ffff3ef4ffffc6f4ffffb2f6ffffccf6ffffd2f8ffff + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: bae8ffff10f4ffffeef8ffff3ef9ffff64fbffff083c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -602,7 +602,7 @@ MonoBehaviour: x: 248 y: 86 width: 1013 - height: 414 + height: 405 m_ViewDataDictionary: {fileID: 0} m_ShowContextualTools: 0 m_WindowGUID: 5eedf6fabfcc34445895c4a53ddf7ba4 @@ -614,9 +614,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -14.662966, y: 5.1161885, z: 2535.6902} + m_Target: {x: 8.696133, y: 5.0103264, z: 2524.2148} speed: 2 - m_Value: {x: -14.662966, y: 5.1161885, z: 2535.6902} + m_Value: {x: 8.696133, y: 5.0103264, z: 2524.2148} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -666,9 +666,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 16.069857 + m_Target: 16.116653 speed: 2 - m_Value: 16.069857 + m_Value: 16.116653 m_Ortho: m_Target: 1 speed: 2 @@ -717,7 +717,7 @@ MonoBehaviour: x: 248 y: 86 width: 1013 - height: 414 + height: 405 m_ViewDataDictionary: {fileID: 0} m_SerializedViewNames: [] m_SerializedViewValues: [] @@ -727,7 +727,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 196, y: 393} + m_TargetSize: {x: 192, y: 384} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -742,10 +742,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -98 - m_HBaseRangeMax: 98 - m_VBaseRangeMin: -196.5 - m_VBaseRangeMax: 196.5 + m_HBaseRangeMin: -96 + m_HBaseRangeMax: 96 + m_VBaseRangeMin: -192 + m_VBaseRangeMax: 192 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -754,7 +754,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -764,9 +764,9 @@ MonoBehaviour: x: 0 y: 21 width: 1013 - height: 393 + height: 384 m_Scale: {x: 1, y: 1} - m_Translation: {x: 506.5, y: 196.5} + m_Translation: {x: 506.5, y: 192} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -774,12 +774,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -506.5 - y: -196.5 + y: -192 width: 1013 - height: 393 + height: 384 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1013, y: 414} + m_LastWindowPixelSize: {x: 1013, y: 405} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000001000000000000 @@ -807,7 +807,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 690 - y: 521 + y: 512 width: 571 - height: 306 + height: 299 m_ViewDataDictionary: {fileID: 0} diff --git a/MeuTetris/Library/SceneVisibilityState.asset b/MeuTetris/Library/SceneVisibilityState.asset index a7b179d..7da0701 100644 Binary files a/MeuTetris/Library/SceneVisibilityState.asset and b/MeuTetris/Library/SceneVisibilityState.asset differ diff --git a/MeuTetris/Library/SourceAssetDB b/MeuTetris/Library/SourceAssetDB index d1a39cd..172bdcc 100644 Binary files a/MeuTetris/Library/SourceAssetDB and b/MeuTetris/Library/SourceAssetDB differ diff --git a/MeuTetris/Library/StateCache/Hierarchy/65cb06-mainStage.json b/MeuTetris/Library/StateCache/Hierarchy/65cb06-mainStage.json index bea01d9..4461fa5 100644 --- a/MeuTetris/Library/StateCache/Hierarchy/65cb06-mainStage.json +++ b/MeuTetris/Library/StateCache/Hierarchy/65cb06-mainStage.json @@ -1 +1 @@ -{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1180,14632],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} \ No newline at end of file +{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/MeuTetris/Library/StateCache/SceneView/5eedf6-mainStage.json b/MeuTetris/Library/StateCache/SceneView/5eedf6-mainStage.json index 9f5c89e..a4222a3 100644 --- a/MeuTetris/Library/StateCache/SceneView/5eedf6-mainStage.json +++ b/MeuTetris/Library/StateCache/SceneView/5eedf6-mainStage.json @@ -1 +1 @@ -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":false,"showMaterialUpdate":false,"showSkybox":false,"showFlares":false,"showImageEffects":false,"showParticleSystems":false},"in2DMode":true,"pivot":{"x":-22.156084060668947,"y":-0.8055093884468079,"z":4015.0361328125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":25.664703369140626,"orthographic":true} \ No newline at end of file +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":false,"showMaterialUpdate":false,"showSkybox":false,"showFlares":false,"showImageEffects":false,"showParticleSystems":false},"in2DMode":true,"pivot":{"x":8.69613265991211,"y":5.010326385498047,"z":2524.21484375},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":16.116653442382814,"orthographic":true} \ No newline at end of file diff --git a/MeuTetris/ProjectSettings/EditorBuildSettings.asset b/MeuTetris/ProjectSettings/EditorBuildSettings.asset index 7f2d9a2..3959acf 100644 --- a/MeuTetris/ProjectSettings/EditorBuildSettings.asset +++ b/MeuTetris/ProjectSettings/EditorBuildSettings.asset @@ -8,4 +8,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/mainTetris.unity guid: 2cda990e2423bbf4892e6590ba056729 + - enabled: 1 + path: Assets/Scenes/GameOver.unity + guid: b390b7ac5568ce6498dfc9f476e8f9d5 m_configObjects: {}