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

工具箱开发完成
2024-06-05 14:22:59 +08:00 · 2024-06-05 14:22:53 +08:00
5 changed files with 397 additions and 14 deletions
--- a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindow.prefab
+++ b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindow.prefab
@ -767,7 +767,7 @@ MonoBehaviour:
  m_CellSize: {x: 120, y: 120}
  m_Spacing: {x: 21, y: 21}
  m_Constraint: 1
-  m_ConstraintCount: 8
+  m_ConstraintCount: 7
 --- !u!1 &7203585046012487069
 GameObject:
  m_ObjectHideFlags: 0
--- a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
+++ b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
@ -885,6 +885,128 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 277373237}
  m_CullTransparentMesh: 1
+--- !u!1001 &379723857
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1771205975173060022}
+    m_Modifications:
+    - target: {fileID: 1570257037484163098, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: rmsCount
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_DirtyAABB
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.x
+      value: -0.00000013411045
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.y
+      value: -0.000000059604645
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.z
+      value: 0.000002694549
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.x
+      value: 0.0060756058
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.y
+      value: 0.013877571
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.z
+      value: 0.0044264225
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_DirtyAABB
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.x
+      value: -0.00000013411045
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.y
+      value: -0.000000059604645
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.z
+      value: 0.000002694549
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.x
+      value: 0.0060756058
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.y
+      value: 0.013877571
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.z
+      value: 0.0044264225
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -3.158
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.1317999
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.425
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.70710677
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.0000020042062
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.000000007450581
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7587649942819475418, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_Name
+      value: "l\u578B\u96C6\u4E2D\u5668"
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+--- !u!4 &379723858 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+  m_PrefabInstance: {fileID: 379723857}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &409230221
 GameObject:
  m_ObjectHideFlags: 0
@ -1709,6 +1831,128 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 756157321}
  m_Mesh: {fileID: -7434549690534084444, guid: 156cca832bad49447b16a92685b1fa5b, type: 3}
+--- !u!1001 &787266783
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1771205975173060022}
+    m_Modifications:
+    - target: {fileID: 1570257037484163098, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: rmsCount
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_DirtyAABB
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.x
+      value: -0.00000013411045
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.y
+      value: -0.000000059604645
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.z
+      value: 0.000002694549
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.x
+      value: 0.0060756058
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.y
+      value: 0.013877571
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.z
+      value: 0.0044264225
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_DirtyAABB
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.x
+      value: -0.00000013411045
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.y
+      value: -0.000000059604645
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.z
+      value: 0.000002694549
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.x
+      value: 0.0060756058
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.y
+      value: 0.013877571
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.z
+      value: 0.0044264225
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -3.158
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.23529999
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.425
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.70710677
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.0000020042062
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.000000007450581
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7587649942819475418, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_Name
+      value: "l\u578B\u96C6\u4E2D\u5668"
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+--- !u!4 &787266784 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+  m_PrefabInstance: {fileID: 787266783}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &862035557
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2357,6 +2601,124 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 7463771665152150607, guid: 58e406f71b32d884392695381bfd0ac5, type: 3}
  m_PrefabInstance: {fileID: 1076963525}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1128175990
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1771205975173060022}
+    m_Modifications:
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_DirtyAABB
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.x
+      value: -0.00000013411045
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.y
+      value: -0.000000059604645
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.z
+      value: 0.000002694549
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.x
+      value: 0.0060756058
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.y
+      value: 0.013877571
+      objectReference: {fileID: 0}
+    - target: {fileID: 2173600290560809397, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.z
+      value: 0.0044264225
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_DirtyAABB
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.x
+      value: -0.00000013411045
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.y
+      value: -0.000000059604645
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Center.z
+      value: 0.000002694549
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.x
+      value: 0.0060756058
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.y
+      value: 0.013877571
+      objectReference: {fileID: 0}
+    - target: {fileID: 5210755541034202660, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_AABB.m_Extent.z
+      value: 0.0044264225
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -3.158
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.682
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.425
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.70710677
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.0000020042062
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.000000007450581
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7587649942819475418, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+      propertyPath: m_Name
+      value: "l\u578B\u96C6\u4E2D\u5668"
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+--- !u!4 &1128175991 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7063737413586441568, guid: 6c9d41f3e96937c4f960e7fc87ca2d32, type: 3}
+  m_PrefabInstance: {fileID: 1128175990}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1160688574
 GameObject:
  m_ObjectHideFlags: 0
@ -4214,8 +4576,11 @@ Transform:
  - {fileID: 930152845}
  - {fileID: 1730311795}
  - {fileID: 4237368092973860874}
+  - {fileID: 1128175991}
  - {fileID: 11517223}
+  - {fileID: 787266784}
  - {fileID: 541355879}
+  - {fileID: 379723858}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &2704155233242594303
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs
@ -14,7 +14,7 @@ namespace ToolsPack
    public class ToolsPackGameObjectComponent : MonoBehaviour
    {
        private HighlightEffect _highlight;
-
+        private int index;
        private void Awake()
        {
            _highlight = this.GetComponent<HighlightEffect>();
@ -35,5 +35,15 @@ namespace ToolsPack
        {
            _highlight.highlighted = false;
        }
+
+        public void SetIndex(int inde)
+        {
+            index = inde;
+        }
+
+        public int GetIndex()
+        {
+            return index;
+        }
    }
 }
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs
@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Security.Cryptography;
 using DefaultNamespace;
 using MotionFramework;
@ -9,6 +10,7 @@ using Newtonsoft.Json.Linq;
 using ToolsPack;
 using Unity.VisualScripting;
 using UnityEngine;
+using UnityEngine.Timeline;

 public enum ToolsPackScene
 {
@ -16,6 +18,7 @@ public enum ToolsPackScene
    其他
 }

+
 /// <summary>
 /// 工具包
 /// </summary>
@ -77,10 +80,12 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
        if (!_toolsPack.ContainsKey(toolsName))
        {
            _toolsPack.Add(toolsName, new List<GameObject>() { toolsGame });
+            toolsGame.GetComponent<ToolsPackGameObjectComponent>().SetIndex(0);
        }
        else
        {
            _toolsPack[toolsName].Add(toolsGame);
+            toolsGame.GetComponent<ToolsPackGameObjectComponent>().SetIndex(_toolsPack[toolsName].Count + 1);
        }
    }

@ -90,15 +95,19 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
    /// <param name="toolsName"></param>
    public void DeleteToolsPack(string toolsName, int index)
    {
-        if (_toolsPack[toolsName].Count > 0)
+        int count = _toolsPack[toolsName].Count;
+        if (count > 1)
        {
-            for (int i = 0; i < _toolsPack[toolsName].Count; i++)
-            {
-                if (i == index)
-                {
-                    _toolsPack[toolsName].RemoveAt(i);
-                }
-            }
+            GameObject g = _toolsPack[toolsName].SingleOrDefault(s => s.GetComponent<ToolsPackGameObjectComponent>().GetIndex() == index);
+            _toolsPack[toolsName].Remove(g);
+            //
+            // for (int i = 0; i < _toolsPack[toolsName].Count; i++)
+            // {
+            //     if (_toolsPack[toolsName][i].GetComponent<ToolsPackGameObjectComponent>().GetIndex() == index)
+            //     {
+            //         _toolsPack[toolsName].re
+            //     }
+            // }
        }
        else
        {
@ -126,7 +135,8 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
        {
            for (int i = 0; i < game.Count; i++)
            {
-                if (i == index)
+                int iii = game[i].GetComponent<ToolsPackGameObjectComponent>().GetIndex();
+                if (iii == index)
                {
                    return (game[i]);
                }
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs
@ -50,14 +50,12 @@ namespace ToolsPack
                        {
                            ToolsPackWindowItemBtComponent btComponent = Instantiate(bt, content, false).GetComponent<ToolsPackWindowItemBtComponent>();
                            btComponent.name = to;
-                            btComponent.Init(to,v.Key,index);
+                            btComponent.Init(to, v.Key, lis.GetComponent<ToolsPackGameObjectComponent>().GetIndex());
                            MotionEngine.GetModule<ToolsPackManager>().AddToolsPackWindowItemBts(btComponent.gameObject);
-                        
                        }

                        index++;
                    }
-                    
                }
            }
        }
Author	SHA1	Message	Date
yzx	4c15139ca8	Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition	2024-06-05 14:22:59 +08:00
yzx	647e170f5c	工具箱开发完成	2024-06-05 14:22:53 +08:00