修改流程

Assets/ArtRes/Materials/Fade.mat

@@ -0,0 +1,129 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Fade
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_ValidKeywords:
+  - _SURFACE_TYPE_TRANSPARENT
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - DepthOnly
+  - SHADOWCASTER
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        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}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        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
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _Surface: 1
+    - _WorkflowMode: 1
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+--- !u!114 &8205723798439752962
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 5

Assets/ArtRes/Materials/Fade.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c3418e6ed2aef6345a0f851ed6a26394
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/05_LiveScene.unity

@@ -638,6 +638,89 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &238725083
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 238725084}
+  - component: {fileID: 238725086}
+  - component: {fileID: 238725085}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &238725084
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 238725083}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.15237045, y: 0.08276367, z: 0.20296991}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 478648693}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &238725085
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 238725083}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: c3418e6ed2aef6345a0f851ed6a26394, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &238725086
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 238725083}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!114 &242050080
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -651,7 +734,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   triggerID: 0
-  triggerName: 
+  triggerName: "B_out_\u7EBF"
   _highlight: {fileID: 0}
   toolType: 12
   isConnected: 1
@@ -704,7 +787,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   triggerID: 0
-  triggerName: 
+  triggerName: "C_out_\u7EBF"
   _highlight: {fileID: 0}
   toolType: 12
   isConnected: 1
@@ -726,7 +809,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   triggerID: 0
-  triggerName: 
+  triggerName: "C_in_\u7EBF"
   _highlight: {fileID: 0}
   toolType: 12
   isConnected: 1
@@ -748,7 +831,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   triggerID: 0
-  triggerName: 
+  triggerName: "B_in_\u7EBF"
   _highlight: {fileID: 0}
   toolType: 12
   isConnected: 1
@@ -770,7 +853,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   triggerID: 0
-  triggerName: 
+  triggerName: "A_in_\u7EBF"
   _highlight: {fileID: 0}
   toolType: 12
   isConnected: 1
@@ -792,7 +875,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   triggerID: 0
-  triggerName: 
+  triggerName: "\u96F6_out_\u7EBF"
   _highlight: {fileID: 0}
   toolType: 12
   isConnected: 1
@@ -1577,8 +1660,9 @@ GameObject:
   m_Component:
   - component: {fileID: 478648693}
   - component: {fileID: 478648694}
+  - component: {fileID: 478648695}
   m_Layer: 0
-  m_Name: "\u7535\u80FD\u8868\u78B0\u649E"
+  m_Name: "\u7535\u80FD\u8868\u533A\u57DF\u78B0\u649E"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1595,7 +1679,8 @@ Transform:
   m_LocalPosition: {x: 0.14690018, y: -0.17933655, z: 0.5191498}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 238725084}
   m_Father: {fileID: 543450652271447145}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1612,6 +1697,178 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.15237045, y: 0.08276367, z: 0.20296991}
   m_Center: {x: 0.0008945465, y: 0.012161255, z: 0.010730207}
