From b27ab42de3e981eb8d9d928051f5ee145022a2d4 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Thu, 5 Sep 2024 10:52:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/New Folder(2)/人物/man.controller | 12 ++--- .../UI/UI_Panel/UI_SelectWorkTicketPanel.cs | 46 ++++--------------- 2 files changed, 16 insertions(+), 42 deletions(-) diff --git a/Assets/ArtRes/Models/New Folder(2)/人物/man.controller b/Assets/ArtRes/Models/New Folder(2)/人物/man.controller index f80c03d..791aee5 100644 --- a/Assets/ArtRes/Models/New Folder(2)/人物/man.controller +++ b/Assets/ArtRes/Models/New Folder(2)/人物/man.controller @@ -26,14 +26,14 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-2189527384325299200 +--- !u!1102 &-4040564592419863537 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Take 001 + m_Name: "\u5F85\u673A\u52A8\u753B" m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -46,7 +46,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 118338acae861c649ab6aa979cc51535, type: 2} + m_Motion: {fileID: 6427199632879939849, guid: 394998ae06fc34948bfedba0fc8e1451, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -85,10 +85,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -4642162309094991576} - m_Position: {x: 520, y: 80, z: 0} + m_Position: {x: 490, y: 80, z: 0} - serializedVersion: 1 - m_State: {fileID: -2189527384325299200} - m_Position: {x: 520, y: 200, z: 0} + m_State: {fileID: -4040564592419863537} + m_Position: {x: 500, y: 170, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_SelectWorkTicketPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_SelectWorkTicketPanel.cs index f21634d..312e19b 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_SelectWorkTicketPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_SelectWorkTicketPanel.cs @@ -38,6 +38,7 @@ public class UI_SelectWorkTicketPanel : BasePanel case E_ModeType.Study: number++; GetControl("Text_True").gameObject.SetActive(true); + if (GetControl("ImageF").isOn) { GameManager.UIMgr.HidePanel(); @@ -67,6 +68,10 @@ public class UI_SelectWorkTicketPanel : BasePanel GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid); GameManager.UIMgr.HidePanel(); } + else + { + GetControl("Text_True").gameObject.SetActive(true); + } break; case E_ModeType.Exam: if (GetControl("ImageF").isOn) @@ -75,48 +80,17 @@ public class UI_SelectWorkTicketPanel : BasePanel GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid); GameManager.UIMgr.HidePanel(); } + else + { + GetControl("Text_True").gameObject.SetActive(true); + } break; } break; } } - //protected override void OnChangeToggle(string toogleName, bool isOn) - //{ - // switch (toogleName) - // { - // case "ImageA": - // Reduction(); - // GetControl("Image_ANoSelected").gameObject.SetActive(false); - // Debug.Log("name" + toogleName); - // break; - // case "ImageB": - // Reduction(); - // GetControl("Image_BNoSelected").gameObject.SetActive(false); - // Debug.Log("name" + toogleName); - // break; - // case "ImageC": - // Reduction(); - // GetControl("Image_CNoSelected").gameObject.SetActive(false); - // Debug.Log("name" + toogleName); - // break; - // case "ImageD": - // Reduction(); - // GetControl("Image_DNoSelected").gameObject.SetActive(false); - // Debug.Log("name" + toogleName); - // break; - // case "ImageE": - // Reduction(); - // GetControl("Image_ENoSelected").gameObject.SetActive(false); - // Debug.Log("name" + toogleName); - // break; - // case "ImageF": - // Reduction(); - // GetControl("Image_FNoSelected").gameObject.SetActive(false); - // Debug.Log("name" + toogleName); - // break; - // } - //} + /// /// 恢复所有未选中image的显示状态