Skip to content

Commit a848a9c

Browse files
committed
Merge branch 'pr/67' into main
2 parents 60a1543 + f734bcd commit a848a9c

20 files changed

+12503
-0
lines changed

UOP1_Project/Assets/Scenes/Settings System.unity

Lines changed: 11931 additions & 0 deletions
Large diffs are not rendered by default.

UOP1_Project/Assets/Scenes/Settings System.unity.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Scripts/Systems.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Scripts/Systems/Settings.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 8d1813776c092430c8317fdd5290dc57, type: 3}
13+
m_Name: GraphicsPresets
14+
m_EditorClassIdentifier:
15+
presetList:
16+
- qualityLevel: 0
17+
shadowQuality: 0
18+
anisotropicFiltering: 0
19+
antiAliasing: 0
20+
shadowDistance: 20
21+
custom: 0
22+
- qualityLevel: 1
23+
shadowQuality: 1
24+
anisotropicFiltering: 1
25+
antiAliasing: 2
26+
shadowDistance: 50
27+
custom: 0
28+
- qualityLevel: 2
29+
shadowQuality: 2
30+
anisotropicFiltering: 2
31+
antiAliasing: 8
32+
shadowDistance: 100
33+
custom: 0

UOP1_Project/Assets/Scripts/Systems/Settings/GraphicsPresets.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
using System;
2+
using System.Collections;
3+
using System.Collections.Generic;
4+
using UnityEngine;
5+
6+
[CreateAssetMenu(fileName = "GraphicsPresets", menuName = "Graphics/Presets", order = 1)]
7+
public class SettingsPresetsScriptableObject : ScriptableObject
8+
{
9+
public List<AdvancedGraphics> presetList;
10+
11+
[Serializable]
12+
public struct AdvancedGraphics
13+
{
14+
public GraphicsQualityLevel qualityLevel;
15+
public ShadowQuality shadowQuality;
16+
public AnisotropicFiltering anisotropicFiltering;
17+
public int antiAliasing;
18+
public float shadowDistance;
19+
public bool custom;
20+
}
21+
22+
public enum GraphicsQualityLevel
23+
{
24+
Low,
25+
Middle,
26+
High
27+
}
28+
29+
public AdvancedGraphics GetPresetByQualityLevel(GraphicsQualityLevel level)
30+
{
31+
foreach (AdvancedGraphics preset in presetList)
32+
{
33+
if (level == preset.qualityLevel)
34+
{
35+
return preset;
36+
}
37+
}
38+
39+
return default;
40+
}
41+
}

UOP1_Project/Assets/Scripts/Systems/Settings/SettingsPresetsScriptableObject.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using UnityEngine;
2+
3+
public class SettingsSystem : MonoBehaviour
4+
{
5+
[SerializeField] SettingsSystemGeneralComponent generalComponent;
6+
[SerializeField] SettingsSystemGraphicsComponent graphicsComponent;
7+
[SerializeField] SettingsSystemAudioComponent audioComponent;
8+
9+
public SettingsSystemGeneralComponent.LanguageSetting Language => generalComponent.Language;
10+
public bool FullScreen => graphicsComponent.FullScreen;
11+
public float MusicVolume => audioComponent.MusicVolume;
12+
public float SfxVolume => audioComponent.SfxVolume;
13+
14+
}

UOP1_Project/Assets/Scripts/Systems/Settings/SettingsSystem.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)