From f8b405baa8c97bc6ce11abdd70a05acf2b9de2b0 Mon Sep 17 00:00:00 2001 From: mnjnhuang <1090031856@qq.com> Date: Sun, 23 Nov 2025 16:46:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81:=20?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=88=91=E6=96=B9=E5=9B=9E=E5=90=88=E9=98=B6?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TurnScripts/TurnCharacterManager.cs | 2 +- .../Events/TurnScripts/TurnManager.cs | 4 +- .../Events/TurnScripts/TurnUIManager.cs | 16 ++--- Assets/Scenes/FightScene.unity | 62 +++++++------------ 4 files changed, 30 insertions(+), 54 deletions(-) diff --git a/Assets/00_scripts/Events/TurnScripts/TurnCharacterManager.cs b/Assets/00_scripts/Events/TurnScripts/TurnCharacterManager.cs index c6ea152..cb08883 100644 --- a/Assets/00_scripts/Events/TurnScripts/TurnCharacterManager.cs +++ b/Assets/00_scripts/Events/TurnScripts/TurnCharacterManager.cs @@ -32,9 +32,9 @@ public class TurnCharacterManager : MonoBehaviour cam: mainCamera, out cardDeckWorldPosition); characterList = characters; - MathWorldPositionPoint(); cardDeckContainer = cardParent; characterContainer = characterParent; + MathWorldPositionPoint(); isSetup = true; } diff --git a/Assets/00_scripts/Events/TurnScripts/TurnManager.cs b/Assets/00_scripts/Events/TurnScripts/TurnManager.cs index e1fb36b..682dabe 100644 --- a/Assets/00_scripts/Events/TurnScripts/TurnManager.cs +++ b/Assets/00_scripts/Events/TurnScripts/TurnManager.cs @@ -23,6 +23,7 @@ public class TurnManager : MonoBehaviour private TurnManagerStateEnum turnManagerState; // 状态机 private TurnCharacterManager characterManager; private TurnCardManager cardManager; + private TurnUIManager uiManager; public enum TurnManagerStateEnum { @@ -39,6 +40,7 @@ public class TurnManager : MonoBehaviour turnManagerSingleton = TurnManagerSingleton.Instance; cardManager = GetComponent(); characterManager = GetComponent(); + uiManager = GetComponent(); TurnManagerEvent.OnTurnManagerStaySelfTurn += TurnStaySelfState; TurnManagerEvent.OnTurnManagerEndSelfTurn += TurnEndSelfState; TurnEnterSetupState(); @@ -84,7 +86,7 @@ public class TurnManager : MonoBehaviour private void TurnEndSelfState() // 结束我方回合 { - if (!turnManagerSingleton.CompareManagerState(TurnManagerStateEnum.SELF_STATE_START)) return; + if (!turnManagerSingleton.CompareManagerState(TurnManagerStateEnum.SELF_STATE_STAY)) return; if (turnManagerSingleton.GetNeedDebugLog()) turnManagerSingleton.PrintMsg("TurnManager", "状态切换", "结束我方回合"); turnManagerState = TurnManagerStateEnum.SELF_STATE_END; } diff --git a/Assets/00_scripts/Events/TurnScripts/TurnUIManager.cs b/Assets/00_scripts/Events/TurnScripts/TurnUIManager.cs index a25652c..6cee605 100644 --- a/Assets/00_scripts/Events/TurnScripts/TurnUIManager.cs +++ b/Assets/00_scripts/Events/TurnScripts/TurnUIManager.cs @@ -4,15 +4,9 @@ using UnityEngine; public class TurnUIManager : MonoBehaviour { - // Start is called before the first frame update - void Start() - { - - } + [SerializeField] private RectTransform inEnemyTurnTooltip; - // Update is called once per frame - void Update() - { - - } -} + public void OnButtonDownEndTurn() => TurnManagerEvent.CallTurnManagerEndSelfTurn(); + + public void EnterEnemyTurn() => inEnemyTurnTooltip.gameObject.SetActive(true); +} \ No newline at end of file diff --git a/Assets/Scenes/FightScene.unity b/Assets/Scenes/FightScene.unity index 9e01808..d74564f 100644 --- a/Assets/Scenes/FightScene.unity +++ b/Assets/Scenes/FightScene.unity @@ -653,7 +653,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &479287682 Transform: m_ObjectHideFlags: 0 @@ -721,37 +721,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &486737762 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 486737763} - m_Layer: 0 - m_Name: TurnUIManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &486737763 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 486737762} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1296209707} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &500639788 GameObject: m_ObjectHideFlags: 0 @@ -897,6 +866,7 @@ GameObject: - component: {fileID: 526573210} - component: {fileID: 526573212} - component: {fileID: 526573213} + - component: {fileID: 526573214} m_Layer: 0 m_Name: TurnManager m_TagString: Untagged @@ -941,6 +911,7 @@ MonoBehaviour: cardDropDuration: 0.25 cardDeckContainer: {fileID: 686000154} cardHandContainer: {fileID: 705744323} + characterContainer: {fileID: 0} cardDeckList: [] --- !u!114 &526573211 MonoBehaviour: @@ -969,8 +940,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da98c08a0661fd2438aa37c5fba5167b, type: 3} m_Name: m_EditorClassIdentifier: - mainCamera: {fileID: 452712464} - characterContainer: {fileID: 255158612} screenOffsetLeft: 8 screenOffsetRight: 6 dealCardPlace: {fileID: 1743330590} @@ -987,9 +956,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed066637eee555d42937080935fa2067, type: 3} m_Name: m_EditorClassIdentifier: - mainCamera: {fileID: 452712464} areaCollider2D: {fileID: 1038122195} splineContainer: {fileID: 500639789} +--- !u!114 &526573214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 526573204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8397f1a9d3619a34ab8cbaad474ebc5c, type: 3} + m_Name: + m_EditorClassIdentifier: + inEnemyTurnTooltip: {fileID: 588735212} --- !u!1 &563549357 GameObject: m_ObjectHideFlags: 0 @@ -1140,7 +1121,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Eneny Turn + m_text: Enemy Turn m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1173,7 +1154,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 256 m_textAlignment: 65535 @@ -1338,8 +1319,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: CardEventUI, Assembly-CSharp + - m_Target: {fileID: 526573214} + m_TargetAssemblyTypeName: TurnUIManager, Assembly-CSharp m_MethodName: OnButtonDownEndTurn m_Mode: 1 m_Arguments: @@ -1406,7 +1387,7 @@ Transform: m_GameObject: {fileID: 705744322} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -1, z: 0} + m_LocalPosition: {x: 0, y: -1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1744,7 +1725,6 @@ Transform: m_Children: - {fileID: 500639790} - {fileID: 526573206} - - {fileID: 486737763} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1358330956