From dfce62e9e2e04bd3335e741b8607a8c425330d86 Mon Sep 17 00:00:00 2001
From: chenxiangxue <910695411@qq.com>
Date: Fri, 23 Aug 2024 11:26:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E6=9D=82=E7=89=A9=EF=BC=8C?=
=?UTF-8?q?=E4=B8=8A=E5=B0=81=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Prefabs/Objects/Tools/盒装封印.prefab | 20 ++-
Assets/Scenes/05_LiveScene.unity | 118 +++++++++++++++++-
Assets/Scripts/CXX/Devices/Device_Seal.cs | 9 ++
.../Devices/计量柜/Device_MeasuringCabinet.cs | 5 +
.../CXX/Devices/计量柜/Device_Sundries.cs | 11 ++
.../Devices/计量柜/Device_Sundries.cs.meta | 11 ++
Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs | 34 +++++
Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs.meta | 11 ++
Assets/Scripts/Project/Enum/Enums.cs | 1 +
9 files changed, 218 insertions(+), 2 deletions(-)
create mode 100644 Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs
create mode 100644 Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs.meta
create mode 100644 Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs
create mode 100644 Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs.meta
diff --git a/Assets/Resources/Prefabs/Objects/Tools/盒装封印.prefab b/Assets/Resources/Prefabs/Objects/Tools/盒装封印.prefab
index 109b8d8..7c61e63 100644
--- a/Assets/Resources/Prefabs/Objects/Tools/盒装封印.prefab
+++ b/Assets/Resources/Prefabs/Objects/Tools/盒装封印.prefab
@@ -464,6 +464,7 @@ GameObject:
- component: {fileID: 3346917713294978289}
- component: {fileID: 3014182739139812810}
- component: {fileID: 5392546290512265981}
+ - component: {fileID: 3188434527706004942}
m_Layer: 0
m_Name: "\u76D2\u88C5\u5C01\u5370"
m_TagString: Untagged
@@ -504,7 +505,8 @@ MonoBehaviour:
triggerID: 0
toolName:
toolOrDeviceOrMaterial: 0
- selfObj: {fileID: 0}
+ objPrefab: {fileID: 0}
+ selfPosInToolRoom: {x: 0, y: 0, z: 0}
_highlight: {fileID: 0}
--- !u!65 &3014182739139812810
BoxCollider:
@@ -691,6 +693,22 @@ MonoBehaviour:
hitFxFadeOutDuration: 0.25
hitFxColor: {r: 1, g: 1, b: 1, a: 1}
hitFxRadius: 0.5
+--- !u!114 &3188434527706004942
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7670065417942988621}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8e4ea428e30fc5d4895108b5ba38a20d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ triggerID: 0
+ triggerName:
+ _highlight: {fileID: 0}
+ toolType: 9
--- !u!1 &9144172510165255722
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity
index 6ebc0c4..821b61e 100644
--- a/Assets/Scenes/05_LiveScene.unity
+++ b/Assets/Scenes/05_LiveScene.unity
@@ -2582,6 +2582,120 @@ MonoBehaviour:
hitFxFadeOutDuration: 0.25
hitFxColor: {r: 1, g: 1, b: 1, a: 1}
hitFxRadius: 0.5
+--- !u!1 &991594635
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 991594636}
+ - component: {fileID: 991594639}
+ - component: {fileID: 991594638}
+ - component: {fileID: 991594637}
+ - component: {fileID: 991594640}
+ m_Layer: 0
+ m_Name: "\u6742\u7269"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &991594636
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 991594635}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -0.0183, y: -0.4259, z: 0}
+ m_LocalScale: {x: 0.45012873, y: 0.16646269, z: 0.049781285}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 5626062447358651775}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &991594637
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 991594635}
+ 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 &991594638
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 991594635}
+ 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: 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 &991594639
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 991594635}
+ m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &991594640
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 991594635}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4df8ad3ae5d512b49b5c3d270a869164, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ triggerID: 0
+ triggerName:
+ _highlight: {fileID: 0}
+ deviceType: 3
--- !u!1 &1065811548
GameObject:
m_ObjectHideFlags: 0
@@ -3658,6 +3772,7 @@ MonoBehaviour:
- {fileID: 302277752}
- {fileID: 1352022184}
dianCollider: {fileID: 0}
+ sundries: {fileID: 991594635}
--- !u!114 &1760046075 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2576541080767639300, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
@@ -5182,7 +5297,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6044607018453959887, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
@@ -6209,6 +6324,7 @@ Transform:
- {fileID: 5523131528923806745}
- {fileID: 5307496774406750061}
- {fileID: 7177105353719849443}
+ - {fileID: 991594636}
m_Father: {fileID: 543450652271447145}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scripts/CXX/Devices/Device_Seal.cs b/Assets/Scripts/CXX/Devices/Device_Seal.cs
index 6ff5e0f..f1092d8 100644
--- a/Assets/Scripts/CXX/Devices/Device_Seal.cs
+++ b/Assets/Scripts/CXX/Devices/Device_Seal.cs
@@ -24,4 +24,13 @@ public class Device_Seal : Device_Base
isCut = true;
gameObject.SetActive(false);
}
+
+ ///
+ /// װӡ
+ ///
+ public void Install()
+ {
+ isCut = false;
+ gameObject.SetActive(true);
+ }
}
diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
index 893d027..e229914 100644
--- a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
@@ -35,6 +35,10 @@ public class Device_MeasuringCabinet : Device_Base
/// ܱײ
///
public BoxCollider dianCollider;
+ ///
+ /// ܱװɺ
+ ///
+ public Device_Sundries sundries;
private void Awake()
{
@@ -161,6 +165,7 @@ public class Device_MeasuringCabinet : Device_Base
meteringDevice.Remove();
//߹˿
ClearLineScrew();
+ sundries.gameObject.SetActive(true);
}
}
}
diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs
new file mode 100644
index 0000000..c660cc0
--- /dev/null
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs
@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Device_Sundries : Device_Base
+{
+ private void OnMouseDown()
+ {
+ gameObject.SetActive(false);
+ }
+}
diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs.meta b/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs.meta
new file mode 100644
index 0000000..9ad43df
--- /dev/null
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4df8ad3ae5d512b49b5c3d270a869164
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs b/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs
new file mode 100644
index 0000000..dd19a91
--- /dev/null
+++ b/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs
@@ -0,0 +1,34 @@
+using System.Collections;
+using System.Collections.Generic;
+using Unity.VisualScripting;
+using UnityEngine;
+
+public class Tool_BoxSeal : Tool_Base
+{
+ private void Update()
+ {
+ //˿
+ Ray tmpray = Camera.main.ScreenPointToRay(Input.mousePosition);
+ if (Physics.Raycast(tmpray, out RaycastHit hit))
+ {
+ //ǵܱ˿
+ if(hit.transform.GetComponent()!=null)
+ {
+ Tool_Screw screw= hit.transform.GetComponent();
+ //˸
+ if(SiteManager.instance.measuringCabinet.meteringDevice!=null && !SiteManager.instance.measuringCabinet.meteringDevice.cover.isOpen)
+ {
+ //˿š˾Ͱװӡ
+ if(screw==SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_left && SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_left.isInstall)
+ {
+ SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.Install();
+ }
+ else if(screw == SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_right && SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_right.isInstall)
+ {
+ SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.Install();
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs.meta b/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs.meta
new file mode 100644
index 0000000..6c7de30
--- /dev/null
+++ b/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8e4ea428e30fc5d4895108b5ba38a20d
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Project/Enum/Enums.cs b/Assets/Scripts/Project/Enum/Enums.cs
index db43d52..2cf6808 100644
--- a/Assets/Scripts/Project/Enum/Enums.cs
+++ b/Assets/Scripts/Project/Enum/Enums.cs
@@ -197,6 +197,7 @@ public enum DeviceType
计量柜,
计量柜_柜门,
计量柜_插座,
+ 计量柜_杂物,
三相四线电表,
三相四线电表_开关,
三相四线电表_铭牌,