From 428b069e7c605d61257c26a1fc6b46da50ad4187 Mon Sep 17 00:00:00 2001 From: yzx Date: Tue, 11 Jun 2024 10:17:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assembly-CSharp-Editor.csproj | 12 +- .../Assembly-CSharp.csproj | 15 +- .../ToolsPack/ToolsPackWindowItemBt.prefab | 3 +- .../Assets/Scenes/工具间Scenes/工具间.unity | 303 +++++++++++++----- .../Assets/Scenes/现场Scenes/现场.unity | 59 ++++ .../Assets/Scripts/DataConfigManager.cs | 2 +- .../Scripts/FaultRecords/FaultRecord.cs | 1 - .../FaultRecords/FaultRecordManager.cs | 1 - .../Scripts/FaultRecords/FaultRecordUI.cs | 3 +- .../Scripts/ToolsPack/ToolsPackManager.cs | 73 ++++- .../Scripts/ToolsPack/ToolsPackSceneJump.cs | 18 ++ .../ToolsPack/ToolsPackSceneJump.cs.meta | 3 + .../ToolsPackWindowItemBtComponent.cs | 20 +- .../ToolsPack/ToolsPackWindowManager.cs | 91 ++++-- .../Assets/Scripts/test1.cs | 8 +- .../ProjectSettings/EditorBuildSettings.asset | 5 +- 16 files changed, 483 insertions(+), 134 deletions(-) create mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs create mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs.meta diff --git a/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj b/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj index 1640805a..f30f91cb 100644 --- a/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj +++ b/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj @@ -331,6 +331,9 @@ E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.collab-proxy@2.3.1\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll + + E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\Ookii.Dialogs.dll + E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.collab-proxy@2.3.1\Lib\Editor\PlasticSCM\log4netPlastic.dll @@ -346,18 +349,15 @@ E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.visualscripting@1.9.2\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll + + E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\System.Windows.Forms.dll + E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\DOTween\DOTween.dll E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\Newtonsoft\Newtonsoft.Json.dll - - E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\Ookii.Dialogs.dll - - - E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\System.Windows.Forms.dll - E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll diff --git a/SXElectricityInformationAcquisition/Assembly-CSharp.csproj b/SXElectricityInformationAcquisition/Assembly-CSharp.csproj index e2b81dd8..4e776b20 100644 --- a/SXElectricityInformationAcquisition/Assembly-CSharp.csproj +++ b/SXElectricityInformationAcquisition/Assembly-CSharp.csproj @@ -60,6 +60,7 @@ + @@ -103,8 +104,8 @@ - + @@ -483,21 +484,21 @@ E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.testtools.codecoverage@1.2.5\lib\ReportGenerator\ReportGeneratorMerged.dll + + E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\Ookii.Dialogs.dll + E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.visualscripting@1.9.2\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll + + E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\System.Windows.Forms.dll + E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\DOTween\DOTween.dll E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\Newtonsoft\Newtonsoft.Json.dll - - E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\Ookii.Dialogs.dll - - - E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\System.Windows.Forms.dll - E:\Program Files\Unity 2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\mscorlib.dll diff --git a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindowItemBt.prefab b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindowItemBt.prefab index 396b16bf..b9f2e8d9 100644 --- a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindowItemBt.prefab +++ b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindowItemBt.prefab @@ -90,7 +90,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5139444481555090497 RectTransform: m_ObjectHideFlags: 0 @@ -331,6 +331,7 @@ MonoBehaviour: ico: {fileID: 1259292961442234839} closeBt: {fileID: 2129228580697719086} btName: + index: 0 btNameText: {fileID: 6673484476586741411} --- !u!1 &8234414753438290431 GameObject: diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity index 84d921af..e7718392 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity @@ -1927,7 +1927,7 @@ RectTransform: - {fileID: 1013479121} - {fileID: 1801241091} - {fileID: 1245220569} - - {fileID: 2109620457} + - {fileID: 1992983540} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2335,7 +2335,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 859467360511336960, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3} + - {fileID: 4595752545965128044, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -3199,6 +3201,85 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1313644145 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1313644146} + - component: {fileID: 1313644148} + - component: {fileID: 1313644147} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1313644146 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1313644145} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1992983540} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1313644147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1313644145} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Button +--- !u!222 &1313644148 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1313644145} + m_CullTransparentMesh: 1 --- !u!1 &1331583476 GameObject: m_ObjectHideFlags: 0 @@ -5522,6 +5603,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1952156942} m_CullTransparentMesh: 1 +--- !u!1 &1992983539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1992983540} + - component: {fileID: 1992983543} + - component: {fileID: 1992983542} + - component: {fileID: 1992983541} + - component: {fileID: 1992983544} + m_Layer: 5 + m_Name: Button (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1992983540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992983539} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1313644146} + m_Father: {fileID: 587418715} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -549, y: -406} + m_SizeDelta: {x: 184.8027, y: 113.9479} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1992983541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992983539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1992983542} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1992983542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992983539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1992983543 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992983539} + m_CullTransparentMesh: 1 +--- !u!114 &1992983544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992983539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 950ed43ca18941be90c7e1a16b578539, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2027912694 GameObject: m_ObjectHideFlags: 0 @@ -5532,7 +5747,6 @@ GameObject: m_Component: - component: {fileID: 2027912695} - component: {fileID: 2027912697} - - component: {fileID: 2027912696} m_Layer: 0 m_Name: PlayerCamera m_TagString: MainCamera @@ -5558,14 +5772,6 @@ Transform: - {fileID: 1099637963} m_Father: {fileID: 1617607508} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &2027912696 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2027912694} - m_Enabled: 1 --- !u!20 &2027912697 Camera: m_ObjectHideFlags: 0 @@ -5617,81 +5823,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!1 &2109620456 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2109620457} - - component: {fileID: 2109620459} - - component: {fileID: 2109620458} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2109620457 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2109620456} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 587418715} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2109620458 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2109620456} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1509434, g: 0.1473834, b: 0.1473834, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2109620459 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2109620456} - m_CullTransparentMesh: 1 --- !u!1 &2129569636 GameObject: m_ObjectHideFlags: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场.unity b/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场.unity index 90eb4bc8..821973e2 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场.unity @@ -384,6 +384,64 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &495255562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 495255564} + - component: {fileID: 495255563} + - component: {fileID: 495255565} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &495255563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495255562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 63b7e72fa2d34c0ca56c938039f733e2, type: 3} + m_Name: + m_EditorClassIdentifier: + toolsPackScene: 1 +--- !u!4 &495255564 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495255562} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 960, y: 540, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &495255565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495255562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4fcc8a50684251544a748a6f8fda3c22, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -189676,3 +189734,4 @@ SceneRoots: - {fileID: 1133290524} - {fileID: 1886732940} - {fileID: 336427328} + - {fileID: 495255564} diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs index 37bef301..12bd59ee 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs @@ -20,7 +20,7 @@ namespace DefaultNamespace { LoadConfig(); - LoadTeachingData(); + // LoadTeachingData(); } public void OnUpdate() diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecord.cs b/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecord.cs index a0abdbb6..95878e28 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecord.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecord.cs @@ -4,7 +4,6 @@ namespace DefaultNamespace.FaultRecords public class FaultRecord { public string content; // 故障记录的内容 - public System.DateTime dateTime; // 记录的时间 } } \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecordManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecordManager.cs index 1fa797fc..506de113 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecordManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecordManager.cs @@ -16,7 +16,6 @@ namespace DefaultNamespace.FaultRecords FaultRecord newRecord = new FaultRecord { content = content, - dateTime = System.DateTime.Now }; records.Add(newRecord); SaveRecords(); // 保存记录到文件 diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecordUI.cs b/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecordUI.cs index fffe475b..d2463fe5 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecordUI.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecordUI.cs @@ -6,6 +6,7 @@ using UnityEngine.UI; namespace DefaultNamespace.FaultRecords { + [ScriptDescription("异常记录信息面板")] public class FaultRecordUI : MonoBehaviour { public FaultRecordManager recordManager; // 故障记录管理器 @@ -15,8 +16,6 @@ namespace DefaultNamespace.FaultRecords public Button addButton; // 新增记录按钮 public Button exportButton; // 导出记录按钮 public Button importButton; // 导入记录按钮 - public string exportFilePath = Application.streamingAssetsPath + "/FaultRecords/FaultRecords.json"; // 导出文件路径 - public string importFilePath = Application.streamingAssetsPath + "/FaultRecords/FaultRecords.json"; // 导入文件路径 void Start() { diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs index dabcb782..32879d10 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs @@ -18,13 +18,20 @@ public enum ToolsPackScene 其他 } +public class ToolsPackString +{ + public ModelTypeEnum ModelTypeEnum; + public string ToolsName; + public int Index; +} /// /// 工具包 /// public class ToolsPackManager : ModuleSingleton, IModule { - private Dictionary> _toolsPack; + private Dictionary> _toolsPack; //在工具间存 + private Dictionary> _toolsPackString; //只存值 private Dictionary _toolsPackWindowBtImage; //工具窗口下的按钮图集 private List _toolsPackWindowItemBts; //工具窗口下创建的按钮集合,点击按钮的X用来删除和新增 private GameObject _toolsPackWindow; @@ -32,11 +39,28 @@ public class ToolsPackManager : ModuleSingleton, IModule private Transform _canvas; private GameObject _toolsPackWindowTemp; + private ToolsPackScene _toolsPackScene; + // 定义一个委托类型 + public delegate void StringEventHandler(string message); + + // 定义一个事件，使用委托类型 + public event StringEventHandler OnStringEvent; + + // 触发事件的方法 + public void OnTriggerStringEvent(string message) + { + if (OnStringEvent != null) + { + OnStringEvent(message); + } + } + public void OnCreate(object createParam) { _toolsPack = new Dictionary>(); + _toolsPackString = new Dictionary>(); _toolsPackWindowItemBts = new List(); //加载工具窗口按钮 @@ -81,12 +105,28 @@ public class ToolsPackManager : ModuleSingleton, IModule if (!_toolsPack.ContainsKey(toolsName)) { _toolsPack.Add(toolsName, new List() { toolsGame }); + _toolsPackString.Add(toolsName, new List() + { + new ToolsPackString() + { + ToolsName = toolsName, + ModelTypeEnum = toolsGame.GetComponent().GetModelTypeEnum(), + Index = 0 + } + }); toolsGame.GetComponent().SetIndex(0); } else { toolsGame.GetComponent().SetIndex(_toolsPack[toolsName].Count); _toolsPack[toolsName].Add(toolsGame); + _toolsPackString[toolsName].Add( + new ToolsPackString() + { + ToolsName = toolsName, + ModelTypeEnum = toolsGame.GetComponent().GetModelTypeEnum(), + Index = _toolsPack[toolsName].Count + }); } } @@ -100,8 +140,12 @@ public class ToolsPackManager : ModuleSingleton, IModule if (count > 1) { GameObject g = _toolsPack[toolsName].SingleOrDefault(s => s.GetComponent().GetIndex() == index); + ToolsPackString gString = _toolsPackString[toolsName].SingleOrDefault(s => s.Index == index); _toolsPack[toolsName].Remove(g); - // + + _toolsPackString[toolsName].Remove(gString); + + // for (int i = 0; i < _toolsPack[toolsName].Count; i++) // { // if (_toolsPack[toolsName][i].GetComponent().GetIndex() == index) @@ -113,9 +157,25 @@ public class ToolsPackManager : ModuleSingleton, IModule else { _toolsPack.Remove(toolsName); + _toolsPackString.Remove(toolsName); } } + public void DeleteStringToolsPack(string toolsName, int index) + { + int count = _toolsPackString[toolsName].Count; + if (count > 1) + { + ToolsPackString gString = _toolsPackString[toolsName].SingleOrDefault(s => s.Index == index); + _toolsPackString[toolsName].Remove(gString); + } + else + { + _toolsPackString.Remove(toolsName); + } + } + + /// /// 获取所有工具包内容 /// @@ -125,6 +185,15 @@ public class ToolsPackManager : ModuleSingleton, IModule return _toolsPack; } + /// + /// 获取所有工具包内容 + /// + /// + public Dictionary> GetToolsPackString() + { + return _toolsPackString; + } + /// /// 根据名字查询工具包内容 /// diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs new file mode 100644 index 00000000..fd1f56a2 --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs @@ -0,0 +1,18 @@ +using System; +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.UI; + +namespace ToolsPack +{ + public class ToolsPackSceneJump : MonoBehaviour + { + public void Start() + { + this.GetComponent