Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition

SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj

@@ -331,6 +331,9 @@
     <Reference Include="Unity.Plastic.Newtonsoft.Json">
       <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.collab-proxy@2.3.1\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="Ookii.Dialogs">
+      <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\Ookii.Dialogs.dll</HintPath>
+    </Reference>
     <Reference Include="log4netPlastic">
       <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.collab-proxy@2.3.1\Lib\Editor\PlasticSCM\log4netPlastic.dll</HintPath>
     </Reference>
@@ -346,18 +349,15 @@
     <Reference Include="Unity.VisualScripting.TextureAssets">
       <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.visualscripting@1.9.2\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll</HintPath>
     </Reference>
+    <Reference Include="System.Windows.Forms">
+      <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\System.Windows.Forms.dll</HintPath>
+    </Reference>
     <Reference Include="DOTween">
       <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\DOTween\DOTween.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\Newtonsoft\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Ookii.Dialogs">
-      <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\Ookii.Dialogs.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows.Forms">
-      <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\System.Windows.Forms.dll</HintPath>
-    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll</HintPath>
     </Reference>

SXElectricityInformationAcquisition/Assembly-CSharp.csproj

@@ -60,6 +60,7 @@
     <Compile Include="Assets\Scripts\ToolsPack\ToolsPackManager.cs" />
     <Compile Include="Assets\Standard Assets 1\CrossPlatformInput\Scripts\AxisTouchButton.cs" />
     <Compile Include="Assets\Model\Fantastic City Generator\Traffic_Light\Scripts\TFShiftHand2.cs" />
+    <Compile Include="Assets\Scripts\ToolsPack\ToolsPackSceneJump.cs" />
     <Compile Include="Assets\Scripts\test1.cs" />
     <Compile Include="Assets\Standard Assets 1\Utility\WaypointCircuit.cs" />
     <Compile Include="Assets\Standard Assets 1\Characters\ThirdPersonCharacter\Scripts\ThirdPersonUserControl.cs" />
@@ -103,8 +104,8 @@
     <Compile Include="Assets\Standard Assets 1\Utility\ObjectResetter.cs" />
     <Compile Include="Assets\HighlightPlus\Scripts\HighlightEffectActions.cs" />
     <Compile Include="Assets\Standard Assets 1\Camera Scripts\MouseLook.cs" />
-    <Compile Include="Assets\Standard Assets 1\Utility\SmoothFollow.cs" />
     <Compile Include="Assets\StandaloneFileBrowser\StandaloneFileBrowser.cs" />
+    <Compile Include="Assets\Standard Assets 1\Utility\SmoothFollow.cs" />
     <Compile Include="Assets\Standard Assets 1\CrossPlatformInput\Scripts\VirtualInput.cs" />
     <Compile Include="Assets\StandaloneFileBrowser\Sample\CanvasSampleSaveFileImage.cs" />
     <Compile Include="Assets\Ladder.cs" />
@@ -483,21 +484,21 @@
     <Reference Include="ReportGeneratorMerged">
       <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.testtools.codecoverage@1.2.5\lib\ReportGenerator\ReportGeneratorMerged.dll</HintPath>
     </Reference>
+    <Reference Include="Ookii.Dialogs">
+      <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\Ookii.Dialogs.dll</HintPath>
+    </Reference>
     <Reference Include="Unity.VisualScripting.Antlr3.Runtime">
       <HintPath>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</HintPath>
     </Reference>
+    <Reference Include="System.Windows.Forms">
+      <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\System.Windows.Forms.dll</HintPath>
+    </Reference>
     <Reference Include="DOTween">
       <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\DOTween\DOTween.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\Newtonsoft\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Ookii.Dialogs">
-      <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\Ookii.Dialogs.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows.Forms">
-      <HintPath>E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\StandaloneFileBrowser\Plugins\System.Windows.Forms.dll</HintPath>
-    </Reference>
     <Reference Include="mscorlib">
       <HintPath>E:\Program Files\Unity 2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\mscorlib.dll</HintPath>
     </Reference>

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:

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

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}

SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs

@@ -20,7 +20,7 @@ namespace DefaultNamespace
         {
             LoadConfig();
 
-            LoadTeachingData();
+            // LoadTeachingData();
         }
 
         public void OnUpdate()

SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecord.cs

@@ -4,7 +4,6 @@ namespace DefaultNamespace.FaultRecords
     public class FaultRecord
     {
         public string content;  // 故障记录的内容
-        public System.DateTime dateTime;  // 记录的时间
     }
 
 }

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();  // 保存记录到文件

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()
         {

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;
+}
 
 /// <summary>
 /// 工具包
 /// </summary>
 public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
 {
-    private Dictionary<string, List<GameObject>> _toolsPack;
+    private Dictionary<string, List<GameObject>> _toolsPack; //在工具间存
+    private Dictionary<string, List<ToolsPackString>> _toolsPackString; //只存值
     private Dictionary<string, Texture2D> _toolsPackWindowBtImage; //工具窗口下的按钮图集
     private List<GameObject> _toolsPackWindowItemBts; //工具窗口下创建的按钮集合,点击按钮的X用来删除和新增
     private GameObject _toolsPackWindow;
@@ -32,11 +39,28 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, 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<string, List<GameObject>>();
+        _toolsPackString = new Dictionary<string, List<ToolsPackString>>();
         _toolsPackWindowItemBts = new List<GameObject>();
 
         //加载工具窗口按钮
@@ -81,12 +105,28 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
         if (!_toolsPack.ContainsKey(toolsName))
         {
             _toolsPack.Add(toolsName, new List<GameObject>() { toolsGame });
+            _toolsPackString.Add(toolsName, new List<ToolsPackString>()
+            {
+                new ToolsPackString()
+                {
+                    ToolsName = toolsName, 
+                    ModelTypeEnum = toolsGame.GetComponent<ToolsPackGameObjectComponent>().GetModelTypeEnum(),
+                    Index = 0
+                }
+            });
             toolsGame.GetComponent<ToolsPackGameObjectComponent>().SetIndex(0);
         }
         else
         {
             toolsGame.GetComponent<ToolsPackGameObjectComponent>().SetIndex(_toolsPack[toolsName].Count);
             _toolsPack[toolsName].Add(toolsGame);
+            _toolsPackString[toolsName].Add(
+                new ToolsPackString()
+            {
+                ToolsName = toolsName,
+                ModelTypeEnum = toolsGame.GetComponent<ToolsPackGameObjectComponent>().GetModelTypeEnum(),
+                Index = _toolsPack[toolsName].Count
+            });
         }
     }
 
@@ -100,8 +140,12 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
         if (count > 1)
         {
             GameObject g = _toolsPack[toolsName].SingleOrDefault(s => s.GetComponent<ToolsPackGameObjectComponent>().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<ToolsPackGameObjectComponent>().GetIndex() == index)
@@ -113,9 +157,25 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, 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);
+        }
+    }
+
+
     /// <summary>
     /// 获取所有工具包内容
     /// </summary>
@@ -125,6 +185,15 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
         return _toolsPack;
     }
 
+    /// <summary>
+    /// 获取所有工具包内容
+    /// </summary>
+    /// <returns></returns>
+    public Dictionary<string, List<ToolsPackString>> GetToolsPackString()
+    {
+        return _toolsPackString;
+    }
+
     /// <summary>
     /// 根据名字查询工具包内容
     /// </summary>

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<Button>().onClick.AddListener(delegate
+            {
+                SceneManager.LoadScene("现场");
+            });
+        }
+    }
+}

SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 950ed43ca18941be90c7e1a16b578539
+timeCreated: 1718067966

SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs

@@ -14,6 +14,7 @@ namespace ToolsPack
         [SerializeField] private string btName;
         [SerializeField] private int index;
         [SerializeField] private Text btNameText;
+        [SerializeField] private ModelTypeEnum _modelTypeEnum;
 
 
         private void Start()
@@ -25,13 +26,30 @@ namespace ToolsPack
                 MotionEngine.GetModule<ToolsPackManager>().DeleteToolsPack(btName,index);
                 MotionEngine.GetModule<ToolsPackManager>().DeleteToolsPackWindowItemBts(btName,index);
             });
