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

Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f597f19f656ba56eae4f6a3a7cc528f4
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 48e08dc33330d11e9d4a1b246c52e4f6
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ed09910c0094cb27be8f3ca264680da3
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: cc355dd4cf1e6173beaeb22c2858cbe1
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab

@@ -402,8 +402,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 545e1bf40c968b94d94dbd234fe1e530, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  ClickSprite: {fileID: 21300000, guid: 79f9b1d682f470f40ab600dade2c369d, type: 3}
+  ExpandSprite: {fileID: 21300000, guid: 4c690750a2bdfd846b732a727903f291, type: 3}
-  OnClickSprite: {fileID: 21300000, guid: 352fb2f67e1311f42a17d4be24bd51b6, type: 3}
+  CollapseSprite: {fileID: 21300000, guid: 352fb2f67e1311f42a17d4be24bd51b6, type: 3}
 --- !u!1 &4240480582127588975
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -4,11 +4,13 @@ using DG.Tweening;
 using UnityEngine.UI;
 using UnityEngine.SceneManagement;
 using TMPro;
+using UnityEngine.EventSystems;
 
 public class UI_MenuBar : BasePanel
 {
+    //Õ¹¿ª°´Å¥ £¬ÊÕÆð°´Å¥
     [SerializeField]
-    private Sprite ClickSprite, OnClickSprite;
+    private Sprite ExpandSprite, CollapseSprite;
     //展开按钮，工具间，前往现场，办理工作票，任务单，返回办公室，拆装填写工单
     private Button CloseDefaultBtn, TooLRoToolRoomBtnomBtn, SiteBtn, WorkOrderBtn, MissionBtn, OfficeBtn, DisassemblyAssemblyWorkOrderBtn;
     //右侧弹窗
@@ -43,22 +45,17 @@ public class UI_MenuBar : BasePanel
         OfficeBtn.gameObject.SetActive(GlobalFlag.currentSceneName == "办公室" );
         DisassemblyAssemblyWorkOrderBtn.gameObject.SetActive(GlobalFlag.currentSceneName == "办公室" );
     }
-    private void OnMouseDown()
-    {
-        if (GetControl<Image>("UI_MenuBar").rectTransform.localPosition.x == 960)
-        {
-            GetControl<Image>("CloseDefaultBtn").sprite = OnClickSprite;
-        }
-    }
     protected override void OnClick(string btnName)
     {
         switch (btnName)
         {
             case "CloseDefaultBtn":
-              transform.GetComponent<RectTransform>().DOLocalMoveX(960, 0.5f);
+               transform.DOLocalMoveX(960, 0.5f);
-                if (transform.GetComponent<RectTransform>().localPosition.x == 960)
+                GetControl<Image>("CloseDefaultBtn").sprite = CollapseSprite;
+                if (transform.localPosition.x == 960)
                 {
-                    transform.GetComponent<RectTransform>().DOLocalMoveX(1070, 0.5f);
+                    GetControl<Image>("CloseDefaultBtn").sprite = ExpandSprite;
+                    transform.DOLocalMoveX(1070, 0.5f);
                 }
                 break;
 
@@ -78,4 +75,14 @@ public class UI_MenuBar : BasePanel
                 break;
         }
     }
+
+    //public void OnPointerEnter(PointerEventData eventData)
+    //{
+    //    GetControl<Image>("CloseDefaultBtn").sprite = OnClickSprite;
+    //}
+
+    //public void OnPointerExit(PointerEventData eventData)
+    //{
+      
+    //}
 }