diff --git a/Assets/JustSign/Scenes/Game.unity b/Assets/JustSign/Scenes/Game.unity index 5698440..e4b5899 100644 --- a/Assets/JustSign/Scenes/Game.unity +++ b/Assets/JustSign/Scenes/Game.unity @@ -492,7 +492,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: New Text + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -2265,6 +2265,7 @@ RectTransform: - {fileID: 2012531008} - {fileID: 114026903} - {fileID: 128049075} + - {fileID: 1627575592} m_Father: {fileID: 1768150806} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4340,6 +4341,141 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: -8, y: -5, z: -8, w: -5} m_Softness: {x: 0, y: 0} +--- !u!1 &1627575591 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1627575592} + - component: {fileID: 1627575594} + - component: {fileID: 1627575593} + m_Layer: 5 + m_Name: Score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1627575592 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627575591} + 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: 7 + 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: 431} + m_SizeDelta: {x: 284.0106, y: 92.0053} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1627575593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627575591} + 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: + 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 &1627575594 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627575591} + m_CullTransparentMesh: 1 --- !u!1 &1628221034 GameObject: m_ObjectHideFlags: 0 @@ -4902,6 +5038,7 @@ MonoBehaviour: canvas: {fileID: 1768150805} answerField: {fileID: 114026902} feedBack: {fileID: 128049076} + scoreDisplay: {fileID: 1627575593} hitZone: {fileID: 2012531007} --- !u!1 &1898716846 GameObject: diff --git a/Assets/JustSign/Scripts/JustSignController.cs b/Assets/JustSign/Scripts/JustSignController.cs index d98ee97..ac671f8 100644 --- a/Assets/JustSign/Scripts/JustSignController.cs +++ b/Assets/JustSign/Scripts/JustSignController.cs @@ -25,6 +25,11 @@ public class JustSignController : MonoBehaviour /// public TMP_Text feedBack; + /// + /// The current score + /// + public TMP_Text scoreDisplay; + /// /// The zone that the player should be hitting with his or her inputs /// @@ -85,16 +90,41 @@ public class JustSignController : MonoBehaviour /// private int perfectBoundary = 10; + /// + /// Score obtained when getting a perfect hit + /// + private int perfectScore = 5; + /// /// Max distance from hit zone to get good score /// private int goodBoundary = 120; + /// + /// Score obtained when getting a good hit + /// + private int goodScore = 3; + /// /// Max distance from hit zone to get meh score /// private int mehBoundary = 200; + /// + /// Score obtained when getting a meh hit + /// + private int mehScore = 1; + + /// + /// Score obtained when getting a terrible hit + /// + private int terribleScore = -3; + + /// + /// Score obtained when symbol goes offscreen + /// + private int offscreenScore = -5; + /// /// Time at which the last symbol was spawned /// @@ -110,12 +140,11 @@ public class JustSignController : MonoBehaviour /// void Start() { + scoreDisplay.text = "Score: " + score.ToString(); themeList = ThemeLoader.LoadJson(); currentTheme = FindThemeByName(PlayerPrefs.GetString("themeName")); words = currentTheme.words; lastSpawn = Time.time; - Debug.Log(hitZone.transform.position.x); - Debug.Log(hitZone.transform.position.y); SpawnNewSymbol(); } @@ -123,23 +152,22 @@ 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!"; + score += perfectScore; } else if (difference < goodBoundary) { feedBack.text = "Good!"; + score += goodScore; } else if (difference < mehBoundary) { feedBack.text = "Meh..."; + score += mehScore; } else { feedBack.text = "Terrible!"; + score += terribleScore; } DestroyRightmostSymbol(); @@ -149,6 +177,7 @@ public class JustSignController : MonoBehaviour // Destroy the oldest symbol if it leaves the screen if (activeSymbols[0].GetComponent().localPosition.x > -trackX) { DestroyRightmostSymbol(); + score += offscreenScore; } // Spawn new symbol every spawn period @@ -163,6 +192,8 @@ public class JustSignController : MonoBehaviour RectTransform rectTransform = symbol.GetComponent(); rectTransform.localPosition = new Vector3(rectTransform.localPosition.x + Time.deltaTime * moveSpeed, trackY, 0); } + + scoreDisplay.text = "Score: " + score.ToString(); } /// diff --git a/Assets/SpellingBee/Scripts/Score.cs b/Assets/SpellingBee/Scripts/Score.cs deleted file mode 100644 index 6d4840a..0000000 --- a/Assets/SpellingBee/Scripts/Score.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; - -public partial class GameController -{ - /// - /// Score class TODO: Move to separate file - /// - [Serializable] - public class Score - { - public int scoreValue; - public string time; - } -} diff --git a/Assets/SpellingBee/Scripts/Score.cs.meta b/Assets/SpellingBee/Scripts/Score.cs.meta deleted file mode 100644 index 8d122b6..0000000 --- a/Assets/SpellingBee/Scripts/Score.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 44c1f8e0fa862b44485ebaa3c81698fc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/users.json b/Assets/users.json index 94163b1..617e981 100644 --- a/Assets/users.json +++ b/Assets/users.json @@ -1 +1 @@ -{"currentUserIndex":0,"storedUsers":[{"username":"adikkema","avatar":{"instanceID":33830},"playtime":0.0,"courses":[],"minigames":[{"entries":[{"key":"minigameIndex","bytes":[0,1,0,0,0,255,255,255,255,1,0,0,0,0,0,0,0,12,2,0,0,0,70,65,115,115,101,109,98,108,121,45,67,83,104,97,114,112,44,32,86,101,114,115,105,111,110,61,48,46,48,46,48,46,48,44,32,67,117,108,116,117,114,101,61,110,101,117,116,114,97,108,44,32,80,117,98,108,105,99,75,101,121,84,111,107,101,110,61,110,117,108,108,5,1,0,0,0,13,77,105,110,105,103,97,109,101,73,110,100,101,120,1,0,0,0,7,118,97,108,117,101,95,95,0,8,2,0,0,0,0,0,0,0,11]},{"key":"highscore","bytes":[0,1,0,0,0,255,255,255,255,1,0,0,0,0,0,0,0,4,1,0,0,0,12,83,121,115,116,101,109,46,73,110,116,51,50,1,0,0,0,7,109,95,118,97,108,117,101,0,8,0,0,0,0,11]},{"key":"scores","bytes":[0,1,0,0,0,255,255,255,255,1,0,0,0,0,0,0,0,12,2,0,0,0,70,65,115,115,101,109,98,108,121,45,67,83,104,97,114,112,44,32,86,101,114,115,105,111,110,61,48,46,48,46,48,46,48,44,32,67,117,108,116,117,114,101,61,110,101,117,116,114,97,108,44,32,80,117,98,108,105,99,75,101,121,84,111,107,101,110,61,110,117,108,108,4,1,0,0,0,129,1,83,121,115,116,101,109,46,67,111,108,108,101,99,116,105,111,110,115,46,71,101,110,101,114,105,99,46,76,105,115,116,96,49,91,91,71,97,109,101,67,111,110,116,114,111,108,108,101,114,43,83,99,111,114,101,44,32,65,115,115,101,109,98,108,121,45,67,83,104,97,114,112,44,32,86,101,114,115,105,111,110,61,48,46,48,46,48,46,48,44,32,67,117,108,116,117,114,101,61,110,101,117,116,114,97,108,44,32,80,117,98,108,105,99,75,101,121,84,111,107,101,110,61,110,117,108,108,93,93,3,0,0,0,6,95,105,116,101,109,115,5,95,115,105,122,101,8,95,118,101,114,115,105,111,110,4,0,0,22,71,97,109,101,67,111,110,116,114,111,108,108,101,114,43,83,99,111,114,101,91,93,2,0,0,0,8,8,9,3,0,0,0,1,0,0,0,1,0,0,0,7,3,0,0,0,0,1,0,0,0,1,0,0,0,4,20,71,97,109,101,67,111,110,116,114,111,108,108,101,114,43,83,99,111,114,101,2,0,0,0,9,4,0,0,0,5,4,0,0,0,20,71,97,109,101,67,111,110,116,114,111,108,108,101,114,43,83,99,111,114,101,2,0,0,0,10,115,99,111,114,101,86,97,108,117,101,4,116,105,109,101,0,1,8,2,0,0,0,0,0,0,0,6,5,0,0,0,21,51,47,49,53,47,50,48,50,51,32,49,48,58,48,52,58,52,48,32,80,77,11]}]}]}]} \ No newline at end of file +{"currentUserIndex":0,"storedUsers":[{"username":"mettn","avatar":{"instanceID":34256},"playtime":0.0,"courses":[],"minigames":[{"entries":[{"key":"minigameIndex","bytes":[0,1,0,0,0,255,255,255,255,1,0,0,0,0,0,0,0,12,2,0,0,0,72,73,110,116,101,114,102,97,99,101,115,83,99,114,105,112,116,115,44,32,86,101,114,115,105,111,110,61,48,46,48,46,48,46,48,44,32,67,117,108,116,117,114,101,61,110,101,117,116,114,97,108,44,32,80,117,98,108,105,99,75,101,121,84,111,107,101,110,61,110,117,108,108,5,1,0,0,0,13,77,105,110,105,103,97,109,101,73,110,100,101,120,1,0,0,0,7,118,97,108,117,101,95,95,0,8,2,0,0,0,0,0,0,0,11]},{"key":"highscore","bytes":[0,1,0,0,0,255,255,255,255,1,0,0,0,0,0,0,0,4,1,0,0,0,12,83,121,115,116,101,109,46,73,110,116,51,50,1,0,0,0,7,109,95,118,97,108,117,101,0,8,0,0,0,0,11]},{"key":"scores","bytes":[0,1,0,0,0,255,255,255,255,1,0,0,0,0,0,0,0,12,2,0,0,0,72,73,110,116,101,114,102,97,99,101,115,83,99,114,105,112,116,115,44,32,86,101,114,115,105,111,110,61,48,46,48,46,48,46,48,44,32,67,117,108,116,117,114,101,61,110,101,117,116,114,97,108,44,32,80,117,98,108,105,99,75,101,121,84,111,107,101,110,61,110,117,108,108,4,1,0,0,0,116,83,121,115,116,101,109,46,67,111,108,108,101,99,116,105,111,110,115,46,71,101,110,101,114,105,99,46,76,105,115,116,96,49,91,91,83,99,111,114,101,44,32,73,110,116,101,114,102,97,99,101,115,83,99,114,105,112,116,115,44,32,86,101,114,115,105,111,110,61,48,46,48,46,48,46,48,44,32,67,117,108,116,117,114,101,61,110,101,117,116,114,97,108,44,32,80,117,98,108,105,99,75,101,121,84,111,107,101,110,61,110,117,108,108,93,93,3,0,0,0,6,95,105,116,101,109,115,5,95,115,105,122,101,8,95,118,101,114,115,105,111,110,4,0,0,7,83,99,111,114,101,91,93,2,0,0,0,8,8,9,3,0,0,0,0,0,0,0,0,0,0,0,7,3,0,0,0,0,1,0,0,0,0,0,0,0,4,5,83,99,111,114,101,2,0,0,0,11]}]}]}]} \ No newline at end of file