Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Fix input conflict in input config.

Browse Source
This commit is contained in:
PopSlime
2023-02-12 17:27:15 +08:00
parent abb7ad6f24
commit f60ba1088d
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Cryville/Crtr/Config/InputConfigPanelEntry.cs
View File

@@ -1,4 +1,5 @@
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI; using UnityEngine.UI;
namespace Cryville.Crtr.Config { namespace Cryville.Crtr.Config {
@@ -17,6 +18,7 @@ namespace Cryville.Crtr.Config {
m_value.text = "None"; m_value.text = "None";
m_button.onClick.AddListener(() => { m_button.onClick.AddListener(() => {
master.OpenDialog(name); master.OpenDialog(name);
EventSystem.current.SetSelectedGameObject(null);
}); });
} }

5
Assets/Cryville/Crtr/Menu.cs
View File

@@ -17,6 +17,8 @@ namespace Cryville.Crtr {
SettingsPanel m_settingsPanel; SettingsPanel m_settingsPanel;
[SerializeField] [SerializeField]
TMP_Text m_title; TMP_Text m_title;
[SerializeField]
GameObject[] m_backBlockingObjects;
#pragma warning restore IDE0044 #pragma warning restore IDE0044
int frameIndex = 2; int frameIndex = 2;
@@ -65,6 +67,9 @@ namespace Cryville.Crtr {
m_title.SetText(title); m_title.SetText(title);
} }
public void Back() { public void Back() {
foreach (var obj in m_backBlockingObjects) {
if (obj.activeInHierarchy) return;
}
if (m_browserMaster.Back()) return; if (m_browserMaster.Back()) return;
m_targetAnimator.SetTrigger("G_Back"); m_targetAnimator.SetTrigger("G_Back");
if (_uiStack.Count <= 1) return; if (_uiStack.Count <= 1) return;

BIN
Assets/Menu.unity
View File

Binary file not shown.