+            
+            
+            this.GetComponent<Button>().onClick.AddListener(delegate
+            {
+                MotionEngine.GetModule<ToolsPackManager>().OnTriggerStringEvent(btName);
+                switch (_modelTypeEnum)
+                {
+                    case ModelTypeEnum.工具:
+                        break;
+                    case ModelTypeEnum.设备:
+                        MotionEngine.GetModule<ToolsPackManager>().DeleteStringToolsPack(btName,index);
+                        MotionEngine.GetModule<ToolsPackManager>().DeleteToolsPackWindowItemBts(btName,index);
+                        break;
+                }
+               
+            });
         }
 
-        public void Init(string gName, string btName,int index)
+        public void Init(string gName, string btName,int index,ModelTypeEnum modelTypeEnum)
         {
             btNameText.text = gName;
             this.btName = btName;
             this.index = index;
+            _modelTypeEnum = modelTypeEnum;
             ico.texture = MotionEngine.GetModule<ToolsPackManager>().GetToolsPackWindowBtImage(gName);
             if (MotionEngine.GetModule<ToolsPackManager>().GetToolsPackScene() == ToolsPackScene.工具间)
             {

SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs

@@ -23,15 +23,18 @@ namespace ToolsPack
     public class ToolsPackWindowManager : MonoBehaviour
     {
         private Dictionary<string, List<GameObject>> _toolsNames;
+        private Dictionary<string, List<ToolsPackString>> _toolsNamesString;
 
         [SerializeField] private Transform content;
         [SerializeField] private Toggle tog;
+
         public void OnEnable()
         {
-           // ChangePage(ModelTypeEnum.工具);
+            // ChangePage(ModelTypeEnum.工具);
 
-           StartCoroutine(SetToggleOnNextFrame(tog));
+            StartCoroutine(SetToggleOnNextFrame(tog));
         }
+
         private IEnumerator SetToggleOnNextFrame(Toggle toggle)
         {
             // 等待一帧，确保所有初始化完成
@@ -45,7 +48,6 @@ namespace ToolsPack
 
         private void OnDisable()
         {
-            
         }
 
 
@@ -62,42 +64,89 @@ namespace ToolsPack
 
             MotionEngine.GetModule<ToolsPackManager>().ClearToolsPackWindowItemBts();
 
-            //初始化工具集
-            _toolsNames = MotionEngine.GetModule<ToolsPackManager>().GetToolsPack();
 
-            GameObject bt = MotionEngine.GetModule<ToolsPackManager>().GetToolsPackWindowBt();
+            if (MotionEngine.GetModule<ToolsPackManager>().GetToolsPackScene() == ToolsPackScene.工具间)
-            foreach (var v in _toolsNames)
             {
-                List<string> li = MotionEngine.GetModule<DataConfigManager>().GetToolsPackData(v.Key);
+                //初始化工具集
+                _toolsNames = MotionEngine.GetModule<ToolsPackManager>().GetToolsPack();
 
-                if (li == null)
+                GameObject bt = MotionEngine.GetModule<ToolsPackManager>().GetToolsPackWindowBt();
+                foreach (var v in _toolsNames)
                 {
-                    foreach (var b in v.Value)
+                    List<string> li = MotionEngine.GetModule<DataConfigManager>().GetToolsPackData(v.Key);
+
+                    if (li == null)
                     {
-                        if (b.GetComponent<ToolsPackGameObjectComponent>().GetModelTypeEnum() == windw)
+                        foreach (var b in v.Value)
                         {
-                            ToolsPackWindowItemBtComponent btComponent = Instantiate(bt, content, false).GetComponent<ToolsPackWindowItemBtComponent>();
+                            ToolsPackGameObjectComponent tp = b.GetComponent<ToolsPackGameObjectComponent>();
-                            btComponent.name = v.Key;
+
-                            btComponent.Init(v.Key, v.Key, b.GetComponent<ToolsPackGameObjectComponent>().GetIndex());
+                            if (tp.GetModelTypeEnum() == windw)
-                            MotionEngine.GetModule<ToolsPackManager>().AddToolsPackWindowItemBts(btComponent.gameObject);
+                            {
+                                ToolsPackWindowItemBtComponent btComponent = Instantiate(bt, content, false).GetComponent<ToolsPackWindowItemBtComponent>();
+                                btComponent.name = v.Key;
+                                btComponent.Init(v.Key, v.Key, tp.GetIndex(), tp.GetModelTypeEnum());
+                                MotionEngine.GetModule<ToolsPackManager>().AddToolsPackWindowItemBts(btComponent.gameObject);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        foreach (var lis in v.Value)
+                        {
+                            if (lis.GetComponent<ToolsPackGameObjectComponent>().GetModelTypeEnum() == windw)
+                            {
+                                foreach (var to in li)
+                                {
+                                    ToolsPackGameObjectComponent tp = lis.GetComponent<ToolsPackGameObjectComponent>();
+
+                                    ToolsPackWindowItemBtComponent btComponent = Instantiate(bt, content, false).GetComponent<ToolsPackWindowItemBtComponent>();
+                                    btComponent.name = to;
+                                    btComponent.Init(to, v.Key, tp.GetIndex(), tp.GetModelTypeEnum());
+                                    MotionEngine.GetModule<ToolsPackManager>().AddToolsPackWindowItemBts(btComponent.gameObject);
+                                }
+                            }
                         }
                     }
                 }
-                else
+            }
+            else
+            {
+                _toolsNamesString = MotionEngine.GetModule<ToolsPackManager>().GetToolsPackString();
+                GameObject bt = MotionEngine.GetModule<ToolsPackManager>().GetToolsPackWindowBt();
+                foreach (var v in _toolsNamesString)
                 {
-                    foreach (var lis in v.Value)
+                    List<string> li = MotionEngine.GetModule<DataConfigManager>().GetToolsPackData(v.Key);
+
+                    if (li == null)
                     {
-                        if (lis.GetComponent<ToolsPackGameObjectComponent>().GetModelTypeEnum() == windw)
+                        foreach (var b in v.Value)
                         {
-                            foreach (var to in li)
+                            if (b.ModelTypeEnum == windw)
                             {
                                 ToolsPackWindowItemBtComponent btComponent = Instantiate(bt, content, false).GetComponent<ToolsPackWindowItemBtComponent>();
-                                btComponent.name = to;
+                                btComponent.name = v.Key;
-                                btComponent.Init(to, v.Key, lis.GetComponent<ToolsPackGameObjectComponent>().GetIndex());
+                                btComponent.Init(v.Key, v.Key, b.Index, b.ModelTypeEnum);
                                 MotionEngine.GetModule<ToolsPackManager>().AddToolsPackWindowItemBts(btComponent.gameObject);
                             }
                         }
                     }
+                    else
+                    {
+                        foreach (var lis in v.Value)
+                        {
+                            if (lis.ModelTypeEnum == windw)
+                            {
+                                foreach (var to in li)
+                                {
+                                    ToolsPackWindowItemBtComponent btComponent = Instantiate(bt, content, false).GetComponent<ToolsPackWindowItemBtComponent>();
+                                    btComponent.name = to;
+                                    btComponent.Init(to, v.Key, lis.Index, lis.ModelTypeEnum);
+                                    MotionEngine.GetModule<ToolsPackManager>().AddToolsPackWindowItemBts(btComponent.gameObject);
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }

SXElectricityInformationAcquisition/Assets/Scripts/test1.cs

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using DefaultNamespace.ProcessMode;
 using DG.Tweening;
+using MotionFramework;
 using UnityEngine;
 
 public class test1 : MonoBehaviour
@@ -10,12 +11,11 @@ public class test1 : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-      
+        MotionEngine.GetModule<ToolsPackManager>().OnStringEvent += HandleStringEvent;
     }
 
-    // Update is called once per frame
+    private void HandleStringEvent(string message)
-    void Update()
     {
-        
+        Debug.Log("Received message: " + message);
     }
 }

SXElectricityInformationAcquisition/ProjectSettings/EditorBuildSettings.asset

@@ -12,6 +12,9 @@ EditorBuildSettings:
     path: Assets/Scenes/test.unity
     guid: 53aa6a7fc4c711845a127fec3a6e62a7
   - enabled: 1
-    path: Assets/Scenes/工具间Scenes/工具间.unity
+    path: "Assets/Scenes/\u5DE5\u5177\u95F4Scenes/\u5DE5\u5177\u95F4.unity"
     guid: a69e8c26c38855643a35005a2b9dcb4e
+  - enabled: 1
+    path: "Assets/Scenes/\u73B0\u573AScenes/\u73B0\u573A.unity"
+    guid: c0fb4ea2f51885d44a37681192d9e4c7
   m_configObjects: {}