diff --git a/Assets/ArtRes/Models/Device/计量柜/空开.fbm/断路器1.png b/Assets/ArtRes/Models/Device/计量柜/空开.fbm/断路器1.png
index e2e3dd0..ea825e3 100644
Binary files a/Assets/ArtRes/Models/Device/计量柜/空开.fbm/断路器1.png and b/Assets/ArtRes/Models/Device/计量柜/空开.fbm/断路器1.png differ
diff --git a/Assets/Resources/UI/UI_Tip/TipPanel.prefab b/Assets/Resources/UI/UI_Tip/TipPanel.prefab
new file mode 100644
index 0000000..42679b2
--- /dev/null
+++ b/Assets/Resources/UI/UI_Tip/TipPanel.prefab
@@ -0,0 +1,243 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4661904819967552791
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4661904819967552788}
+ - component: {fileID: 4661904819967552794}
+ - component: {fileID: 4661904819967552789}
+ - component: {fileID: 6229245798759294243}
+ m_Layer: 5
+ m_Name: TipPanel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4661904819967552788
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4661904819967552791}
+ 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: 4661904820320339121}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 198}
+ m_SizeDelta: {x: 365.3268, y: 75.8311}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4661904819967552794
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4661904819967552791}
+ m_CullTransparentMesh: 1
+--- !u!114 &4661904819967552789
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4661904819967552791}
+ 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: -14.4, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 6ec5e20009b493c49b5856ba21d8c40e, type: 3}
+ m_Type: 1
+ 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!114 &6229245798759294243
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4661904819967552791}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d41cb19b621fde745b769d27a8553f62, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_TextMeshProUGUI: {fileID: 4661904820320339126}
+--- !u!1 &4661904820320339120
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4661904820320339121}
+ - component: {fileID: 4661904820320339127}
+ - component: {fileID: 4661904820320339126}
+ - component: {fileID: 4987385666945690322}
+ m_Layer: 5
+ m_Name: Text_Content
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4661904820320339121
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4661904820320339120}
+ 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: []
+ m_Father: {fileID: 4661904819967552788}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4661904820320339127
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4661904820320339120}
+ m_CullTransparentMesh: 1
+--- !u!114 &4661904820320339126
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4661904820320339120}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text:
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
+ m_sharedMaterial: {fileID: -4829118149068189727, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4293984000
+ m_fontColor: {r: 0, g: 1, b: 0.9402251, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 20
+ m_fontSizeBase: 20
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &4987385666945690322
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4661904820320339120}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
diff --git a/Assets/Resources/UI/UI_Tip/TipPanel.prefab.meta b/Assets/Resources/UI/UI_Tip/TipPanel.prefab.meta
new file mode 100644
index 0000000..18a4f99
--- /dev/null
+++ b/Assets/Resources/UI/UI_Tip/TipPanel.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6bab032b52abb4b4ea24fd138d6b77ce
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity
index 662362c..cf44d33 100644
--- a/Assets/Scenes/05_LiveScene.unity
+++ b/Assets/Scenes/05_LiveScene.unity
@@ -2551,6 +2551,293 @@ MonoBehaviour:
hitFxFadeOutDuration: 0.25
hitFxColor: {r: 1, g: 1, b: 1, a: 1}
hitFxRadius: 0.5
+--- !u!1 &950850337
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 950850338}
+ - component: {fileID: 950850341}
+ - component: {fileID: 950850340}
+ - component: {fileID: 950850339}
+ - component: {fileID: 950850343}
+ - component: {fileID: 950850342}
+ m_Layer: 0
+ m_Name: "\u68C0\u67E5\u63A5\u7EBF\u5B8C\u597D"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &950850338
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 950850337}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.14606, y: -0.15198, z: 0.40478}
+ m_LocalScale: {x: 0.10437811, y: 0.029909056, z: 0.0563622}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 543450652271447145}
+ m_RootOrder: 8
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &950850339
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 950850337}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1, y: 1, z: 1}
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &950850340
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 950850337}
+ m_Enabled: 0
+ 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: 31321ba15b8f8eb4c954353edc038b1d, 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 &950850341
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 950850337}
+ m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &950850342
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 950850337}
+ 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 &950850343
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 950850337}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f00c6998a11da1f49be16976546d5f34, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ triggerID: 0
+ triggerName:
+ _highlight: {fileID: 0}
+ isChecked: 0
--- !u!1 &991594635
GameObject:
m_ObjectHideFlags: 0
@@ -3995,6 +4282,7 @@ MonoBehaviour:
- {fileID: 1775693151}
- {fileID: 1577392988}
- {fileID: 1641381927}
+ check_JieXian: {fileID: 0}
--- !u!114 &1760046075 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2576541080767639300, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
@@ -4630,63 +4918,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &2135879011
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
- propertyPath: m_RootOrder
- value: 10
- objectReference: {fileID: 0}
- - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
- propertyPath: m_LocalPosition.y
- value: 1.5
- objectReference: {fileID: 0}
- - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1817104531314915914, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1817104531314915916, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
- propertyPath: m_Name
- value: "\u6B65\u9AA4\u72B6\u6001"
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 049bfb1489c99ca49bfbcdcdca9d9cbf, type: 3}
--- !u!23 &158497138924415964
MeshRenderer:
m_ObjectHideFlags: 0
@@ -4791,6 +5022,7 @@ Transform:
- {fileID: 1843008148}
- {fileID: 1065811549}
- {fileID: 478648693}
+ - {fileID: 950850338}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scripts/CXX/Devices/杂/接线完好检查.meta b/Assets/Scripts/CXX/Devices/杂/接线完好检查.meta
new file mode 100644
index 0000000..e802a2a
--- /dev/null
+++ b/Assets/Scripts/CXX/Devices/杂/接线完好检查.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d5fdc4eb5f8bd3f4b9460ca078fcc023
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs b/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs
new file mode 100644
index 0000000..b211837
--- /dev/null
+++ b/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs
@@ -0,0 +1,31 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+///
+///
+///
+public class Check_JieXian : PermanentTriggerBase
+{
+ ///
+ /// ǷѼ
+ ///
+ public bool isChecked;
+ private void OnMouseDown()
+ {
+ Invoke("Check", 1);
+ }
+
+ ///
+ /// ɹ
+ ///
+ public void Check()
+ {
+ Debug.Log("");
+ isChecked = true;
+ gameObject.SetActive(false);
+
+ if (GameManager.ProcessMgr != null)
+ GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true);
+ }
+}
diff --git a/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs.meta b/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs.meta
new file mode 100644
index 0000000..82f204e
--- /dev/null
+++ b/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f00c6998a11da1f49be16976546d5f34
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
index e13d24e..5984146 100644
--- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
+++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
@@ -32,7 +32,6 @@ public class Device_Cover : Device_Base
{
if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)) == 0)
{
- Debug.Log("");
isCheckOK = true;
if (!isOpen)
diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_NamePlate.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_NamePlate.cs
index 779eaf1..d02a81b 100644
--- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_NamePlate.cs
+++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_NamePlate.cs
@@ -16,7 +16,6 @@ public class Device_NamePlate : Device_Base
/// ˶Ժͳ¼UI
///
private GameObject checkUiPrefb;
- private ProcessTipPanel processTipPanel;
private void OnMouseDown()
@@ -29,11 +28,9 @@ public class Device_NamePlate : Device_Base
checkUiPrefb = Resources.Load("UI/UI_Tip/ProcessTipPanel");
}
- if (processTipPanel == null)
- {
- GameObject tip = Instantiate(checkUiPrefb, UIManager.Instance.canvas.transform);
- processTipPanel = tip.GetComponent();
- }
+ //ɽ
+ GameObject tip = Instantiate(checkUiPrefb, UIManager.Instance.canvas.transform);
+ ProcessTipPanel processTipPanel = tip.GetComponent();
//ʼ߽
processTipPanel.StartProcess(result =>
@@ -42,13 +39,12 @@ public class Device_NamePlate : Device_Base
{
Debug.Log("˲");
isChecked = true;
- //if (GameManager.UIMgr != null)
- //{
- // GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (panel) =>
- // {
- // //panel.Init($"{""}:{""}", $"{"˶Ժͳ¼ɣ"}");
- // });
- //}
+ if (GameManager.UIMgr != null)
+ {
+ GameObject tip2 = Instantiate(checkUiPrefb, UIManager.Instance.canvas.transform);
+ TipPanel tipPanel = tip2.GetComponent();
+ tipPanel.Init("˶Ժͳ¼ɣ");
+ }
}
});
}
diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Switch.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Switch.cs
index 74812f2..94a87fd 100644
--- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Switch.cs
+++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Switch.cs
@@ -56,7 +56,7 @@ public class Device_Switch : Device_Base
public void CloseState()
{
isOpen = false;
- transform.localEulerAngles = new Vector3(45, 0, 0);
+ transform.localEulerAngles = new Vector3(0, 45, 0);
}
diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs
index 6a40b32..16fa77a 100644
--- a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs
@@ -65,4 +65,24 @@ public class Device_CabinetDoor : Device_Base
}
}
+ ///
+ /// Ŵ״̬
+ ///
+ public void OpenState()
+ {
+ SiteManager.instance.measuringCabinet.cabinetDoor.isOpen = true;
+ SiteManager.instance.measuringCabinet.cabinetDoor.transform.localEulerAngles = new Vector3(0, 0, 180);
+ SiteManager.instance.measuringCabinet.cabinetDoor.transform.Find("2/3").localEulerAngles = new Vector3(-45f, 0, 0);
+ }
+
+ ///
+ /// Źر״̬
+ ///
+ public void CloseState()
+ {
+ isOpen = false;
+ transform.localEulerAngles = Vector3.zero;
+ transform.Find("2/3").localEulerAngles = Vector3.zero;
+ }
+
}
diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
index ee2c5b0..73404b3 100644
--- a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
@@ -41,6 +41,10 @@ public class Device_MeasuringCabinet : Device_Base
/// 翪ؽ˿
///
public List inSwitchScrews;
+ ///
+ ///
+ ///
+ public Check_JieXian check_JieXian;
private void Awake()
{
@@ -71,14 +75,11 @@ public class Device_MeasuringCabinet : Device_Base
//ԭߵܱ
meteringDevice.Init(true);
//ԭ
- cabinetDoor.isOpen = false;
- cabinetDoor.transform.localEulerAngles = Vector3.zero;
- cabinetDoor.transform.Find("2/3").localEulerAngles = Vector3.zero;
+ cabinetDoor.CloseState();
//ԭ
//ԭ߿
- inSwitch.isOpen = true;
- inSwitch.transform.localEulerAngles = new Vector3(0, 0, 0);
+ inSwitch.OpenState();
//ԭܱ
jieXian_screws.ForEach(screw =>
{
diff --git a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
index 16185f2..21bc3ed 100644
--- a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
+++ b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
@@ -124,9 +124,8 @@ public class StepState_1002 : StepState
//ϿԴ
//ſ
- SiteManager.instance.measuringCabinet.cabinetDoor.isOpen = true;
- SiteManager.instance.measuringCabinet.cabinetDoor.transform.localEulerAngles = new Vector3(0,0,180);
- SiteManager.instance.measuringCabinet.cabinetDoor.transform.Find("2/3").localEulerAngles =new Vector3(-45f,0,0);
+ SiteManager.instance.measuringCabinet.cabinetDoor.OpenState();
+
//Ӳ
SiteManager.instance.measuringCabinet.meteringDevice.CoverUnstallState();
diff --git a/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs b/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs
index d3389cb..209ea49 100644
--- a/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs
@@ -56,6 +56,12 @@ public class Tool_Screwdriver : Tool_Base
return;
}
+ //˿Ҫȵ
+ if (SiteManager.instance.measuringCabinet.meteringDevice.jieXian_screws.Contains(ts) && !SiteManager.instance.measuringCabinet.check_JieXian.isChecked)
+ {
+ return;
+ }
+
if ((triggerAction == null ? 0 : triggerAction.Invoke(ts.triggerName, true)) == 0)
{
if (ts.isInstall)
diff --git a/Assets/Scripts/CXX/UI/TipPanel.cs b/Assets/Scripts/CXX/UI/TipPanel.cs
new file mode 100644
index 0000000..7fa332a
--- /dev/null
+++ b/Assets/Scripts/CXX/UI/TipPanel.cs
@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using TMPro;
+using UnityEngine;
+
+public class TipPanel : MonoBehaviour
+{
+ public TextMeshProUGUI m_TextMeshProUGUI;
+ public void Init(string tip)
+ {
+ m_TextMeshProUGUI.text= tip;
+ }
+}
diff --git a/Assets/Scripts/CXX/UI/TipPanel.cs.meta b/Assets/Scripts/CXX/UI/TipPanel.cs.meta
new file mode 100644
index 0000000..f00f18f
--- /dev/null
+++ b/Assets/Scripts/CXX/UI/TipPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d41cb19b621fde745b769d27a8553f62
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant: