修复一些问题

2024-07-31 08:38:21 +08:00 · 2024-07-31 08:38:21 +08:00 · 18619c666b
parent 4539e63bb3
commit 18619c666b
27 changed files with 1096 additions and 164 deletions
--- a/SXElectricityInformationAcquisition/Assets/Fonts/PangMenZhengDaoBiaoTiTiMianFeiBan-2
+++ b/SXElectricityInformationAcquisition/Assets/Fonts/PangMenZhengDaoBiaoTiTiMianFeiBan-2
--- a/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity
+++ b/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity
@ -199,6 +199,17 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5290061}
  m_CullTransparentMesh: 1
+--- !u!114 &10415334 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2803791738351137529, guid: fa12b84946083d14cb4447029910be28, type: 3}
+  m_PrefabInstance: {fileID: 191666367}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8768f1946ef64a2daa62ded671a1fcb1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &17406790
 GameObject:
  m_ObjectHideFlags: 0
@ -638,7 +649,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Texture: {fileID: 2800000, guid: f4034c9eb17183443a3c821c6ce3fc4e, type: 3}
+  m_Texture: {fileID: 2800000, guid: 91c44ccdd19c1af48815f3aee2743c5a, type: 3}
  m_UVRect:
    serializedVersion: 2
    x: 0
@ -1993,7 +2004,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1966874932685706031, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_text
-      value: 
+      value: "\u586B\u5199\u5DE5\u4F5C\u7968"
      objectReference: {fileID: 0}
    - target: {fileID: 2015168015288718721, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_Enabled
@ -2087,6 +2098,14 @@ PrefabInstance:
      propertyPath: m_enableWordWrapping
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 3087814542126416934, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 6.6524
+      objectReference: {fileID: 0}
+    - target: {fileID: 3087814542126416934, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -39.6
+      objectReference: {fileID: 0}
    - target: {fileID: 3159596304304772684, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_AnchoredPosition.x
      value: -100.1001
@ -2117,12 +2136,24 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3612772911471161229, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_text
-      value: 
+      value: "\u6A21\u5F0F\uFF1A\u57F9\u8BAD\u6A21\u5F0F"
      objectReference: {fileID: 0}
    - target: {fileID: 3614215655286724767, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_SizeDelta.y
      value: 356
      objectReference: {fileID: 0}
+    - target: {fileID: 3668413075806497024, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 168.5894
+      objectReference: {fileID: 0}
+    - target: {fileID: 3668413075806497024, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -24.1276
+      objectReference: {fileID: 0}
+    - target: {fileID: 3668413075806497024, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 39.9
+      objectReference: {fileID: 0}
    - target: {fileID: 3675874295142686003, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_IsActive
      value: 0
@ -2259,6 +2290,30 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 5439446738207451450, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5439446738207451450, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5439446738207451450, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5439446738207451450, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5439446738207451450, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 252.67
+      objectReference: {fileID: 0}
+    - target: {fileID: 5439446738207451450, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -32.462
+      objectReference: {fileID: 0}
    - target: {fileID: 5653705898394455902, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_Enabled
      value: 1
@ -2299,6 +2354,10 @@ PrefabInstance:
      propertyPath: m_Enabled
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 6332063773234233809, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 6359040609588837943, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_Text
      value: 
@ -2335,6 +2394,22 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 6825941962264751519, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 6.6477003
+      objectReference: {fileID: 0}
+    - target: {fileID: 6825941962264751519, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -39.599976
+      objectReference: {fileID: 0}
+    - target: {fileID: 6868777688919749608, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 6.6524
+      objectReference: {fileID: 0}
+    - target: {fileID: 6868777688919749608, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0.000022888184
+      objectReference: {fileID: 0}
    - target: {fileID: 6932745200035972310, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
      value: 0
@ -2401,7 +2476,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7027834050634466508, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_text
-      value: 
+      value: "\u5F20\u4E09\u4E09"
      objectReference: {fileID: 0}
    - target: {fileID: 7111662294929120867, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_Sprite
@ -2423,6 +2498,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: -56
      objectReference: {fileID: 0}
+    - target: {fileID: 7248471393004443603, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 3c356ab78eb40034582ebf22bfa0b35c, type: 3}
    - target: {fileID: 7652391826265654237, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_IsActive
      value: 0
@ -2451,13 +2530,21 @@ PrefabInstance:
      propertyPath: m_Pivot.y
      value: 0.9999999
      objectReference: {fileID: 0}
+    - target: {fileID: 8040459939376544360, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 300.5518
+      objectReference: {fileID: 0}
+    - target: {fileID: 8040459939376544360, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 144.7239
+      objectReference: {fileID: 0}
    - target: {fileID: 8040459939376544360, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 175
+      value: 175.57587
      objectReference: {fileID: 0}
    - target: {fileID: 8040459939376544360, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -118.6
+      value: -119.5
      objectReference: {fileID: 0}
    - target: {fileID: 8133670367026815220, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_fontAsset
@ -2491,6 +2578,10 @@ PrefabInstance:
      propertyPath: m_hasFontAssetChanged
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8157337112890738104, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 8216632422787132331, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_IsActive
      value: 0
@ -2579,6 +2670,9 @@ PrefabInstance:
      insertIndex: -1
      addedObject: {fileID: 1382749199}
    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1040707731}
    - targetCorrespondingSourceObject: {fileID: 7261749442720430534, guid: fa12b84946083d14cb4447029910be28, type: 3}
      insertIndex: -1
      addedObject: {fileID: 191666369}
@ -10930,6 +11024,24 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1038244345}
  m_CullTransparentMesh: 1
+--- !u!1 &1040707726 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3}
+  m_PrefabInstance: {fileID: 191666367}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1040707731
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1040707726}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa632feb72110948a76db8d00b696c3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  toolsPackMenuBtOnClick: {fileID: 10415334}
 --- !u!1 &1047742104
 GameObject:
  m_ObjectHideFlags: 0
--- a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
+++ b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
@ -11470,6 +11470,10 @@ PrefabInstance:
      propertyPath: IsClick
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 670462147742735335, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
+      propertyPath: _ToolProperties
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 843823494717570895, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
      propertyPath: m_TagString
      value: Tools
@ -11502,6 +11506,10 @@ PrefabInstance:
      propertyPath: IsClick
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 1135580117868787308, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
+      propertyPath: _ToolProperties
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1201641625300399713, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
      propertyPath: IsClick
      value: 1
@ -11510,6 +11518,10 @@ PrefabInstance:
      propertyPath: IsClick
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 1234371878495806569, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
+      propertyPath: _ToolProperties
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1328682437358414045, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
      propertyPath: m_TagString
      value: Tools
@ -11554,6 +11566,10 @@ PrefabInstance:
      propertyPath: IsClick
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 2784448293754525205, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
+      propertyPath: _ToolProperties
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 2813967467961408526, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
      propertyPath: m_TagString
      value: Tools
@ -11618,6 +11634,10 @@ PrefabInstance:
      propertyPath: IsClick
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 4939365695586856861, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
+      propertyPath: _ToolProperties
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 5057495791668034610, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
      propertyPath: IsClick
      value: 1
@ -11630,6 +11650,10 @@ PrefabInstance:
      propertyPath: IsClick
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 5196444625338266019, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
+      propertyPath: _ToolProperties
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 5252345472685876603, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
      propertyPath: IsClick
      value: 1
@ -11654,6 +11678,10 @@ PrefabInstance:
      propertyPath: IsClick
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 6079982017498218556, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
+      propertyPath: _ToolProperties
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 6166671220020926670, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
      propertyPath: IsClick
      value: 0
@ -11666,6 +11694,10 @@ PrefabInstance:
      propertyPath: IsClick
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 6201601074909819496, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
+      propertyPath: _ToolProperties
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 6487353676969599811, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
      propertyPath: IsClick
      value: 1
@ -11690,6 +11722,10 @@ PrefabInstance:
      propertyPath: IsClick
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 6763588455289719455, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
+      propertyPath: _ToolProperties
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 6993615044140163675, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
      propertyPath: IsClick
      value: 1
@ -11770,6 +11806,10 @@ PrefabInstance:
      propertyPath: IsClick
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 8190246182521221796, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
+      propertyPath: _ToolProperties
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 8205667967450490662, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
      propertyPath: m_TagString
      value: Tools
@ -11798,6 +11838,10 @@ PrefabInstance:
      propertyPath: IsClick
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 8491586979902425176, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
+      propertyPath: _ToolProperties
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 8718437854365716368, guid: 7e42ad4821305374ba380adcf42bf09b, type: 3}
      propertyPath: IsClick
      value: 1
@ -11839,7 +11883,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 06e3d9c9216875449967ccc627eb21bb, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  ui: {fileID: 298456061}
 --- !u!1 &822621102
 GameObject:
  m_ObjectHideFlags: 0
--- a/SXElectricityInformationAcquisition/Assets/Scenes/现场
+++ b/SXElectricityInformationAcquisition/Assets/Scenes/现场
@ -4248,6 +4248,127 @@ Canvas:
  m_SortingLayerID: 0
  m_SortingOrder: 0
  m_TargetDisplay: 0
+--- !u!1 &214213910
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 214213911}
+  - component: {fileID: 214213914}
+  - component: {fileID: 214213913}
+  - component: {fileID: 214213912}
+  m_Layer: 5
+  m_Name: "\u6536\u56DE\u5DE5\u5177Btn"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &214213911
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 214213910}
+  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: 823455882}
+  m_Father: {fileID: 2030963599}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -64.70001, y: 591.4}
+  m_SizeDelta: {x: 72, y: 72}
+  m_Pivot: {x: 1, y: 0}
+--- !u!114 &214213912
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 214213910}
+  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: 214213913}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &214213913
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 214213910}
+  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: 21300000, guid: 04b39ad12990ffa4d84537b19ed62db4, type: 3}
+  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 &214213914
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 214213910}
+  m_CullTransparentMesh: 1
 --- !u!1 &214295990
 GameObject:
  m_ObjectHideFlags: 0
@ -15640,6 +15761,85 @@ Canvas:
  m_SortingLayerID: 0
  m_SortingOrder: 0
  m_TargetDisplay: 0
+--- !u!1 &823455881
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 823455882}
+  - component: {fileID: 823455884}
+  - component: {fileID: 823455883}
+  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 &823455882
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 823455881}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.000039062514}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 214213911}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: -8}
+  m_SizeDelta: {x: 72, y: 27}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &823455883
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 823455881}
+  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: 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6536\u56DE\u5DE5\u5177"
+--- !u!222 &823455884
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 823455881}
+  m_CullTransparentMesh: 1
 --- !u!1 &824315056
 GameObject:
  m_ObjectHideFlags: 0
