更新至Unity6

This commit is contained in:
2024-10-14 15:31:04 +08:00
parent 6d3f85829b
commit c5192ae3ec
48 changed files with 48730 additions and 455 deletions

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;
}

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);
}
}*/
}
}