diff --git a/Assets/JustSign/Scenes/Game.unity b/Assets/JustSign/Scenes/Game.unity index f93d241..5698440 100644 --- a/Assets/JustSign/Scenes/Game.unity +++ b/Assets/JustSign/Scenes/Game.unity @@ -434,6 +434,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 114026901} m_CullTransparentMesh: 1 +--- !u!1 &128049074 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 128049075} + - component: {fileID: 128049077} + - component: {fileID: 128049076} + m_Layer: 5 + m_Name: Feedback + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &128049075 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 128049074} + 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: 906197777} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -448.00266} + m_SizeDelta: {x: 284.0106, y: 92.0053} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &128049076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 128049074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 48 + m_fontSizeBase: 48 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &128049077 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 128049074} + m_CullTransparentMesh: 1 --- !u!1 &129643495 GameObject: m_ObjectHideFlags: 0 @@ -2129,6 +2264,7 @@ RectTransform: - {fileID: 2093721209} - {fileID: 2012531008} - {fileID: 114026903} + - {fileID: 128049075} m_Father: {fileID: 1768150806} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4765,6 +4901,8 @@ MonoBehaviour: m_EditorClassIdentifier: canvas: {fileID: 1768150805} answerField: {fileID: 114026902} + feedBack: {fileID: 128049076} + hitZone: {fileID: 2012531007} --- !u!1 &1898716846 GameObject: m_ObjectHideFlags: 0 @@ -5070,8 +5208,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 480, y: -200} - m_SizeDelta: {x: -1640, y: -800} + m_AnchoredPosition: {x: 580, y: -200} + m_SizeDelta: {x: -1840, y: -800} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2012531009 MonoBehaviour: diff --git a/Assets/JustSign/Scripts/JustSignController.cs b/Assets/JustSign/Scripts/JustSignController.cs index 65b21a4..d98ee97 100644 --- a/Assets/JustSign/Scripts/JustSignController.cs +++ b/Assets/JustSign/Scripts/JustSignController.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using TMPro; @@ -19,6 +20,16 @@ public class JustSignController : MonoBehaviour /// public TMP_InputField answerField; + /// + /// The feedback on the timing + /// + public TMP_Text feedBack; + + /// + /// The zone that the player should be hitting with his or her inputs + /// + public GameObject hitZone; + /// /// All of the words that can be used in this session /// @@ -44,6 +55,11 @@ public class JustSignController : MonoBehaviour /// private List activeSymbols = new List(); + /// + /// The current score + /// + private int score; + /// /// Width and height of the symbols /// @@ -64,11 +80,31 @@ public class JustSignController : MonoBehaviour /// private int trackY = -200; + /// + /// Max distance from hit zone to get perfect score + /// + private int perfectBoundary = 10; + + /// + /// Max distance from hit zone to get good score + /// + private int goodBoundary = 120; + + /// + /// Max distance from hit zone to get meh score + /// + private int mehBoundary = 200; + /// /// Time at which the last symbol was spawned /// private float lastSpawn; + /// + /// Determines every how many seconds a symbol should spawn (will become music-dependent later on) + /// + private float spawnPeriod = 3.0f; + /// /// Start is called before the first frame update /// @@ -78,7 +114,8 @@ public class JustSignController : MonoBehaviour currentTheme = FindThemeByName(PlayerPrefs.GetString("themeName")); words = currentTheme.words; lastSpawn = Time.time; - + Debug.Log(hitZone.transform.position.x); + Debug.Log(hitZone.transform.position.y); SpawnNewSymbol(); } @@ -86,22 +123,42 @@ public class JustSignController : MonoBehaviour /// Update is called once per frame /// void Update() - { + { /* + Debug.Log("X"); + Debug.Log(activeSymbols[0].transform.position.x); + Debug.Log("Y"); + Debug.Log(activeSymbols[0].transform.position.y); + */ + // Destroy the oldest symbol if the current input matches it if (answerField.text.ToLower() == activeWords[0]) { + int difference = Math.Abs((int) (activeSymbols[0].transform.position.x - hitZone.transform.position.x)); + if (difference < perfectBoundary) { + feedBack.text = "Perfect!"; + } else if (difference < goodBoundary) { + feedBack.text = "Good!"; + } else if (difference < mehBoundary) { + feedBack.text = "Meh..."; + } else { + feedBack.text = "Terrible!"; + } + DestroyRightmostSymbol(); answerField.text = ""; } + // Destroy the oldest symbol if it leaves the screen if (activeSymbols[0].GetComponent().localPosition.x > -trackX) { DestroyRightmostSymbol(); } + // Spawn new symbol every spawn period float currentTime = Time.time; - if (currentTime - lastSpawn > 1) { + if (currentTime - lastSpawn > spawnPeriod) { lastSpawn = currentTime; SpawnNewSymbol(); } + // Move all active symbols to the right foreach (GameObject symbol in activeSymbols) { RectTransform rectTransform = symbol.GetComponent(); rectTransform.localPosition = new Vector3(rectTransform.localPosition.x + Time.deltaTime * moveSpeed, trackY, 0);