diff --git a/ProjetoMemorias/Assets/Scenes/puzzle1.unity b/ProjetoMemorias/Assets/Scenes/puzzle1.unity index 01d50a1..d335145 100644 --- a/ProjetoMemorias/Assets/Scenes/puzzle1.unity +++ b/ProjetoMemorias/Assets/Scenes/puzzle1.unity @@ -3439,7 +3439,7 @@ GameObject: - component: {fileID: 568094587} - component: {fileID: 568094586} m_Layer: 5 - m_Name: Button + m_Name: btnSalvar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3462,8 +3462,8 @@ RectTransform: 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: 301, y: 162} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 354, y: 171} + m_SizeDelta: {x: 63.2, y: 24.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &568094586 MonoBehaviour: @@ -4035,83 +4035,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 1 m_SpriteSortPoint: 0 ---- !u!1 &630792135 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 630792136} - - component: {fileID: 630792138} - - component: {fileID: 630792137} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &630792136 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 630792135} - 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: 1772622541} - 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 &630792137 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 630792135} - 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_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - 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: Limpar tabela ---- !u!222 &630792138 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 630792135} - m_CullTransparentMesh: 0 --- !u!1 &677838598 GameObject: m_ObjectHideFlags: 0 @@ -9084,135 +9007,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 1 m_SpriteSortPoint: 0 ---- !u!1 &1772622540 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1772622541} - - component: {fileID: 1772622544} - - component: {fileID: 1772622543} - - component: {fileID: 1772622542} - m_Layer: 5 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1772622541 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772622540} - 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: - - {fileID: 630792136} - m_Father: {fileID: 1974778714} - m_RootOrder: 39 - 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: 301, y: 122} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1772622542 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772622540} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - 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: 1772622543} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1714551521} - m_MethodName: limparTabela - 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 &1772622543 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772622540} - 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_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1772622544 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772622540} - m_CullTransparentMesh: 0 --- !u!1 &1784795953 GameObject: m_ObjectHideFlags: 0 @@ -10383,7 +10177,6 @@ RectTransform: - {fileID: 2019583669} - {fileID: 1098451271} - {fileID: 568094585} - - {fileID: 1772622541} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/ProjetoMemorias/Assets/Scenes/puzzle2.unity b/ProjetoMemorias/Assets/Scenes/puzzle2.unity index 5e3f4f0..a707424 100644 --- a/ProjetoMemorias/Assets/Scenes/puzzle2.unity +++ b/ProjetoMemorias/Assets/Scenes/puzzle2.unity @@ -5226,6 +5226,83 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MainCamera: {fileID: 2004549879} +--- !u!1 &1043406984 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1043406985} + - component: {fileID: 1043406987} + - component: {fileID: 1043406986} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1043406985 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1043406984} + 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: 1736701732} + 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: 5.8, y: 0} + m_SizeDelta: {x: -11.6, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1043406986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1043406984} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + 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: Salvar +--- !u!222 &1043406987 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1043406984} + m_CullTransparentMesh: 0 --- !u!1 &1044383299 GameObject: m_ObjectHideFlags: 0 @@ -7526,7 +7603,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2, y: 0.00000095367} + m_AnchoredPosition: {x: 2, y: 0} m_SizeDelta: {x: -4, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1546793841 @@ -8499,6 +8576,7 @@ GameObject: m_Component: - component: {fileID: 1714551520} - component: {fileID: 1714551519} + - component: {fileID: 1714551521} m_Layer: 0 m_Name: LevelManager m_TagString: Untagged @@ -8532,6 +8610,147 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1714551521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714551518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d2fd939264cbd94b9a1ff6c9880db3a, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1736701731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1736701732} + - component: {fileID: 1736701735} + - component: {fileID: 1736701734} + - component: {fileID: 1736701733} + m_Layer: 5 + m_Name: btnSalvar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1736701732 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736701731} + 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: + - {fileID: 1043406985} + m_Father: {fileID: 1974778714} + m_RootOrder: 38 + 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: 346, y: 166} + m_SizeDelta: {x: 69, y: 24.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1736701733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736701731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + 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: 1736701734} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1714551521} + m_MethodName: salvarJogo + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 2 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1736701734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736701731} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1736701735 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736701731} + m_CullTransparentMesh: 0 --- !u!1 &1740198030 GameObject: m_ObjectHideFlags: 0 @@ -9942,6 +10161,7 @@ RectTransform: - {fileID: 1894210511} - {fileID: 2019583669} - {fileID: 1098451271} + - {fileID: 1736701732} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/ProjetoMemorias/Assets/Scenes/puzzle3.unity b/ProjetoMemorias/Assets/Scenes/puzzle3.unity index 51fc69c..10eeeac 100644 --- a/ProjetoMemorias/Assets/Scenes/puzzle3.unity +++ b/ProjetoMemorias/Assets/Scenes/puzzle3.unity @@ -600,6 +600,135 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MainCamera: {fileID: 2004549879} +--- !u!1 &125934434 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 125934435} + - component: {fileID: 125934438} + - component: {fileID: 125934437} + - component: {fileID: 125934436} + m_Layer: 5 + m_Name: btnSalvar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &125934435 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 125934434} + 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: + - {fileID: 2131701290} + m_Father: {fileID: 1974778714} + m_RootOrder: 38 + 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: 356.6, y: 165.7} + m_SizeDelta: {x: 58.9, y: 28.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &125934436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 125934434} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + 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: 125934437} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1714551521} + m_MethodName: salvarJogo + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 3 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &125934437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 125934434} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &125934438 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 125934434} + m_CullTransparentMesh: 0 --- !u!1 &151910389 GameObject: m_ObjectHideFlags: 0 @@ -7526,7 +7655,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2, y: 0.00000095367} + m_AnchoredPosition: {x: 2, y: 0} m_SizeDelta: {x: -4, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1546793841 @@ -8499,6 +8628,7 @@ GameObject: m_Component: - component: {fileID: 1714551520} - component: {fileID: 1714551519} + - component: {fileID: 1714551521} m_Layer: 0 m_Name: LevelManager m_TagString: Untagged @@ -8532,6 +8662,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1714551521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714551518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d2fd939264cbd94b9a1ff6c9880db3a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1740198030 GameObject: m_ObjectHideFlags: 0 @@ -9942,6 +10084,7 @@ RectTransform: - {fileID: 1894210511} - {fileID: 2019583669} - {fileID: 1098451271} + - {fileID: 125934435} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10993,3 +11136,80 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 1 m_SpriteSortPoint: 0 +--- !u!1 &2131701289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2131701290} + - component: {fileID: 2131701292} + - component: {fileID: 2131701291} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2131701290 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2131701289} + 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: 125934435} + 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 &2131701291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2131701289} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + 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: Salvar +--- !u!222 &2131701292 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2131701289} + m_CullTransparentMesh: 0 diff --git a/ProjetoMemorias/Assets/Scenes/tela_menu.unity b/ProjetoMemorias/Assets/Scenes/tela_menu.unity index 265ee87..8534707 100644 --- a/ProjetoMemorias/Assets/Scenes/tela_menu.unity +++ b/ProjetoMemorias/Assets/Scenes/tela_menu.unity @@ -197,6 +197,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 212796144} m_CullTransparentMesh: 0 +--- !u!1 &313961609 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 313961610} + - component: {fileID: 313961612} + - component: {fileID: 313961611} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &313961610 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313961609} + 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: 2030776678} + 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 &313961611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313961609} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + 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: Apagar Jogos Salvos +--- !u!222 &313961612 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313961609} + m_CullTransparentMesh: 0 --- !u!1 &368319088 GameObject: m_ObjectHideFlags: 0 @@ -969,6 +1046,7 @@ GameObject: m_Component: - component: {fileID: 1694766169} - component: {fileID: 1694766168} + - component: {fileID: 1694766170} m_Layer: 0 m_Name: LevelManager m_TagString: Untagged @@ -1002,6 +1080,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1694766170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1694766167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d2fd939264cbd94b9a1ff6c9880db3a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1802143987 GameObject: m_ObjectHideFlags: 0 @@ -1167,7 +1257,7 @@ GameObject: - component: {fileID: 1978617003} - component: {fileID: 1978617002} m_Layer: 0 - m_Name: GameObject + m_Name: ConexaoBD m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1199,6 +1289,135 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2030776677 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2030776678} + - component: {fileID: 2030776681} + - component: {fileID: 2030776680} + - component: {fileID: 2030776679} + m_Layer: 5 + m_Name: btnApagarTabela + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2030776678 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2030776677} + 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: + - {fileID: 313961610} + m_Father: {fileID: 2034995148} + 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: 326.1, y: 158.3} + m_SizeDelta: {x: 119.8, y: 45.405} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2030776679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2030776677} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + 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: 2030776680} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1694766170} + m_MethodName: limparTabela + 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 &2030776680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2030776677} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2030776681 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2030776677} + m_CullTransparentMesh: 0 --- !u!1 &2034995144 GameObject: m_ObjectHideFlags: 0 @@ -1292,6 +1511,7 @@ RectTransform: - {fileID: 614293412} - {fileID: 419571766} - {fileID: 212796145} + - {fileID: 2030776678} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/ProjetoMemorias/Assets/Scripts/SQLite.cs b/ProjetoMemorias/Assets/Scripts/SQLite.cs index 8ca0e85..b1d10b7 100644 --- a/ProjetoMemorias/Assets/Scripts/SQLite.cs +++ b/ProjetoMemorias/Assets/Scripts/SQLite.cs @@ -2,11 +2,11 @@ using System.Data; using Mono.Data.Sqlite; using System.IO; +using System; public class SQLite : MonoBehaviour{ //Esse script é responsável por realizar a conexão entre o banco de dados e o jogo! - public static int id_do_save = 1; - + // Start is called before the first frame update void Start(){ //CRIANDO A CONEXÃO COM O BANCO DE DADOS @@ -19,10 +19,9 @@ void Start(){ IDataReader leitor; //Variável responsável por receber o que for retornado (valores...) do banco de dados dbcmd = dbcon.CreateCommand(); //Criando um comando para o banco de dados - string criar_tabela = "CREATE TABLE IF NOT EXISTS ultimo_save (id INTEGER PRIMARY KEY, tela_salva INTEGER )"; //Escrevendo o comando a ser executado no BD, no caso, será criada uma tabela "ultimo_save" com as colunas "id" e "tela_salva" + string criar_tabela = "CREATE TABLE IF NOT EXISTS ultimo_save (id INTEGER PRIMARY KEY AUTOINCREMENT, tela_salva INTEGER )"; //Escrevendo o comando a ser executado no BD, no caso, será criada uma tabela "ultimo_save" com as colunas "id" (com "auto incremento"!) e "tela_salva" dbcmd.CommandText = criar_tabela; //Executando o comando da última linha leitor = dbcmd.ExecuteReader(); - } // Update is called once per frame diff --git a/ProjetoMemorias/Assets/Scripts/botaoSalvar.cs b/ProjetoMemorias/Assets/Scripts/botaoSalvar.cs index 86a930e..7c0263c 100644 --- a/ProjetoMemorias/Assets/Scripts/botaoSalvar.cs +++ b/ProjetoMemorias/Assets/Scripts/botaoSalvar.cs @@ -7,63 +7,45 @@ using System.IO; public class botaoSalvar : MonoBehaviour{ - // Start is called before the first frame update - void Start(){ - - } - - // Update is called once per frame + //Função responsável por salvar o jogo! public void salvarJogo(int id_da_fase){ string connection = "URI=file:"+Application.persistentDataPath+"/BD_Proj_Memorias"; //Adicionando à variável "connection" o caminho para o nosso Banco de Dados "BD_Proj_Memorias" IDbConnection dbcon = new SqliteConnection(connection); //Comunicando com o nosso banco de dados cujo caminho está sendo passado como parâmetro pela variável "connection" dbcon.Open(); //Abrindo a conexão com o banco de dados - IDbCommand cmnd = dbcon.CreateCommand(); - cmnd.CommandText = "INSERT INTO ultimo_save (id, tela_salva) VALUES ("+SQLite.id_do_save+", "+id_da_fase+")"; - cmnd.ExecuteNonQuery(); + IDbCommand cmnd = dbcon.CreateCommand(); //Criando variável para receber comando + cmnd.CommandText = "INSERT INTO ultimo_save (tela_salva) VALUES ("+id_da_fase+")"; //Aqui, estamos armazenando o ID da fase salva no nosso Banco de DAdos + cmnd.ExecuteNonQuery(); //Executando o comando anterior - //Fechando a conexão + //Retornando para o Console os valores salvos na tabela, apenas para teste! IDbCommand cmnd_read = dbcon.CreateCommand(); IDataReader reader; - string query = "SELECT * FROM ultimo_save"; + string query = "SELECT * FROM ultimo_save"; //Selecionando todos os itens da nossa tabela no Banco de Dados cmnd_read.CommandText = query; reader = cmnd_read.ExecuteReader(); - while(reader.Read()){ + while(reader.Read()){ //Mostrando todos os valores salvos na tabela Debug.Log("id: " + reader[0].ToString()); Debug.Log("última tela salva: " + reader[1].ToString()); } - SQLite.id_do_save = SQLite.id_do_save + 1; + + //Fechando a conexão com o Banco de Dados dbcon.Close(); } - public void limparTabela(){ + //Função responsável por limpar todos os valores presentes na tabela! Serve para apagar todos os itens (fases) salvos! + public void limparTabela(){ string connection = "URI=file:"+Application.persistentDataPath+"/BD_Proj_Memorias"; //Adicionando à variável "connection" o caminho para o nosso Banco de Dados "BD_Proj_Memorias" IDbConnection dbcon = new SqliteConnection(connection); //Comunicando com o nosso banco de dados cujo caminho está sendo passado como parâmetro pela variável "connection" dbcon.Open(); //Abrindo a conexão com o banco de dados IDbCommand cmnd = dbcon.CreateCommand(); cmnd.CommandText = "DELETE FROM ultimo_save"; - cmnd.ExecuteNonQuery(); - - IDbCommand cmnd2 = dbcon.CreateCommand(); - cmnd2.CommandText = "VACUUM"; - cmnd2.ExecuteNonQuery(); - - IDbCommand cmnd_read = dbcon.CreateCommand(); - IDataReader reader; - - string query = "SELECT * FROM ultimo_save"; - cmnd_read.CommandText = query; - reader = cmnd_read.ExecuteReader(); - - while(reader.Read()){ - Debug.Log("id: " + reader[0].ToString()); - Debug.Log("última tela salva: " + reader[1].ToString()); - } + cmnd.ExecuteNonQuery(); //Executando comando da linha anterior, onde deletaremos todos os itens da nossa tabela "ultimo_save" + //Fechando nossa conexão dbcon.Close(); } } diff --git a/ProjetoMemorias/Assets/Scripts/teste.cs b/ProjetoMemorias/Assets/Scripts/teste.cs deleted file mode 100644 index c45e850..0000000 --- a/ProjetoMemorias/Assets/Scripts/teste.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class teste : MonoBehaviour -{ - public Camera MainCamera; - private Vector2 screenBounds; - private float objectWidth; - private float objectHeight; - - // Use this for initialization - void Start() - { - screenBounds = MainCamera.ScreenToWorldPoint(new Vector3(Screen.width, Screen.height, MainCamera.transform.position.z)); - - objectWidth = transform.GetComponent().bounds.extents.x; //extents = size of width / 2 - objectHeight = transform.GetComponent().bounds.extents.y; //extents = size of height / 2 - - //print(screenBounds.x); - } - - // Update is called once per frame - void LateUpdate() - { - Vector3 viewPos = transform.position; - - viewPos.x = Mathf.Clamp(viewPos.x, -screenBounds.x + (objectWidth+2400), screenBounds.x - objectWidth); - - viewPos.y = Mathf.Clamp(viewPos.y, -screenBounds.y + (objectHeight+1400), screenBounds.y - objectHeight); - - transform.position = viewPos; - - //Debug.Log(objectWidth); = 118; - } -} diff --git a/ProjetoMemorias/Assets/Scripts/teste.cs.meta b/ProjetoMemorias/Assets/Scripts/teste.cs.meta deleted file mode 100644 index aa36cef..0000000 --- a/ProjetoMemorias/Assets/Scripts/teste.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9e7b587f3ba203648b17a6733567d205 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjetoMemorias/DB_Proj_Memorias.db b/ProjetoMemorias/DB_Proj_Memorias.db index e69de29..3f31b98 100644 Binary files a/ProjetoMemorias/DB_Proj_Memorias.db and b/ProjetoMemorias/DB_Proj_Memorias.db differ diff --git a/ProjetoMemorias/Library/CurrentLayout-default.dwlt b/ProjetoMemorias/Library/CurrentLayout-default.dwlt index b18a22b..fd4d8cb 100644 --- a/ProjetoMemorias/Library/CurrentLayout-default.dwlt +++ b/ProjetoMemorias/Library/CurrentLayout-default.dwlt @@ -21,7 +21,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 2} - m_MinSize: {x: 950, y: 300} + m_MinSize: {x: 950, y: 494} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &2 MonoBehaviour: @@ -92,10 +92,10 @@ MonoBehaviour: y: 30 width: 1366 height: 635 - m_MinSize: {x: 917, y: 444} - m_MaxSize: {x: 22012, y: 10022} + m_MinSize: {x: 911, y: 444} + m_MaxSize: {x: 22006, y: 10022} vertical: 0 - controlID: 31 + controlID: 73 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 202, y: 444} m_MaxSize: {x: 4002, y: 8044} vertical: 1 - controlID: 32 + controlID: 54 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -161,8 +161,8 @@ MonoBehaviour: y: 0 width: 204 height: 635 - m_MinSize: {x: 204, y: 222} - m_MaxSize: {x: 4004, y: 4022} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -213,8 +213,8 @@ MonoBehaviour: y: 0 width: 277 height: 635 - m_MinSize: {x: 277, y: 72} - m_MaxSize: {x: 4002, y: 4022} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -239,8 +239,8 @@ MonoBehaviour: y: 0 width: 651 height: 316 - m_MinSize: {x: 202, y: 222} - m_MaxSize: {x: 4002, y: 4022} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -265,8 +265,8 @@ MonoBehaviour: y: 316 width: 651 height: 319 - m_MinSize: {x: 202, y: 222} - m_MaxSize: {x: 4002, y: 4022} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -301,23 +301,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 84edffff - m_LastClickedID: -4732 - m_ExpandedIDs: e4e5ffff16e6ffffa8e6fffface6ffffb0e6ffffb4e6ffffb8e6ffffc6e6ffffcae6ffffcee6ffffd2e6ffffd6e6ffff84edffffa4eeffffeaeeffffdcf5ffff84f6ffff6af8ffffdef8ffff74fbfffff83500009a3e00002a5f0000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 26dcffff58dcffffecdcfffff4dcfffffcdcffff04ddffff0cddffff1cddffff24ddffff2cddffff34ddffff3cddffff2edeffff06dfffffd8e3ffffa0e5ffff9ae6ffffece6ffff1ae8ffff6ce8ffffa4e8ffffdae8ffffc4e9ffff4cfbffffa632000002730000708400000ea70000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Canvas + m_OriginalName: Canvas m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 36826 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 7} m_SearchString: @@ -413,9 +413,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 7a310000 - m_LastClickedID: 12666 - m_ExpandedIDs: 00000000462d000000ca9a3b + m_SelectedIDs: 7c310000 + m_LastClickedID: 12668 + m_ExpandedIDs: 00000000482d000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -443,7 +443,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000462d0000a62e0000 + m_ExpandedIDs: 00000000482d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -616,9 +616,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.045438714, y: -0.15876237, z: -1341.17} + m_Target: {x: -0.4251055, y: 0.3456533, z: -4449.0933} speed: 2 - m_Value: {x: -0.045438714, y: -0.15876237, z: -1341.17} + m_Value: {x: -0.4251055, y: 0.3456533, z: -4449.0933} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -651,9 +651,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.370591 + m_Target: 14.138496 speed: 2 - m_Value: 12.370591 + m_Value: 14.138496 m_Ortho: m_Target: 1 speed: 2 diff --git a/ProjetoMemorias/Library/EditorUserBuildSettings.asset b/ProjetoMemorias/Library/EditorUserBuildSettings.asset index 59d85da..368b35e 100644 Binary files a/ProjetoMemorias/Library/EditorUserBuildSettings.asset and b/ProjetoMemorias/Library/EditorUserBuildSettings.asset differ diff --git a/ProjetoMemorias/Library/InspectorExpandedItems.asset b/ProjetoMemorias/Library/InspectorExpandedItems.asset index bb6159d..b5dad95 100644 Binary files a/ProjetoMemorias/Library/InspectorExpandedItems.asset and b/ProjetoMemorias/Library/InspectorExpandedItems.asset differ diff --git a/ProjetoMemorias/Library/LastBuild.buildreport b/ProjetoMemorias/Library/LastBuild.buildreport index cab55a9..7cc2c7c 100644 Binary files a/ProjetoMemorias/Library/LastBuild.buildreport and b/ProjetoMemorias/Library/LastBuild.buildreport differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.dll b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.dll index 9de6aa6..72bbc9d 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.dll and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.dll differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/Unity.TextMeshPro.dll b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/Unity.TextMeshPro.dll index a04b4c8..b31ea8f 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/Unity.TextMeshPro.dll and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/Unity.TextMeshPro.dll differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/Unity.Timeline.dll b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/Unity.Timeline.dll index 0489a72..e4d1da3 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/Unity.Timeline.dll and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/Unity.Timeline.dll differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/UnityEngine.UI.dll b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/UnityEngine.UI.dll index 25586b3..2cb8343 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/UnityEngine.UI.dll and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/Managed/UnityEngine.UI.dll differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/boot.config b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/boot.config index 7d84bdc..bf50eb3 100644 --- a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/boot.config +++ b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/boot.config @@ -5,4 +5,4 @@ vr-enabled=0 hdr-display-enabled=0 androidStartInFullscreen=1 androidRenderOutsideSafeArea=1 -buildDate=637536667790413562 +buildDate=637536893605707153 diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/globalgamemanagers b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/globalgamemanagers index 7ba8e96..4a13b03 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/globalgamemanagers and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/globalgamemanagers differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/globalgamemanagers.assets b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/globalgamemanagers.assets index 0d0f40d..cd38c5c 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/globalgamemanagers.assets and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/globalgamemanagers.assets differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level0 b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level0 index b51861f..12fb094 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level0 and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level0 differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level1 b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level1 index bf2363f..c9e0dfc 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level1 and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level1 differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level2 b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level2 index 02b6d2a..3f34c92 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level2 and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level2 differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level3 b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level3 index 4e99b90..e7bd0f8 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level3 and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level3 differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level4 b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level4 index 14b4661..ccac64d 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level4 and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level4 differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level5 b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level5 index 5b1d763..2b67499 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level5 and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level5 differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level6 b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level6 index 5b73729..68e0945 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level6 and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level6 differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level7 b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level7 index 9ad9731..aa8855f 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level7 and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level7 differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level8 b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level8 index 03a4897..56715ab 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level8 and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level8 differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level9 b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level9 index 07f4321..0a39e27 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level9 and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/level9 differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets0.assets b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets0.assets index c197681..951b5a7 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets0.assets and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets0.assets differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets1.assets b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets1.assets index b3cfb3d..7ab333e 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets1.assets and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets1.assets differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets2.assets b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets2.assets index f1b6e7f..bc1d8f8 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets2.assets and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets2.assets differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets3.assets b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets3.assets index e8a473a..6029a75 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets3.assets and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets3.assets differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets4.assets b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets4.assets index 231a09b..716c0ab 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets4.assets and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets4.assets differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets5.assets b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets5.assets index af15a9e..d92c978 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets5.assets and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets5.assets differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets6.assets b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets6.assets index c056d13..837e474 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets6.assets and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets6.assets differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets7.assets b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets7.assets index bf337da..59b3866 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets7.assets and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets7.assets differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets8.assets b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets8.assets index 2a973f0..0f5d23f 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets8.assets and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets8.assets differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets9.assets b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets9.assets index d9c7ad4..bf6d9fb 100644 Binary files a/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets9.assets and b/ProjetoMemorias/Library/PlayerDataCache/Android/Data/sharedassets9.assets differ diff --git a/ProjetoMemorias/Library/PlayerDataCache/Android/ScriptsOnlyCache.yaml b/ProjetoMemorias/Library/PlayerDataCache/Android/ScriptsOnlyCache.yaml index 520f07c..3e05364 100644 --- a/ProjetoMemorias/Library/PlayerDataCache/Android/ScriptsOnlyCache.yaml +++ b/ProjetoMemorias/Library/PlayerDataCache/Android/ScriptsOnlyCache.yaml @@ -54,11 +54,11 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10650} - Class: 114 - Script: {instanceID: 11126} + Script: {instanceID: 11128} - Class: 114 - Script: {instanceID: 11240} + Script: {instanceID: 11242} - Class: 114 - Script: {instanceID: 11498} + Script: {instanceID: 11500} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -101,11 +101,11 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10650} - Class: 114 - Script: {instanceID: 11126} + Script: {instanceID: 11128} - Class: 114 - Script: {instanceID: 11240} + Script: {instanceID: 11242} - Class: 114 - Script: {instanceID: 11498} + Script: {instanceID: 11500} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -148,11 +148,11 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10650} - Class: 114 - Script: {instanceID: 11126} + Script: {instanceID: 11128} - Class: 114 - Script: {instanceID: 11240} + Script: {instanceID: 11242} - Class: 114 - Script: {instanceID: 11498} + Script: {instanceID: 11500} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -195,11 +195,11 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10650} - Class: 114 - Script: {instanceID: 11126} + Script: {instanceID: 11128} - Class: 114 - Script: {instanceID: 11240} + Script: {instanceID: 11242} - Class: 114 - Script: {instanceID: 11498} + Script: {instanceID: 11500} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -236,11 +236,11 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10650} - Class: 114 - Script: {instanceID: 11126} + Script: {instanceID: 11128} - Class: 114 - Script: {instanceID: 11240} + Script: {instanceID: 11242} - Class: 114 - Script: {instanceID: 11498} + Script: {instanceID: 11500} - Class: 115 Script: {instanceID: 0} - Class: 157 @@ -291,15 +291,15 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10720} - Class: 114 - Script: {instanceID: 10916} + Script: {instanceID: 10730} - Class: 114 - Script: {instanceID: 11126} + Script: {instanceID: 10918} - Class: 114 - Script: {instanceID: 11240} + Script: {instanceID: 11128} - Class: 114 - Script: {instanceID: 11498} + Script: {instanceID: 11242} - Class: 114 - Script: {instanceID: 13022} + Script: {instanceID: 11500} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -356,13 +356,15 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10720} - Class: 114 - Script: {instanceID: 10916} + Script: {instanceID: 10730} - Class: 114 - Script: {instanceID: 11126} + Script: {instanceID: 10918} - Class: 114 - Script: {instanceID: 11240} + Script: {instanceID: 11128} - Class: 114 - Script: {instanceID: 11498} + Script: {instanceID: 11242} + - Class: 114 + Script: {instanceID: 11500} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -419,13 +421,15 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10720} - Class: 114 - Script: {instanceID: 10916} + Script: {instanceID: 10730} + - Class: 114 + Script: {instanceID: 10918} - Class: 114 - Script: {instanceID: 11126} + Script: {instanceID: 11128} - Class: 114 - Script: {instanceID: 11240} + Script: {instanceID: 11242} - Class: 114 - Script: {instanceID: 11498} + Script: {instanceID: 11500} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -474,11 +478,11 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10650} - Class: 114 - Script: {instanceID: 11126} + Script: {instanceID: 11128} - Class: 114 - Script: {instanceID: 11240} + Script: {instanceID: 11242} - Class: 114 - Script: {instanceID: 11498} + Script: {instanceID: 11500} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -523,11 +527,13 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 10650} - Class: 114 - Script: {instanceID: 11126} + Script: {instanceID: 10730} + - Class: 114 + Script: {instanceID: 11128} - Class: 114 - Script: {instanceID: 11240} + Script: {instanceID: 11242} - Class: 114 - Script: {instanceID: 11498} + Script: {instanceID: 11500} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -801,6 +807,12 @@ ScriptsOnlyBuild: assemblyName: Assembly-CSharp.dll namespaceName: className: ArrastarESoltar + - hash: + serializedVersion: 2 + Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f + assemblyName: Assembly-CSharp.dll + namespaceName: + className: botaoSalvar - hash: serializedVersion: 2 Hash: 5ad4aa237d47ac2bab17bacb672edf7a @@ -975,12 +987,6 @@ ScriptsOnlyBuild: assemblyName: Unity.Timeline.dll namespaceName: UnityEngine.Timeline className: SignalEmitter - - hash: - serializedVersion: 2 - Hash: a2d4f8a2ac979089923687e6f4ed4b7c - assemblyName: Assembly-CSharp.dll - namespaceName: - className: teste - hash: serializedVersion: 2 Hash: 7072231382eb3c4871b3dd75ad0227e1 @@ -999,12 +1005,6 @@ ScriptsOnlyBuild: assemblyName: Unity.Timeline.dll namespaceName: UnityEngine.Timeline className: PlayableTrack - - hash: - serializedVersion: 2 - Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f - assemblyName: Assembly-CSharp.dll - namespaceName: - className: botaoSalvar platform: 13 scenePathNames: - Assets/Scenes/tela_menu.unity @@ -1017,4 +1017,4 @@ ScriptsOnlyBuild: - Assets/Scenes/dialogo_4.unity - Assets/Scenes/puzzle3.unity - Assets/Scenes/dialogo_5.unity - playerPath: C:/Users/jcs19/Documents/#01_PastaProvisoria/ProjetoMemorias/JogoMemorias_v04-alpha.apk + playerPath: C:/Users/jcs19/Documents/#01_PastaProvisoria/ProjetoMemorias/JogoMemorias_v01-beta.apk diff --git a/ProjetoMemorias/Library/ScriptAssemblies/Assembly-CSharp.dll b/ProjetoMemorias/Library/ScriptAssemblies/Assembly-CSharp.dll index 1688615..148882f 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/Assembly-CSharp.dll and b/ProjetoMemorias/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/ProjetoMemorias/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll b/ProjetoMemorias/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll index e2c7609..b25e75e 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll and b/ProjetoMemorias/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll differ diff --git a/ProjetoMemorias/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll b/ProjetoMemorias/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll index 5c812f2..9e390c1 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll and b/ProjetoMemorias/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll differ diff --git a/ProjetoMemorias/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll b/ProjetoMemorias/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll index 1f507f2..24588f6 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll and b/ProjetoMemorias/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll differ diff --git a/ProjetoMemorias/Library/ScriptAssemblies/Unity.Rider.Editor.dll b/ProjetoMemorias/Library/ScriptAssemblies/Unity.Rider.Editor.dll index 30579c3..568c9f6 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/Unity.Rider.Editor.dll and b/ProjetoMemorias/Library/ScriptAssemblies/Unity.Rider.Editor.dll differ diff --git a/ProjetoMemorias/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll b/ProjetoMemorias/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll index e4ca0f3..d04aa14 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll and b/ProjetoMemorias/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll differ diff --git a/ProjetoMemorias/Library/ScriptAssemblies/Unity.TextMeshPro.dll b/ProjetoMemorias/Library/ScriptAssemblies/Unity.TextMeshPro.dll index e2df289..0cf3775 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/Unity.TextMeshPro.dll and b/ProjetoMemorias/Library/ScriptAssemblies/Unity.TextMeshPro.dll differ diff --git a/ProjetoMemorias/Library/ScriptAssemblies/Unity.Timeline.Editor.dll b/ProjetoMemorias/Library/ScriptAssemblies/Unity.Timeline.Editor.dll index b641b38..8746a73 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/Unity.Timeline.Editor.dll and b/ProjetoMemorias/Library/ScriptAssemblies/Unity.Timeline.Editor.dll differ diff --git a/ProjetoMemorias/Library/ScriptAssemblies/Unity.Timeline.dll b/ProjetoMemorias/Library/ScriptAssemblies/Unity.Timeline.dll index 451b808..367b365 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/Unity.Timeline.dll and b/ProjetoMemorias/Library/ScriptAssemblies/Unity.Timeline.dll differ diff --git a/ProjetoMemorias/Library/ScriptAssemblies/Unity.VSCode.Editor.dll b/ProjetoMemorias/Library/ScriptAssemblies/Unity.VSCode.Editor.dll index f1367ca..a746e09 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/Unity.VSCode.Editor.dll and b/ProjetoMemorias/Library/ScriptAssemblies/Unity.VSCode.Editor.dll differ diff --git a/ProjetoMemorias/Library/ScriptAssemblies/UnityEditor.TestRunner.dll b/ProjetoMemorias/Library/ScriptAssemblies/UnityEditor.TestRunner.dll index ae1d671..deff637 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/UnityEditor.TestRunner.dll and b/ProjetoMemorias/Library/ScriptAssemblies/UnityEditor.TestRunner.dll differ diff --git a/ProjetoMemorias/Library/ScriptAssemblies/UnityEditor.UI.dll b/ProjetoMemorias/Library/ScriptAssemblies/UnityEditor.UI.dll index 5a04c6a..12ad1dd 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/UnityEditor.UI.dll and b/ProjetoMemorias/Library/ScriptAssemblies/UnityEditor.UI.dll differ diff --git a/ProjetoMemorias/Library/ScriptAssemblies/UnityEngine.TestRunner.dll b/ProjetoMemorias/Library/ScriptAssemblies/UnityEngine.TestRunner.dll index e7ebb66..afbd568 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/UnityEngine.TestRunner.dll and b/ProjetoMemorias/Library/ScriptAssemblies/UnityEngine.TestRunner.dll differ diff --git a/ProjetoMemorias/Library/ScriptAssemblies/UnityEngine.UI.dll b/ProjetoMemorias/Library/ScriptAssemblies/UnityEngine.UI.dll index 0f694b6..32a7e0a 100644 Binary files a/ProjetoMemorias/Library/ScriptAssemblies/UnityEngine.UI.dll and b/ProjetoMemorias/Library/ScriptAssemblies/UnityEngine.UI.dll differ diff --git a/ProjetoMemorias/Library/StateCache/SceneView/6091ea-mainStage.json b/ProjetoMemorias/Library/StateCache/SceneView/6091ea-mainStage.json index 4e26e83..51e914c 100644 --- a/ProjetoMemorias/Library/StateCache/SceneView/6091ea-mainStage.json +++ b/ProjetoMemorias/Library/StateCache/SceneView/6091ea-mainStage.json @@ -1 +1 @@ -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-0.04543871432542801,"y":-0.1587623655796051,"z":-1341.1700439453125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":12.370591163635254,"orthographic":true} \ No newline at end of file +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-0.4251055121421814,"y":0.3456532955169678,"z":-4449.09326171875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":14.138496398925782,"orthographic":true} \ No newline at end of file diff --git a/ProjetoMemorias/Library/assetDatabase3 b/ProjetoMemorias/Library/assetDatabase3 index 9342e89..bd2d140 100644 Binary files a/ProjetoMemorias/Library/assetDatabase3 and b/ProjetoMemorias/Library/assetDatabase3 differ diff --git a/ProjetoMemorias/Library/metadata/3d/3d2fd939264cbd94b9a1ff6c9880db3a b/ProjetoMemorias/Library/metadata/3d/3d2fd939264cbd94b9a1ff6c9880db3a index e4ccd90..98f2f8c 100644 Binary files a/ProjetoMemorias/Library/metadata/3d/3d2fd939264cbd94b9a1ff6c9880db3a and b/ProjetoMemorias/Library/metadata/3d/3d2fd939264cbd94b9a1ff6c9880db3a differ diff --git a/ProjetoMemorias/Library/metadata/9e/9e7b587f3ba203648b17a6733567d205 b/ProjetoMemorias/Library/metadata/9e/9e7b587f3ba203648b17a6733567d205 deleted file mode 100644 index c0d7394..0000000 Binary files a/ProjetoMemorias/Library/metadata/9e/9e7b587f3ba203648b17a6733567d205 and /dev/null differ diff --git a/ProjetoMemorias/Library/metadata/9e/9e7b587f3ba203648b17a6733567d205.info b/ProjetoMemorias/Library/metadata/9e/9e7b587f3ba203648b17a6733567d205.info deleted file mode 100644 index 5ea198a..0000000 Binary files a/ProjetoMemorias/Library/metadata/9e/9e7b587f3ba203648b17a6733567d205.info and /dev/null differ diff --git a/ProjetoMemorias/Library/metadata/c9/c9a2d3b66ea5cc345aeb908d6dbbd4c8 b/ProjetoMemorias/Library/metadata/c9/c9a2d3b66ea5cc345aeb908d6dbbd4c8 index 17dddc0..7bfe9fb 100644 Binary files a/ProjetoMemorias/Library/metadata/c9/c9a2d3b66ea5cc345aeb908d6dbbd4c8 and b/ProjetoMemorias/Library/metadata/c9/c9a2d3b66ea5cc345aeb908d6dbbd4c8 differ