Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

Assets/Scripts/Project/UI/UI_Panel/UI_CustomSessionPanel.cs

@@ -18,11 +18,15 @@ public class UI_CustomSessionPanel : BasePanel
     {
         this.triggerID = triggerID;
         callBack += _callBack;
-        //GetControl<TextMeshProUGUI>("ClientText_DialogBox").text = clientTalk /*"好的"*/;
+        GetControl<TextMeshProUGUI>("ClientText_DialogBox").text = "";
         //UItext = GetControl<TextMeshProUGUI>("ClientText_DialogBox");
         StartTypewriterEffect(clientTalk);
     }
 
+    public override void HideMe()
+    {
+        base.HideMe();
+    }
     //}
     /// <summary>
     /// 按钮点击
@@ -33,7 +37,6 @@ public class UI_CustomSessionPanel : BasePanel
         switch (btnName)
         {
             case "ClientContinueBtn":
-                //GameManager.UIMgr.HidePanel<UI_CustomSessionPanel>();
                 callBack?.Invoke(triggerID);
                 break;
         }

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<Image>("CloseDefaultBtn").sprite = ExpandSprite;
-        GetControl<Image>("MenuBar").rectTransform.DOAnchorPosX(0, 0.5f);
-    }
-
-    private void CloseMenu()
-    {
-        GetControl<Image>("MenuBar").rectTransform.DOAnchorPosX(110, 0.5f);
-        GetControl<Image>("CloseDefaultBtn").sprite = CollapseSprite;
-    }
 
     /// <summary>
     /// 倒计时
@@ -155,6 +144,17 @@ public class UI_MenuBar : BasePanel
             CloseMenu();
         }
     }
+    private void OpenMenu()
+    {
+        GetControl<Image>("CloseDefaultBtn").sprite = CollapseSprite;
+        GetControl<Image>("MenuBar").rectTransform.DOAnchorPosX(0, 0.2f);
+    }
+
+    private void CloseMenu()
+    {
+        GetControl<Image>("CloseDefaultBtn").sprite = ExpandSprite;
+        GetControl<Image>("MenuBar").rectTransform.DOAnchorPosX(110, 0.2f);
+    }
     protected override void OnClick(string btnName)
     {
         switch (btnName)

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.DOLocalMove(new Vector3(588, 0, 0), 1f);
-        rPanel.DOScale(new Vector3(1, 1, 1), 1.5f);
+        rPanel.DOScale(new Vector3(1, 1, 1), 1f);
         this.triggerName = triggerName;
     }
     protected override void OnClick(string btnName)

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()
+    public void Init()
-   {
-   }
-    void Start()
     {
-       
     }
- 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 "":