Wes xx build fix

This commit is contained in:
Dries Van Schuylenbergh
2023-03-09 12:44:11 +00:00
committed by Louis Adriaens
parent 601cf38c61
commit 2fa54620ef
74 changed files with 1009 additions and 214 deletions

View File

@@ -1,12 +1,9 @@
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using static Unity.VisualScripting.Member;
using UnityEditor;
public class GameController : MonoBehaviour
{
@@ -107,7 +104,7 @@ public class GameController : MonoBehaviour
replayButton.onClick.AddListener(Start);
// Create entry in current user for keeping track of progress
user = userList.users[userList.currentUserIndex];
user = userList.GetCurrentUser();
progress = user.minigames.Find((p) => p != null && p.Get<MinigameIndex>("minigameIndex") == minigame.index);
if (progress == null)
{
@@ -118,7 +115,8 @@ public class GameController : MonoBehaviour
progress.AddOrUpdate<int>("highscore", 0);
user.minigames.Add(progress);
}
EditorUtility.SetDirty(user);
userList.Save();
DeleteWord();
// TODO: change to ScriptableObject
themeList = ThemeLoader.LoadJson();
@@ -191,7 +189,7 @@ public class GameController : MonoBehaviour
if (score < highscore)
{
progress.AddOrUpdate<int>("highsscore", score);
EditorUtility.SetDirty(user);
userList.Save();
}
// @lukas stuff

View File

@@ -1,10 +1,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class ThemeItem : MonoBehaviour

View File

@@ -1,5 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
// JSON structure containing all themes/words

View File

@@ -1,8 +1,4 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using TMPro;
using UnityEngine.SceneManagement;
public class ThemeSelectionController : MonoBehaviour