Assemblied created
This commit is contained in:
25
Assets/Scripts/Game/Game_Assembly.asmdef
Normal file
25
Assets/Scripts/Game/Game_Assembly.asmdef
Normal file
@ -0,0 +1,25 @@
|
||||
{
|
||||
"name": "Game_Assembly",
|
||||
"rootNamespace": "Game",
|
||||
"references": [
|
||||
"GUID:457756d89b35d2941b3e7b37b4ece6f1",
|
||||
"GUID:a075b55b404a34748ac14ea9b6039911",
|
||||
"GUID:78bd2ddd6e276394a9615c203e574844",
|
||||
"GUID:344e024b5bc996043a11da352e2c9150",
|
||||
"GUID:304b399c7a7ca8f45afdcd73cf5552b3",
|
||||
"GUID:5b5e144fbbfa9e24188cdc68fa9a4b3c",
|
||||
"GUID:df380645f10b7bc4b97d4f5eb6303d95",
|
||||
"GUID:6e5480588ffa37d4f82fe96c45e8ce9c",
|
||||
"GUID:bf043f86dbf1bda4398ec83eebe40b8c",
|
||||
"GUID:f0bbd04fc036a3046993adc87bbfb698"
|
||||
],
|
||||
"includePlatforms": [],
|
||||
"excludePlatforms": [],
|
||||
"allowUnsafeCode": false,
|
||||
"overrideReferences": false,
|
||||
"precompiledReferences": [],
|
||||
"autoReferenced": true,
|
||||
"defineConstraints": [],
|
||||
"versionDefines": [],
|
||||
"noEngineReferences": false
|
||||
}
|
7
Assets/Scripts/Game/Game_Assembly.asmdef.meta
Normal file
7
Assets/Scripts/Game/Game_Assembly.asmdef.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ed2e13dc5752a434aadb5bd0b74dd42a
|
||||
AssemblyDefinitionImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -4,11 +4,14 @@ using UnityEngine;
|
||||
using UnityEngine.Rendering;
|
||||
using UnityEngine.SceneManagement;
|
||||
|
||||
|
||||
namespace Game
|
||||
{
|
||||
public class InGameManager : MonoBehaviour
|
||||
{
|
||||
|
||||
[SerializeField] private Volume gameVolume;
|
||||
|
||||
|
||||
[SerializeField] private Volume pausedVolume;
|
||||
|
||||
@ -27,6 +30,7 @@ public class InGameManager : MonoBehaviour
|
||||
private bool isTransitioning;
|
||||
|
||||
public bool IsPaused => isPaused;
|
||||
[SerializeField] private Scriptable.GameState state;
|
||||
|
||||
// Start is called before the first frame update
|
||||
private void Start()
|
||||
@ -45,6 +49,7 @@ public class InGameManager : MonoBehaviour
|
||||
// Update is called once per frame
|
||||
private void Update()
|
||||
{
|
||||
state.IsPaused = isPaused;
|
||||
if (Input.GetButtonDown("Pause")) TogglePause();
|
||||
|
||||
if (isTransitioning || true)
|
||||
|
@ -15,7 +15,7 @@ namespace Game
|
||||
|
||||
private InGameManager gameManager;
|
||||
private Animator menuAnimator;
|
||||
private Player.PlayerComponent player;
|
||||
[SerializeField] private Scriptable.GameSettings settings;
|
||||
|
||||
// Start is called before the first frame update
|
||||
private void Start()
|
||||
@ -23,7 +23,7 @@ namespace Game
|
||||
menuAnimator = GetComponent<Animator>();
|
||||
settingsButton.onClick.AddListener(SettingsClicked);
|
||||
returnToMenuButton.onClick.AddListener(SettingsUnClicked);
|
||||
player = FindObjectOfType(typeof(Player.PlayerComponent)) as Player.PlayerComponent;
|
||||
|
||||
gameManager = FindObjectOfType<InGameManager>();
|
||||
}
|
||||
|
||||
@ -44,7 +44,8 @@ namespace Game
|
||||
|
||||
public void UpdateSensitivity()
|
||||
{
|
||||
player.SetSensitivity(sensitivitySlider.value * 4f);
|
||||
//player.SetSensitivity(sensitivitySlider.value * 4f);
|
||||
settings.Sensitivity = sensitivitySlider.value * 4f;
|
||||
}
|
||||
|
||||
public void UpdateVolume()
|
||||
|
Reference in New Issue
Block a user