cneicy/Dontback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码格式化

Browse Source 
Signed-off-by: Eicy <im@crash.work>
This commit is contained in:
Eicy
2024-09-14 15:56:34 +08:00
parent 1614c6a29b
commit e601da9a96
10 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Scripts/Camera/CameraPostProcessing.cs
View File

@@ -8,6 +8,7 @@ namespace Camera
{ {
private UnityEngine.Camera _camera; private UnityEngine.Camera _camera;
private PostProcessVolume _processVolume; private PostProcessVolume _processVolume;
private void Awake() private void Awake()
{ {
_camera = GetComponent<UnityEngine.Camera>(); _camera = GetComponent<UnityEngine.Camera>();
@@ -23,12 +24,14 @@ namespace Camera
private void PostProcess() private void PostProcess()
{ {
_camera.fieldOfView = Mathf.Lerp(_camera.fieldOfView, 90f, Time.deltaTime * 10f); _camera.fieldOfView = Mathf.Lerp(_camera.fieldOfView, 90f, Time.deltaTime * 10f);
_processVolume.profile.GetSetting<ChromaticAberration>().intensity.value = Mathf.Lerp(_processVolume.profile.GetSetting<ChromaticAberration>().intensity.value, 1f, Time.deltaTime * 10f); _processVolume.profile.GetSetting<ChromaticAberration>().intensity.value = Mathf.Lerp(
_processVolume.profile.GetSetting<ChromaticAberration>().intensity.value, 1f, Time.deltaTime * 10f);
} }
private void ProcessingStop() private void ProcessingStop()
{ {
_processVolume.profile.GetSetting<ChromaticAberration>().intensity.value = Mathf.Lerp(_processVolume.profile.GetSetting<ChromaticAberration>().intensity.value, 0f, Time.deltaTime * 10f); _processVolume.profile.GetSetting<ChromaticAberration>().intensity.value = Mathf.Lerp(
_processVolume.profile.GetSetting<ChromaticAberration>().intensity.value, 0f, Time.deltaTime * 10f);
_camera.fieldOfView = Mathf.Lerp(_camera.fieldOfView, 60f, Time.deltaTime * 10f); _camera.fieldOfView = Mathf.Lerp(_camera.fieldOfView, 60f, Time.deltaTime * 10f);
} }
} }

5
Assets/Scripts/Camera/CameraShake.cs
View File

@@ -12,6 +12,7 @@ namespace Camera
private Vector3 _originalPos; private Vector3 _originalPos;
private bool _isRunning; private bool _isRunning;
private bool _isWalking; private bool _isWalking;
private void Start() private void Start()
{ {
_originalPos = cameraTransform.localPosition; _originalPos = cameraTransform.localPosition;
@@ -59,10 +60,10 @@ namespace Camera
var yShake = Mathf.Cos(Time.time * frequency / 2 * 2) * amplitude * 0.5f; var yShake = Mathf.Cos(Time.time * frequency / 2 * 2) * amplitude * 0.5f;
cameraTransform.localPosition = _originalPos + new Vector3(xShake, yShake, 0); cameraTransform.localPosition = _originalPos + new Vector3(xShake, yShake, 0);
}else }
else
cameraTransform.localPosition = _originalPos; cameraTransform.localPosition = _originalPos;
} }
} }
} }
} }

4
Assets/Scripts/Data/DialogData.cs
View File

@@ -1,5 +1,5 @@
public struct DialogData public struct DialogData
{ {
public int index; public int index;
public string content; public string content;
} }

1
Assets/Scripts/Event/EventManager.cs
View File

@@ -72,6 +72,7 @@ namespace Event
{ {
PlayerRunStart?.Invoke(); PlayerRunStart?.Invoke();
} }
public void OnPlayerRunning() public void OnPlayerRunning()
{ {
PlayerRunning?.Invoke(); PlayerRunning?.Invoke();

2
Assets/Scripts/Items/TestItem.cs
View File

@@ -4,7 +4,7 @@ using Items.Interface;
namespace Items namespace Items
{ {
public class TestItem : ItemBase , IItem public class TestItem : ItemBase, IItem
{ {
protected override void ActivateItem() protected override void ActivateItem()
{ {

1
Assets/Scripts/Keyboard/KeySettingManager.cs
View File

@@ -37,6 +37,7 @@ namespace Keyboard
{ {
_instance = this; _instance = this;
} }
DontDestroyOnLoad(gameObject); DontDestroyOnLoad(gameObject);
filePath = Application.persistentDataPath + "/" + "KeySetting.json"; filePath = Application.persistentDataPath + "/" + "KeySetting.json";
LoadKeySettings(); LoadKeySettings();

15
Assets/Scripts/Player/PlayerMotion.cs
View File

@@ -23,7 +23,8 @@ namespace Player
private void Run() 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); rb.AddForce(_velocity.normalized * (Time.deltaTime * 50), ForceMode.Impulse);
if (_velocity == Vector3.zero) if (_velocity == Vector3.zero)
{ {
@@ -32,7 +33,9 @@ namespace Player
temp.y = rb.velocity.y; temp.y = rb.velocity.y;
rb.velocity = temp; 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) if (!_isRunning)
{ {
@@ -41,10 +44,13 @@ namespace Player
EventManager.Instance.OnPlayerWalkStop(); EventManager.Instance.OnPlayerWalkStop();
EventManager.Instance.OnPlayerRunStart(); EventManager.Instance.OnPlayerRunStart();
} }
EventManager.Instance.OnPlayerRunning(); 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) if (!_isWalking)
{ {
@@ -53,6 +59,7 @@ namespace Player
EventManager.Instance.OnPlayerRunStop(); EventManager.Instance.OnPlayerRunStop();
EventManager.Instance.OnPlayerWalkStart(); EventManager.Instance.OnPlayerWalkStart();
} }
EventManager.Instance.OnPlayerWalking(); EventManager.Instance.OnPlayerWalking();
rb.velocity = Vector3.ClampMagnitude(rb.velocity, maxVelocity); rb.velocity = Vector3.ClampMagnitude(rb.velocity, maxVelocity);
} }

5
Assets/Scripts/UI/Dialog.cs
View File

@@ -11,7 +11,8 @@ namespace UI
{ {
[SerializeField] private string dialogsPath; [SerializeField] private string dialogsPath;
[SerializeField] private string dialogJson; [SerializeField] private string dialogJson;
private Dictionary<int,string> _dialogsMap = new(); private Dictionary<int, string> _dialogsMap = new();
private void Awake() private void Awake()
{ {
dialogsPath = Application.persistentDataPath + "/" + "Dialogs.json"; dialogsPath = Application.persistentDataPath + "/" + "Dialogs.json";
@@ -19,7 +20,7 @@ namespace UI
if (File.Exists(dialogsPath)) if (File.Exists(dialogsPath))
{ {
dialogJson = File.ReadAllText(dialogsPath); dialogJson = File.ReadAllText(dialogsPath);
_dialogsMap = JsonConvert.DeserializeObject<Dictionary<int,string>>(dialogJson); _dialogsMap = JsonConvert.DeserializeObject<Dictionary<int, string>>(dialogJson);
} }
else else
{ {