From e84e8a46d88f84efe224f611da2bbffd8a3f8694 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Sun, 17 Sep 2023 17:06:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AB=98=E4=BA=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Adam/Scripts/Components/ToolModelClick.cs | 9 +++++++-- .../Assets/Scenes/工具间场景.unity | 10 +++++----- .../Packages/packages-lock.json | 8 ++++---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs index aab03257..5d5f7bd7 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs @@ -1,3 +1,4 @@ +using HighlightingSystem; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -58,14 +59,18 @@ public class ToolModelClick : MonoBehaviour public GameObject line; public GameObject Higth; - private void Awake() + public Highlighter selfHighlighter; + + private void Awake() { if (line != null) line.SetActive(false); - if (Higth!=null) + if (Higth != null) { Higth.SetActive(false); } + selfHighlighter = GetComponent(); + selfHighlighter.ConstantOn(); } private void OnMouseEnter() diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity index dff3dfc2..f4ce1a71 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity @@ -5125,7 +5125,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3} propertyPath: m_LocalPosition.x - value: -5.731 + value: -5.72 objectReference: {fileID: 0} - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3} propertyPath: m_LocalPosition.y @@ -5133,11 +5133,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3} propertyPath: m_LocalPosition.z - value: 4.747 + value: 5.18 objectReference: {fileID: 0} - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3} propertyPath: m_LocalRotation.w - value: 0.535383 + value: -0.0064957133 objectReference: {fileID: 0} - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3} propertyPath: m_LocalRotation.x @@ -5145,7 +5145,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3} propertyPath: m_LocalRotation.y - value: 0.8446094 + value: 0.9999789 objectReference: {fileID: 0} - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3} propertyPath: m_LocalRotation.z @@ -5157,7 +5157,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 180.744 objectReference: {fileID: 0} - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3} propertyPath: m_LocalEulerAnglesHint.z diff --git a/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json b/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json index f98f7bdf..0cbeb9db 100644 --- a/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json +++ b/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json @@ -35,12 +35,12 @@ "source": "builtin", "dependencies": { "com.unity.ide.visualstudio": "2.0.16", - "com.unity.ide.rider": "3.0.16", + "com.unity.ide.rider": "3.0.15", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.1.1", "com.unity.test-framework": "1.1.31", - "com.unity.testtools.codecoverage": "1.2.2" + "com.unity.testtools.codecoverage": "1.0.1" } }, "com.unity.ide.rider": { @@ -92,7 +92,7 @@ "url": "https://packages.unity.cn" }, "com.unity.services.core": { - "version": "1.6.0", + "version": "1.4.2", "depth": 1, "source": "registry", "dependencies": { @@ -121,7 +121,7 @@ "url": "https://packages.unity.cn" }, "com.unity.testtools.codecoverage": { - "version": "1.2.2", + "version": "1.0.1", "depth": 1, "source": "registry", "dependencies": {