diff --git a/Assets/Scenes/SceneUnity.unity b/Assets/Scenes/SceneUnity.unity index 9ed2f22..f6f6ad1 100644 --- a/Assets/Scenes/SceneUnity.unity +++ b/Assets/Scenes/SceneUnity.unity @@ -316,7 +316,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 688067481} - m_RootOrder: 4 + 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} @@ -530,17 +530,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 684742172} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 688067481} - m_RootOrder: 2 + m_Father: {fileID: 928082020} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.0010681151, y: -272} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &684742174 @@ -614,7 +614,6 @@ RectTransform: m_Children: - {fileID: 863474840} - {fileID: 242025437} - - {fileID: 684742173} - {fileID: 1334178018} - {fileID: 434190814} m_Father: {fileID: 1319816890} @@ -1166,13 +1165,18 @@ MonoBehaviour: lengths: - {fileID: 7258324625842614780, guid: 4ead936c2f2085d48b81defe274f569a, type: 3} - {fileID: 7258324625842614780, guid: 44ae7734a977b4841846708441d640d6, type: 3} + - {fileID: 0} - {fileID: 7258324625842614780, guid: 33fa0f6fcbc88d842a72d2c0ecd260bc, type: 3} + - {fileID: 7258324625842614780, guid: 58ad4e169ae42e648a34605b685ddcd8, type: 3} numberImage: 0 lengthTexts: 2 arrowLeft: {fileID: 515450135} arrowRight: {fileID: 91748009} m_Animator: {fileID: 891683120} textNumber: {fileID: 761596205} + images: 02000000 + imageAndTexts: + - {fileID: 684742172} --- !u!1 &1319816889 GameObject: m_ObjectHideFlags: 0 @@ -1305,7 +1309,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 688067481} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/SwipeManagementScript.cs b/Assets/Scripts/SwipeManagementScript.cs index 7ad08ce..100d4f1 100644 --- a/Assets/Scripts/SwipeManagementScript.cs +++ b/Assets/Scripts/SwipeManagementScript.cs @@ -19,13 +19,21 @@ public class SwipeManagementScript : MonoBehaviour public TMP_Text textNumber; + public List images; + private Vector2 startTouchPosition; - private Vector2 endTouchPosition; + private Vector2 endTouchPosition; + + private GameObject image; + + public List imageAndTexts; + private int indexList = 0; + // Start is called before the first frame update void Start() { textSteps.text = lengths[0].text; - textNumber.text = "Step 1/" + lengthTexts; + textNumber.text = "Step 1/" + (lengthTexts+1); arrowLeft.gameObject.SetActive(false); } @@ -63,8 +71,15 @@ public class SwipeManagementScript : MonoBehaviour if(numberImage != 0){ arrowLeft.gameObject.SetActive(true); } - textSteps.text = lengths[numberImage].text; - textNumber.text = "Step" + (numberImage+1) + "/" + lengthTexts; + if(images.Contains(numberImage - 1)){ + DisableImageStep(); + } + if(images.Contains(numberImage)){ + SetImageStep(); + }else{ + textSteps.text = lengths[numberImage].text; + textNumber.text = "Step" + (numberImage+1) + "/" + (lengthTexts+1); + } } } @@ -78,9 +93,16 @@ public class SwipeManagementScript : MonoBehaviour } if(numberImage != lengthTexts){ arrowRight.gameObject.SetActive(true); - } - textSteps.text = lengths[numberImage].text; - textNumber.text = "Step" + (numberImage+1) + "/" + lengthTexts; + } + if(images.Contains(numberImage + 1)){ + DisableImageStep(); + } + if(images.Contains(numberImage)){ + SetImageStep(); + }else{ + textSteps.text = lengths[numberImage].text; + textNumber.text = "Step" + (numberImage+1) + "/" + (lengthTexts+1); + } } } @@ -92,4 +114,16 @@ public class SwipeManagementScript : MonoBehaviour m_Animator.ResetTrigger("SwipeDown"); m_Animator.SetTrigger("SwipeUp"); } + + private void SetImageStep(){ + textSteps.text = ""; + textNumber.text = "Step" + (numberImage+1) + "/" + (lengthTexts+1); + image = imageAndTexts[indexList]; + indexList ++; + image.SetActive(true); + } + + private void DisableImageStep(){ + image.SetActive(false); + } } diff --git a/Assets/Text/TextStep4.prefab b/Assets/Text/TextStep4.prefab new file mode 100644 index 0000000..30124d4 --- /dev/null +++ b/Assets/Text/TextStep4.prefab @@ -0,0 +1,82 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8773979142530325389 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 702887422664560343} + - component: {fileID: 7773009873150152974} + - component: {fileID: 7258324625842614780} + m_Layer: 5 + m_Name: TextStep4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &702887422664560343 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8773979142530325389} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -12.999986} + m_LocalScale: {x: 1.5000002, y: 1.5000002, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + 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, y: -1.4999998} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7773009873150152974 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8773979142530325389} + m_CullTransparentMesh: 1 +--- !u!114 &7258324625842614780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8773979142530325389} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 652f7165b7c30ab46af6c4aad90a639b, type: 2} + m_FontSize: 16 + 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: SUUUUUUUUUUUUUUU diff --git a/Assets/Text/TextStep4.prefab.meta b/Assets/Text/TextStep4.prefab.meta new file mode 100644 index 0000000..8cf79e8 --- /dev/null +++ b/Assets/Text/TextStep4.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 58ad4e169ae42e648a34605b685ddcd8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: