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

更新至Unity6

Browse Source
This commit is contained in:
Eicy
2024-10-14 15:31:04 +08:00
parent 6d3f85829b
commit c5192ae3ec
48 changed files with 48730 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/Dialog/DialogManager.cs
View File

@@ -50,7 +50,7 @@ namespace Dialog
{
if (_instance)
return _instance;
_instance = FindObjectOfType<DialogManager>() ??
_instance = FindFirstObjectByType<DialogManager>() ??
new GameObject("DialogData").AddComponent<DialogManager>();
return _instance;
}

6
Assets/Scripts/Dialog/ItemDialog.cs
View File

@@ -27,6 +27,7 @@ namespace Dialog
private void DialogPop(ItemDialogArgs itemDialogArgs)
{
var itemText = DialogManager.Instance.GetItemText(itemDialogArgs.ItemName);
Debug.Log("ItemDialog");
if (itemText is null) return;
panel.SetActive(true);
itemIcon.texture = Resources.Load<Texture2D>("Item" + "/" + itemText.Name);
@@ -35,12 +36,13 @@ namespace Dialog
Time.timeScale = 0;
}
private void Update()
//todo
/*private void Update()
{
if ((!panel.activeSelf || !Input.GetKeyDown(KeyCode.Escape)) &&
!Input.GetKeyDown(KeySettingManager.Instance.GetKey("InterAct"))) return;
Time.timeScale = 1;
panel.SetActive(false);
}
}*/
}
}

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

@@ -14,7 +14,7 @@ namespace Event
{
if (_instance)
return _instance;
_instance = FindObjectOfType<EventManager>() ??
_instance = FindFirstObjectByType<EventManager>() ??
new GameObject("EventManager").AddComponent<EventManager>();
return _instance;
}

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

@@ -9,7 +9,7 @@ namespace Items
protected override void ActivateItem()
{
base.ActivateItem();
EventManager.Instance.OnDialogPop(index);
//EventManager.Instance.OnDialogPop(index);
EventManager.Instance.OnItemDialog(gameObject.name);
Destroy(gameObject);
}

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

@@ -19,7 +19,7 @@ namespace Keyboard
{
if (_instance)
return _instance;
_instance = FindObjectOfType<KeySettingManager>() ??
_instance = FindFirstObjectByType<KeySettingManager>() ??
new GameObject("KeySettingManager").AddComponent<KeySettingManager>();
return _instance;
}

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

@@ -28,10 +28,10 @@ namespace Player
rb.AddForce(_velocity.normalized * (Time.deltaTime * 50), ForceMode.Impulse);
if (_velocity == Vector3.zero)
{
var temp = rb.velocity;
var temp = rb.linearVelocity;
temp = Vector3.ClampMagnitude(temp, 2);
temp.y = rb.velocity.y;
rb.velocity = temp;
temp.y = rb.linearVelocity.y;
rb.linearVelocity = temp;
}
if (Input.GetKey(KeySettingManager.Instance.GetKey("Run")) &&
@@ -46,7 +46,7 @@ namespace Player
}
EventManager.Instance.OnPlayerRunning();
rb.velocity = Vector3.ClampMagnitude(rb.velocity, maxVelocity + 2);
rb.linearVelocity = Vector3.ClampMagnitude(rb.linearVelocity, maxVelocity + 2);
}
if (!Input.GetKey(KeySettingManager.Instance.GetKey("Run")) &&
@@ -61,7 +61,7 @@ namespace Player
}
EventManager.Instance.OnPlayerWalking();
rb.velocity = Vector3.ClampMagnitude(rb.velocity, maxVelocity);
rb.linearVelocity = Vector3.ClampMagnitude(rb.linearVelocity, maxVelocity);
}
if (KeySettingManager.Instance.Direction == Vector2.zero)