添加officemanager管理类，修改流程类

Merge branch 'main' of http://3ff0919a.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology
修改Itemtips
2024-08-15 00:40:07 +08:00 · 2024-08-14 21:30:54 +08:00 · 2024-08-14 21:30:49 +08:00
24 changed files with 860 additions and 144 deletions
--- a/Assets/ArtRes/Excel/Config.xlsx
+++ b/Assets/ArtRes/Excel/Config.xlsx
--- a/Assets/Resources/UI/UI_Panel/ItemTips.prefab
+++ b/Assets/Resources/UI/UI_Panel/ItemTips.prefab
@ -307,7 +307,7 @@ RectTransform:
  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_AnchoredPosition: {x: 0, y: 48}
  m_SizeDelta: {x: 120, y: 36}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1055551684720532243
--- a/Assets/Resources/UI/UI_Panel/UI_ToolAndMaterialPanel.prefab
+++ b/Assets/Resources/UI/UI_Panel/UI_ToolAndMaterialPanel.prefab
@ -675,7 +675,7 @@ MonoBehaviour:
  m_text: "\u5DE5\u5177\u5305"
  m_isRightToLeft: 0
  m_fontAsset: {fileID: 11400000, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
-  m_sharedMaterial: {fileID: 7379424646034793120, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
+  m_sharedMaterial: {fileID: -4829118149068189727, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@ -812,7 +812,7 @@ RectTransform:
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 20, y: 20}
  m_Pivot: {x: 0.5, y: 0.5}
@ -1131,7 +1131,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1263243931714669586
 RectTransform:
  m_ObjectHideFlags: 0
@ -1269,7 +1269,13 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 7040691280408631362}
+  - {fileID: 4955123006011599717}
+  - {fileID: 7659248119990251660}
+  - {fileID: 6203714921751036000}
+  - {fileID: 725822971673040588}
+  - {fileID: 2544401556514031479}
  m_Father: {fileID: 664557115506198354}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1316,3 +1322,615 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_HorizontalFit: 2
  m_VerticalFit: 2
+--- !u!1001 &1845140041570666936
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2473787330965529335}
+    m_Modifications:
+    - target: {fileID: 4239231589677207246, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Name
+      value: ToolAndMeterialItem (5)
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+--- !u!224 &2544401556514031479 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+  m_PrefabInstance: {fileID: 1845140041570666936}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &3514604922092967939
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2473787330965529335}
+    m_Modifications:
+    - target: {fileID: 4239231589677207246, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Name
+      value: ToolAndMeterialItem (4)
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+--- !u!224 &725822971673040588 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+  m_PrefabInstance: {fileID: 3514604922092967939}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5809603104501136963
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2473787330965529335}
+    m_Modifications:
+    - target: {fileID: 4239231589677207246, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Name
+      value: ToolAndMeterialItem (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+--- !u!224 &7659248119990251660 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+  m_PrefabInstance: {fileID: 5809603104501136963}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6584625223648237197
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2473787330965529335}
+    m_Modifications:
+    - target: {fileID: 4239231589677207246, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Name
+      value: ToolAndMeterialItem
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+--- !u!224 &7040691280408631362 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+  m_PrefabInstance: {fileID: 6584625223648237197}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7839855945094123183
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2473787330965529335}
+    m_Modifications:
+    - target: {fileID: 4239231589677207246, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Name
+      value: ToolAndMeterialItem (3)
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+--- !u!224 &6203714921751036000 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+  m_PrefabInstance: {fileID: 7839855945094123183}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &9084011915536819626
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2473787330965529335}
+    m_Modifications:
+    - target: {fileID: 4239231589677207246, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Name
+      value: ToolAndMeterialItem (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+--- !u!224 &4955123006011599717 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4239231589677207247, guid: 2e27fc7afa0219549b3a44811d66c063, type: 3}
+  m_PrefabInstance: {fileID: 9084011915536819626}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/SandBox/JBQ/JBQ_Test.cs
+++ b/Assets/SandBox/JBQ/JBQ_Test.cs
@ -67,7 +67,7 @@ public class JBQ_Test : MonoBehaviour
            ///8.电能计量装置装拆工单
            UIManager.Instance.ShowPanel<UI_InstallAndDismantleTicketPanel>(E_UI_Layer.System, (panel) =>
            {
-                panel.Init();
+                //panel.Init();

            });
        }
--- a/Assets/Scenes/03_OfficeScene.unity
+++ b/Assets/Scenes/03_OfficeScene.unity
@ -641,7 +641,7 @@ GameObject:
  - component: {fileID: 1986188605}
  - component: {fileID: 1986188606}
  m_Layer: 0
-  m_Name: Responser
+  m_Name: OfficeManager
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -671,7 +671,7 @@ MonoBehaviour:
  m_GameObject: {fileID: 1986188604}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5acc47c41ca61b344ba11e38989c2ac8, type: 3}
+  m_Script: {fileID: 11500000, guid: e84b5b8de3a3f154ba32f7748599c99d, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
 --- !u!1 &2077977345
@ -1566,7 +1566,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  downIndex: 0
  modelID: 5005
-  subProcessStepID: 
+  currentSubProcessStepID: -1
 --- !u!65 &919132148358585194
 BoxCollider:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/ExcelData/DataClass/TB_SubProcessStep.cs
+++ b/Assets/Scripts/ExcelData/DataClass/TB_SubProcessStep.cs
@ -7,7 +7,7 @@ public class TB_SubProcessStep
 	public string subProcessStepName;
 	public bool isPrecondition;
 	public string precondition;
-	public string toolID;
+	public string triggerID;
 	public string tipTitle;
 	public float score;
 }
--- a/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcessStep.cs
+++ b/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcessStep.cs
@ -14,11 +14,11 @@ public class D_SubProcessStep : I_Enter, I_Exit
    public string subProcessStepName;
    public bool isPrecondition;
    public string precondition;
-    public string toolId;
+    public string triggerID;
    public string tipTitle;
    public float score;

-    public List<int> toolsId = new List<int>();
+    public List<int> triggersId = new List<int>();

    public void Init()
    {
@ -30,19 +30,17 @@ public class D_SubProcessStep : I_Enter, I_Exit
    /// </summary>
    private void GetToolID()
    {
-        if (string.IsNullOrEmpty(toolId)) return;
-        if (toolId.Contains(','))
+        if (string.IsNullOrEmpty(triggerID)) return;
+        if (triggerID.Contains(','))
        {
-            string[] toolIdTemp = toolId.Split(',');
+            string[] toolIdTemp = triggerID.Split(',');
            for (int i = 0; i < toolIdTemp.Length; i++)
            {
-                toolsId.Add(int.Parse(toolIdTemp[i]));
+                triggersId.Add(int.Parse(toolIdTemp[i]));
            }
        }
        else
-            toolsId.Add(int.Parse(toolId));
-
-
+            triggersId.Add(int.Parse(triggerID));
    }


@ -60,7 +58,7 @@ public class D_SubProcessStep : I_Enter, I_Exit
    /// </summary>
    public void Exit()
    {
-        toolsId.Clear();
+        triggersId.Clear();
        UnityEngine.Debug.Log("退出当前子流程步骤:" + id + "_" + subProcessStepName);
    }
 }
--- a/Assets/Scripts/Project/Manager/DataManager.cs
+++ b/Assets/Scripts/Project/Manager/DataManager.cs
@ -197,7 +197,7 @@ public class DataManager : BaseManager<DataManager>
                d_SubProcessStep.subProcessStepName = step.subProcessStepName;
                d_SubProcessStep.isPrecondition = step.isPrecondition;
                d_SubProcessStep.precondition = step.precondition;
-                d_SubProcessStep.toolId = step.toolID;
+                d_SubProcessStep.triggerID = step.triggerID;
                d_SubProcessStep.tipTitle = step.tipTitle;
                d_SubProcessStep.score = step.score;
                d_SubProcessSteps.Add(d_SubProcessStep);
@ -219,11 +219,11 @@ public class DataManager : BaseManager<DataManager>
        }
        foreach (var item in tb_subProcesssSteps)
        {
-            if (string.IsNullOrEmpty(item.toolID))
+            if (string.IsNullOrEmpty(item.triggerID))
            {
                continue;
            }
-            string[] subProcessStepToolID = item.toolID.Split(',');
+            string[] subProcessStepToolID = item.triggerID.Split(',');
            for (int i = 0; i < subProcessStepToolID.Length; i++)
            {
                if (int.Parse(subProcessStepToolID[i]) == toolID)
--- a/Assets/Scripts/Project/Manager/OfficeManager.cs
+++ b/Assets/Scripts/Project/Manager/OfficeManager.cs
@ -0,0 +1,50 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+/// <summary>
+/// create by adam
+/// </summary>
+public class OfficeManager : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        GameManager.EventMgr.AddEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver);
+        GameManager.EventMgr.AddEventListener(Enum_EventType.InitializationUI, InitializationUI);
+    }
+
+    private void OfficeTimeLineOver()
+    {
+        GameManager.UIMgr.ShowPanel<UI_MaskPanel>(E_UI_Layer.System, (panel) =>
+        {
+            panel.Init();
+            GameManager.EventMgr.EventTrigger(Enum_EventType.HideMask);
+
+        });
+    }
+    private void InitializationUI()
+    {
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
+        {
+            GameManager.UIMgr.ShowPanel<UI_TaskListPanel>(E_UI_Layer.Bot, (panel) =>
+            {
+                panel.Init(GameManager.ProcessMgr.subProcessId);
+            });
+        }
+
+        GameManager.UIMgr.ShowPanel<UI_MenuBar>(E_UI_Layer.Mid, (panel) =>
+        {
+            panel.Init();
+            GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
+        });
+    }
+
+
+    private void OnDestroy()
+    {
+        GameManager.EventMgr.RemoveEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver);
+        GameManager.EventMgr.RemoveEventListener(Enum_EventType.InitializationUI, InitializationUI);
+    }
+
+}
--- a/Assets/Scripts/Project/Manager/OfficeManager.cs.meta
+++ b/Assets/Scripts/Project/Manager/OfficeManager.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e84b5b8de3a3f154ba32f7748599c99d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Project/Manager/ProcessManager.cs
+++ b/Assets/Scripts/Project/Manager/ProcessManager.cs
@ -115,32 +115,37 @@ public class ProcessManager : BaseManager<ProcessManager>
    /// 切换
    /// </summary>
    /// <returns></returns>
-    public bool CheckSubProcessSteps(int subProcessStepID, int subProcessStepToolID)
+    public bool CheckSubProcessSteps(int subProcessStepID, int subProcessStepTriggerID)
    {
+        if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.Count > 0)
+        {
+            int currentSubProcessStepsToolId = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0];
+            if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId == subProcessStepID && subProcessStepTriggerID == currentSubProcessStepsToolId)
+            {
+                GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, currentSubProcessStepsToolId);
+                d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.RemoveAt(0);
+                return true;
+            }
+            else
+            {
+                Debug.Log("点击正确的操作");
+                return false;
+            }
+        }
        if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId.Equals(subProcessStepID))
        {
            int spStepID = subProcessStepId + 1;
            int spStepcount = d_Scheme.CurrentProcess.CurrentSubProcess.subProcessStepes.Count;
            if (spStepID <= d_Scheme.CurrentProcess.CurrentSubProcess.subProcessStepes[spStepcount - 1].id)
            {
-                if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.toolsId.Count > 0)
+                HandoverSubProcessStep(spStepID);
+                GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, subProcessStepID);
+                GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
                {
-                    int currentSubProcessStepsToolId = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.toolsId[0];
-                    GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepToolID, currentSubProcessStepsToolId);
-                    d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.toolsId.RemoveAt(0);
-                    return true;
-                }
-                else
-                {
-                    HandoverSubProcessStep(spStepID);
-                    GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, subProcessStepID);
-                    GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
-                    {
-                        panel.Init($"{d_Scheme.CurrentProcess.processName}:<color=blue>{d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{d_Scheme.CurrentProcess.CurrentSubProcess.tips}");
-                    });
-                    Debug.Log("进入下一步子流程步骤");
-                    return true;
-                }
+                    panel.Init($"{d_Scheme.CurrentProcess.processName}:<color=blue>{d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{d_Scheme.CurrentProcess.CurrentSubProcess.tips}");
+                });
+                Debug.Log("进入下一步子流程步骤");
+                return true;
            }
            else
            {
@ -149,9 +154,9 @@ public class ProcessManager : BaseManager<ProcessManager>
                if (spID <= d_Scheme.CurrentProcess.subProcesses[spCount - 1].id)
                {
                    HandoverSubProcess(spID, 0);
-                    int currentSubProcessStepsToolId = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.toolsId[0];
-                    GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepToolID, currentSubProcessStepsToolId);
-                    d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.toolsId.RemoveAt(0);
+                    int currentSubProcessStepsToolId = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0];
+                    GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, currentSubProcessStepsToolId);
+                    d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.RemoveAt(0);
                    GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId);
                    GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
                    GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
@ -168,9 +173,9 @@ public class ProcessManager : BaseManager<ProcessManager>
                    if (pID <= d_Scheme.processes[pCount - 1].id)
                    {
                        HandoverProcess(pID, 0, 0);
-                        int currentSubProcessStepsToolId = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.toolsId[0];
-                        GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepToolID, currentSubProcessStepsToolId);
-                        d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.toolsId.RemoveAt(0);
+                        int currentSubProcessStepsToolId = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0];
+                        GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, currentSubProcessStepsToolId);
+                        d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.RemoveAt(0);
                        GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId);
                        GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
                        GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
--- a/Assets/Scripts/Project/Objects/Device/Device_Mobile.cs
+++ b/Assets/Scripts/Project/Objects/Device/Device_Mobile.cs
@ -3,11 +3,13 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.EventSystems;

 public class Device_Mobile : MonoBehaviour
 {
    public int downIndex = 0;
    public int modelID = 5005;
+    public int currentSubProcessStepID = -1;
    //public List<int> subProcessStepID = new List<int>();
    private HighlightEffect _highlight;
    private void Awake()
@ -17,10 +19,10 @@ public class Device_Mobile : MonoBehaviour
    }
    private void Start()
    {
-        GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcessStepToolID, SwitchSubProcessStepToolID);
+        GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
    }

-    private void SwitchSubProcessStepToolID(int arg0)
+    private void SwitchSubProcessStepTriggerID(int arg0)
    {
        if (modelID == arg0)
        {
@ -33,6 +35,7 @@ public class Device_Mobile : MonoBehaviour

    private void OnMouseDown()
    {
+        if (EventSystem.current.IsPointerOverGameObject()) return;
        switch (downIndex)
        {
            case 0:
@ -45,10 +48,11 @@ public class Device_Mobile : MonoBehaviour
                break;
            case 1:

-                GameManager.UIMgr.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.Mid, (panel) =>
-                {
-                    panel.Init(modelID);
-                });
+                //GameManager.UIMgr.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.Mid, (panel) =>
+                //{
+                //    panel.Init(modelID);
+                //});
+                GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId, modelID);
                _highlight.highlighted = false;
                downIndex = 0;
                break;
@ -83,6 +87,6 @@ public class Device_Mobile : MonoBehaviour

    private void OnDestroy()
    {
-        GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcessStepToolID, SwitchSubProcessStepToolID);
+        GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
    }
 }
--- a/Assets/Scripts/Project/UI/UI_Item/UI_ProcessItem.cs
+++ b/Assets/Scripts/Project/UI/UI_Item/UI_ProcessItem.cs
@ -3,10 +3,11 @@ using TMPro;
 public class UI_ProcessItem : BaseItem
 {
    public int processID;
-    public void Init(int processID, string processName)
+    public void Init(D_Process d_Process)
    {
-        this.processID = processID;
-        GetControl<TextMeshProUGUI>("processItemName").text = processName;
+        this.processID = d_Process.id;
+        GetControl<TextMeshProUGUI>("processItemName").text = d_Process.processName;
        gameObject.name = processID.ToString();
+     
    }
 }
--- a/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
+++ b/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
@ -10,19 +10,25 @@ public class UI_SubProcessItem : BaseItem
    public int subProcessID;
    public int subProcessStepID;

-    private void Start()
-    {
-        GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
-    }
-    public void Init(D_SubProcess d_SubProcess)
+    public void Init(D_SubProcess d_SubProcess,int subProcessID)
    {
        this.processID = d_SubProcess.processId;
        this.subProcessID = d_SubProcess.id;
        this.subProcessStepID = d_SubProcess.subProcessStepes[0].id;
        GetControl<TextMeshProUGUI>("subProcessItemName").text = d_SubProcess.subProcessName;
        gameObject.name = subProcessID.ToString();
+        SwitchSubProcess(subProcessID);
+        ShowMe();
    }

+    public override void ShowMe()
+    {
+        GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
+    }
+    public override void HideMe()
+    {
+        GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
+    }
    /// <summary>
    /// ¿ØÖÆ°´Å¥×´Ì¬
    /// </summary>
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.cs
@ -5,16 +5,16 @@ using UnityEditor.VersionControl;
 using UnityEngine;
 using UnityEngine.UI;

-public class UI_InstallAndDismantleTicketPanel :BasePanel
+public class UI_InstallAndDismantleTicketPanel : BasePanel
 {
    /// <summary>
    /// 是否提交
    /// </summary>
    private bool submite;
    private Image Image_Mask;
-    public void Init()
+    public void Init(int triggerID)
    {
-        
+
    }


@ -31,7 +31,10 @@ public class UI_InstallAndDismantleTicketPanel :BasePanel
                Debug.Log(1);
                Submit();
                break;
-            
+            case "Button_Close":
+                GameManager.UIMgr.HidePanel<UI_InstallAndDismantleTicketPanel>();
+                break;
+
        }
    }

@ -41,10 +44,10 @@ public class UI_InstallAndDismantleTicketPanel :BasePanel
    private void Submit()
    {
        GameObject viewport = GetControl<Image>("Viewport").gameObject;
-          
+
        foreach (Transform child in viewport.transform)
        {
-            
+
            TMP_InputField inputField = child.GetComponent<TMP_InputField>();

            // 如果找到了TMP_InputField组件，则禁用它  
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs
@ -3,10 +3,10 @@ using UnityEngine;

 public class UI_LowTensionWorkTicketPanel : BasePanel
 {
-    public int toolID;
-    public void Init(int toolID)
+    public int triggerID;
+    public void Init(int triggerID)
    {
-        this.toolID = toolID;
+        this.triggerID = triggerID;
    }

    public override void ShowMe()
@ -24,7 +24,12 @@ public class UI_LowTensionWorkTicketPanel : BasePanel

        switch (btnName)
        {
-            case "":
+            case "closeBtn":
+                GameManager.UIMgr.HidePanel<UI_LowTensionWorkTicketPanel>();
+                break;
+            case "ConfirmBtn":
+                GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId, triggerID);
+                GameManager.UIMgr.HidePanel<UI_LowTensionWorkTicketPanel>();
                break;
            default:
                break;
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs
@ -6,16 +6,21 @@ using UnityEngine.SceneManagement;
 using TMPro;
 using UnityEngine.EventSystems;
 using System.Collections;
+using System;

 public class UI_MenuBar : BasePanel
 {
    [SerializeField]
    private Sprite ExpandSprite, CollapseSprite;
-    private Button CloseDefaultBtn, ToolRoomBtn, SiteBtn, WorkOrderBtn, MissionBtn, OfficeBtn, DisassemblyAssemblyWorkOrderBtn, ToolKitBtn;
+    private Button closeDefaultBtn, toolRoomBtn, siteBtn, workOrderBtn, missionBtn, officeBtn, disassemblyAssemblyWorkOrderBtn, toolKitBtn;
    public int countDown = 0;

    private int time;

+    public int workOrderID = 5006;
+    public int disassemblyAssemblyWorkOrderID = 5007;
+
+
    /// <summary>
    /// ¼ÇÂ¼µ¹¼ÆÊ±µÄÐ³Ì
    /// </summary>
@ -24,34 +29,48 @@ public class UI_MenuBar : BasePanel
    {
        coroutine = GameManager.MonoMgr.StartCoroutine(CountDown(countDown));
        //MenuBarIamge = GetControl<Image>("MenuBar");
-        CloseDefaultBtn = GetControl<Button>("CloseDefaultBtn");
-        ToolRoomBtn = GetControl<Button>("ToolRoomBtn");
-        SiteBtn = GetControl<Button>("SiteBtn");
-        WorkOrderBtn = GetControl<Button>("WorkOrderBtn");
-        MissionBtn = GetControl<Button>("MissionBtn");
-        OfficeBtn = GetControl<Button>("OfficeBtn");
-        ToolKitBtn = GetControl<Button>("ToolKitBtn");
-        DisassemblyAssemblyWorkOrderBtn = GetControl<Button>("DisassemblyAssemblyWorkOrderBtn");
-        ShowMe();
+        closeDefaultBtn = GetControl<Button>("CloseDefaultBtn");
+        toolRoomBtn = GetControl<Button>("ToolRoomBtn");
+        siteBtn = GetControl<Button>("SiteBtn");
+        workOrderBtn = GetControl<Button>("WorkOrderBtn");
+        missionBtn = GetControl<Button>("MissionBtn");
+        officeBtn = GetControl<Button>("OfficeBtn");
+        toolKitBtn = GetControl<Button>("ToolKitBtn");
+        disassemblyAssemblyWorkOrderBtn = GetControl<Button>("DisassemblyAssemblyWorkOrderBtn");
    }
    public override void ShowMe()
    {
        GameManager.EventMgr.AddEventListener<E_SceneType>(Enum_EventType.SwitchScene, CheckBtnBySceneName);
+        GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
    }
+
+    private void SwitchSubProcessStepTriggerID(int triggerID)
+    {
+        if (triggerID == workOrderID)
+        {
+            Debug.Log("묏鱗데瓊刻");
+        }
+        if (triggerID == disassemblyAssemblyWorkOrderID)
+        {
+            Debug.Log("뀔陋묏데瓊刻");
+        }
+    }
+
    public override void HideMe()
    {
        GameManager.EventMgr.RemoveEventListener<E_SceneType>(Enum_EventType.SwitchScene, CheckBtnBySceneName);
+        GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
    }
    public void CheckBtnBySceneName(E_SceneType type)
    {
        Debug.Log(type.ToString());
-        ToolRoomBtn.gameObject.SetActive(type != E_SceneType.ToolRoom);
-        SiteBtn.gameObject.SetActive(type == E_SceneType.ToolRoom);
-        WorkOrderBtn.gameObject.SetActive(type == E_SceneType.Office || type == E_SceneType.Site);
-        MissionBtn.gameObject.SetActive(type == E_SceneType.Office || type == E_SceneType.ToolRoom || type == E_SceneType.Site);
-        OfficeBtn.gameObject.SetActive(type == E_SceneType.ToolRoom);
-        DisassemblyAssemblyWorkOrderBtn.gameObject.SetActive(type == E_SceneType.Office);
-        ToolKitBtn.gameObject.SetActive(type != E_SceneType.Office);
+        toolRoomBtn.gameObject.SetActive(type != E_SceneType.ToolRoom);
+        siteBtn.gameObject.SetActive(type == E_SceneType.ToolRoom);
+        workOrderBtn.gameObject.SetActive(type == E_SceneType.Office || type == E_SceneType.Site);
+        missionBtn.gameObject.SetActive(type == E_SceneType.Office || type == E_SceneType.ToolRoom || type == E_SceneType.Site);
+        officeBtn.gameObject.SetActive(type == E_SceneType.ToolRoom);
+        disassemblyAssemblyWorkOrderBtn.gameObject.SetActive(type == E_SceneType.Office);
+        toolKitBtn.gameObject.SetActive(type != E_SceneType.Office);
    }


@ -83,7 +102,7 @@ public class UI_MenuBar : BasePanel
                    GetControl<Image>("CloseDefaultBtn").sprite = ExpandSprite;
                    GetControl<Image>("MenuBar").transform.DOLocalMoveX(1070, 0.5f);
                }
-                    break;
+                break;

            case "ToolRoomBtn":
                GameManager.UIMgr.ShowPanel<UI_LoadingPanel>(E_UI_Layer.System, (panel) =>
@ -100,10 +119,19 @@ public class UI_MenuBar : BasePanel
                SceneManager.LoadScene("");
                break;
            case "WorkOrderBtn":
-
+                GameManager.UIMgr.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.Mid, (panel) =>
+                {
+                    panel.Init(workOrderID);
+                });
                break;
            case "WorkTicketBtn":

+                break;
+            case "DisassemblyAssemblyWorkOrderBtn":
+                GameManager.UIMgr.ShowPanel<UI_InstallAndDismantleTicketPanel>(E_UI_Layer.Mid, (panel) =>
+                {
+                    panel.Init(disassemblyAssemblyWorkOrderID);
+                });
                break;
            default:
                break;
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_SelectWorkTicketPanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_SelectWorkTicketPanel.cs
@ -4,14 +4,17 @@ using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;

+/// <summary>
+/// 工作票选择面板
+/// </summary>
 public class UI_SelectWorkTicketPanel : BasePanel
 {
    private int number = 0;
-    public int toolID;
-    public void Init(int toolID)
+    private int triggerID;
+    public void Init(int triggerID)
    {
        number = 0;
-        this.toolID = toolID;
+        this.triggerID = triggerID;
    }

    protected override void OnClick(string btnName)
@ -32,7 +35,8 @@ public class UI_SelectWorkTicketPanel : BasePanel
                            UIManager.Instance.HidePanel<UI_SelectWorkTicketPanel>();
                            GameManager.UIMgr.ShowPanel<UI_LowTensionWorkTicketPanel>(E_UI_Layer.Mid, (p) =>
                            {
-                                p.Init(toolID);
+                                p.Init(triggerID);
+                                GameManager.ProcessMgr.CheckSubProcessSteps(ProcessManager.Instance.subProcessStepId, triggerID);
                            });
                            Debug.Log("选择了正确选项F，进行下一个面板");
                        }
@ -44,7 +48,8 @@ public class UI_SelectWorkTicketPanel : BasePanel
                                Debug.Log("错误三次了,直接进行下一个面板");
                                GameManager.UIMgr.ShowPanel<UI_LowTensionWorkTicketPanel>(E_UI_Layer.Mid, (p) =>
                                {
-                                    p.Init(toolID);
+                                    p.Init(triggerID);
+                                    GameManager.ProcessMgr.CheckSubProcessSteps(ProcessManager.Instance.subProcessStepId, triggerID);
                                });
                            }
                        }
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs
@ -8,41 +8,37 @@ using System.Collections.Generic;
 public class UI_TaskListPanel : BasePanel
 {
    public UI_ProcessItem _processItem;
-    public UI_SubProcessItem _subProcessItem;
    public RectTransform _content;
-    public void Init(int schemeID)
+    public void Init(int subProcessID)
    {
        GameManager.ResourcesMgr.LoadAsync<UI_ProcessItem>($"{Const.UI_Item}UI_TaskListPanel/processItem", (ptemp) =>
        {
            _processItem = ptemp;
            GameManager.ResourcesMgr.LoadAsync<UI_SubProcessItem>($"{Const.UI_Item}UI_TaskListPanel/subProcessItem", (stemp) =>
            {
-                _subProcessItem = stemp;
                D_Scheme d_Scheme = GameManager.ProcessMgr.d_Scheme;
                for (int i = 0; i < d_Scheme.processes.Count; i++)
                {
                    var t = Instantiate(_processItem, _content);
-                    t.Init(d_Scheme.processes[i].id, d_Scheme.processes[i].processName);
+                    t.Init(d_Scheme.processes[i]);
                    for (int j = 0; j < d_Scheme.processes[i].subProcesses.Count; j++)
                    {
-                        var s = Instantiate(_subProcessItem, _content);
-                        s.Init(d_Scheme.processes[i].subProcesses[j]);
+                        var s = Instantiate(stemp, _content);
+                        s.Init(d_Scheme.processes[i].subProcesses[j], subProcessID);
                    }
                }
-
            });
        });
    }

-    protected override void OnClick(string btnName)
-    {
+    //private void CreateSubProcessItem(UI_SubProcessItem sTemp)
+    //{
+    //    D_Scheme d_Scheme = GameManager.ProcessMgr.d_Scheme;
+    //    for (int i = 0; i < d_Scheme.processes.Count; i++)
+    //    {
+    //        var t = Instantiate(_processItem, _content);
+    //        t.Init(d_Scheme.processes[i],sTemp);
+    //    }
+    //}

-        switch (btnName)
-        {
-            case "":
-                break;
-            default:
-                break;
-        }
-    }
 }
--- a/Assets/Scripts/ProjectBase/EventCenter/Enum_EventType.cs
+++ b/Assets/Scripts/ProjectBase/EventCenter/Enum_EventType.cs
@ -41,5 +41,13 @@ public enum Enum_EventType
    /// <summary>
    /// 切换目标工具ID
    /// </summary>
-    SwitchSubProcessStepToolID,
+    SwitchSubProcessStepTriggerID,
+    /// <summary>
+    /// 办公室动画结束
+    /// </summary>
+    OfficeTimeLineOver,
+    /// <summary>
+    /// 初始化UI
+    /// </summary>
+    InitializationUI,
 }
