Fix input conflict in input config.
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace Cryville.Crtr.Config {
|
||||
@@ -17,6 +18,7 @@ namespace Cryville.Crtr.Config {
|
||||
m_value.text = "None";
|
||||
m_button.onClick.AddListener(() => {
|
||||
master.OpenDialog(name);
|
||||
EventSystem.current.SetSelectedGameObject(null);
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -17,6 +17,8 @@ namespace Cryville.Crtr {
|
||||
SettingsPanel m_settingsPanel;
|
||||
[SerializeField]
|
||||
TMP_Text m_title;
|
||||
[SerializeField]
|
||||
GameObject[] m_backBlockingObjects;
|
||||
#pragma warning restore IDE0044
|
||||
|
||||
int frameIndex = 2;
|
||||
@@ -65,6 +67,9 @@ namespace Cryville.Crtr {
|
||||
m_title.SetText(title);
|
||||
}
|
||||
public void Back() {
|
||||
foreach (var obj in m_backBlockingObjects) {
|
||||
if (obj.activeInHierarchy) return;
|
||||
}
|
||||
if (m_browserMaster.Back()) return;
|
||||
m_targetAnimator.SetTrigger("G_Back");
|
||||
if (_uiStack.Count <= 1) return;
|
||||
|
Binary file not shown.
Reference in New Issue
Block a user