+--- !u!114 &478648695
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 478648692}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  profile: {fileID: 0}
+  profileSync: 0
+  camerasLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  effectGroup: 0
+  effectGroupLayer:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  effectNameFilter: 
+  combineMeshes: 0
+  alphaCutOff: 0
+  cullBackFaces: 1
+  ignoreObjectVisibility: 0
+  reflectionProbes: 0
+  GPUInstancing: 1
+  optimizeSkinnedMesh: 1
+  depthClip: 0
+  cameraDistanceFade: 0
+  cameraDistanceFadeNear: 0
+  cameraDistanceFadeFar: 1000
+  normalsOption: 0
+  ignore: 0
+  _highlighted: 0
+  fadeInDuration: 0
+  fadeOutDuration: 0
+  flipY: 0
+  constantWidth: 1
+  subMeshMask: -1
+  overlay: 0
+  overlayMode: 0
+  overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  overlayAnimationSpeed: 1
+  overlayMinIntensity: 0.5
+  overlayBlending: 1
+  overlayTexture: {fileID: 0}
+  overlayTextureUVSpace: 0
+  overlayTextureScale: 1
+  overlayVisibility: 0
+  outline: 1
+  outlineColor: {r: 0.8080046, g: 1.6417967, b: 0.36961916, a: 1}
+  outlineColorStyle: 0
+  outlineGradient:
+    serializedVersion: 2
+    key0: {r: 1, g: 1, b: 1, a: 1}
+    key1: {r: 1, g: 1, b: 1, a: 1}
+    key2: {r: 0, g: 0, b: 0, a: 0}
+    key3: {r: 0, g: 0, b: 0, a: 0}
+    key4: {r: 0, g: 0, b: 0, a: 0}
+    key5: {r: 0, g: 0, b: 0, a: 0}
+    key6: {r: 0, g: 0, b: 0, a: 0}
+    key7: {r: 0, g: 0, b: 0, a: 0}
+    ctime0: 0
+    ctime1: 65535
+    ctime2: 0
+    ctime3: 0
+    ctime4: 0
+    ctime5: 0
+    ctime6: 0
+    ctime7: 0
+    atime0: 0
+    atime1: 65535
+    atime2: 0
+    atime3: 0
+    atime4: 0
+    atime5: 0
+    atime6: 0
+    atime7: 0
+    m_Mode: 0
+    m_NumColorKeys: 2
+    m_NumAlphaKeys: 2
+  outlineGradientInLocalSpace: 0
+  outlineWidth: 0.45
+  outlineBlurPasses: 2
+  outlineQuality: 3
+  outlineEdgeMode: 0
+  outlineEdgeThreshold: 0.995
+  outlineDownsampling: 2
+  outlineVisibility: 0
+  glowBlendMode: 0
+  outlineBlitDebug: 0
+  outlineIndependent: 0
+  outlineContourStyle: 0
+  glow: 0.48
+  glowWidth: 0.4
+  glowQuality: 3
+  glowBlurMethod: 0
+  glowDownsampling: 2
+  glowHQColor: {r: 0.64, g: 1, b: 0, a: 1}
+  glowDithering: 1
+  glowMagicNumber1: 0.75
+  glowMagicNumber2: 0.5
+  glowAnimationSpeed: 1
+  glowVisibility: 0
+  glowBlitDebug: 0
+  glowBlendPasses: 1
+  glowPasses:
+  - offset: 4
+    alpha: 0.1
+    color: {r: 0.64, g: 1, b: 0, a: 1}
+  - offset: 3
+    alpha: 0.2
+    color: {r: 0.64, g: 1, b: 0, a: 1}
+  - offset: 2
+    alpha: 0.3
+    color: {r: 0.64, g: 1, b: 0, a: 1}
+  - offset: 1
+    alpha: 0.4
+    color: {r: 0.64, g: 1, b: 0, a: 1}
+  glowIgnoreMask: 0
+  innerGlow: 0
+  innerGlowWidth: 1
+  innerGlowColor: {r: 1, g: 1, b: 1, a: 1}
+  innerGlowBlendMode: 0
+  innerGlowVisibility: 0
+  targetFX: 0
+  targetFXTexture: {fileID: 0}
+  targetFXColor: {r: 1, g: 1, b: 1, a: 1}
+  targetFXCenter: {fileID: 0}
+  targetFXRotationSpeed: 50
+  targetFXInitialScale: 4
+  targetFXEndScale: 1.5
+  targetFXScaleToRenderBounds: 1
+  targetFXAlignToGround: 0
+  targetFXFadePower: 32
+  targetFXGroundMaxDistance: 10
+  targetFXGroundLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  targetFXTransitionDuration: 0.5
+  targetFXStayDuration: 1.5
+  targetFXVisibility: 1
+  seeThrough: 2
+  seeThroughOccluderMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  seeThroughOccluderThreshold: 0.3
+  seeThroughOccluderMaskAccurate: 0
+  seeThroughOccluderCheckInterval: 1
+  seeThroughOccluderCheckIndividualObjects: 0
+  seeThroughDepthOffset: 0
+  seeThroughMaxDepth: 0
+  seeThroughIntensity: 0.8
+  seeThroughTintAlpha: 0.5
+  seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1}
+  seeThroughNoise: 1
+  seeThroughBorder: 0
+  seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1}
+  seeThroughBorderOnly: 0
+  seeThroughBorderWidth: 0.45
+  seeThroughOrdered: 0
+  seeThroughTexture: {fileID: 0}
+  seeThroughTextureUVSpace: 0
+  seeThroughTextureScale: 1
+  rmsCount: 1
+  hitFxInitialIntensity: 0
+  hitFxMode: 0
+  hitFxFadeOutDuration: 0.25
+  hitFxColor: {r: 1, g: 1, b: 1, a: 1}
+  hitFxRadius: 0.5
 --- !u!114 &665521232 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2576541081685985455, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
@@ -2356,7 +2613,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   triggerID: 0
-  triggerName: 
+  triggerName: "A_out_\u7EBF"
   _highlight: {fileID: 0}
   toolType: 12
   isConnected: 1
@@ -2607,7 +2864,7 @@ MeshRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 950850337}
-  m_Enabled: 0
+  m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
@@ -2620,7 +2877,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  - {fileID: 2100000, guid: c3418e6ed2aef6345a0f851ed6a26394, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -3464,7 +3721,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   triggerID: 0
-  triggerName: 
+  triggerName: "\u96F6_\u5730_\u7EBF"
   _highlight: {fileID: 0}
   toolType: 12
   isConnected: 1
@@ -4259,10 +4516,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 983a202d77c30ac4bb8c9f6ba09e9ff6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  triggerID: 0
-  triggerName: 
-  _highlight: {fileID: 0}
-  deviceType: 0
   meteringDevice: {fileID: 1566240508}
   cabinetDoor: {fileID: 1462070149}
   socket: {fileID: 127937610}
@@ -5608,30 +5861,66 @@ PrefabInstance:
       propertyPath: triggerName
       value: "\u7535\u80FD\u8868\u94ED\u724C"
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541079950677451, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "\u7535\u80FD\u8868\u62C6\u88C5\u87BA\u4E1D1"
+      objectReference: {fileID: 0}
+    - target: {fileID: 2576541080106509928, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "C_in_\u87BA\u4E1Dup"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541080106509928, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541080121702409, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "B_out_\u87BA\u4E1Ddown"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541080121702409, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541080135006610, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "\u96F6_\u5730_\u87BA\u4E1Ddown"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541080135006610, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541080207224026, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: id
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 2576541080207224026, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "C_out_\u87BA\u4E1Ddown"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541080207224026, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541080325731230, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "A_in_\u87BA\u4E1Ddown"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541080325731230, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541080334431885, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "A_out_\u87BA\u4E1Ddown"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541080334431885, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541080545036943, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "A_out_\u87BA\u4E1Dup"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541080545036943, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
@@ -5644,10 +5933,18 @@ PrefabInstance:
       propertyPath: triggerName
       value: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D1"
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541080563400545, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "\u96F6_out_\u87BA\u4E1Ddown"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541080563400545, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541080767639300, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "B_in_\u87BA\u4E1Dup"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541080767639300, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
@@ -5660,10 +5957,18 @@ PrefabInstance:
       propertyPath: triggerName
       value: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D2"
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541080794005323, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "C_in_\u87BA\u4E1Ddown"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541080794005323, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541080876693594, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "B_out_\u87BA\u4E1Dup"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541080876693594, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
@@ -5676,22 +5981,46 @@ PrefabInstance:
       propertyPath: triggerName
       value: "\u7535\u80FD\u8868\u76D6\u5B50"
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541081049590947, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "C_out_\u87BA\u4E1Dup"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541081049590947, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541081131008877, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "\u7535\u80FD\u8868\u62C6\u88C5\u87BA\u4E1D2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 2576541081226192895, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "\u96F6_\u5730_\u87BA\u4E1Dup"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541081226192895, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541081356017717, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "\u96F6_out_\u87BA\u4E1Dup"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541081356017717, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541081685985455, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "B_in_\u87BA\u4E1Ddown"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541081685985455, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2576541081774396260, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: triggerName
+      value: "A_in_\u87BA\u4E1Dup"
+      objectReference: {fileID: 0}
     - target: {fileID: 2576541081774396260, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
       value: 1
@@ -5700,6 +6029,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u4E09\u76F8\u56DB\u7EBF\u7535\u8868"
       objectReference: {fileID: 0}
+    - target: {fileID: 4675619581299266311, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: m_RootOrder
       value: 0

Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs

@@ -30,7 +30,7 @@ public class Device_Cover : Device_Base
 
     private void OnMouseDown()
     {
-        if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)) == 0)
+        if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, false)) == 0)
         {
             isCheckOK = true;
 

Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_NamePlate.cs

@@ -17,9 +17,11 @@ public class Device_NamePlate : Device_Base
     /// </summary>
     private GameObject checkUiPrefb;
 
-
+    protected override void OnMDown()
-    private void OnMouseDown()
     {
+        if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, false)) == 0)
+        {
+            base.OnMDown();
             if (!isChecked)
             {
                 //核对和记录
@@ -39,14 +41,16 @@ public class Device_NamePlate : Device_Base
                     {
                         Debug.Log("核查完成");
                         isChecked = true;
+                        TipPanel tTemp = Resources.Load<TipPanel>("UI/UI_Tip/TipPanel");
                         if (GameManager.UIMgr != null)
                         {
-                        GameObject tip2 = Instantiate<GameObject>(checkUiPrefb, UIManager.Instance.canvas.transform);
+                            TipPanel tip2 = Instantiate(tTemp, UIManager.Instance.canvas.transform);
-                        TipPanel tipPanel = tip2.GetComponent<TipPanel>();
+                            tip2.Init("ºË¶ÔºÍ³­Â¼Íê³É£¡");
-                        tipPanel.Init("核对和抄录完成！");
                         }
+                        int state = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
                     }
                 });
             }
         }
     }
+}

Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs

@@ -1,3 +1,4 @@
+using HighlightPlus;
 using Sirenix.Utilities;
 using System.Collections;
 using System.Collections.Generic;
@@ -6,7 +7,7 @@ using UnityEngine;
 /// <summary>
 /// 计量柜
 /// </summary>
-public class Device_MeasuringCabinet : Device_Base
+public class Device_MeasuringCabinet : MonoBehaviour
 {
     /// <summary>
     /// 当前机柜中安装的三相四线电能表
@@ -46,6 +47,7 @@ public class Device_MeasuringCabinet : Device_Base
     /// </summary>
     public Check_JieXian check_JieXian;
 
+
     private void Awake()
     {
         //添加开关切换回调
@@ -64,9 +66,20 @@ public class Device_MeasuringCabinet : Device_Base
                 CheckHasElectricity();
             });
         });
-
+        GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+    }
+    private void SwitchSubProcessStepTriggerID(string arg0)
+    {
+        if (dianCollider.gameObject.name == arg0)
+        {
+            dianCollider.GetComponent<HighlightEffect>().SetHighlighted(true);
+        }
+        else
+        {
+            dianCollider.GetComponent<HighlightEffect>().SetHighlighted(false);
         }
 
+    }
     /// <summary>
     /// 还原计量柜状态
     /// </summary>
@@ -179,11 +192,15 @@ public class Device_MeasuringCabinet : Device_Base
         }
 
         //安装或拆除电能表
+        if (dianCollider.enabled)
+        {
             if (Input.GetMouseButtonDown(0))
             {
                 if (Physics.Raycast(Camera.main.ScreenPointToRay(Input.mousePosition), out RaycastHit hit))
                 {
                     if (hit.collider == dianCollider)
+                    {
+                        if ((GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(dianCollider.gameObject.name, true)) == 0)
                         {
                             if (meteringDevice == null)
                             {
@@ -216,3 +233,5 @@ public class Device_MeasuringCabinet : Device_Base
                 }
             }
         }
+    }
+}

Assets/Scripts/CXX/Tools/Tool_Line.cs

@@ -34,9 +34,11 @@ public class Tool_Line: Tool_Base
         base.OnAwake();
         id = gameObject.name;
     }
-
+    protected override void OnMDown()
-    private void OnMouseDown()
     {
+        if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, false)) == 0)
+        {
+            base.OnMDown();
             if (isConnected)
             {
                 //ȡϽÓÏß
@@ -45,6 +47,7 @@ public class Tool_Line: Tool_Base
                     transform.DOLocalMoveY(InstallPosY - 2, 1).OnComplete(() =>
                     {
                         isConnected = false;
+                        int state = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
                     });
                 }
             }
@@ -56,8 +59,10 @@ public class Tool_Line: Tool_Base
                     transform.DOLocalMoveY(InstallPosY, 1).OnComplete(() =>
                     {
                         isConnected = true;
+                        int state = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
                     });
                 }
             }
         }
     }
+}

Assets/Scripts/CXX/Tools/Tool_TestPen.cs

@@ -102,6 +102,8 @@ public class Tool_TestPen : Tool_Base
     /// </summary>
     /// <param name="tool_base">被验电设备</param>
     public void Test(Tool_Base tool_base)
+    {
+        if ((triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{tool_base.triggerName}", true)) == 0)
         {
             if (tool_base.toolType == ToolType.螺丝)
             {
@@ -116,6 +118,7 @@ public class Tool_TestPen : Tool_Base
 
             screem.materials[0].color = isFlicker ? Color.red : Color.white;
         }
+    }
 
 
 }

Assets/Scripts/CXX/UI/ProcessTipPanel.cs

@@ -33,7 +33,7 @@ public class ProcessTipPanel : MonoBehaviour
     public void StartProcess(Action<bool> back)
     {
         this.isCheck=true;
-        tmpback = back;
+        tmpback += back;
         Debug.Log("开始核对和抄录");
     }
 
@@ -45,7 +45,7 @@ public class ProcessTipPanel : MonoBehaviour
         this.isCheck = false;
         currentProcess = 0;
         image.fillAmount = currentProcess;
-        tmpback(false);
+        tmpback?.Invoke(false);
     }
 
 
@@ -79,7 +79,7 @@ public class ProcessTipPanel : MonoBehaviour
     private void ThisDestroy()
     {
         Debug.Log("核对和抄录完成！");
-        tmpback(true);
+        tmpback?.Invoke(true);
         Destroy(gameObject);
     }
 }

Assets/Scripts/Project/DataClass/ProcessData/D_SubProcessStep.cs

@@ -38,12 +38,12 @@ public class D_SubProcessStep : I_Enter, I_Exit
             string[] toolIdTemp = triggerID.Split(',');
             for (int i = 0; i < toolIdTemp.Length; i++)
             {
-                triggersName.Add(toolIdTemp[i]);
+                triggersName.Add(toolIdTemp[i].Replace("\r\n", "").Replace("\n", "").Replace("\r", ""));
             }
         }
         else
         {
-            triggersName.Add(triggerID);
+            triggersName.Add(triggerID.Replace("\r\n", "").Replace("\n", "").Replace("\r", ""));
         }
     }
 

Assets/Scripts/Project/Manager/LiveSceneManager.cs

@@ -10,6 +10,7 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
     public GameObject currentTool;
     public Transform spawnToolPos;
     public Transform tMDTips;
+   
     protected override void Awake()
     {
         base.Awake();