--- a/Assets/Scripts/Wwz/OfficeScene/OfficeTimelineControl.cs
+++ b/Assets/Scripts/Wwz/OfficeScene/OfficeTimelineControl.cs
@ -33,12 +33,8 @@ public class OfficeTimelineControl : MonoBehaviour
    {
        if (mPlayableDirector == aDirector)
        {
-            GameManager.UIMgr.ShowPanel<UI_MaskPanel>(E_UI_Layer.System, (panel) =>
-            {
-                panel.Init();
-                GameManager.EventMgr.EventTrigger(Enum_EventType.HideMask);
-                Invoke("DestroyPlayer", 1f);
-            });
+            GameManager.EventMgr.EventTrigger(Enum_EventType.OfficeTimeLineOver);
+            Invoke("DestroyPlayer", 1f);
        }
    }

@ -47,20 +43,7 @@ public class OfficeTimelineControl : MonoBehaviour
        Destroy(playerModel);
        Destroy(aniCamera);
        playerController.SetActive(true);
-        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
-        {
-            GameManager.UIMgr.ShowPanel<UI_TaskListPanel>(E_UI_Layer.Bot, (panel) =>
-            {
-                panel.Init(GameManager.RunModelMgr.deviceId);
-            });
-        }
-
-        GameManager.UIMgr.ShowPanel<UI_MenuBar>(E_UI_Layer.Mid, (panel) =>
-        {
-            panel.Init();
-            GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
-        });
-
+        GameManager.EventMgr.EventTrigger(Enum_EventType.InitializationUI);
    }

    void OnDestroy()
