|
@@ -26,6 +26,14 @@ public class MouseConfirm : MonoBehaviour
|
|
|
|
|
|
|
|
void Update()
|
|
void Update()
|
|
|
{
|
|
{
|
|
|
|
|
+ if (!SB_EventSystem.ins.simulateMouseIsAwaked) {
|
|
|
|
|
+ Hide();
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (!SB_EventSystem.ins.simulateMouse.GetCurrentSelectable()) {
|
|
|
|
|
+ Hide();
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
if (_targetSelectable) {
|
|
if (_targetSelectable) {
|
|
|
if (!_prepared) {
|
|
if (!_prepared) {
|
|
|
_prepared = true;
|
|
_prepared = true;
|
|
@@ -34,7 +42,6 @@ public class MouseConfirm : MonoBehaviour
|
|
|
GetComponent<Canvas>().sortingOrder = _targetSelectable.GetComponentInParent<Canvas>().sortingOrder + 1;
|
|
GetComponent<Canvas>().sortingOrder = _targetSelectable.GetComponentInParent<Canvas>().sortingOrder + 1;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if (!SB_EventSystem.ins.simulateMouseIsAwaked) Hide();
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void Show() {
|
|
void Show() {
|
|
@@ -66,13 +73,9 @@ public class MouseConfirm : MonoBehaviour
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public void SetSelectable(Selectable selectable) {
|
|
public void SetSelectable(Selectable selectable) {
|
|
|
- Debug.Log(1);
|
|
|
|
|
if (!selectable) return;
|
|
if (!selectable) return;
|
|
|
- Debug.Log(2);
|
|
|
|
|
if (selectable == _targetSelectable) return;
|
|
if (selectable == _targetSelectable) return;
|
|
|
- Debug.Log(3);
|
|
|
|
|
if (selectable == _selfSelectable) return;
|
|
if (selectable == _selfSelectable) return;
|
|
|
- Debug.Log(4);
|
|
|
|
|
_targetSelectable = selectable;
|
|
_targetSelectable = selectable;
|
|
|
Show();
|
|
Show();
|
|
|
}
|
|
}
|