fixed controls, texts and added image, v1.4.1

This commit is contained in:
TAASONI3
2023-07-05 17:42:35 +02:00
parent 0dc2ff831f
commit d0d9a6847a
33 changed files with 11964 additions and 405 deletions

View File

@@ -20,8 +20,6 @@ public class AudioHandler : MonoBehaviour
AudioSource cameraAudio;
AudioSource playerAudio;
string filepath = "./audiosettings.txt";
// Start is called before the first frame update
public void Start()
{
@@ -118,8 +116,8 @@ public class AudioHandler : MonoBehaviour
string result = "";
float music = GameObject.Find("slideMusic").GetComponent<Slider>().value;
float effects = GameObject.Find("slideEffects").GetComponent<Slider>().value;
result = result + TextHandler.getText("music") + ": " + music + "\r\n";
result = result + TextHandler.getText("effects") + ": " + effects;
result = result + TextHandler.getText("music") + ":" + music + "\r\n";
result = result + TextHandler.getText("effects") + ":" + effects;
return result;
}
}

View File

@@ -82,6 +82,7 @@ namespace Assets.Scripts
string saveText = "";
audioHandler.playButtonClick();
saveText = saveText + uihandler.saveVideoSettings() + "\r\n";
saveText = saveText + uihandler.saveLanguage() + "\r\n";
saveText = saveText + audioHandler.saveAudioSettings() + "\r\n";
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().mouseSpeed = GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value;
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().controllerSpeed = GameObject.Find("slideSensitivityController").GetComponent<Slider>().value;

View File

@@ -8,6 +8,7 @@ using UnityEngine;
using UnityEngine.UI;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using UnityEngine.Localization.Settings;
namespace Assets.Scripts
{
@@ -54,8 +55,9 @@ namespace Assets.Scripts
sw = File.CreateText(settingsPath);
sw.WriteLine("Music:0.5");
sw.WriteLine("Effects:0.5");
sw.WriteLine("Resolution:0");
sw.WriteLine("Resolution:1");
sw.WriteLine("Mode:0");
sw.WriteLine("Language:en");
sw.WriteLine("SensitivityMouse:1");
sw.WriteLine("SensitivityController:1");
sw.Flush();
@@ -96,6 +98,9 @@ namespace Assets.Scripts
break;
}
break;
case "Language":
LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale(line.Split(":")[1]);
break;
case "SensitivityMouse":
if(isIngame){
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().mouseSpeed = float.Parse(line.Split(':')[1]);
@@ -126,6 +131,9 @@ namespace Assets.Scripts
case "Mode":
GameObject.Find("dropMode").GetComponent<Dropdown>().value = int.Parse(line.Split(':')[1]);
break;
case "Language":
GameObject.Find("dropLanguage").GetComponent<Dropdown>().value = line.Split(':')[1].Equals("en") ? 1 : 0;
break;
case "SensitivityMouse":
GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value = float.Parse(line.Split(':')[1]);
break;

View File

@@ -34,8 +34,20 @@ public class TextHandler : MonoBehaviour
public static string translate(string text){
string result = "";
for(int i = 0; i < text.Split(" ").Length; i++){
result += getText(text.Split(" ")[i]) + " ";
string[] parts = text.Split(" ");
for(int i = 0; i < parts.Length; i++){
try{
int.Parse(parts[i]);
result += parts[i] + " ";
}
catch(Exception ex){
if(parts[i].Contains("/")){
result += parts[i] + " ";
}
else{
result += getText(parts[i]) + " ";
}
}
}
return result;
}

View File

@@ -4,6 +4,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.Localization.Settings;
using UnityEngine.UI;
namespace Assets.Scripts
@@ -127,7 +128,6 @@ namespace Assets.Scripts
public void openOptions()
{
options.SetActive(true);
FileHandler.loadOptionDisplay();
hideOtherElements(options);
state = UIState.PAUSEOPTIONS;
@@ -137,7 +137,6 @@ namespace Assets.Scripts
public void closeOptions()
{
options.SetActive(false);
state = UIState.PAUSE;
openPauseMenu();
}
@@ -304,6 +303,22 @@ namespace Assets.Scripts
return result;
}
public string saveLanguage(){
GameObject language = GameObject.Find("dropLanguage");
string result = "";
switch (language.GetComponent<Dropdown>().value)
{
case 0:
result = "de";
break;
case 1:
result = "en";
break;
}
result = "Language:"+result;
return result;
}
public void openPauseMenu()
{
hideOtherElements(pauseMenu);
@@ -576,5 +591,18 @@ namespace Assets.Scripts
}
}
}
public void switchLanguage(){
GameObject language = GameObject.Find("dropLanguage");
switch (language.GetComponent<Dropdown>().value)
{
case 0:
LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("de");
break;
case 1:
LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("en");
break;
}
}
}
}