diff --git a/Assets/00_scripts/CardScripts/Card.cs b/Assets/00_scripts/CardScripts/Card.cs index 83f6aa4..a58ad7a 100644 --- a/Assets/00_scripts/CardScripts/Card.cs +++ b/Assets/00_scripts/CardScripts/Card.cs @@ -55,8 +55,8 @@ public class Card : MonoBehaviour private void OnMouseDrag() { if (is_drag) return; - if (CardEventOS.Instance.LOCK_GET(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM.SORRY_PLEASE_LOCK_I_DRAG_CARD) && !is_drag) return; - if (!CardEventOS.Instance.LOCK_APPLY(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM.SORRY_PLEASE_LOCK_I_DRAG_CARD)) return; + if (CardOS.Instance.LOCK_GET(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM.SORRY_PLEASE_LOCK_I_DRAG_CARD) && !is_drag) return; + if (!CardOS.Instance.LOCK_APPLY(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM.SORRY_PLEASE_LOCK_I_DRAG_CARD)) return; Sequence seq = DOTween.Sequence(); seq.Join(transform.DOMove(hover_position, hover_duration)); seq.Join(transform.DOScale(card_status.SCALE * 2f, hover_duration)); @@ -74,7 +74,7 @@ public class Card : MonoBehaviour seq.Join(transform.DORotateQuaternion(card_status.ROTATION, hover_duration)); seq.OnComplete(() => { - CardEventOS.Instance.LOCK_RELEASE(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM.SORRY_PLEASE_LOCK_I_DRAG_CARD); + CardOS.Instance.LOCK_RELEASE(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM.SORRY_PLEASE_LOCK_I_DRAG_CARD); is_drag = false; }); sprite_renderer.sortingOrder = card_status.SORTING_ORDER; @@ -84,7 +84,7 @@ public class Card : MonoBehaviour private void m_msg_draw_card() { - CardEventOS.Instance.EVENT_REGISTER( + CardOS.Instance.EVENT_REGISTER( CardEventData.EVENT_REGISTER_CARD_ENUM.EXCUSE_ME_PLEASE_LET_ME_DRAW_CARD, callback); void callback(CardEventData.STRUCT_EVENT_DRAW_CARD args) diff --git a/Assets/00_scripts/CardScripts/CardManager.cs b/Assets/00_scripts/CardScripts/CardManager.cs index 15c53e3..b77b0d2 100644 --- a/Assets/00_scripts/CardScripts/CardManager.cs +++ b/Assets/00_scripts/CardScripts/CardManager.cs @@ -42,7 +42,7 @@ public class CardManager : MonoBehaviour { if (Input.GetKeyDown(KeyCode.Space)) { - if (CardEventOS.Instance.LOCK_GET(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM.SORRY_PLEASE_LOCK_I_DRAG_CARD)) + if (CardOS.Instance.LOCK_GET(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM.SORRY_PLEASE_LOCK_I_DRAG_CARD)) { print($"状态已被锁定: {CardEventData.LOCK_EXCLUSIVE_CARD_ENUM.SORRY_PLEASE_LOCK_I_DRAG_CARD}"); return; @@ -105,7 +105,7 @@ public class CardManager : MonoBehaviour Vector3 upwards = Vector3.Cross(up, forward).normalized; // 切线和向上的夹角计算方向 Quaternion rotation = Quaternion.LookRotation(up, upwards); - CardEventOS.Instance.EVENT_TRIGGER(CardEventData.EVENT_REGISTER_CARD_ENUM.EXCUSE_ME_PLEASE_LET_ME_DRAW_CARD, + CardOS.Instance.EVENT_TRIGGER(CardEventData.EVENT_REGISTER_CARD_ENUM.EXCUSE_ME_PLEASE_LET_ME_DRAW_CARD, new CardEventData.STRUCT_EVENT_DRAW_CARD { ID = i, diff --git a/Assets/00_scripts/Events/CardEventOS.cs b/Assets/00_scripts/Events/CardOS.cs similarity index 91% rename from Assets/00_scripts/Events/CardEventOS.cs rename to Assets/00_scripts/Events/CardOS.cs index 0475e22..c79edc3 100644 --- a/Assets/00_scripts/Events/CardEventOS.cs +++ b/Assets/00_scripts/Events/CardOS.cs @@ -1,42 +1,42 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using JetBrains.Annotations; -using UnityEngine; - -public class CardEventOS : MonoBehaviour -{ - public static CardEventOS Instance { get; private set; } - private CardLockSvc cardLockSvc; - private CardEventSvc cardEventSvc; - - private void Awake() - { - if (Instance != null && Instance != this) - { - Destroy(gameObject); - return; - } - - Instance = this; - cardLockSvc = new CardLockSvc(); - cardEventSvc = new CardEventSvc(); - DontDestroyOnLoad(gameObject); - } - - // *************** 锁 **************** - public bool LOCK_APPLY(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM lock_name) => cardLockSvc.LOCK_APPLY(lock_name); - public void LOCK_RELEASE(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM lock_name) => cardLockSvc.LOCK_RELEASE(lock_name); - - public bool LOCK_GET(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM lock_name) => cardLockSvc.LOCK_GET(lock_name); - - // *************** 事件系统 **************** - public void EVENT_REGISTER(CardEventData.EVENT_REGISTER_CARD_ENUM event_name, Action callback) where T : struct => - cardEventSvc.EVENT_REGISTER(event_name, callback); - - public void EVENT_TRIGGER(CardEventData.EVENT_REGISTER_CARD_ENUM event_name, object data) => - cardEventSvc.EVENT_TRIGGER(event_name, data); - - // public void EVENT_UNREGISTER(CardEventData.EVENT_REGISTER_CARD_ENUM event_name, Action callback) => - // cardEventSvc.EVENT_UNREGISTER(event_name, callback); +using System; +using System.Collections; +using System.Collections.Generic; +using JetBrains.Annotations; +using UnityEngine; + +public class CardOS : MonoBehaviour +{ + public static CardOS Instance { get; private set; } + private CardLockSvc cardLockSvc; + private CardEventSvc cardEventSvc; + + private void Awake() + { + if (Instance != null && Instance != this) + { + Destroy(gameObject); + return; + } + + Instance = this; + cardLockSvc = new CardLockSvc(); + cardEventSvc = new CardEventSvc(); + DontDestroyOnLoad(gameObject); + } + + // *************** 锁 **************** + public bool LOCK_APPLY(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM lock_name) => cardLockSvc.LOCK_APPLY(lock_name); + public void LOCK_RELEASE(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM lock_name) => cardLockSvc.LOCK_RELEASE(lock_name); + + public bool LOCK_GET(CardEventData.LOCK_EXCLUSIVE_CARD_ENUM lock_name) => cardLockSvc.LOCK_GET(lock_name); + + // *************** 事件系统 **************** + public void EVENT_REGISTER(CardEventData.EVENT_REGISTER_CARD_ENUM event_name, Action callback) where T : struct => + cardEventSvc.EVENT_REGISTER(event_name, callback); + + public void EVENT_TRIGGER(CardEventData.EVENT_REGISTER_CARD_ENUM event_name, object data) => + cardEventSvc.EVENT_TRIGGER(event_name, data); + + // public void EVENT_UNREGISTER(CardEventData.EVENT_REGISTER_CARD_ENUM event_name, Action callback) => + // cardEventSvc.EVENT_UNREGISTER(event_name, callback); } \ No newline at end of file diff --git a/Assets/00_scripts/Events/CardEventOS.cs.meta b/Assets/00_scripts/Events/CardOS.cs.meta similarity index 100% rename from Assets/00_scripts/Events/CardEventOS.cs.meta rename to Assets/00_scripts/Events/CardOS.cs.meta