修改流程脚本，工具基类脚本，忽略字体文件

2024-08-22 09:53:42 +08:00 · 2024-08-22 09:53:42 +08:00 · ffca0cd8e3
parent 76295dfd90
commit ffca0cd8e3
32 changed files with 108 additions and 351933 deletions
--- a/.gitignore
+++ b/.gitignore
@ -74,3 +74,4 @@ crashlytics-build.properties
 /[Aa]ssets/[Ss]treamingAssets/aa/*

 /*.vsconfig
+/Assets/ArtRes/Fonts
--- a/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold
+++ b/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold
--- a/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold
+++ b/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9ea913af302bbdf42a9f003451c70e02
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold.otf
+++ b/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold.otf
--- a/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold.otf.meta
+++ b/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold.otf.meta
@ -1,21 +0,0 @@
-fileFormatVersion: 2
-guid: 4eae2d3f036a9f34e8b72ef95695be9d
-TrueTypeFontImporter:
-  externalObjects: {}
-  serializedVersion: 4
-  fontSize: 16
-  forceTextureCase: -2
-  characterSpacing: 0
-  characterPadding: 1
-  includeFontData: 1
-  fontNames:
-  - Alimama ShuHeiTi
-  fallbackFontReferences: []
-  customCharacters: 
-  fontRenderingMode: 0
-  ascentCalculationMode: 1
-  useLegacyBoundsCalculation: 0
-  shouldRoundAdvanceValue: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ArtRes/Fonts/SourceHanSansCN-Bold
+++ b/Assets/ArtRes/Fonts/SourceHanSansCN-Bold
--- a/Assets/ArtRes/Fonts/SourceHanSansCN-Bold
+++ b/Assets/ArtRes/Fonts/SourceHanSansCN-Bold
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f8ef5cb2ab4d4da4093d3fe60f978c99
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ArtRes/Fonts/SourceHanSansCN-Bold.otf
+++ b/Assets/ArtRes/Fonts/SourceHanSansCN-Bold.otf
--- a/Assets/ArtRes/Fonts/SourceHanSansCN-Bold.otf.meta
+++ b/Assets/ArtRes/Fonts/SourceHanSansCN-Bold.otf.meta
@ -1,21 +0,0 @@
-fileFormatVersion: 2
-guid: 60b5d8dde4f509a4185ee4a54a236416
-TrueTypeFontImporter:
-  externalObjects: {}
-  serializedVersion: 4
-  fontSize: 16
-  forceTextureCase: -2
-  characterSpacing: 0
-  characterPadding: 1
-  includeFontData: 1
-  fontNames:
-  - Source Han Sans CN
-  fallbackFontReferences: []
-  customCharacters: 
-  fontRenderingMode: 0
-  ascentCalculationMode: 1
-  useLegacyBoundsCalculation: 0
-  shouldRoundAdvanceValue: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ArtRes/Fonts/SourceHanSansCN-Medium
+++ b/Assets/ArtRes/Fonts/SourceHanSansCN-Medium
--- a/Assets/ArtRes/Fonts/SourceHanSansCN-Medium
+++ b/Assets/ArtRes/Fonts/SourceHanSansCN-Medium
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1c4004df1d65ff944b6e23e3af757df7
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ArtRes/Fonts/SourceHanSansCN-Medium.otf
+++ b/Assets/ArtRes/Fonts/SourceHanSansCN-Medium.otf
--- a/Assets/ArtRes/Fonts/SourceHanSansCN-Medium.otf.meta
+++ b/Assets/ArtRes/Fonts/SourceHanSansCN-Medium.otf.meta
@ -1,21 +0,0 @@
-fileFormatVersion: 2
-guid: 8af3ad854ddf42d4bad8563aff10a985
-TrueTypeFontImporter:
-  externalObjects: {}
-  serializedVersion: 4
-  fontSize: 16
-  forceTextureCase: -2
-  characterSpacing: 0
-  characterPadding: 1
-  includeFontData: 1
-  fontNames:
-  - Source Han Sans CN
-  fallbackFontReferences: []
-  customCharacters: 
-  fontRenderingMode: 0
-  ascentCalculationMode: 1
-  useLegacyBoundsCalculation: 0
-  shouldRoundAdvanceValue: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ArtRes/Fonts/SourceHanSansCN-Regular
+++ b/Assets/ArtRes/Fonts/SourceHanSansCN-Regular
--- a/Assets/ArtRes/Fonts/SourceHanSansCN-Regular
+++ b/Assets/ArtRes/Fonts/SourceHanSansCN-Regular
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f23cde0c3d86dad49bedc202ad993d21
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ArtRes/Fonts/SourceHanSansCN-Regular.otf
+++ b/Assets/ArtRes/Fonts/SourceHanSansCN-Regular.otf
--- a/Assets/ArtRes/Fonts/SourceHanSansCN-Regular.otf.meta
+++ b/Assets/ArtRes/Fonts/SourceHanSansCN-Regular.otf.meta
@ -1,21 +0,0 @@
-fileFormatVersion: 2
-guid: 21e520e9f4216d64e86ecdad0d82df46
-TrueTypeFontImporter:
-  externalObjects: {}
-  serializedVersion: 4
-  fontSize: 16
-  forceTextureCase: -2
-  characterSpacing: 0
-  characterPadding: 1
-  includeFontData: 1
-  fontNames:
-  - Source Han Sans CN
-  fallbackFontReferences: []
-  customCharacters: 
-  fontRenderingMode: 0
-  ascentCalculationMode: 1
-  useLegacyBoundsCalculation: 0
-  shouldRoundAdvanceValue: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ArtRes/Fonts/chinese.txt
+++ b/Assets/ArtRes/Fonts/chinese.txt
--- a/Assets/ArtRes/Fonts/chinese.txt.meta
+++ b/Assets/ArtRes/Fonts/chinese.txt.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 79e309f1e0c36e849a1766c6c66545ed
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/HighlightPlus/Runtime/Resources/HighlightPlus/HighlightOutline.mat
+++ b/Assets/Plugins/HighlightPlus/Runtime/Resources/HighlightPlus/HighlightOutline.mat
@ -15,14 +15,15 @@ MonoBehaviour:
  version: 1
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: HighlightOutline
  m_Shader: {fileID: 4800000, guid: cbbf740e9c8644e8492d08b1a3fd0203, type: 3}
-  m_ShaderKeywords: 
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 1
  m_DoubleSidedGI: 0
@ -45,7 +46,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 1e193a79841ea4b4b8dddf797b7fba7d, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
@ -56,16 +57,22 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    - _OutlineGradientTex:
+        m_Texture: {fileID: 2800000, guid: 1e193a79841ea4b4b8dddf797b7fba7d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
    - _SpecGlossMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
    - _BumpScale: 1
-    - _ConstantWidth: 1
-    - _Cull: 2
+    - _ConstantWidth: 0.28
+    - _Cull: 2.17
+    - _CutOff: -0.32
    - _Cutoff: 0.5
    - _DstBlend: 0
    - _EnvironmentReflections: 1
@ -75,7 +82,7 @@ Material:
    - _Metallic: 0
    - _OcclusionStrength: 1
    - _OutlineWidth: 0.01
-    - _OutlineZTest: 4
+    - _OutlineZTest: 3.44
    - _QueueOffset: 0
    - _ReceiveShadows: 1
    - _Smoothness: 0.5
@ -92,3 +99,4 @@ Material:
    - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
    - _OutlineDirection: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/Resources/Prefabs/Objects/Tools/绝缘螺丝刀.prefab
+++ b/Assets/Resources/Prefabs/Objects/Tools/绝缘螺丝刀.prefab
@ -65,7 +65,7 @@ BoxCollider:
  m_GameObject: {fileID: 7175692158753146328}
  m_Material: {fileID: 0}
  m_IsTrigger: 0
-  m_Enabled: 0
+  m_Enabled: 1
  serializedVersion: 2
  m_Size: {x: 0.05094013, y: 0.05094013, z: 0.30404854}
  m_Center: {x: 0, y: 0.00000011920929, z: -0.15774488}
--- a/Assets/Resources/UI/UI_Panel/UI_SessionPanel.prefab
+++ b/Assets/Resources/UI/UI_Panel/UI_SessionPanel.prefab
@ -172,11 +172,11 @@ RectTransform:
  m_Father: {fileID: 2593408648689179035}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 56, y: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -1124, y: 0}
  m_SizeDelta: {x: 740, y: 92}
-  m_Pivot: {x: 0, y: 0}
+  m_Pivot: {x: 1, y: 0}
 --- !u!222 &6808126078078298486
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -595,7 +595,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
@ -729,7 +729,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.3962264, g: 0.3962264, b: 0.3962264, a: 0.5372549}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.3137255}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
@ -883,7 +883,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
@ -993,8 +993,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 132.09, y: 24}
-  m_SizeDelta: {x: 549, y: 54}
+  m_AnchoredPosition: {x: 160, y: 24}
+  m_SizeDelta: {x: 480, y: 54}
  m_Pivot: {x: 0, y: 0}
 --- !u!222 &5021900504341359756
 CanvasRenderer:
@ -1018,7 +1018,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
@ -1192,11 +1192,11 @@ RectTransform:
  m_Father: {fileID: 2593408648689179035}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 56, y: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -52.66, y: 0}
  m_SizeDelta: {x: 740, y: 92}
-  m_Pivot: {x: 0, y: 0}
+  m_Pivot: {x: 1, y: 0}
 --- !u!222 &5298249789619151875
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -1558,8 +1558,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 132.09, y: 24}
-  m_SizeDelta: {x: 549, y: 54}
+  m_AnchoredPosition: {x: 102, y: 24}
+  m_SizeDelta: {x: 466.9986, y: 54}
  m_Pivot: {x: 0, y: 0}
 --- !u!222 &5988554802588913644
 CanvasRenderer:
@ -1583,7 +1583,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
--- a/Assets/Scenes/04_ToolMaterialScene.unity
+++ b/Assets/Scenes/04_ToolMaterialScene.unity
@ -144,11 +144,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 0
+      value: -0.795
      objectReference: {fileID: 0}
    - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 1.5
+      value: 1.143
      objectReference: {fileID: 0}
    - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
      propertyPath: m_LocalPosition.z
@ -156,19 +156,19 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0
+      value: 0.1539439
      objectReference: {fileID: 0}
    - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 1
+      value: 0.9880796
      objectReference: {fileID: 0}
    - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -176,7 +176,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
-      value: 180
+      value: 162.289
      objectReference: {fileID: 0}
    - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
@ -1209,6 +1209,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 9063172993125021920, guid: f8a9676618f065446b3926269089375e, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: f8a9676618f065446b3926269089375e, type: 3}
 --- !u!4 &1585685579 stripped
@ -1231,6 +1235,10 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 4524593902786536362, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 5690046137980526191, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
      propertyPath: m_RootOrder
      value: 13
@ -2557,6 +2565,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 9063172993125021920, guid: f8a9676618f065446b3926269089375e, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: f8a9676618f065446b3926269089375e, type: 3}
 --- !u!114 &2557768359599646897 stripped
--- a/Assets/Scenes/05_LiveScene.unity
+++ b/Assets/Scenes/05_LiveScene.unity
@ -5610,7 +5610,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -7572541995124411918, guid: 3022de55b8046f04485b93331386de5f, type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: -7515113890240633245, guid: 3022de55b8046f04485b93331386de5f, type: 3}
      propertyPath: m_Name
--- a/Assets/Scripts/CXX/Devices/Device_Base.cs
+++ b/Assets/Scripts/CXX/Devices/Device_Base.cs
@ -9,14 +9,28 @@ public class Device_Base : PermanentTriggerBase
    /// </summary>
    public DeviceType deviceType;

+    protected override void OnStart()
+    {
+        if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
+        {
+            base.OnStart();
+        }
+    }
+
    protected override void OnMEnter()
    {
-        base.OnMEnter();
-        _highlight.highlighted = true;
+        if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
+        {
+            base.OnMEnter();
+            _highlight.SetHighlighted(true);
+        }
    }
    protected override void OnMExit()
    {
-        base.OnMExit();
-        _highlight.highlighted = false;
+        if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
+        {
+            base.OnMExit();
+            _highlight.SetHighlighted(false);
+        }
    }
 }
--- a/Assets/Scripts/CXX/Tools/Tool_Base.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_Base.cs
@ -12,13 +12,20 @@ public class Tool_Base : PermanentTriggerBase
    /// </summary>
    public ToolType toolType;

+    protected override void OnStart()
+    {
+        if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
+        {
+            base.OnStart();
+        }
+    }
    protected override void OnMEnter()
    {
        if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
        {
            base.OnMEnter();
-            Debug.Log(gameObject.name);
-            _highlight.highlighted = true;
+            _highlight.SetHighlighted(true);
+
        }
    }
    protected override void OnMExit()
@ -26,7 +33,7 @@ public class Tool_Base : PermanentTriggerBase
        if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
        {
            base.OnMExit();
-            _highlight.highlighted = false;
+            _highlight.SetHighlighted(false);
        }
    }
 }
--- a/Assets/Scripts/Project/Manager/ProcessManager.cs
+++ b/Assets/Scripts/Project/Manager/ProcessManager.cs
@ -205,7 +205,10 @@ public class ProcessManager : BaseManager<ProcessManager>
                        CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
                        Debug.Log($"<color=red>triggersId空了</color>");
                    }
-                    GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0]);
+                    if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.Count != 0)
+                    {
+                        GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0]);
+                    }
                    return 0;
                }
                else
--- a/Assets/Scripts/Project/Objects/Other/MirrorController.cs
+++ b/Assets/Scripts/Project/Objects/Other/MirrorController.cs
@ -4,6 +4,10 @@ using UnityEngine;

 public class MirrorController : PermanentTriggerBase
 {
+    protected override void OnStart()
+    {
+        base.OnStart();
+    }
    protected override void OnMDown()
    {
        base.OnMDown();
--- a/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
+++ b/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
@ -11,20 +11,14 @@ public class PermanentTriggerBase : MonoBehaviour
 {
    public int triggerID;
    public string triggerName;
-    //[HideInInspector]
    public HighlightEffect _highlight;
    private void Awake()
    {
-        _highlight = GetComponent<HighlightEffect>();
        OnAwake();
    }

    private void Start()
    {
-        if (GameManager.EventMgr != null)
-        {
-            GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
-        }
        OnStart();
    }
    private void SwitchSubProcessStepTriggerID(int arg0)
@ -32,8 +26,7 @@ public class PermanentTriggerBase : MonoBehaviour
        if (triggerID == arg0)
        {
            _highlight.SetHighlighted(true);
-            //_highlight.highlighted = true;
-            Debug.Log("ÎÒÓ¦¸ÃÌáÊ¾");
+            Debug.Log("PermanentTriggerBase我应该提示");
        }
        else
        {
@ -45,14 +38,14 @@ public class PermanentTriggerBase : MonoBehaviour
    /// </summary>
    protected virtual void OnAwake()
    {
-        
+        _highlight = GetComponent<HighlightEffect>();
    }
    /// <summary>
    /// Start
    /// </summary>
    protected virtual void OnStart()
    {
-
+        GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
    }
    private void OnMouseEnter()
    {
--- a/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs
+++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs
@ -36,8 +36,7 @@ public abstract class BaseToolOrDevice : MonoBehaviour
        if (itemInfo.triggerID == arg0)
        {
            _highlight.SetHighlighted(true);
-            //_highlight.highlighted = true;
-            Debug.Log("我应该提示");
+            Debug.Log("BaseToolOrDevice我应该提示");
        }
        else
        {
@ -90,17 +89,17 @@ public abstract class BaseToolOrDevice : MonoBehaviour

    public virtual void OnEnter()
    {
-        Debug.Log("进入");
+        //Debug.Log("进入");
    }

    public virtual void OnDown()
    {
-        Debug.Log("点击");
+        //Debug.Log("点击");
    }

    public virtual void OnExit()
    {
-        Debug.Log("离开");
+        //Debug.Log("离开");
    }

    private void OnDestroy()
--- a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs
+++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs
@ -16,7 +16,7 @@ public class Tool_SelectComponent : BaseToolOrDevice
        ///高亮
        if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
        {
-            _highlight.highlighted = true;
+            _highlight.SetHighlighted(true);
        }
    }
    public override void OnDown()
@ -33,9 +33,10 @@ public class Tool_SelectComponent : BaseToolOrDevice
    public override void OnExit()
    {
        ///关闭高亮
-        GameManager.UIMgr.HidePanel<ItemTips>();//ÌáÊ¾Ãæ°å
+        //if (GameManager.UIMgr.GetPanel<ItemTips>())
+        //    GameManager.UIMgr.HidePanel<ItemTips>();//ÌáÊ¾Ãæ°å
        base.OnExit();
        if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
-            _highlight.highlighted = false;
+            _highlight.SetHighlighted(false);
    }
 }
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs
@ -118,7 +118,10 @@ public class UI_MenuBar : BasePanel
                    {
                        GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
                        GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
-                        GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0]);
+                        if (GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.Count > 0)
+                        {
+                            GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0]);
+                        }
                    });
                });
                break;
@ -131,7 +134,10 @@ public class UI_MenuBar : BasePanel
                    {
                        GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
                        GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
-                        GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0]);
+                        if (GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.Count > 0)
+                        {
+                            GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0]);
+                        }
                    });
                });
                break;