From 7d6b942a8a3241e2704b70c11a0720ce77743b8b Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Tue, 3 Sep 2024 18:31:51 +0800 Subject: [PATCH] aa --- ...Scene 经互感器接入式低压电能计量装置.unity | 76 +++++++++++++++++-- Assets/Scenes/05_LiveScene.unity | 23 +++++- .../直接接入式电能计量装置/Device_Cover.cs | 5 ++ .../CXX/Devices/计量柜/Device_Control_1002.cs | 24 +++--- Assets/Scripts/CXX/Score/Score_1002.cs | 2 - Assets/Scripts/CXX/Tools/Tool_TestPen.cs | 12 +-- 6 files changed, 115 insertions(+), 27 deletions(-) diff --git a/Assets/Scenes/05_LiveScene 经互感器接入式低压电能计量装置.unity b/Assets/Scenes/05_LiveScene 经互感器接入式低压电能计量装置.unity index 891f00b..40077ce 100644 --- a/Assets/Scenes/05_LiveScene 经互感器接入式低压电能计量装置.unity +++ b/Assets/Scenes/05_LiveScene 经互感器接入式低压电能计量装置.unity @@ -3898,6 +3898,70 @@ MonoBehaviour: triggerName: "\u68C0\u67E5\u63A5\u7EBF" _highlight: {fileID: 0} isChecked: 0 + tool_Lines: [] + tool_Screws: [] +--- !u!1001 &977745247 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 543450653314515341} + m_Modifications: + - target: {fileID: 4675619581299266311, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_Name + value: "\u4E09\u76F8\u56DB\u7EBF\u7535\u80FD\u8868" + objectReference: {fileID: 0} + - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_LocalPosition.x + value: -0.2566948 + objectReference: {fileID: 0} + - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_LocalPosition.y + value: -0.17933655 + objectReference: {fileID: 0} + - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_LocalPosition.z + value: 0.54939747 + objectReference: {fileID: 0} + - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} +--- !u!4 &977745248 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + m_PrefabInstance: {fileID: 977745247} + m_PrefabAsset: {fileID: 0} --- !u!1 &1044951649 GameObject: m_ObjectHideFlags: 0 @@ -6165,6 +6229,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6589deeaefa4a17428d6c3ce0d699c77, type: 3} m_Name: m_EditorClassIdentifier: + device_Control: {fileID: 0} --- !u!114 &1577392988 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5948617165317844720, guid: c80ccdb516dbab94083bd57fa1650eda, type: 3} @@ -7887,6 +7952,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 977745248} - {fileID: 7750112674851636861} - {fileID: 6919098457600344112} - {fileID: 5626062446178738331} @@ -15201,7 +15267,7 @@ Transform: - {fileID: 5307496775317697161} - {fileID: 7177105354899762183} m_Father: {fileID: 543450653314515341} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &5626062447358651775 Transform: @@ -17217,7 +17283,7 @@ Transform: - {fileID: 1390758943222448632} - {fileID: 4366389706591193706} m_Father: {fileID: 543450653314515341} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &6939770098881280481 MeshRenderer: @@ -17622,7 +17688,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7151331951889542704 Transform: m_ObjectHideFlags: 0 @@ -18644,7 +18710,7 @@ Transform: - {fileID: 872580710017047027} - {fileID: 453902553046789838} m_Father: {fileID: 543450653314515341} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7776229725599993088 GameObject: @@ -19234,7 +19300,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!33 &8094023289907880971 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity index 04e9cb2..c3f8ec9 100644 --- a/Assets/Scenes/05_LiveScene.unity +++ b/Assets/Scenes/05_LiveScene.unity @@ -394,7 +394,7 @@ GameObject: - component: {fileID: 238725086} - component: {fileID: 238725085} m_Layer: 0 - m_Name: Cube + m_Name: "\u4F4D\u7F6E" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1531,6 +1531,7 @@ GameObject: - component: {fileID: 478648693} - component: {fileID: 478648694} - component: {fileID: 478648695} + - component: {fileID: 478648696} m_Layer: 0 m_Name: "\u7535\u80FD\u8868\u533A\u57DF\u78B0\u649E" m_TagString: Untagged @@ -1739,6 +1740,22 @@ MonoBehaviour: hitFxFadeOutDuration: 0.25 hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxRadius: 0.5 +--- !u!114 &478648696 +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: ad1852809a3fa664b833b3c6f0b340d3, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerID: 0 + triggerName: "\u7535\u80FD\u8868\u533A\u57DF\u78B0\u649E" + _highlight: {fileID: 0} + installVector: {fileID: 238725084} --- !u!114 &665521232 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2576541081685985455, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} @@ -3328,6 +3345,8 @@ MonoBehaviour: triggerName: "\u68C0\u67E5\u63A5\u7EBF" _highlight: {fileID: 0} isChecked: 0 + tool_Lines: [] + tool_Screws: [] --- !u!1 &1044951649 GameObject: m_ObjectHideFlags: 0 @@ -5450,7 +5469,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6589deeaefa4a17428d6c3ce0d699c77, type: 3} m_Name: m_EditorClassIdentifier: - measuringCabinet: {fileID: 1723332379} + device_Control: {fileID: 0} --- !u!114 &1577392988 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5948617165317844720, guid: c80ccdb516dbab94083bd57fa1650eda, type: 3} diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs index 0d0c270..692d3c9 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs @@ -107,6 +107,11 @@ public class Device_Cover : Device_Base } } }; + //עṤóջأʾķӡĴ + EventCenter.Instance.AddEventListener(Enum_EventType.TakeOutAndRetrievingTheTools, () => + { + + }); } protected override void OnMDown() { diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_Control_1002.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_Control_1002.cs index 5deeb6f..9872f3e 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_Control_1002.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_Control_1002.cs @@ -33,7 +33,7 @@ public class Device_Control_1002 : Device_Control /// /// ܱײ /// - public BoxCollider dianCollider; + public DeviceTrigger dianTrigger; /// /// ܱװɺ /// @@ -97,13 +97,13 @@ public class Device_Control_1002 : Device_Control } private void SwitchSubProcessStepTriggerID(string arg0) { - if (dianCollider.gameObject.name == arg0) + if (dianTrigger.gameObject.name == arg0) { - dianCollider.GetComponent().SetHighlighted(true); + dianTrigger.GetComponent().SetHighlighted(true); } else { - dianCollider.GetComponent().SetHighlighted(false); + dianTrigger.GetComponent().SetHighlighted(false); } } /// @@ -234,31 +234,31 @@ public class Device_Control_1002 : Device_Control //ǷԴܱIJжװ if (meteringDevice == null) { - dianCollider.enabled = true; + dianTrigger.enabled = true; } else { //̶ܱ˿ˣ߲ if (!meteringDevice.fix_screw_left.isInstall && !meteringDevice.fix_screw_right.isInstall && jieXian_lines.TrueForAll(a => !a.isConnected)) { - dianCollider.enabled = true; + dianTrigger.enabled = true; } else { - dianCollider.enabled = false; + dianTrigger.enabled = false; } } //װܱ - if (dianCollider.enabled) + if (dianTrigger.enabled) { if (Input.GetMouseButtonDown(0)) { if (Physics.Raycast(Camera.main.ScreenPointToRay(Input.mousePosition), out RaycastHit hit)) { - if (hit.collider == dianCollider) + if (hit.collider == dianTrigger) { - if ((GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(dianCollider.gameObject.name, true)) == 0) + if ((GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(dianTrigger.gameObject.name, true)) == 0) { if (meteringDevice == null) { @@ -274,7 +274,7 @@ public class Device_Control_1002 : Device_Control //ˢ´״̬ CheckHasElectricity(); // - ScoreManager.instance.Check(dianCollider.gameObject.name, true); + ScoreManager.instance.Check(dianTrigger.gameObject.name, true); } } else @@ -285,7 +285,7 @@ public class Device_Control_1002 : Device_Control ClearLineScrew(); sundries.gameObject.SetActive(true); // - ScoreManager.instance.Check(dianCollider.gameObject.name, false); + ScoreManager.instance.Check(dianTrigger.gameObject.name, false); } } } diff --git a/Assets/Scripts/CXX/Score/Score_1002.cs b/Assets/Scripts/CXX/Score/Score_1002.cs index 77f1082..b397e1b 100644 --- a/Assets/Scripts/CXX/Score/Score_1002.cs +++ b/Assets/Scripts/CXX/Score/Score_1002.cs @@ -2,8 +2,6 @@ using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; using System.Linq; -using Unity.VisualScripting; -using Unity.VisualScripting.Antlr3.Runtime.Misc; using UnityEngine; public class Score_1002 : ScoreBase diff --git a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs index f4b0aaa..6d18eae 100644 --- a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs +++ b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs @@ -93,7 +93,7 @@ public class Tool_TestPen : Tool_Base if (device_base.deviceType == DeviceType._) { isMoving = true; - backToHandTime = 3f; + backToHandTime = 2f; var tmp = ((Device_Socket)device_base); //λƶ base.hand_out_action?.Invoke(); @@ -106,14 +106,14 @@ public class Tool_TestPen : Tool_Base screem.materials[0].color = isFlicker ? Color.red : Color.white; int index = (triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", true)); isMoving = false; - backToHandTime = 3f; + backToHandTime = 2f; base.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}"); }); } else if (device_base.deviceType == DeviceType._) { var tmp = ((Device_CabinetDoor)device_base); - backToHandTime = 3f; + backToHandTime = 2f; //λƶ base.hand_out_action?.Invoke(); transform.parent = null; @@ -125,7 +125,7 @@ public class Tool_TestPen : Tool_Base screem.materials[0].color = isFlicker ? Color.red : Color.white; int index = (triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", true)); isMoving = false; - backToHandTime = 3f; + backToHandTime = 2f; base.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}"); }); } @@ -143,7 +143,7 @@ public class Tool_TestPen : Tool_Base if (tool_base.toolType == ToolType.˿) { isMoving = true; - backToHandTime = 3f; + backToHandTime = 2f; var tmp = ((Tool_Screw)tool_base); base.hand_out_action?.Invoke(); //λƶ @@ -155,7 +155,7 @@ public class Tool_TestPen : Tool_Base isFlicker = tmp.hasElectricity; screem.materials[0].color = isFlicker ? Color.red : Color.white; isMoving = false; - backToHandTime = 3f; + backToHandTime = 2f; base.CallScoreAction(null, $"{triggerName}+{tool_base.triggerName}"); }); }