diff --git a/Assets/Scripts/Camera/CameraController.cs b/Assets/Scripts/Camera/CameraController.cs index d8551ee..aa43789 100644 --- a/Assets/Scripts/Camera/CameraController.cs +++ b/Assets/Scripts/Camera/CameraController.cs @@ -18,10 +18,10 @@ namespace Camera { var mouseX = Input.GetAxis("Mouse X") * mouseSensitivity * Time.deltaTime; var mouseY = Input.GetAxis("Mouse Y") * mouseSensitivity * Time.deltaTime; - + _xRotation -= mouseY; _xRotation = Mathf.Clamp(_xRotation, -90f, 90f); - + transform.localRotation = Quaternion.Euler(_xRotation, 0f, 0f); playerBody.Rotate(Vector3.up * mouseX); } diff --git a/Assets/Scripts/Camera/CameraInteract.cs b/Assets/Scripts/Camera/CameraInteract.cs index 563ee02..4f16596 100644 --- a/Assets/Scripts/Camera/CameraInteract.cs +++ b/Assets/Scripts/Camera/CameraInteract.cs @@ -8,7 +8,7 @@ namespace Camera { [SerializeField] private int maxInterActDistance = 10; [SerializeField] private GameObject target; - + private void Update() { diff --git a/Assets/Scripts/Camera/CameraPostProcessing.cs b/Assets/Scripts/Camera/CameraPostProcessing.cs index 07db58e..436337f 100644 --- a/Assets/Scripts/Camera/CameraPostProcessing.cs +++ b/Assets/Scripts/Camera/CameraPostProcessing.cs @@ -8,6 +8,7 @@ namespace Camera { private UnityEngine.Camera _camera; private PostProcessVolume _processVolume; + private void Awake() { _camera = GetComponent(); @@ -23,12 +24,14 @@ namespace Camera private void PostProcess() { _camera.fieldOfView = Mathf.Lerp(_camera.fieldOfView, 90f, Time.deltaTime * 10f); - _processVolume.profile.GetSetting().intensity.value = Mathf.Lerp(_processVolume.profile.GetSetting().intensity.value, 1f, Time.deltaTime * 10f); + _processVolume.profile.GetSetting().intensity.value = Mathf.Lerp( + _processVolume.profile.GetSetting().intensity.value, 1f, Time.deltaTime * 10f); } private void ProcessingStop() { - _processVolume.profile.GetSetting().intensity.value = Mathf.Lerp(_processVolume.profile.GetSetting().intensity.value, 0f, Time.deltaTime * 10f); + _processVolume.profile.GetSetting().intensity.value = Mathf.Lerp( + _processVolume.profile.GetSetting().intensity.value, 0f, Time.deltaTime * 10f); _camera.fieldOfView = Mathf.Lerp(_camera.fieldOfView, 60f, Time.deltaTime * 10f); } } diff --git a/Assets/Scripts/Camera/CameraShake.cs b/Assets/Scripts/Camera/CameraShake.cs index 56d2d2c..f206f58 100644 --- a/Assets/Scripts/Camera/CameraShake.cs +++ b/Assets/Scripts/Camera/CameraShake.cs @@ -12,6 +12,7 @@ namespace Camera private Vector3 _originalPos; private bool _isRunning; private bool _isWalking; + private void Start() { _originalPos = cameraTransform.localPosition; @@ -20,8 +21,8 @@ namespace Camera EventManager.Instance.PlayerWalking += OnPlayerWalking; EventManager.Instance.PlayerWalkStop += StopWalking; } - - + + private void OnPlayerRunning() { _isRunning = true; @@ -31,7 +32,7 @@ namespace Camera { _isWalking = true; } - + private void StopRunning() { _isRunning = false; @@ -48,7 +49,7 @@ namespace Camera { var xShake = Mathf.Sin(Time.time * frequency) * amplitude; var yShake = Mathf.Cos(Time.time * frequency * 2) * amplitude * 0.5f; - + cameraTransform.localPosition = _originalPos + new Vector3(xShake, yShake, 0); } else @@ -57,12 +58,12 @@ namespace Camera { var xShake = Mathf.Sin(Time.time * frequency / 2) * amplitude; var yShake = Mathf.Cos(Time.time * frequency / 2 * 2) * amplitude * 0.5f; - + cameraTransform.localPosition = _originalPos + new Vector3(xShake, yShake, 0); - }else + } + else cameraTransform.localPosition = _originalPos; } - } } } \ No newline at end of file diff --git a/Assets/Scripts/Data/DialogData.cs b/Assets/Scripts/Data/DialogData.cs index 4a0a303..11efccb 100644 --- a/Assets/Scripts/Data/DialogData.cs +++ b/Assets/Scripts/Data/DialogData.cs @@ -1,5 +1,5 @@ public struct DialogData { - public int index; - public string content; + public int index; + public string content; } \ No newline at end of file diff --git a/Assets/Scripts/Event/EventManager.cs b/Assets/Scripts/Event/EventManager.cs index 5c2a6cf..c491327 100644 --- a/Assets/Scripts/Event/EventManager.cs +++ b/Assets/Scripts/Event/EventManager.cs @@ -34,10 +34,10 @@ namespace Event public event CameraInterActHandler CameraInterAct; public event DialogPopHandler DialogPop; - + public event PlayerRunStartHandler PlayerRunStart; public event PlayerRunningHandler PlayerRunning; - + public event PlayerRunStopHandler PlayerRunStop; public event PlayerWalkStartHandler PlayerWalkStart; public event PlayerWalkStopHandler PlayerWalkStop; @@ -67,11 +67,12 @@ namespace Event { PlayerWalking?.Invoke(); } - + public void OnPlayerRunStart() { PlayerRunStart?.Invoke(); } + public void OnPlayerRunning() { PlayerRunning?.Invoke(); diff --git a/Assets/Scripts/Items/TestItem.cs b/Assets/Scripts/Items/TestItem.cs index 80a8619..82203b7 100644 --- a/Assets/Scripts/Items/TestItem.cs +++ b/Assets/Scripts/Items/TestItem.cs @@ -4,7 +4,7 @@ using Items.Interface; namespace Items { - public class TestItem : ItemBase , IItem + public class TestItem : ItemBase, IItem { protected override void ActivateItem() { diff --git a/Assets/Scripts/Keyboard/KeySettingManager.cs b/Assets/Scripts/Keyboard/KeySettingManager.cs index dfb993e..8b5888a 100644 --- a/Assets/Scripts/Keyboard/KeySettingManager.cs +++ b/Assets/Scripts/Keyboard/KeySettingManager.cs @@ -12,7 +12,7 @@ namespace Keyboard public string filePath; private static KeySettingManager _instance; - + public static KeySettingManager Instance { get @@ -37,6 +37,7 @@ namespace Keyboard { _instance = this; } + DontDestroyOnLoad(gameObject); filePath = Application.persistentDataPath + "/" + "KeySetting.json"; LoadKeySettings(); @@ -88,7 +89,7 @@ namespace Keyboard SaveKeySettings(); } - + //更新Direction private void Update() { @@ -121,12 +122,12 @@ namespace Keyboard { Direction = new Vector2(0, Direction.y); } - + if (Input.GetKey(GetKey("Up")) && Input.GetKey(GetKey("Down"))) { Direction = new Vector2(Direction.x, 0); } - + if (!Input.GetKey(GetKey("Up")) && !Input.GetKey(GetKey("Down"))) { Direction = new Vector2(Direction.x, 0); diff --git a/Assets/Scripts/Player/PlayerMotion.cs b/Assets/Scripts/Player/PlayerMotion.cs index be6233d..9431b50 100644 --- a/Assets/Scripts/Player/PlayerMotion.cs +++ b/Assets/Scripts/Player/PlayerMotion.cs @@ -23,7 +23,8 @@ namespace Player private void Run() { - _velocity = KeySettingManager.Instance.Direction.x * transform.right + KeySettingManager.Instance.Direction.y * transform.forward; + _velocity = KeySettingManager.Instance.Direction.x * transform.right + + KeySettingManager.Instance.Direction.y * transform.forward; rb.AddForce(_velocity.normalized * (Time.deltaTime * 50), ForceMode.Impulse); if (_velocity == Vector3.zero) { @@ -32,7 +33,9 @@ namespace Player temp.y = rb.velocity.y; rb.velocity = temp; } - if (Input.GetKey(KeySettingManager.Instance.GetKey("Run")) && KeySettingManager.Instance.Direction != Vector2.zero) + + if (Input.GetKey(KeySettingManager.Instance.GetKey("Run")) && + KeySettingManager.Instance.Direction != Vector2.zero) { if (!_isRunning) { @@ -41,10 +44,13 @@ namespace Player EventManager.Instance.OnPlayerWalkStop(); EventManager.Instance.OnPlayerRunStart(); } + EventManager.Instance.OnPlayerRunning(); - rb.velocity = Vector3.ClampMagnitude(rb.velocity, maxVelocity+2); + rb.velocity = Vector3.ClampMagnitude(rb.velocity, maxVelocity + 2); } - if (!Input.GetKey(KeySettingManager.Instance.GetKey("Run")) && KeySettingManager.Instance.Direction != Vector2.zero) + + if (!Input.GetKey(KeySettingManager.Instance.GetKey("Run")) && + KeySettingManager.Instance.Direction != Vector2.zero) { if (!_isWalking) { @@ -53,6 +59,7 @@ namespace Player EventManager.Instance.OnPlayerRunStop(); EventManager.Instance.OnPlayerWalkStart(); } + EventManager.Instance.OnPlayerWalking(); rb.velocity = Vector3.ClampMagnitude(rb.velocity, maxVelocity); } diff --git a/Assets/Scripts/UI/Dialog.cs b/Assets/Scripts/UI/Dialog.cs index 7306e5e..8d2cbf4 100644 --- a/Assets/Scripts/UI/Dialog.cs +++ b/Assets/Scripts/UI/Dialog.cs @@ -11,15 +11,16 @@ namespace UI { [SerializeField] private string dialogsPath; [SerializeField] private string dialogJson; - private Dictionary _dialogsMap = new(); + private Dictionary _dialogsMap = new(); + private void Awake() { dialogsPath = Application.persistentDataPath + "/" + "Dialogs.json"; - + if (File.Exists(dialogsPath)) { dialogJson = File.ReadAllText(dialogsPath); - _dialogsMap = JsonConvert.DeserializeObject>(dialogJson); + _dialogsMap = JsonConvert.DeserializeObject>(dialogJson); } else {