@ -26206,7 +26406,7 @@ BoxCollider:
  m_LayerOverridePriority: 0
  m_IsTrigger: 1
  m_ProvidesContacts: 0
-  m_Enabled: 0
+  m_Enabled: 1
  serializedVersion: 3
  m_Size: {x: 3.1789246, y: 1, z: 3.1007233}
  m_Center: {x: 0.046676636, y: 0, z: 1.0503616}
@ -28574,6 +28774,10 @@ MonoBehaviour:
    returnButton: {fileID: 587729411}
    originalPosition: {x: 0, y: 0, z: 0}
    originalRotation: {x: 0, y: 0, z: 0, w: 0}
+  - toolObject: {fileID: 895989071}
+    returnButton: {fileID: 214213912}
+    originalPosition: {x: 0, y: 0, z: 0}
+    originalRotation: {x: 0, y: 0, z: 0, w: 0}
  PlayercameraTrans: {fileID: 6121626523118833240}
  Fieldobservation: {fileID: 6121626523908351180}
 --- !u!114 &1505150134
@ -34610,7 +34814,10 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 2030963599}
    m_AddedComponents:
    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3}
      insertIndex: -1
@ -35198,6 +35405,7 @@ MonoBehaviour:
  - {fileID: 398533227}
  - {fileID: 1869768458}
  - {fileID: 587729411}
+  - {fileID: 214213912}
  ArrowImage: {fileID: 1707754176}
  inthis: 0
 --- !u!114 &1810323354
@ -35232,8 +35440,8 @@ BoxCollider:
  m_ProvidesContacts: 0
  m_Enabled: 1
  serializedVersion: 3
-  m_Size: {x: 0.9429537, y: 0.27271962, z: 0.90303916}
-  m_Center: {x: 0.0028089092, y: -0.36363685, z: -0.04848197}
+  m_Size: {x: 0.9429537, y: 0.27271962, z: 1.4630866}
+  m_Center: {x: 0.0028089092, y: -0.36363685, z: 0.23154095}
 --- !u!23 &1810323356
 MeshRenderer:
  m_ObjectHideFlags: 0
@ -37440,7 +37648,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1961907591
 RectTransform:
  m_ObjectHideFlags: 0
@ -39140,6 +39348,108 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2024319182}
  m_CullTransparentMesh: 1
+--- !u!1 &2030963598
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2030963599}
+  - component: {fileID: 2030963602}
+  - component: {fileID: 2030963601}
+  - component: {fileID: 2030963600}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2030963599
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2030963598}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 214213911}
+  m_Father: {fileID: 895989075}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &2030963600
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2030963598}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &2030963601
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2030963598}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &2030963602
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2030963598}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
 --- !u!1 &2032227360 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 8670774606254665842, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
--- a/SXElectricityInformationAcquisition/Assets/Screwdriver.cs
+++ b/SXElectricityInformationAcquisition/Assets/Screwdriver.cs
@ -92,7 +92,7 @@ public class Screwdriver : MonoBehaviour
    /// <summary>
    /// 拆完旧集中器下端螺丝后
    /// </summary>
-    bool issplit =true;
+    bool issplit = true;

    /// <summary>
    /// 螺丝刀的原始位置