--- a/Assets/Scripts/Wwz/OfficeScene/Responser.cs
+++ b/Assets/Scripts/Wwz/OfficeScene/Responser.cs
@ -1,24 +1,19 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;

 public class Responser : MonoBehaviour
 {
-    // Start is called before the first frame update
+
    void Start()
    {
-      //  GameManager.DataMgr. GameManager.ProcessMgr.subProcessStepId
-        GameManager.EventMgr.AddEventListener(Enum_EventType.SwitchMode,HandleEvent);
+        GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
    }

-    private void HandleEvent()
+    private void SwitchSubProcessStepTriggerID(int arg0)
    {
-        
+        Debug.Log($"MenuClick ===== {arg0}");
    }

-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
 }
--- a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary
+++ b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary
--- a/Assets/StreamingAssets/BinaryData/TB_ToolAndMaterial.binary
+++ b/Assets/StreamingAssets/BinaryData/TB_ToolAndMaterial.binary
Author	SHA1	Message	Date
YangHua	7c45a376ce	添加officemanager管理类，修改流程类	2024-08-15 00:40:07 +08:00
YangHua	164450a064	Merge branch 'main' of http://3ff0919a.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology	2024-08-14 21:30:54 +08:00
YangHua	3a8e9f5b07	修改Itemtips	2024-08-14 21:30:49 +08:00