diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 97b882e..f0ef3f1 100644 Binary files a/Assets/ArtRes/Excel/Config.xlsx and b/Assets/ArtRes/Excel/Config.xlsx differ diff --git a/Assets/Scripts/Project/Enum/Enums.cs b/Assets/Scripts/Project/Enum/Enums.cs index 8522d89..e289d18 100644 --- a/Assets/Scripts/Project/Enum/Enums.cs +++ b/Assets/Scripts/Project/Enum/Enums.cs @@ -92,7 +92,7 @@ public enum E_ModeType /// /// 工具材料 /// -public enum E_ToolOrMaterial +public enum E_ToolOrDevice { /// /// 空 @@ -103,11 +103,11 @@ public enum E_ToolOrMaterial /// 工具 /// Tool, - + /// /// 材质 /// - Material, + Device, } /// diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs b/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs new file mode 100644 index 0000000..06245c3 --- /dev/null +++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs @@ -0,0 +1,72 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; +using UnityEngine.EventSystems; + +/// +/// 工具或者材料基类,此脚本必须挂在工具或者材料上 +/// +public abstract class BaseToolOrDevice : MonoBehaviour +{ + /// + /// 工具Id + /// + public int toolId; + + public string toolName; + + /// + /// 工器具类型 工具/设备 + /// + public E_ToolOrDevice toolOrMaterial; + + [ContextMenu("GetInfo")] + public void GetInfo() + { + + } + + private void OnMouseEnter() + { + if (GlobalFlag.currentUserID != "04_ToolMaterialScene") return; + if (EventSystem.current.IsPointerOverGameObject()) return; + OnEnter(); + //TODO: 这里写提示打开的代码 + } + + private void OnMouseDown() + { + if (GlobalFlag.currentUserID != "04_ToolMaterialScene") return; + if (EventSystem.current.IsPointerOverGameObject()) return; + OnDown(); + gameObject.SetActive(false); + } + + private void OnMouseExit() + { + //TODO: 这里写提示关闭的代码 + if (GlobalFlag.currentUserID != "04_ToolMaterialScene") return; + if (EventSystem.current.IsPointerOverGameObject()) return; + OnExit(); + } + + + public virtual void OnEnter() + { + Debug.Log("进入"); + } + + public virtual void OnDown() + { + Debug.Log("点击"); + } + + public virtual void OnExit() + { + Debug.Log("离开"); + } + + + +} diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrMaterial.cs.meta b/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs.meta similarity index 100% rename from Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrMaterial.cs.meta rename to Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs.meta diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrMaterial.cs b/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrMaterial.cs deleted file mode 100644 index 7a77e18..0000000 --- a/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrMaterial.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 工具或者材料基类 -/// -public abstract class BaseToolOrMaterial : MonoBehaviour -{ - /// - /// 工具Id - /// - public int toolId; - - /// - /// 工器具类型 工具/材料 - /// - public E_ToolOrMaterial toolOrMaterial; - - - - -} diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_Electroprobe.cs b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_Electroprobe.cs index 215e8d5..59e60d5 100644 --- a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_Electroprobe.cs +++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_Electroprobe.cs @@ -4,7 +4,7 @@ using UnityEngine; /// /// /// -public class Tool_Electroprobe : BaseToolOrMaterial +public class Tool_Electroprobe : BaseToolOrDevice { } diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_InsulatedScrewdriver.cs b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_InsulatedScrewdriver.cs index 28bfa2c..0ab9569 100644 --- a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_InsulatedScrewdriver.cs +++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_InsulatedScrewdriver.cs @@ -4,7 +4,7 @@ using UnityEngine; /// /// 绝缘螺丝刀 /// -public class Tool_InsulatedScrewdriver : BaseToolOrMaterial +public class Tool_InsulatedScrewdriver : BaseToolOrDevice { } diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs new file mode 100644 index 0000000..4ac54e9 --- /dev/null +++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Tool_SelectComponent : BaseToolOrDevice +{ + +} diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs.meta b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs.meta new file mode 100644 index 0000000..64ad3c0 --- /dev/null +++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a6f31a9609373b04faa317bc87afe550 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Docs/ReadMe.txt b/Docs/ReadMe.txt new file mode 100644 index 0000000..309cbb7 --- /dev/null +++ b/Docs/ReadMe.txt @@ -0,0 +1,4 @@ +UI设计图: https://lanhuapp.com/web/#/item/project/stage?pid=e9f8fe5b-bcc0-4abc-8c67-ab835fe30448&image_id=d10b92fc-acf0-49bb-baad-3ed2de8d577e&tid=c8c17801-6d13-4d68-b35c-c07226fd5f21 +业务、研发流程图: https://lanhuapp.com/web/#/item/project/product?tid=b340bf82-0fdd-4ca9-89b0-0b2c033b31e2&pid=91885815-de31-4387-9610-4776a57fff41&versionId=11d16567-1909-461f-b6dd-3fb0cffa30f9&docId=b27d3db7-fa20-4cf9-9207-f6fb4802913e&docType=axure&pageId=3ba4da39bb1f4eab9d956605c6463033&image_id=b27d3db7-fa20-4cf9-9207-f6fb4802913e&parentId=c741a79a-b646-45be-ae66-b0e6954ff2b1 +腾讯文档】计量专业仿真内部表 +https://docs.qq.com/sheet/DQlBodkpVamRJTUdu \ No newline at end of file