@ -168,12 +168,12 @@ public class Screwdriver : MonoBehaviour
    {
        //if (EventSystem.current.IsPointerOverGameObject())
        //   return;
-        
+
        if (Ischaiwan == true)
        {
            chaiwan();
        }
-       
+
        if (Input.GetMouseButtonDown(0))
        {//Camera.transform.forward
            Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
@ -207,13 +207,13 @@ public class Screwdriver : MonoBehaviour
                }
                for (int i = 0; i < ScrewObj.Length; i++)
                {
-                    if (hit.collider.gameObject.name == ScrewObj[i].name)
+                    if (ScrewObj[i] != null && hit.collider.gameObject.name == ScrewObj[i].name)
                    {
                        ScrewdriverTrans.gameObject.transform.SetPositionAndRotation(OpenScrewScrewdriverTrans[4].gameObject.transform.position, OpenScrewScrewdriverTrans[4].gameObject.transform.rotation);
                        ScrewdriverTrans.gameObject.transform.SetParent(null);
                        Debug.Log(hit.collider.gameObject.name);
                        ScrewObj[i].gameObject.SetActive(false);
-                        switch (hit.collider.gameObject.name) 
+                        switch (hit.collider.gameObject.name)
                        {
                            case "JZQ_螺丝001":
                                ScrewObj[i].gameObject.SetActive(false);
@ -265,7 +265,7 @@ public class Screwdriver : MonoBehaviour
                    MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);

                }
-              
+
                if (AreAllObjectsHidden())
                {
                    isPlayAni = false;
@ -300,7 +300,7 @@ public class Screwdriver : MonoBehaviour
        //集中器外壳上的封印和螺丝全拆完后盖子位移
        if (AllHubOfHubs())
        {
-            HubCoverObj.gameObject.transform.DOLocalMove(new Vector3(0, 0.0167f, -0.2387f),1);
+            HubCoverObj.gameObject.transform.DOLocalMove(new Vector3(0, 0.0167f, -0.2387f), 1);
            // Debug.Log("所有集线器盖子螺丝都已隐藏");
        }
    }
@ -319,45 +319,45 @@ public class Screwdriver : MonoBehaviour
            }
            if (!ScrewObj[2].activeInHierarchy && !ScrewObj[3].activeInHierarchy)
            {
-                   StartCoroutine(Second());
-    
+                StartCoroutine(Second());
+
                issplit = true;
-            
+
            }
            if (!ScrewObj[4].activeInHierarchy && !ScrewObj[5].activeInHierarchy)
            {
-             
-                    StartCoroutine(Thrid());
-               
+
+                StartCoroutine(Thrid());
+
                issplit = true;
-               
+
            }
            if (!ScrewObj[6].activeInHierarchy && !ScrewObj[7].activeInHierarchy)
            {

-                    StartCoroutine(Fourth());
-            
+                StartCoroutine(Fourth());
+
                issplit = true;
-         
+
            }
            if (!ScrewObj[9].activeInHierarchy)
            {
-               
-            
-                    StartCoroutine(Sixth());
-                
+
+
+                StartCoroutine(Sixth());
+
                issplit = true;
-               
+
            }
            if (!ScrewObj[8].activeInHierarchy)
            {
-              
-                    StartCoroutine(Fivth());
-               
+
+                StartCoroutine(Fivth());
+
                issplit = true;
-                
+
            }
-            if (!ScrewObj[0].activeInHierarchy && !ScrewObj[1].activeInHierarchy&& !ScrewObj[2].activeInHierarchy && !ScrewObj[3].activeInHierarchy&& !ScrewObj[4].activeInHierarchy && !ScrewObj[5].activeInHierarchy&& !ScrewObj[6].activeInHierarchy && !ScrewObj[7].activeInHierarchy&& !ScrewObj[8].activeInHierarchy)
+            if (!ScrewObj[0].activeInHierarchy && !ScrewObj[1].activeInHierarchy && !ScrewObj[2].activeInHierarchy && !ScrewObj[3].activeInHierarchy && !ScrewObj[4].activeInHierarchy && !ScrewObj[5].activeInHierarchy && !ScrewObj[6].activeInHierarchy && !ScrewObj[7].activeInHierarchy && !ScrewObj[8].activeInHierarchy)
            {
                Ischaiwan = false;
            }
@ -405,12 +405,12 @@ public class Screwdriver : MonoBehaviour
    {
        foreach (GameObject obj in ScrewObj)
        {
-            if (obj.activeInHierarchy) 
+            if (obj.activeInHierarchy)
            {
-                return false;  
+                return false;
            }
        }
-        return true;  
+        return true;
    }

    /// <summary>
@ -421,12 +421,12 @@ public class Screwdriver : MonoBehaviour
    {
        foreach (GameObject obj in concentratorScrew)
        {
-            if (obj.activeInHierarchy)  
+            if (obj.activeInHierarchy)
            {
-                return false; 
+                return false;
            }
        }
-        return true; 
+        return true;
    }

    /// <summary>
@ -551,7 +551,7 @@ public class Screwdriver : MonoBehaviour
    /// 集线器螺丝拆完后电线动画
    /// </summary>
    /// <returns></returns>
-    IEnumerator IEElectricWire(string name ,GameObject[] Screw)
+    IEnumerator IEElectricWire(string name, GameObject[] Screw)
    {
        for (int a = 0; a < Screw.Length; a++)
        {
@ -564,7 +564,7 @@ public class Screwdriver : MonoBehaviour
                }
            }
        }
-       
+
    }
    #region 电线动画
    IEnumerator Frist()
--- a/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs
@ -12,6 +12,7 @@ namespace DefaultNamespace

        private bool isChange = false;
        public GameObject gg;
+        

        public void Start()
        {
@ -45,5 +46,19 @@ namespace DefaultNamespace

            this.transform.Find("Texture").GetComponent<RawImage>().texture = MotionEngine.GetModule<ToolsPackManager>().GetToolsPackWindowBtImage(this.name);
        }
