From 0fe5010b1ee5ff1f545cd4e466f1fc57abc43bfe Mon Sep 17 00:00:00 2001 From: guyuan9527 <2533167850@qq.com> Date: Mon, 18 Sep 2023 00:05:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=92=B3=E5=BD=A2?= =?UTF-8?q?=E7=94=B5=E6=B5=81=E8=A1=A8UI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefeb/三相_无互感器_无光伏.prefab | 6 ++ .../Prefeb/三相_无互感器_有光伏.prefab | 12 ++++ .../Resources/New/Models/钳形电流表.prefab | 67 +++++++++---------- .../Assets/Scenes/农家乐.unity | 24 +++++-- .../AmmeterManager/MultimeterRecovery.cs | 4 ++ .../Assets/Script/GameManager/GameManager.cs | 1 - .../Interactive/ClampAmmetersInteractive.cs | 4 ++ .../Packages/packages-lock.json | 8 +-- 8 files changed, 82 insertions(+), 44 deletions(-) diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab index fc890790..79ef2b23 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab @@ -880,6 +880,7 @@ MonoBehaviour: name: "\u7528\u7535_AA2" linearMeasure: 0 floats: [] + Fuan: 5 --- !u!114 &1791810255 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2566,6 +2567,7 @@ MonoBehaviour: name: "\u7528\u7535_CA2" linearMeasure: 0 floats: [] + Fuan: 10 --- !u!1 &2848851287756016752 GameObject: m_ObjectHideFlags: 0 @@ -3302,6 +3304,7 @@ MonoBehaviour: name: "\u7528\u7535_BA2" linearMeasure: 0 floats: [] + Fuan: 6 --- !u!114 &1791810253 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3629,6 +3632,7 @@ MonoBehaviour: name: "\u7528\u70B9_BA2" linearMeasure: 0 floats: [] + Fuan: 5 --- !u!114 &1791810254 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4641,6 +4645,7 @@ MonoBehaviour: name: "\u7528\u7535_AA2" linearMeasure: 0 floats: [] + Fuan: 2 --- !u!64 &7534600608170525114 MeshCollider: m_ObjectHideFlags: 0 @@ -4862,6 +4867,7 @@ MonoBehaviour: name: "\u7528\u7535_CA2" linearMeasure: 0 floats: [] + Fuan: 10 --- !u!114 &1791810252 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab index e35f7e60..3816f7ba 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab @@ -2054,6 +2054,7 @@ MonoBehaviour: name: "\u53D1\u7535_AA2" linearMeasure: 0 floats: [] + Fuan: 0 --- !u!1 &1134823686227163403 GameObject: m_ObjectHideFlags: 0 @@ -3918,6 +3919,7 @@ MonoBehaviour: name: "\u7528\u7535_CA2" linearMeasure: 0 floats: [] + Fuan: 10 --- !u!1 &1955535642318241800 GameObject: m_ObjectHideFlags: 0 @@ -4134,6 +4136,7 @@ MonoBehaviour: name: "\u53D1\u7535_BA2" linearMeasure: 0 floats: [] + Fuan: 0 --- !u!1 &2008518560071678347 GameObject: m_ObjectHideFlags: 0 @@ -6395,6 +6398,7 @@ MonoBehaviour: name: "\u7528\u7535_BA2" linearMeasure: 0 floats: [] + Fuan: 10 --- !u!1 &3581289492504554486 GameObject: m_ObjectHideFlags: 0 @@ -8021,6 +8025,7 @@ MonoBehaviour: name: "\u7528\u7535_AA2" linearMeasure: 0 floats: [] + Fuan: 10 --- !u!1 &4704354016240891966 GameObject: m_ObjectHideFlags: 0 @@ -9236,6 +9241,7 @@ MonoBehaviour: name: "\u7528\u7535_AA2" linearMeasure: 0 floats: [] + Fuan: 10 --- !u!1 &5474855114193124813 GameObject: m_ObjectHideFlags: 0 @@ -9421,6 +9427,7 @@ MonoBehaviour: name: "\u53D1\u7535_BA2" linearMeasure: 0 floats: [] + Fuan: 0 --- !u!1 &5665595963479227047 GameObject: m_ObjectHideFlags: 0 @@ -10204,6 +10211,7 @@ MonoBehaviour: name: "\u53D1\u7535_CA2" linearMeasure: 0 floats: [] + Fuan: 0 --- !u!1 &6198007651436644694 GameObject: m_ObjectHideFlags: 0 @@ -12081,6 +12089,7 @@ MonoBehaviour: name: "\u53D1\u7535_AA2" linearMeasure: 0 floats: [] + Fuan: 0 --- !u!1 &7732102390116573455 GameObject: m_ObjectHideFlags: 0 @@ -12380,6 +12389,7 @@ MonoBehaviour: name: "\u7528\u7535_BA2" linearMeasure: 0 floats: [] + Fuan: 10 --- !u!1 &7848068579051495581 GameObject: m_ObjectHideFlags: 0 @@ -12679,6 +12689,7 @@ MonoBehaviour: name: "\u53D1\u7535_CA2" linearMeasure: 0 floats: [] + Fuan: 0 --- !u!1 &7936017779960656771 GameObject: m_ObjectHideFlags: 0 @@ -13914,6 +13925,7 @@ MonoBehaviour: name: "\u7528\u7535_CA2" linearMeasure: 0 floats: [] + Fuan: 10 --- !u!1 &9048269487564603909 GameObject: m_ObjectHideFlags: 0 diff --git a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/钳形电流表.prefab b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/钳形电流表.prefab index 2242a504..861cf9be 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/钳形电流表.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/钳形电流表.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4746120913896119046} - m_Layer: 7 + m_Layer: 0 m_Name: Group17 m_TagString: Untagged m_Icon: {fileID: 0} @@ -41,7 +41,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8908368846004673723} - m_Layer: 7 + m_Layer: 0 m_Name: _U39_8 m_TagString: Untagged m_Icon: {fileID: 0} @@ -74,7 +74,7 @@ GameObject: - component: {fileID: 1510498653468131571} - component: {fileID: 8083333804028303023} - component: {fileID: 8060894827574564018} - m_Layer: 7 + m_Layer: 0 m_Name: Mesh17 m_TagString: Untagged m_Icon: {fileID: 0} @@ -156,7 +156,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8476607629018925953} - m_Layer: 7 + m_Layer: 0 m_Name: _U39_7 m_TagString: Untagged m_Icon: {fileID: 0} @@ -187,7 +187,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5141020518187440115} - m_Layer: 7 + m_Layer: 0 m_Name: GameObject m_TagString: Untagged m_Icon: {fileID: 0} @@ -229,7 +229,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4569857264886921150} - m_Layer: 7 + m_Layer: 0 m_Name: _U39_2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -262,7 +262,7 @@ GameObject: - component: {fileID: 3593119658715885829} - component: {fileID: 8894608374412218228} - component: {fileID: 5902783392504266881} - m_Layer: 7 + m_Layer: 0 m_Name: Mesh14 m_TagString: Untagged m_Icon: {fileID: 0} @@ -345,7 +345,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1412327515338934020} - m_Layer: 7 + m_Layer: 0 m_Name: _U39_5 m_TagString: Untagged m_Icon: {fileID: 0} @@ -378,7 +378,7 @@ GameObject: - component: {fileID: 6863689414392290985} - component: {fileID: 8044578243574067465} - component: {fileID: 2995178057851021996} - m_Layer: 7 + m_Layer: 0 m_Name: Mesh11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -462,7 +462,7 @@ GameObject: - component: {fileID: 7166864065046920756} - component: {fileID: 8803119539513020876} - component: {fileID: 1323511220634850497} - m_Layer: 7 + m_Layer: 0 m_Name: Mesh16 m_TagString: Untagged m_Icon: {fileID: 0} @@ -545,7 +545,7 @@ GameObject: - component: {fileID: 3744470472664545976} - component: {fileID: 4732807883570881695} - component: {fileID: 5267447848939407980} - m_Layer: 7 + m_Layer: 0 m_Name: Mesh13 m_TagString: Untagged m_Icon: {fileID: 0} @@ -628,7 +628,7 @@ GameObject: - component: {fileID: 856354189508394070} - component: {fileID: 6185989547905503852} - component: {fileID: 6727731447967569148} - m_Layer: 7 + m_Layer: 0 m_Name: Mesh18 m_TagString: Untagged m_Icon: {fileID: 0} @@ -710,7 +710,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7565062848938117245} - m_Layer: 7 + m_Layer: 0 m_Name: _U39_6 m_TagString: Untagged m_Icon: {fileID: 0} @@ -741,7 +741,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3001571435648375146} - m_Layer: 7 + m_Layer: 0 m_Name: Group16 m_TagString: Untagged m_Icon: {fileID: 0} @@ -783,7 +783,7 @@ GameObject: - component: {fileID: 7225766980221362327} - component: {fileID: 2642407967348639564} - component: {fileID: 712922406971046451} - m_Layer: 7 + m_Layer: 0 m_Name: "\u65CB\u8F6C" m_TagString: Untagged m_Icon: {fileID: 0} @@ -864,7 +864,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1250851749381091549} - m_Layer: 7 + m_Layer: 0 m_Name: Group14 m_TagString: Untagged m_Icon: {fileID: 0} @@ -896,7 +896,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6176178018017224778} - m_Layer: 7 + m_Layer: 0 m_Name: _U39_1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -927,7 +927,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3558027010293232005} - m_Layer: 7 + m_Layer: 0 m_Name: __ m_TagString: Untagged m_Icon: {fileID: 0} @@ -959,7 +959,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1318875288723816913} - m_Layer: 7 + m_Layer: 0 m_Name: ____1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -994,7 +994,7 @@ GameObject: - component: {fileID: 6158171241742345503} - component: {fileID: 6158171241742345500} - component: {fileID: 1304439518211024554} - m_Layer: 7 + m_Layer: 0 m_Name: "\u94B3\u5F62\u7535\u6D41\u8868" m_TagString: Untagged m_Icon: {fileID: 0} @@ -1121,7 +1121,6 @@ MonoBehaviour: line: {fileID: 0} Higth: {fileID: 0} selfHighlighter: {fileID: 0} - tipPrefab: {fileID: 3004857750428858783, guid: 5cb5fabd80716b64b88f3517ee4bbbc3, type: 3} --- !u!1 &6229784074040811293 GameObject: m_ObjectHideFlags: 0 @@ -1131,7 +1130,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4381305327205380603} - m_Layer: 7 + m_Layer: 0 m_Name: Group13 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1165,7 +1164,7 @@ GameObject: - component: {fileID: 8815301766835690312} - component: {fileID: 640432348759470623} - component: {fileID: 3148247045032298343} - m_Layer: 7 + m_Layer: 0 m_Name: Mesh20 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1248,7 +1247,7 @@ GameObject: - component: {fileID: 8052766349307259215} - component: {fileID: 8077896581930785308} - component: {fileID: 8259873583255218498} - m_Layer: 7 + m_Layer: 0 m_Name: Mesh21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1329,7 +1328,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 798318469011142299} - m_Layer: 7 + m_Layer: 0 m_Name: _U39_3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1362,7 +1361,7 @@ GameObject: - component: {fileID: 2479850269220612731} - component: {fileID: 6680923818199869575} - component: {fileID: 6705236448059270355} - m_Layer: 7 + m_Layer: 0 m_Name: Mesh15 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1445,7 +1444,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7775139103552558503} - m_Layer: 7 + m_Layer: 0 m_Name: Group15 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1477,7 +1476,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8927848855781106664} - m_Layer: 7 + m_Layer: 0 m_Name: ____2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1509,7 +1508,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3045188933783192207} - m_Layer: 7 + m_Layer: 0 m_Name: Group12 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1541,7 +1540,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6714006973245369769} - m_Layer: 7 + m_Layer: 0 m_Name: Group11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1573,7 +1572,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6229437332415234806} - m_Layer: 7 + m_Layer: 0 m_Name: ___1_1_1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1605,7 +1604,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 529358269224803276} - m_Layer: 7 + m_Layer: 0 m_Name: _U39_4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1636,7 +1635,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5544607966390666044} - m_Layer: 7 + m_Layer: 0 m_Name: __1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1670,7 +1669,7 @@ GameObject: - component: {fileID: 2284983111740971690} - component: {fileID: 7298726139806341806} - component: {fileID: 1528828075962168210} - m_Layer: 7 + m_Layer: 0 m_Name: Mesh12 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity index e2c726ee..a6c8aac2 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity @@ -68122,11 +68122,13 @@ MonoBehaviour: backTransform: {fileID: 1205873787} mtTransform: {fileID: 1205873788} NameplateImage: {fileID: 1205873786} + Obj_Nameplate: [] NameplateTextUGUI: - {fileID: 1012121768} - {fileID: 1012121767} - {fileID: 1012121766} - Obj_Nameplate: [] + TextUGUI_NBQ: [] + TextUGUI_HGQ: [] --- !u!1001 &1804378208 PrefabInstance: m_ObjectHideFlags: 0 @@ -71112,7 +71114,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -80786,7 +80788,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2132026558 RectTransform: m_ObjectHideFlags: 0 @@ -80805,8 +80807,8 @@ RectTransform: 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: 746.2654, y: -83.01744} - m_SizeDelta: {x: 390.7727, y: 97.681} + m_AnchoredPosition: {x: 790.21, y: -77.1} + m_SizeDelta: {x: 204.2113, y: 69.4306} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2132026559 MonoBehaviour: @@ -81777,6 +81779,7 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 --- !u!33 &103665586572150244 MeshFilter: m_ObjectHideFlags: 0 @@ -83131,6 +83134,7 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 --- !u!4 &554189251323931875 Transform: m_ObjectHideFlags: 0 @@ -83257,6 +83261,7 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 --- !u!1 &590723110959959151 GameObject: m_ObjectHideFlags: 0 @@ -84160,6 +84165,7 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 --- !u!23 &832619338999474934 MeshRenderer: m_ObjectHideFlags: 0 @@ -84874,6 +84880,7 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 --- !u!4 &984881775158257347 Transform: m_ObjectHideFlags: 0 @@ -84906,6 +84913,7 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 --- !u!33 &986493321439845694 MeshFilter: m_ObjectHideFlags: 0 @@ -85533,6 +85541,7 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 --- !u!4 &1127675622180248741 Transform: m_ObjectHideFlags: 0 @@ -86152,6 +86161,7 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 --- !u!33 &1254889740818102185 MeshFilter: m_ObjectHideFlags: 0 @@ -93718,6 +93728,7 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 --- !u!23 &2498195703580325393 MeshRenderer: m_ObjectHideFlags: 0 @@ -94189,6 +94200,7 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 --- !u!23 &2598389080269526869 MeshRenderer: m_ObjectHideFlags: 0 @@ -94845,6 +94857,7 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 --- !u!1 &2739453376186451831 GameObject: m_ObjectHideFlags: 0 @@ -94974,6 +94987,7 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 --- !u!1 &2768174694713984503 GameObject: m_ObjectHideFlags: 0 diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterRecovery.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterRecovery.cs index 81e7eed2..f8332ecd 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterRecovery.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterRecovery.cs @@ -12,6 +12,8 @@ public class MultimeterRecovery : MonoBehaviour [SerializeField] Transform trans; [SerializeField] Vector3 Redpos; [SerializeField] Vector3 Blackpos; + public float Multimeter; + public string MultimeterV; // Start is called before the first frame update void Start() { @@ -19,6 +21,8 @@ public class MultimeterRecovery : MonoBehaviour btn = GetComponent