From 642aee79041cfff24d17913686c4aed76582c65a Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Fri, 30 Aug 2024 09:37:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/UI_Panel/UI_CustomSessionPanel.cs | 7 ++++-- .../Scripts/Project/UI/UI_Panel/UI_MenuBar.cs | 22 +++++++++---------- .../UI/UI_Panel/UI_ReceiveTaskPanel.cs | 4 ++-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_CustomSessionPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_CustomSessionPanel.cs index 5cf6953..689cf6e 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_CustomSessionPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_CustomSessionPanel.cs @@ -18,11 +18,15 @@ public class UI_CustomSessionPanel : BasePanel { this.triggerID = triggerID; callBack += _callBack; - //GetControl("ClientText_DialogBox").text = clientTalk /*"好的"*/; + GetControl("ClientText_DialogBox").text = ""; //UItext = GetControl("ClientText_DialogBox"); StartTypewriterEffect(clientTalk); } + public override void HideMe() + { + base.HideMe(); + } //} /// /// 按钮点击 @@ -33,7 +37,6 @@ public class UI_CustomSessionPanel : BasePanel switch (btnName) { case "ClientContinueBtn": - //GameManager.UIMgr.HidePanel(); callBack?.Invoke(triggerID); break; } diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs index 717a655..3c600fa 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs @@ -127,17 +127,6 @@ public class UI_MenuBar : BasePanel notifyBtn.gameObject.SetActive(type == E_SceneType.Site); } - private void OpenMenu() - { - GetControl("CloseDefaultBtn").sprite = ExpandSprite; - GetControl("MenuBar").rectTransform.DOAnchorPosX(0, 0.5f); - } - - private void CloseMenu() - { - GetControl("MenuBar").rectTransform.DOAnchorPosX(110, 0.5f); - GetControl("CloseDefaultBtn").sprite = CollapseSprite; - } /// /// µ¹¼Æʱ @@ -155,6 +144,17 @@ public class UI_MenuBar : BasePanel CloseMenu(); } } + private void OpenMenu() + { + GetControl("CloseDefaultBtn").sprite = ExpandSprite; + GetControl("MenuBar").rectTransform.DOAnchorPosX(0, 0.2f); + } + + private void CloseMenu() + { + GetControl("MenuBar").rectTransform.DOAnchorPosX(110, 0.2f); + GetControl("CloseDefaultBtn").sprite = CollapseSprite; + } protected override void OnClick(string btnName) { switch (btnName) diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_ReceiveTaskPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_ReceiveTaskPanel.cs index f061ee8..5840e03 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_ReceiveTaskPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_ReceiveTaskPanel.cs @@ -14,8 +14,8 @@ public class UI_ReceiveTaskPanel : BasePanel Vector3 uiPos = Vector3.zero; RectTransformUtility.ScreenPointToWorldPointInRectangle(rPanel, pos, null, out uiPos); rPanel.position = uiPos; - rPanel.DOLocalMove(new Vector3(588, 0, 0), 1.5f); - rPanel.DOScale(new Vector3(1, 1, 1), 1.5f); + rPanel.DOLocalMove(new Vector3(588, 0, 0), 1f); + rPanel.DOScale(new Vector3(1, 1, 1), 1f); this.triggerName = triggerName; } protected override void OnClick(string btnName) From 148ed39fbff63ce810ef2767d8223fcd05905def Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Fri, 30 Aug 2024 13:26:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8D=A2=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Project/UI/UI_Panel/UI_MenuBar.cs | 4 ++-- ...icePanel.cs => UI_TipsForPracticePanel.cs} | 20 ++++++++----------- ...s.meta => UI_TipsForPracticePanel.cs.meta} | 0 3 files changed, 10 insertions(+), 14 deletions(-) rename Assets/Scripts/Project/UI/UI_Panel/{TipsForPracticePanel.cs => UI_TipsForPracticePanel.cs} (54%) rename Assets/Scripts/Project/UI/UI_Panel/{TipsForPracticePanel.cs.meta => UI_TipsForPracticePanel.cs.meta} (100%) diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs index 3c600fa..d98e1f3 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs @@ -146,14 +146,14 @@ public class UI_MenuBar : BasePanel } private void OpenMenu() { - GetControl("CloseDefaultBtn").sprite = ExpandSprite; + GetControl("CloseDefaultBtn").sprite = CollapseSprite; GetControl("MenuBar").rectTransform.DOAnchorPosX(0, 0.2f); } private void CloseMenu() { + GetControl("CloseDefaultBtn").sprite = ExpandSprite; GetControl("MenuBar").rectTransform.DOAnchorPosX(110, 0.2f); - GetControl("CloseDefaultBtn").sprite = CollapseSprite; } protected override void OnClick(string btnName) { diff --git a/Assets/Scripts/Project/UI/UI_Panel/TipsForPracticePanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_TipsForPracticePanel.cs similarity index 54% rename from Assets/Scripts/Project/UI/UI_Panel/TipsForPracticePanel.cs rename to Assets/Scripts/Project/UI/UI_Panel/UI_TipsForPracticePanel.cs index 3680ba9..8bc8e2d 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/TipsForPracticePanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_TipsForPracticePanel.cs @@ -1,28 +1,24 @@ - using UnityEngine; -public class TipsForPracticePanel : BasePanel +public class UI_TipsForPracticePanel : BasePanel { -public void Init() - { - } - void Start() + public void Init() { - } - public override void ShowMe() + + public override void ShowMe() { - + } public override void HideMe() { - + } - protected override void OnClick(string btnName) + protected override void OnClick(string btnName) { - + switch (btnName) { case "": diff --git a/Assets/Scripts/Project/UI/UI_Panel/TipsForPracticePanel.cs.meta b/Assets/Scripts/Project/UI/UI_Panel/UI_TipsForPracticePanel.cs.meta similarity index 100% rename from Assets/Scripts/Project/UI/UI_Panel/TipsForPracticePanel.cs.meta rename to Assets/Scripts/Project/UI/UI_Panel/UI_TipsForPracticePanel.cs.meta