+        public void SetState(bool _isChange)
+        {
+            isChange = _isChange;
+            if (isChange)
+            {
+                this.GetComponent<Image>().sprite = clickSprite;
+                gg.SetActive(true);
+            }
+            else
+            {
+                this.GetComponent<Image>().sprite = defaSprite;
+                gg.SetActive(false);
+            }
+        }
    }
 }
--- a/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipInfoManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipInfoManager.cs
@ -1,3 +1,4 @@
+using MotionFramework;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@ -45,6 +46,7 @@ namespace DefaultNamespace
                    HandSlot.GetComponent<SkinnedMeshRenderer>().material = m; isEquip = true;
                    break;
            }
+           

            foreach (var v in infoBt)
            {
--- a/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipManager.cs
@ -31,8 +31,6 @@ namespace DefaultNamespace
            _cancel = Resources.LoadAll<Material>("Materials/CharacterEquip/Cancel").ToList();
            _wear = Resources.LoadAll<Material>("Materials/CharacterEquip/Wear").ToList();
            equipBt = Resources.Load<GameObject>("Prefabs/Window/CharacterEquip/CharacterEquipBt");
-
-          
        }

        public Material changeEquip(string equipName, bool ischange)
@ -41,10 +39,12 @@ namespace DefaultNamespace
            if (ischange)
            {
                ma = _wear.SingleOrDefault(s => s.name == equipName);
+                MotionEngine.GetModule<ToolsPackManager>().AddWearTool(equipName);
            }
            else
            {
                ma = _cancel.SingleOrDefault(s => s.name == equipName);
+                MotionEngine.GetModule<ToolsPackManager>().RemoveWearTool(equipName);
            }

            return ma;
--- a/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipWindowManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipWindowManager.cs
@ -51,8 +51,14 @@ namespace DefaultNamespace
                            {
                                CharacterEquipBtOnClick btComponent = Instantiate(bt, content, false).GetComponent<CharacterEquipBtOnClick>();
                                btComponent.name = v.Key;
-                                _toolsNameTemp.Add(v.Key,btComponent);
+                                _toolsNameTemp.Add(v.Key, btComponent);
+                                List<string> wearToolsTemp = MotionEngine.GetModule<ToolsPackManager>().wearTools;
+                                if (wearToolsTemp.Contains(v.Key))
+                                {
+                                    btComponent.SetState(true);
+                                }
                            }
+
                            // btComponent.Init(v.Key, v.Key, b.GetComponent<ToolsPackGameObjectComponent>().GetIndex());
                        }
                    }
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs
@ -6,6 +6,13 @@ using MotionFramework;
 using UnityEngine;
 using UnityEngine.EventSystems;

+//public enum ToolProperties
+//{
+//    默认,
+//    穿戴,
+//    工具
+//}
+
 namespace ToolsPack
 {
    /// <summary>
@ -20,7 +27,7 @@ namespace ToolsPack
        [SerializeField] private ModelTypeEnum _modelTypeEnum;
        [SerializeField] private ToolsPackScene _toolsPackScene;
        [SerializeField] private bool IsClick = true;
-
+        //public ToolProperties _ToolProperties = ToolProperties.默认;
        private void Awake()
        {
            _highlight = this.GetComponent<HighlightEffect>();
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs
@ -48,11 +48,13 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
    private GameObject _toolsPackWindowTemp;

    private ToolsPackScene _toolsPackScene;
-    
+
    public delegate void StringEventHandler(string message);
-    
+
    public event StringEventHandler OnStringEvent;

+    public List<string> wearTools = new List<string>();
+
    // 触发事件的方法
    public void OnTriggerStringEvent(string message)
    {
@ -100,6 +102,22 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
    {
    }

+    public void AddWearTool(string wearToolName)
+    {
+        if (!wearTools.Contains(wearToolName))
+        {
+            wearTools.Add(wearToolName);
+        }
+    }
+
+    public void RemoveWearTool(string wearToolName)
+    {
+        if (wearTools.Contains(wearToolName))
+        {
+            wearTools.Remove(wearToolName);
+        }
+    }
+
    /// <summary>
    /// 添加到工具包
    /// </summary>
@ -312,7 +330,7 @@ public class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
                            GameObject g = _toolsPackWindowItemBts[i];
                            _toolsPackWindowItemBts.Remove(g);
                            UnityEngine.Object.Destroy(g);
-                           
+
                        }
                    }
                }
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackMenuBtOnClick.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackMenuBtOnClick.cs
@ -11,9 +11,11 @@ namespace ToolsPack
    /// </summary>
    public class ToolsPackMenuBtOnClick : MonoBehaviour
    {
+        public Button selfBtn;
        private void Start()
        {
-            this.GetComponent<Button>().onClick.AddListener(delegate
+            selfBtn = GetComponent<Button>();
+            selfBtn.onClick.AddListener(delegate
            {
                GameObject towin = MotionEngine.GetModule<ToolsPackManager>().GetToolsPackWindowTemp();
                if (towin == null)
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs
@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using DefaultNamespace;
 using MotionFramework;
 using TMPro;
 using Unity.VisualScripting;
@ -75,7 +76,7 @@ namespace ToolsPack
        public void Init(string gName, string btName, int index, ModelTypeEnum modelTypeEnum)
        {
            btNameText = gName;
-            clickName= btName;
+            clickName = btName;
            // this.index = index;
            _modelTypeEnum = modelTypeEnum;
            ico.texture = MotionEngine.GetModule<ToolsPackManager>().GetToolsPackWindowBtImage(gName);
@ -101,7 +102,11 @@ namespace ToolsPack

            if (MotionEngine.GetModule<ToolsPackManager>().GetToolsPackScene() == ToolsPackScene.工具间)
            {
-                closeBt.SetActive(true);
+                if (MotionEngine.GetModule<DataConfigManager>().GetProcessMode() != DefaultNamespace.ProcessMode.ProcessMode.Teaching)
+                {
+                    closeBt.SetActive(true);
+                }
+
            }
        }

@ -120,12 +125,12 @@ namespace ToolsPack
            return _toolsPackWindowItemBtModels.Count - 1;
        }

-        
+
        public int GetGameNumber()
        {
            return gameNumber;
        }
-        
+
        /// <summary>
        /// 添加物体堆叠数
        /// </summary>
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs
@ -98,8 +98,16 @@ namespace ToolsPack
                                    btComponent.Init(v.Key, v.Key, tp.GetIndex(), tp.GetModelTypeEnum());
                                    MotionEngine.GetModule<ToolsPackManager>().AddToolsPackWindowItemBts(btComponent.gameObject);
                                    _toolsNameTemp.Add(v.Key, btComponent);
+
+                                    List<string> wearToolsTemp = MotionEngine.GetModule<ToolsPackManager>().wearTools;
+                                    if (wearToolsTemp.Contains(v.Key))
+                                    {
+                                        btComponent.gameObject.SetActive(false);
+                                    }
                                }
                            }
+
+
                        }
                    }
                    else
@ -126,6 +134,11 @@ namespace ToolsPack
                                        btComponent.Init(to, v.Key, tp.GetIndex(), tp.GetModelTypeEnum());
                                        MotionEngine.GetModule<ToolsPackManager>().AddToolsPackWindowItemBts(btComponent.gameObject);
                                        _toolsNameTemp.Add(to, btComponent);
+                                        List<string> wearToolsTemp = MotionEngine.GetModule<ToolsPackManager>().wearTools;
+                                        if (wearToolsTemp.Contains(to))
+                                        {
+                                            btComponent.gameObject.SetActive(false);
+                                        }
                                    }
                                }
                            }
@ -162,6 +175,11 @@ namespace ToolsPack
                                    btComponent.Init(v.Key, v.Key, b.Index, b.ModelTypeEnum);
                                    MotionEngine.GetModule<ToolsPackManager>().AddToolsPackWindowItemBts(btComponent.gameObject);
                                    _toolsNameTemp.Add(v.Key, btComponent);
+                                    List<string> wearToolsTemp = MotionEngine.GetModule<ToolsPackManager>().wearTools;
+                                    if (wearToolsTemp.Contains(v.Key))
+                                    {
+                                        btComponent.gameObject.SetActive(false);
+                                    }
                                }
                            }
                        }
@ -187,7 +205,11 @@ namespace ToolsPack
                                        ToolsPackWindowItemBtComponent btComponent = Instantiate(bt, content, false).GetComponent<ToolsPackWindowItemBtComponent>();
                                        btComponent.name = to;
                                        btComponent.Init(to, v.Key, lis.Index, lis.ModelTypeEnum);
-                                        _toolsNameTemp.Add(to, btComponent);
+                                        List<string> wearToolsTemp = MotionEngine.GetModule<ToolsPackManager>().wearTools;
+                                        if (wearToolsTemp.Contains(v.Key))
+                                        {
+                                            btComponent.gameObject.SetActive(false);
+                                        }
                                    }
                                }
                            }
--- a/SXElectricityInformationAcquisition/Assets/Scripts/UIManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/UIManager.cs
@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using ToolsPack;
+using UnityEngine;
+
+public class UIManager : MonoBehaviour
+{
+    public static UIManager instance;
+    public ToolsPackMenuBtOnClick toolsPackMenuBtOnClick;
+    private void Awake()
+    {
+        instance = this;
+    }
+    // Start is called before the first frame update
+}
--- a/SXElectricityInformationAcquisition/Assets/Scripts/UIManager.cs.meta
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/UIManager.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1aa632feb72110948a76db8d00b696c3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/SXElectricityInformationAcquisition/Assets/Scripts/UserInfoComponent.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/UserInfoComponent.cs
@ -31,9 +31,9 @@ public class UserInfoComponent : MonoBehaviour

    private void Start()
    {
-        
+
        SubmitBt.GetComponent<Button>().onClick.AddListener(Submit);
-        
+
        StartCountdown().Forget();
    }

@ -46,37 +46,41 @@ public class UserInfoComponent : MonoBehaviour
    {
        await UniTask.Delay(TimeSpan.FromSeconds(1));
        ParsedData parsedData = MotionEngine.GetModule<InfoDataManager>().GetParsedData();
-        ProcessMode pm =  MotionEngine.GetModule<DataConfigManager>().GetProcessMode();
+        ProcessMode pm = MotionEngine.GetModule<DataConfigManager>().GetProcessMode();
+        gameTime.gameObject.SetActive(false);
+        processMessage.gameObject.SetActive(true);
+        SubmitBt.SetActive(true);
        switch (pm)
        {
            case ProcessMode.Teaching:
-                processDescribe.text = "模式：教学实训";
+                processDescribe.text = "模式：教学实训"; SubmitBt.SetActive(false);
                break;
            case ProcessMode.Training:
-                processDescribe.text = "模式：培训实训"; SubmitBt.SetActive(true);
+                processDescribe.text = "模式：培训实训";
                break;
            case ProcessMode.Practice:
-                processDescribe.text = "模式：练习实训"; SubmitBt.SetActive(true);
+                processDescribe.text = "模式：练习实训";
                break;
            case ProcessMode.Assessment:
                processDescribe.text = "模式：考核模式";
-                SubmitBt.SetActive(true);
+                gameTime.gameObject.SetActive(true);
+                processMessage.gameObject.SetActive(false);
                break;
            default:
                throw new ArgumentOutOfRangeException();
        }


-        Debug.Log(parsedData.UserTime);
+        //Debug.Log("parsedData.UserTime" + parsedData.UserTime);
        username.text = parsedData.Username;

-        int totalTime = parsedData.UserTime * 60; 
+        int totalTime = parsedData.UserTime * 60;
        await Countdown(totalTime);
    }

    private async UniTask Countdown(int totalTime)
    {
-        while (totalTime > 0)
+        while (totalTime > 5395)
        {
            totalTime--;
            int minutes = totalTime / 60;
@ -88,19 +92,18 @@ public class UserInfoComponent : MonoBehaviour
            gameTime.text = $"剩余时间：{formattedMinutes}:{formattedSeconds}";
            await UniTask.Delay(TimeSpan.FromSeconds(1));
        }
-
-        gameTime.text = "剩余时间：00:00"; 
+        gameTime.text = "剩余时间：00:00";
    }
-    
-    
+
+
    public async void Submit()
    {

        ParsedData parsedData = MotionEngine.GetModule<InfoDataManager>().GetParsedData();


-        MotionEngine.GetModule<AnimationProcessManager>().CalculateTotalScore();            
-            
+        MotionEngine.GetModule<AnimationProcessManager>().CalculateTotalScore();
+
        SubmitScoreData sub = new SubmitScoreData();
        sub.userName = parsedData.SceneName;
        sub.userId = parsedData.UserId;
@ -111,7 +114,7 @@ public class UserInfoComponent : MonoBehaviour
        sub.stepList = MotionEngine.GetModule<AnimationProcessManager>().GetSubmitScoreStepList();

        string js = JsonConvert.SerializeObject(sub);
-            
+
        Debug.Log(js);
        string json = await MotionEngine.GetModule<WebRequestManager>().PostJsonAsync(APIs.SimulationScore, js, (ste) => { });
        Debug.Log(json);
--- a/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini
+++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini
@ -1 +1 @@
-2024-07-19 16:52:07#'ydcj://;cb,2,47,userId,username,token,90,-1,-1,http://5ac8d9f1.r27.cpolar.top;'|
+2024-07-19 16:52:07#'ydcj://;cb,2,47,userId,username,token,90,-1,-1,http://ef0ba11.r27.cpolar.top;'|
--- a/SXElectricityInformationAcquisition/Assets/ToolManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/ToolManager.cs
@ -188,11 +188,11 @@ public class ToolManager : MonoBehaviour
            if (message == "¹¤×÷Ö¤")
            {
                Tool[1].gameObject.SetActive(true);
+                RetractBtn[5].gameObject.SetActive(true);
            }
        }
        if (RoleMove.instance.isup)
        {
-
            if (generateAreaScript.IsPlayerInArea())
            {
                if (message == "°þÏßÇ¯")
@ -225,6 +225,7 @@ public class ToolManager : MonoBehaviour

                Debug.Log("Received message: " + message);
            }
+            UIManager.instance.toolsPackMenuBtOnClick.selfBtn.interactable = false;
        }
    }
 }
--- a/SXElectricityInformationAcquisition/Assets/UI/123/系统提示.png
+++ b/SXElectricityInformationAcquisition/Assets/UI/123/系统提示.png
--- a/SXElectricityInformationAcquisition/Assets/UI/123/系统提示.png.meta
+++ b/SXElectricityInformationAcquisition/Assets/UI/123/系统提示.png.meta
@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 91c44ccdd19c1af48815f3aee2743c5a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/SXElectricityInformationAcquisition/Assets/UI/2024-7-5/信息@2xOld.png
+++ b/SXElectricityInformationAcquisition/Assets/UI/2024-7-5/信息@2xOld.png
--- a/SXElectricityInformationAcquisition/Assets/UI/2024-7-5/信息@2xOld.png.meta
+++ b/SXElectricityInformationAcquisition/Assets/UI/2024-7-5/信息@2xOld.png.meta
@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 3c356ab78eb40034582ebf22bfa0b35c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/DisplayKnapsackObjects.cs
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/DisplayKnapsackObjects.cs
@ -28,9 +28,10 @@ public class DisplayKnapsackObjects : MonoBehaviour
    {
        MotionEngine.GetModule<ToolsPackManager>().OnStringEvent += HandleStringEvent;
        MotionEngine.GetModule<AnimationProcessManager>().OnUIEvent += UIEvent;
-        
-        
-        PutBack.onClick.AddListener(() => {
+        Debug.Log($"<color=green>{gameObject.name}</color>");
+
+        PutBack.onClick.AddListener(() =>
+        {
            //ÌÝ×Ó
            if (Tool[0].activeInHierarchy)
            {
@ -70,7 +71,7 @@ public class DisplayKnapsackObjects : MonoBehaviour
        });
        processBt.onClick.AddListener(delegate
        {
-           
+
            ui.SetActive(false);
        });
    }
@ -80,7 +81,7 @@ public class DisplayKnapsackObjects : MonoBehaviour
        ui.SetActive(true);
    }

-    
+
    private void HandleStringEvent(string message)
    {
        if (message == "ÌÝ×Ó")
@ -123,7 +124,7 @@ public class DisplayKnapsackObjects : MonoBehaviour
            RetractToolBtn[5].gameObject.SetActive(true);
            Tool[7].gameObject.SetActive(true);
        }
-     
+
        Debug.Log("Received message: " + message);
    }
 }
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/OpenLightManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/OpenLightManager.cs
@ -13,10 +13,11 @@ public class OpenLightManager : MonoBehaviour
    public GameObject ElectricEnergyMeterCanvas;
    void Start()
    {
-      ConsumePowerManager.Instance.OnOpenLight += OpenLightFun;
+        if (ConsumePowerManager.Instance != null)
+            ConsumePowerManager.Instance.OnOpenLight += OpenLightFun;
+


-      
    }

    private void OpenLightFun()
@ -27,5 +28,5 @@ public class OpenLightManager : MonoBehaviour
        ElectricEnergyMeterCanvas.SetActive(true);
    }

-   
+
 }
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs
@ -22,17 +22,17 @@ public class TooslManager : MonoBehaviour
        [HideInInspector]
        public Quaternion originalRotation;
    }
-    
-    
-    
-    
-    
+
+
+
+
+
    public List<Tool> tools;
-    
+
    /// <summary>
    /// 在梯子上使用的工具
    /// </summary>
-   // public GameObject[] onladderTools;
+    // public GameObject[] onladderTools;

    public Transform PlayercameraTrans;

@ -57,7 +57,10 @@ public class TooslManager : MonoBehaviour
            tool.originalRotation = tool.toolObject.transform.localRotation;
            Debug.Log("第一个位置：" + tool.originalPosition);
            // 为每个按钮添加点击事件
-            tool.returnButton.onClick.AddListener(ResetAllTools);
+            tool.returnButton.onClick.AddListener(() =>
+            {
+                ResetAllTools(); UIManager.instance.toolsPackMenuBtOnClick.selfBtn.interactable = true;
+            });
        }
    }
    void Update()
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/WorkPermit.cs
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/WorkPermit.cs
@ -52,14 +52,15 @@ public class WorkPermit : MonoBehaviour
        NextlBtn.gameObject.SetActive(false);
        ContinueBtn.gameObject.SetActive(true);
        DialogboxText.text = null;
-        ContinueBtn.onClick.AddListener(() => 
+        ContinueBtn.onClick.AddListener(() =>
        {
            Dialogbox.gameObject.SetActive(false);
            DialogboxText.text = null;
-            Destroy(WorkPermitObj);
+            //Destroy(WorkPermitObj);
+            WorkPermitObj.SetActive(false);
            ArrowImage.gameObject.SetActive(true);
            MotionEngine.GetModule<AnimationProcessManager>().HandleClick("客户");
-            
+
        });

        WorkPermitvoid();
@ -67,13 +68,13 @@ public class WorkPermit : MonoBehaviour

    void Update()
    {
-        
+
    }

    /// <summary>
    /// 背包工牌按钮点击后调这个
    /// </summary>
-    void WorkPermitvoid ()
+    void WorkPermitvoid()
    {
        WorkPermitObj.gameObject.SetActive(true);
        Dialogbox.gameObject.SetActive(true);