|
|
@@ -9,11 +9,13 @@ public class GameMenuView : MonoBehaviour
|
|
|
public Button[] funcItemButtons;
|
|
|
private int funcItemButtonIndex = -1;
|
|
|
void UpdateFuncItemButtonIndex(int deltaValue) {
|
|
|
- if (funcItemButtonIndex == -1) funcItemButtonIndex = 0;
|
|
|
- funcItemButtonIndex += deltaValue;
|
|
|
- while (funcItemButtonIndex < 0) {
|
|
|
- funcItemButtonIndex += funcItemButtons.Length;
|
|
|
+ if (funcItemButtonIndex == -1)
|
|
|
+ {
|
|
|
+ funcItemButtonIndex = 0;
|
|
|
+ return;
|
|
|
}
|
|
|
+ funcItemButtonIndex += deltaValue;
|
|
|
+ while (funcItemButtonIndex < 0) funcItemButtonIndex += funcItemButtons.Length;
|
|
|
funcItemButtonIndex %= funcItemButtons.Length;
|
|
|
}
|
|
|
|
|
|
@@ -39,7 +41,8 @@ public class GameMenuView : MonoBehaviour
|
|
|
if (Input.GetKeyDown(KeyCode.Escape))
|
|
|
{
|
|
|
funcItemButtonIndex = -1;
|
|
|
- ResumeTarget();
|
|
|
+ SetSelectable(null);
|
|
|
+ AudioMgr.ins.PlayBtn();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -50,11 +53,15 @@ public class GameMenuView : MonoBehaviour
|
|
|
Selectable.Transition _btnTransition;
|
|
|
|
|
|
void SetSelectable(Selectable selectable) {
|
|
|
- if (!selectable) return;
|
|
|
if (selectable == _targetSelectable) return;
|
|
|
|
|
|
ResumeTarget();
|
|
|
|
|
|
+ if (!selectable) {
|
|
|
+ _targetSelectable = null;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
Button btn = selectable.GetComponent<Button>();
|
|
|
if (!btn) return;
|
|
|
if (!btn.interactable) return;
|