Resolve conflicts

This commit was merged in pull request #10.
This commit is contained in:
lvrossem
2023-03-02 20:52:01 +01:00
275 changed files with 21338 additions and 11 deletions

View File

@@ -0,0 +1,228 @@
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
public class SpellingBeeController : MonoBehaviour {
// All of the words that can be used in this session
private string[] words;
// Where we currently are in the word
private int currentIndex;
// The word that is currently being spelled
private string currentWord;
// All of the available themes
private ThemeList themeList;
// The theme we are currently using
private Theme currentTheme;
// The GameObjects representing the letters
private GameObject[] letters;
// The Image component for displaying the appropriate sprite
public Image image;
// The input field for testing purposes
public TMP_InputField input;
// Current value of timer in seconds
private float timerValue;
// Timer display
public TMP_Text timerText;
// First score display
public TMP_Text correctWordsText;
// Second score display
public TMP_Text correctLettersText;
// The game over panel
public GameObject gameOverPanel;
public Button replayButton;
// Indicates if the game is still going
private bool gameOver;
// Amount of seconds user gets per letter of the current word
// Set to 1 for testing; should be increased later
private int secondsPerLetter = 1;
// Counter that keeps track of how many words have been spelled correctly
private int spelledLetters;
// Counter that keeps track of how many letters have been spelled correctly
private int spelledWords;
// Start is called before the first frame update
void Start() {
spelledLetters = 0;
// We use -1 instead of 0 so SetRandomWord can simply increment it each time
spelledWords = -1;
gameOver = false;
input.text = "";
gameOverPanel.SetActive(false);
replayButton.onClick.AddListener(() => Start());
themeList = ThemeLoader.loadJson();
currentTheme = FindThemeByName(PlayerPrefs.GetString("themeName"));
words = currentTheme.words;
SetRandomWord();
}
// Update is called once per frame
void Update() {
if (!gameOver) {
if (input.text.Length > 0) {
CheckChar(input.text[0]);
}
timerValue -= Time.deltaTime;
if (timerValue <= 0.0f) {
timerValue = 0.0f;
ActivateGameOver();
}
int minutes = Mathf.FloorToInt(timerValue / 60.0f);
int seconds = Mathf.FloorToInt(timerValue % 60.0f);
timerText.text = string.Format("{0:00}:{1:00}", minutes, seconds);
}
}
// Displays the game over panel and score values
void ActivateGameOver() {
DeleteWord();
correctLettersText.text = "Correctly spelled letters: " + spelledLetters.ToString();
correctWordsText.text = "Correctly spelled words: " + spelledWords.ToString();
gameOverPanel.SetActive(true);
gameOverPanel.transform.SetAsLastSibling();
gameOver = true;
}
// Check if the correct char has been given as input
void CheckChar(char letter) {
if (Char.ToUpper(letter) == Char.ToUpper(currentWord[currentIndex]) && input.text.Length == 1) {
letters[currentIndex].GetComponent<Image>().color = Color.green;
input.text = "";
spelledLetters++;
currentIndex++;
if (currentIndex >= currentWord.Length) {
DeleteWord();
StartCoroutine(Wait());
SetRandomWord();
}
}
}
// Delete all letter objects
void DeleteWord() {
for (int i = 0; i < currentWord.Length; i++) {
Destroy(letters[i]);
}
}
// Adds seconds to timer
void AddSeconds(int seconds) {
timerValue += (float) seconds;
}
// Find the chosen theme by its name
Theme FindThemeByName(string themeName) {
int themeIndex = 0;
while (themeIndex < themeList.themes.Length) {
Theme theme = themeList.themes[themeIndex];
if (theme.name == themeName) {
return theme;
}
themeIndex++;
}
Debug.Log("Requested theme not found");
return null;
}
// Pick a new random word from words and initialize the needed variables
void SetRandomWord() {
currentIndex = 0;
spelledWords++;
int randomIndex = UnityEngine.Random.Range(0, words.Length - 1);
string randomWord = words[randomIndex];
letters = new GameObject[randomWord.Length];
currentWord = randomWord;
ChangeSprite(randomWord);
DisplayWord(randomWord);
AddSeconds(currentWord.Length * secondsPerLetter + 1);
}
// Displays the word that needs to be spelled
void DisplayWord(string word) {
int length = word.Length;
int canvasWidth = 1920;
int maxWidth = 1080;
int spacing = maxWidth / (length - 1);
letters = new GameObject[length];
int[] xvalues = new int[length];
for (int i = 0; i < length; i++) {
xvalues[i] = (canvasWidth - maxWidth) / 2 + i * spacing;
}
for (int i = 0; i < length; i++) {
GameObject colorBox = new GameObject("Letter box");
colorBox.transform.SetParent(gameObject.transform);
letters[i] = colorBox;
// Add an Image component to the new GameObject
Image background = colorBox.AddComponent<Image>();
background.color = Color.red;
background.sprite = UnityEditor.AssetDatabase.GetBuiltinExtraResource<Sprite>("UI/Skin/UISprite.psd");
// Create a new child GameObject to hold the Text component
GameObject letterObject = new GameObject("Text");
letterObject.transform.SetParent(colorBox.transform);
// Add a Text component to the new child GameObject
Text letterComponent = letterObject.AddComponent<Text>();
letterComponent.text = Char.ToString(Char.ToUpper(word[i]));
letterComponent.alignment = TextAnchor.MiddleCenter;
letterComponent.fontSize = 60;
// Set the font of the Text component
letterComponent.font = Resources.GetBuiltinResource<Font>("Arial.ttf");
// Set the position of the parent GameObject
colorBox.transform.position = new Vector2(xvalues[i], 450);
}
}
// Change the image that is being displayed
void ChangeSprite(string spriteName) {
Image imageComponent = image.GetComponent<Image>();
// Load the new sprite from the Resources folder
Sprite sprite = Resources.Load<Sprite>("SpellingBee/images/" + spriteName);
// Set the new sprite as the Image component's source image
image.sprite = sprite;
}
IEnumerator Wait() {
yield return new WaitForSecondsRealtime(2);
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 44fbed5ae228de39b9f727def7578d06
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,62 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using TMPro;
public class SpellingBeeThemeSelectionController : MonoBehaviour {
private int buttonHeight = 140;
private int buttonWidth = 600;
private int canvasWidth = 1920;
// Start is called before the first frame update
void Start() {
ThemeList themeList = ThemeLoader.loadJson();
for (int i = 0; i < themeList.themes.Length; i++) {
Theme theme = themeList.themes[i];
// First, you need to create a new button game object
GameObject newButton = new GameObject("Button - " + theme.name);
newButton.transform.SetParent(gameObject.transform);
// Then, add the button component to the game object
Button buttonComponent = newButton.AddComponent<Button>();
buttonComponent.onClick.AddListener(() => OnButtonClick(theme.name));
GameObject colorBox = new GameObject("Letter box");
colorBox.transform.SetParent(newButton.transform);
Image background = colorBox.AddComponent<Image>();
background.rectTransform.sizeDelta = new Vector2(buttonWidth, buttonHeight);
background.color = Color.black;
background.sprite = UnityEditor.AssetDatabase.GetBuiltinExtraResource<Sprite>("UI/Skin/UIMask.psd");
// Create the text game object
GameObject textObject = new GameObject("Text - " + theme.name);
textObject.transform.SetParent(newButton.transform);
// Set the position of the button game object
int xPos = (int) (i % 2 == 0 ? canvasWidth * 0.25f : canvasWidth * 0.75f);
int yPos = (1 + i / 2) * 180;
newButton.transform.position = new Vector2(xPos, yPos);
// Add the text component to the game object
Text textComponent = textObject.AddComponent<Text>();
textComponent.alignment = TextAnchor.MiddleCenter;
textComponent.color = new Color(50, 50, 50);
textComponent.text = theme.name;
textComponent.rectTransform.sizeDelta = new Vector2(buttonWidth, buttonHeight);
textComponent.font = Resources.GetBuiltinResource<Font>("Arial.ttf");
textComponent.fontSize = 36;
}
}
void OnButtonClick(string clickedTheme) {
PlayerPrefs.SetString("themeName", clickedTheme);
ChangeSceneOnClick.loadScene("SpellingBee");
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 68caaa5508a4d40448b47630ff86f035
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,26 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
// JSON structure containing all themes/words
[System.Serializable]
public class ThemeList {
public Theme[] themes;
}
// Object representing part of the JSON containing word data
[System.Serializable]
public class Theme {
public string name;
public string description;
public string[] words;
}
public class ThemeLoader : MonoBehaviour
{
// Loads the JSON file containing all of the themes
public static ThemeList loadJson() {
TextAsset themeJson = Resources.Load<TextAsset>("SpellingBee/words");
return JsonUtility.FromJson<ThemeList>(themeJson.text);
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 3e90cb50d2bd06aa382940db9c8c2810
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: