diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index a50fe7d..d952b47 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -370,7 +370,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Easy + m_Text: Einfach --- !u!222 &22113748 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3352,7 +3352,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Warrior + m_Text: Krieger --- !u!222 &385059081 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3566,6 +3566,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 402060856} m_CullTransparentMesh: 1 +--- !u!1 &446493448 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 446493449} + m_Layer: 0 + m_Name: GameData + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &446493449 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446493448} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 959.6816, y: 0, z: 3891.7393} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &447210028 GameObject: m_ObjectHideFlags: 0 @@ -7041,7 +7072,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: K + m_Text: "Klein (5 St\xE4dte)" --- !u!222 &929276014 CanvasRenderer: m_ObjectHideFlags: 0 @@ -9602,7 +9633,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 800x600 + m_Text: Deutsch --- !u!222 &1225249785 CanvasRenderer: m_ObjectHideFlags: 0 @@ -10570,7 +10601,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Human + m_Text: Mensch --- !u!222 &1332405179 CanvasRenderer: m_ObjectHideFlags: 0 @@ -10669,6 +10700,98 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1333783825} m_CullTransparentMesh: 1 +--- !u!1 &1338623866 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1338623869} + - component: {fileID: 1338623868} + - component: {fileID: 1338623867} + m_Layer: 0 + m_Name: Main Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1338623867 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1338623866} + m_Enabled: 1 +--- !u!20 &1338623868 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1338623866} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1338623869 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1338623866} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1348951832 GameObject: m_ObjectHideFlags: 0 @@ -16578,7 +16701,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Window + m_Text: Fenster --- !u!222 &1955851823 CanvasRenderer: m_ObjectHideFlags: 0 @@ -17880,3 +18003,5 @@ SceneRoots: - {fileID: 1311414698} - {fileID: 356515707} - {fileID: 990713968} + - {fileID: 446493449} + - {fileID: 1338623869} diff --git a/Assets/Scripts/Handler/AudioHandler.cs b/Assets/Scripts/Handler/AudioHandler.cs index e41400c..3c4661b 100644 --- a/Assets/Scripts/Handler/AudioHandler.cs +++ b/Assets/Scripts/Handler/AudioHandler.cs @@ -110,14 +110,4 @@ public class AudioHandler : MonoBehaviour GameObject.Find("slideEffects").GetComponent().value = playerAudio.volume; GameObject.Find("slideMusic").GetComponent().value = cameraAudio.volume; } - - public string saveAudioSettings() - { - string result = ""; - float music = GameObject.Find("slideMusic").GetComponent().value; - float effects = GameObject.Find("slideEffects").GetComponent().value; - result = result + "Music:" + music + "\r\n"; - result = result + "Effects:" + effects; - return result; - } } diff --git a/Assets/Scripts/Handler/ButtonHandler.cs b/Assets/Scripts/Handler/ButtonHandler.cs index 17ee0a0..d5bbaa6 100644 --- a/Assets/Scripts/Handler/ButtonHandler.cs +++ b/Assets/Scripts/Handler/ButtonHandler.cs @@ -84,7 +84,7 @@ namespace Assets.Scripts audioHandler.playButtonClick(); saveText = saveText + uihandler.saveVideoSettings() + "\r\n"; saveText = saveText + uihandler.saveLanguage() + "\r\n"; - saveText = saveText + audioHandler.saveAudioSettings() + "\r\n"; + saveText = saveText + uihandler.saveAudioSettings() + "\r\n"; GameObject.Find("Controls").GetComponent().sensitivityMouse = new Vector2( GameObject.Find("slideSensitivityMouseHorizontal").GetComponent().value, GameObject.Find("slideSensitivityMouseVertical").GetComponent().value diff --git a/Assets/Scripts/Handler/FileHandler.cs b/Assets/Scripts/Handler/FileHandler.cs index 689787c..4558e6b 100644 --- a/Assets/Scripts/Handler/FileHandler.cs +++ b/Assets/Scripts/Handler/FileHandler.cs @@ -67,9 +67,11 @@ namespace Assets.Scripts foreach(string line in lines){ switch(line.Split(":")[0]){ case "Music": + if (!isIngame) break; GameObject.Find("Main Camera").GetComponent().volume = float.Parse(line.Split(':')[1]); break; case "Effects": + if (!isIngame) break; GameObject.Find("Player").GetComponent().volume = float.Parse(line.Split(':')[1]); break; case "Resolution": diff --git a/Assets/Scripts/Handler/SteamWorksHandler.cs b/Assets/Scripts/Handler/SteamWorksHandler.cs index 6c2b2c2..0ab432b 100644 --- a/Assets/Scripts/Handler/SteamWorksHandler.cs +++ b/Assets/Scripts/Handler/SteamWorksHandler.cs @@ -41,14 +41,47 @@ public class SteamWorksHandler : MonoBehaviour } } + public static void getFirstPlayAchievement() + { + if (SteamManager.Initialized) + { + bool hasAchievement; + bool success = SteamUserStats.GetAchievement("StartAchievement", out hasAchievement); + if (success && !hasAchievement) + { + SteamUserStats.SetAchievement("StartAchievement"); + SteamUserStats.StoreStats(); + } + } + } + + public static void getCharacterCreationAchievement() + { + if (SteamManager.Initialized) + { + bool hasAchievement; + bool success = SteamUserStats.GetAchievement("CharAchievement", out hasAchievement); + if (success && !hasAchievement) + { + SteamUserStats.SetAchievement("CharAchievement"); + SteamUserStats.StoreStats(); + } + } + } + public static void getStandardAchievement(string name) { if (!isGodMode()) { if (SteamManager.Initialized) { - SteamUserStats.SetAchievement(name); - SteamUserStats.StoreStats(); + bool hasAchievement; + bool success = SteamUserStats.GetAchievement(name, out hasAchievement); + if (success && !hasAchievement) + { + SteamUserStats.SetAchievement(name); + SteamUserStats.StoreStats(); + } } } } @@ -57,8 +90,13 @@ public class SteamWorksHandler : MonoBehaviour { if (SteamManager.Initialized) { - SteamUserStats.SetAchievement("GodAchievement"); - SteamUserStats.StoreStats(); + bool hasAchievement; + bool success = SteamUserStats.GetAchievement("GodAchievement", out hasAchievement); + if (success && !hasAchievement) + { + SteamUserStats.SetAchievement("GodAchievement"); + SteamUserStats.StoreStats(); + } } } @@ -90,8 +128,13 @@ public class SteamWorksHandler : MonoBehaviour { if (SteamManager.Initialized) { - SteamUserStats.SetAchievement(name); - SteamUserStats.StoreStats(); + bool hasAchievement; + bool success = SteamUserStats.GetAchievement(name, out hasAchievement); + if (success && !hasAchievement) + { + SteamUserStats.SetAchievement(name); + SteamUserStats.StoreStats(); + } } } } @@ -107,29 +150,37 @@ public class SteamWorksHandler : MonoBehaviour { if (!isGodMode()) { - SteamUserStats.SetAchievement("ItemAchievement"); - SteamUserStats.StoreStats(); + bool hasAchievement; + bool success = SteamUserStats.GetAchievement("ItemAchievement", out hasAchievement); + if (success && !hasAchievement) + { + SteamUserStats.SetAchievement("ItemAchievement"); + SteamUserStats.StoreStats(); + } + string name = ""; switch (item.getRarity()) { case ItemRarity.COMMON: - SteamUserStats.SetAchievement("CommonAchievement"); - SteamUserStats.StoreStats(); + name = "CommonAchievement"; break; case ItemRarity.RARE: - SteamUserStats.SetAchievement("RareAchievement"); - SteamUserStats.StoreStats(); + name = "RareAchievement"; break; case ItemRarity.EPIC: - SteamUserStats.SetAchievement("EpicAchievement"); - SteamUserStats.StoreStats(); + name = "EpicAchievement"; break; case ItemRarity.LEGENDARY: - SteamUserStats.SetAchievement("LegendaryAchievement"); - SteamUserStats.StoreStats(); + name = "LegendaryAchievement"; break; } + success = SteamUserStats.GetAchievement(name, out hasAchievement); + if (success && !hasAchievement) + { + SteamUserStats.SetAchievement(name); + SteamUserStats.StoreStats(); + } } } - + } } diff --git a/Assets/Scripts/Handler/UIHandler.cs b/Assets/Scripts/Handler/UIHandler.cs index 6a26575..67340a2 100644 --- a/Assets/Scripts/Handler/UIHandler.cs +++ b/Assets/Scripts/Handler/UIHandler.cs @@ -296,6 +296,16 @@ namespace Assets.Scripts return result; } + public string saveAudioSettings() + { + string result = ""; + float music = GameObject.Find("slideMusic").GetComponent().value; + float effects = GameObject.Find("slideEffects").GetComponent().value; + result = result + "Music:" + music + "\r\n"; + result = result + "Effects:" + effects; + return result; + } + public void openPauseMenu() { hideOtherElements(pauseMenu); @@ -313,7 +323,7 @@ namespace Assets.Scripts public void showDeathScreen() { state = UIState.DEATH; - + PlayerObject player = GameObject.Find("Player").GetComponent().getPlayer(); GameObject statText = GameObject.Find("txtDeathStats"); string text = statText.GetComponent().text; diff --git a/Assets/Scripts/Menu/ButtonHandlerMenu.cs b/Assets/Scripts/Menu/ButtonHandlerMenu.cs index e92733c..10dda6a 100644 --- a/Assets/Scripts/Menu/ButtonHandlerMenu.cs +++ b/Assets/Scripts/Menu/ButtonHandlerMenu.cs @@ -9,13 +9,11 @@ namespace Assets.Scripts.Menu public class ButtonHandlerMenu : MonoBehaviour { UIHandlerMenu uihandler; - AudioHandler audioHandler; SceneHandler sceneHandler; private void Start() { uihandler = GameObject.Find("UIHandler").GetComponent(); - audioHandler = GameObject.Find("AudioHandler").GetComponent(); sceneHandler = GameObject.Find("SceneHandlerLoaded").GetComponent(); if(FileHandler.hasSaveFile()){ GameObject.Find("btnLoad").GetComponent