1212

Assets/Scripts/Project/Enum/Enums.cs

@@ -1,7 +1,7 @@
 /// <summary>
 /// 流程分类/阶段
 /// </summary>
-public enum E_ProcessType 
+public enum E_ProcessType
 {
     /// <summary>
     /// 查看任务单
@@ -90,15 +90,15 @@ public enum E_ModeType
 }
 
 /// <summary>
-/// 工具材料
+/// 工具材料设备
 /// </summary>
-public enum E_ToolOrDevice 
+public enum E_ToolOrDeviceOrMaterials
 {
     /// <summary>
     /// 空
     /// </summary>
     None = 0,
-    
+
     /// <summary>
     /// 工具
     /// </summary>
@@ -107,13 +107,17 @@ public enum E_ToolOrDevice
     /// <summary>
     /// 材质
     /// </summary>
-    Device,
+    Materials,
+    /// <summary>
+    /// 设备
+    /// </summary>
+    Device
 }
 
 /// <summary>
 /// 淡入淡出枚举
 /// </summary>
-public enum E_FadeInAndOut 
+public enum E_FadeInAndOut
 {
     /// <summary>
     /// 淡入
@@ -128,7 +132,7 @@ public enum E_FadeInAndOut
 /// <summary>
 /// 消息类型
 /// </summary>
-public enum E_MessageType 
+public enum E_MessageType
 {
     /// <summary>
     /// 普通/正常消息
@@ -146,7 +150,7 @@ public enum E_MessageType
     Error,
 }
 
-public enum E_SceneType 
+public enum E_SceneType
 {
     /// <summary>
     /// 办公室

Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs

@@ -17,14 +17,14 @@ public abstract class BaseToolOrDevice : MonoBehaviour
     public string toolName;
 
     /// <summary>
-    /// 工器具类型  工具/设备
+    /// 工器具类型  工具/材质/设备
     /// </summary>
-    public E_ToolOrDevice toolOrMaterial;
+    public E_ToolOrDeviceOrMaterials toolOrDeviceOrMaterial;
 
     [ContextMenu("GetInfo")]
     public void GetInfo()
     {
-
+        //TODO:后续 根据英文名称去获取ID 中文名 和其它
     }
 
     private void OnMouseEnter()

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

@@ -55,10 +55,10 @@ public class UI_MenuBar : BasePanel
         switch (btnName)
         {
             case "CloseDefaultBtn":
-                GetControl<Image>("UI_MenuBar").rectTransform.DOLocalMoveX(960, 0.5f);
-                if (GetControl<Image>("UI_MenuBar").rectTransform.localPosition.x == 960)
+              transform.GetComponent<RectTransform>().DOLocalMoveX(960, 0.5f);
+                if (transform.GetComponent<RectTransform>().localPosition.x == 960)
                 {
-                    GetControl<Image>("UI_MenuBar").rectTransform.DOLocalMoveX(1070, 0.5f);
+                    transform.GetComponent<RectTransform>().DOLocalMoveX(1070, 0.5f);
                 }
                 break;
 

ProjectSettings/ProjectSettings.asset

@@ -734,7 +734,7 @@ PlayerSettings:
     PS4: DOTWEEN
     PS5: DOTWEEN
     Stadia: DOTWEEN
-    Standalone: DOTWEEN
+    Standalone: DOTWEEN;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3
     WebGL: DOTWEEN
     Windows Store Apps: DOTWEEN
     XboxOne: DOTWEEN