diff --git a/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold SDF.asset b/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold SDF.asset index 8ffd51f..e63242e 100644 --- a/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold SDF.asset +++ b/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold SDF.asset @@ -1378,6 +1378,21 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 + - m_Index: 4336 + m_Metrics: + m_Width: 83.328125 + m_Height: 81.453125 + m_HorizontalBearingX: 3.515625 + m_HorizontalBearingY: 72.453125 + m_HorizontalAdvance: 90 + m_GlyphRect: + m_X: 831 + m_Y: 716 + m_Width: 84 + m_Height: 82 + m_Scale: 1 + m_AtlasIndex: 0 + m_ClassDefinitionType: 0 m_CharacterTable: - m_ElementType: 1 m_Unicode: 8230 @@ -1735,6 +1750,10 @@ MonoBehaviour: m_Unicode: 36335 m_GlyphIndex: 5682 m_Scale: 1 + - m_ElementType: 1 + m_Unicode: 32451 + m_GlyphIndex: 4336 + m_Scale: 1 m_AtlasTextures: - {fileID: 3431476274029196215} m_AtlasTextureIndex: 0 @@ -2093,6 +2112,10 @@ MonoBehaviour: m_Y: 706 m_Width: 104 m_Height: 100 + - m_X: 821 + m_Y: 706 + m_Width: 103 + m_Height: 101 m_FreeGlyphRects: - m_X: 95 m_Y: 28 @@ -2262,10 +2285,6 @@ MonoBehaviour: m_Y: 602 m_Width: 1 m_Height: 4 - - m_X: 914 - m_Y: 606 - m_Width: 3 - m_Height: 417 - m_X: 511 m_Y: 600 m_Width: 98 @@ -2354,17 +2373,29 @@ MonoBehaviour: m_Y: 704 m_Width: 1 m_Height: 101 + - m_X: 914 + m_Y: 606 + m_Width: 3 + m_Height: 100 + - m_X: 717 + m_Y: 807 + m_Width: 306 + m_Height: 90 - m_X: 717 m_Y: 806 - m_Width: 306 + m_Width: 104 m_Height: 91 - m_X: 719 - m_Y: 806 + m_Y: 807 m_Width: 304 + m_Height: 216 + - m_X: 719 + m_Y: 806 + m_Width: 102 m_Height: 217 - - m_X: 821 + - m_X: 924 m_Y: 706 - m_Width: 202 + m_Width: 99 m_Height: 317 m_fontInfo: Name: diff --git a/Assets/Scripts/Project/Enum/Enums.cs b/Assets/Scripts/Project/Enum/Enums.cs index e289d18..7757d3c 100644 --- a/Assets/Scripts/Project/Enum/Enums.cs +++ b/Assets/Scripts/Project/Enum/Enums.cs @@ -1,7 +1,7 @@ /// /// 流程分类/阶段 /// -public enum E_ProcessType +public enum E_ProcessType { /// /// 查看任务单 @@ -90,15 +90,15 @@ public enum E_ModeType } /// -/// 工具材料 +/// 工具材料设备 /// -public enum E_ToolOrDevice +public enum E_ToolOrDeviceOrMaterials { /// /// 空 /// None = 0, - + /// /// 工具 /// @@ -107,13 +107,17 @@ public enum E_ToolOrDevice /// /// 材质 /// - Device, + Materials, + /// + /// 设备 + /// + Device } /// /// 淡入淡出枚举 /// -public enum E_FadeInAndOut +public enum E_FadeInAndOut { /// /// 淡入 @@ -128,7 +132,7 @@ public enum E_FadeInAndOut /// /// 消息类型 /// -public enum E_MessageType +public enum E_MessageType { /// /// 普通/正常消息 @@ -146,7 +150,7 @@ public enum E_MessageType Error, } -public enum E_SceneType +public enum E_SceneType { /// /// 办公室 diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs b/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs index 06245c3..11ecbbe 100644 --- a/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs +++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs @@ -17,14 +17,14 @@ public abstract class BaseToolOrDevice : MonoBehaviour public string toolName; /// - /// 工器具类型 工具/设备 + /// 工器具类型 工具/材质/设备 /// - public E_ToolOrDevice toolOrMaterial; + public E_ToolOrDeviceOrMaterials toolOrDeviceOrMaterial; [ContextMenu("GetInfo")] public void GetInfo() { - + //TODO:后续 根据英文名称去获取ID 中文名 和其它 } private void OnMouseEnter() diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs index 4f8480b..5b0e63f 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs @@ -55,10 +55,10 @@ public class UI_MenuBar : BasePanel switch (btnName) { case "CloseDefaultBtn": - GetControl("UI_MenuBar").rectTransform.DOLocalMoveX(960, 0.5f); - if (GetControl("UI_MenuBar").rectTransform.localPosition.x == 960) + transform.GetComponent().DOLocalMoveX(960, 0.5f); + if (transform.GetComponent().localPosition.x == 960) { - GetControl("UI_MenuBar").rectTransform.DOLocalMoveX(1070, 0.5f); + transform.GetComponent().DOLocalMoveX(1070, 0.5f); } break; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bd33611..3bab801 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/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