From f7c6787acabf94ad04ceaa3ae4e78d6dd69a0911 Mon Sep 17 00:00:00 2001 From: guyuan9527 <2533167850@qq.com> Date: Mon, 18 Sep 2023 08:42:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=92=B3=E5=BD=A2=E7=94=B5?= =?UTF-8?q?=E6=B5=81=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefeb/三相_无互感器_有光伏.prefab | 32 +- .../Prefeb/三相_有互感器_无光伏.prefab | 749 ++++++++++++++++-- .../Resources/New/Models/钳形电流表.prefab | 4 +- .../Assets/Script/GameManager/GameManager.cs | 49 +- .../Interactive/ClampAmmetersInteractive.cs | 6 +- .../Packages/packages-lock.json | 8 +- 6 files changed, 758 insertions(+), 90 deletions(-) diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab index b0e43038..ebc9d64e 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab @@ -1786,13 +1786,14 @@ GameObject: - component: {fileID: 7875158991895200655} - component: {fileID: 7948171202674590707} - component: {fileID: 367880661161749300} + - component: {fileID: 6401969213118122126} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u6709\u5149\u4F0F_\u5E76\u7F51\u8868_\u76D6\u5B50" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &6754469576225502091 Transform: m_ObjectHideFlags: 0 @@ -1872,6 +1873,20 @@ MonoBehaviour: m_EditorClassIdentifier: name: "\u76D6\u5B50" ammeterSon: {fileID: 0} +--- !u!64 &6401969213118122126 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1032632914913527736} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -2998889441421176999, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3} --- !u!1 &1085956406430007308 GameObject: m_ObjectHideFlags: 0 @@ -6055,6 +6070,7 @@ GameObject: - component: {fileID: 8290444955099289595} - component: {fileID: 7214588288924135272} - component: {fileID: 4178374076203963528} + - component: {fileID: 5961635962258652438} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u6709\u5149\u4F0F_\u5E76\u7F51\u8868_\u87BA\u4E1D" m_TagString: Untagged @@ -6141,6 +6157,20 @@ MonoBehaviour: m_EditorClassIdentifier: name: "\u87BA\u4E1D" ammeterSon: {fileID: 367880661161749300} +--- !u!64 &5961635962258652438 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3395799650169961684} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -1097162192350208437, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3} --- !u!1 &3432868336608827256 GameObject: m_ObjectHideFlags: 0 diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab index f1ef12b6..aec261e2 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab @@ -399,6 +399,8 @@ GameObject: - component: {fileID: 3204363607286772227} - component: {fileID: 4018111164424293776} - component: {fileID: 7519103125931224788} + - component: {fileID: 1909105469973038086} + - component: {fileID: 7790923421373493683} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_\u7535\u538B_B\u76F8_\u6B63\u786E" m_TagString: Untagged @@ -417,7 +419,8 @@ Transform: m_LocalPosition: {x: 2.3920794, y: 0.6801221, z: -0.28066945} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7083546871195749123} m_Father: {fileID: 1454913978642549817} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -471,6 +474,39 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &1909105469973038086 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360178313063423931} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -286426659787545787, guid: 3c10a05dd7008c34d837451c78491571, type: 3} +--- !u!114 &7790923421373493683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360178313063423931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3} + m_Name: + m_EditorClassIdentifier: + isInteractive: 0 + g1: {fileID: 6323416925032525140} + name: + linearMeasure: 0 + floats: [] + Fuan: 0 + unit: A --- !u!1 &364140894688988025 GameObject: m_ObjectHideFlags: 0 @@ -1083,7 +1119,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isInteractive: 0 - g1: {fileID: 5510298771229176834} + g1: {fileID: 5972927993521893981} name: "\u7528\u7535_CA3" linearMeasure: 0 floats: [] @@ -1463,6 +1499,8 @@ GameObject: - component: {fileID: 349610352732120075} - component: {fileID: 2711054046199434499} - component: {fileID: 3039435108087699499} + - component: {fileID: 8591528476114874226} + - component: {fileID: 4044936669192548439} m_Layer: 0 m_Name: "\u4E09\u76F8_\u6709\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_C\u76F81\u6B21\u56DE\u8DEF" m_TagString: Untagged @@ -1481,7 +1519,8 @@ Transform: m_LocalPosition: {x: -0.24359131, y: 5.845154, z: 2.3646686} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3714599111458508935} m_Father: {fileID: 1549940567543248317} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1535,6 +1574,70 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &8591528476114874226 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1114591624192017537} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3} + m_Name: + m_EditorClassIdentifier: + isInteractive: 0 + g1: {fileID: 5555240334297640412} + name: + linearMeasure: 0 + floats: [] + Fuan: 0 + unit: A +--- !u!64 &4044936669192548439 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1114591624192017537} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 3063524212658399182, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3} +--- !u!1 &1163469228716114748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4836613799120280394} + m_Layer: 0 + m_Name: Cube (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4836613799120280394 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163469228716114748} + m_LocalRotation: {x: -0.000000029802322, y: -0.000000014901161, z: 0.000000029802322, w: 1} + m_LocalPosition: {x: -0.019042972, y: -0.13409781, z: 0.009201065} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3142905344159105717} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1310403604436195092 GameObject: m_ObjectHideFlags: 0 @@ -2464,7 +2567,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isInteractive: 0 - g1: {fileID: 5510298771229176834} + g1: {fileID: 1777020875024972615} name: "\u7528\u7535_BA3" linearMeasure: 0 floats: [] @@ -3040,6 +3143,8 @@ GameObject: - component: {fileID: 7543022582600294573} - component: {fileID: 5272144715426657235} - component: {fileID: 7137907560168321248} + - component: {fileID: 8980723536433637578} + - component: {fileID: 6156807888132215657} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_\u7535\u6D41_\u63A5\u7EBF\u76D2\u81F3\u4E92\u611F\u5668_A\u76F8_\u51FA_\u6B63\u786E" m_TagString: Untagged @@ -3059,7 +3164,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 9163812536152159309} + - {fileID: 6657407069582823892} m_Father: {fileID: 1454913978642549817} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3126,11 +3231,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isInteractive: 0 - g1: {fileID: 7958380611471871807} + g1: {fileID: 5495471460900989437} name: "\u7528\u7535_AA3" linearMeasure: 0 floats: [] - Fuan: 0 + Fuan: 2 unit: A --- !u!64 &7137907560168321248 MeshCollider: @@ -3146,6 +3251,39 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 5699600915691267413, guid: 3c10a05dd7008c34d837451c78491571, type: 3} +--- !u!64 &8980723536433637578 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2571069490088923507} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 5699600915691267413, guid: 3c10a05dd7008c34d837451c78491571, type: 3} +--- !u!114 &6156807888132215657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2571069490088923507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3} + m_Name: + m_EditorClassIdentifier: + isInteractive: 0 + g1: {fileID: 0} + name: + linearMeasure: 0 + floats: [] + Fuan: 0 + unit: --- !u!1 &2571977261248522050 GameObject: m_ObjectHideFlags: 0 @@ -3489,6 +3627,8 @@ GameObject: - component: {fileID: 5628285356639401483} - component: {fileID: 1466767362190688725} - component: {fileID: 6395429860798199179} + - component: {fileID: 6724356607303599370} + - component: {fileID: 3192312147718851319} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_\u7535\u538B_A\u76F8_\u6B63\u786E" m_TagString: Untagged @@ -3507,7 +3647,8 @@ Transform: m_LocalPosition: {x: 2.3920794, y: 0.67994374, z: -0.31451344} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1736251263084467383} m_Father: {fileID: 1454913978642549817} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3561,6 +3702,39 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &6724356607303599370 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2834405563394974423} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4314733556764735260, guid: 3c10a05dd7008c34d837451c78491571, type: 3} +--- !u!114 &3192312147718851319 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2834405563394974423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3} + m_Name: + m_EditorClassIdentifier: + isInteractive: 0 + g1: {fileID: 5325271450725069806} + name: + linearMeasure: 0 + floats: [] + Fuan: 2 + unit: A --- !u!1 &2850252329512971376 GameObject: m_ObjectHideFlags: 0 @@ -4791,6 +4965,8 @@ GameObject: - component: {fileID: 9142664756398056412} - component: {fileID: 2939987975656736876} - component: {fileID: 1483003281333461482} + - component: {fileID: 2857846783766676712} + - component: {fileID: 3750822724782708961} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_\u7535\u6D41_\u63A5\u7EBF\u76D2\u81F3\u4E92\u611F\u5668_A\u76F8_\u8FDB_\u6B63\u786E" m_TagString: Untagged @@ -4810,7 +4986,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6193825997167179110} + - {fileID: 4099021113884915599} m_Father: {fileID: 1454913978642549817} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4877,11 +5053,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isInteractive: 0 - g1: {fileID: 5510298771229176834} + g1: {fileID: 6576278650721410473} name: "\u7528\u7535_AA3" linearMeasure: 0 floats: [] - Fuan: 0 + Fuan: 2 unit: A --- !u!64 &1483003281333461482 MeshCollider: @@ -4897,6 +5073,39 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300232903881392264, guid: 3c10a05dd7008c34d837451c78491571, type: 3} +--- !u!64 &2857846783766676712 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4186038795663082382} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300232903881392264, guid: 3c10a05dd7008c34d837451c78491571, type: 3} +--- !u!114 &3750822724782708961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4186038795663082382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3} + m_Name: + m_EditorClassIdentifier: + isInteractive: 0 + g1: {fileID: 0} + name: + linearMeasure: 0 + floats: [] + Fuan: 0 + unit: --- !u!1 &4239833130606502007 GameObject: m_ObjectHideFlags: 0 @@ -5245,7 +5454,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isInteractive: 0 - g1: {fileID: 5510298771229176834} + g1: {fileID: 4663950415603396569} name: "\u7528\u7535_BA3" linearMeasure: 0 floats: [] @@ -5556,6 +5765,8 @@ GameObject: - component: {fileID: 2934023190944179320} - component: {fileID: 5457848676225233657} - component: {fileID: 8591486848500968878} + - component: {fileID: 31991848138360238} + - component: {fileID: 5270113766491381768} m_Layer: 0 m_Name: "\u4E09\u76F8_\u6709\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_B\u76F81\u6B21\u56DE\u8DEF" m_TagString: Untagged @@ -5574,7 +5785,8 @@ Transform: m_LocalPosition: {x: -0.24359131, y: 5.849182, z: 2.3520238} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1550595196841573540} m_Father: {fileID: 1549940567543248317} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5628,6 +5840,39 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &31991848138360238 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4907663247037485056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3} + m_Name: + m_EditorClassIdentifier: + isInteractive: 0 + g1: {fileID: 6353080852345845249} + name: + linearMeasure: 0 + floats: [] + Fuan: 0 + unit: A +--- !u!64 &5270113766491381768 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4907663247037485056} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 3563966791565219368, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3} --- !u!1 &5072761559882161538 GameObject: m_ObjectHideFlags: 0 @@ -5839,6 +6084,8 @@ GameObject: - component: {fileID: 3142905344159105717} - component: {fileID: 7644442142851228787} - component: {fileID: 2805721517176126987} + - component: {fileID: 116028437943061198} + - component: {fileID: 6877210800375098176} m_Layer: 0 m_Name: "\u4E09\u76F8_\u6709\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_A\u76F81\u6B21\u56DE\u8DEF" m_TagString: Untagged @@ -5857,7 +6104,8 @@ Transform: m_LocalPosition: {x: -0.24359131, y: 5.857483, z: 2.3415668} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4836613799120280394} m_Father: {fileID: 1549940567543248317} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5911,6 +6159,39 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &116028437943061198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5222666162961430171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3} + m_Name: + m_EditorClassIdentifier: + isInteractive: 0 + g1: {fileID: 1163469228716114748} + name: + linearMeasure: 0 + floats: [] + Fuan: 0 + unit: A +--- !u!64 &6877210800375098176 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5222666162961430171} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 6377449099579235548, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3} --- !u!1 &5228224078928474699 GameObject: m_ObjectHideFlags: 0 @@ -5994,6 +6275,103 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5325271450725069806 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1736251263084467383} + - component: {fileID: 5782574578809634139} + - component: {fileID: 8241347433878772611} + - component: {fileID: 3809214548591764374} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1736251263084467383 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5325271450725069806} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.00727, y: -0.15304, z: 0} + m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 5628285356639401483} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5782574578809634139 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5325271450725069806} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8241347433878772611 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5325271450725069806} + 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: 10303, guid: 0000000000000000f000000000000000, type: 0} + 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!65 &3809214548591764374 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5325271450725069806} + 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!1 &5478729078447363518 GameObject: m_ObjectHideFlags: 0 @@ -6077,7 +6455,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &5510298771229176834 +--- !u!1 &5495471460900989437 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6085,27 +6463,124 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6193825997167179110} + - component: {fileID: 6657407069582823892} + - component: {fileID: 4686240819361928687} + - component: {fileID: 595082832300420675} + - component: {fileID: 6396672608064410242} m_Layer: 0 - m_Name: "\u7528\u7535_AA3" + m_Name: Cube (2) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6193825997167179110 +--- !u!4 &6657407069582823892 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5510298771229176834} + m_GameObject: {fileID: 5495471460900989437} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.233, y: 0.0511, z: -0.028} - m_LocalScale: {x: 0.004999999, y: 0.005, z: 0.004999999} + m_LocalPosition: {x: -0.2397971, y: 0.0052837087, z: -0.027822211} + m_LocalScale: {x: 0.0049999994, y: 0.005, z: 0.0049999994} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 8437581056151983874} + m_Father: {fileID: 8177684096262903697} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4686240819361928687 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5495471460900989437} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &595082832300420675 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5495471460900989437} + 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: 10303, guid: 0000000000000000f000000000000000, type: 0} + 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!65 &6396672608064410242 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5495471460900989437} + 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!1 &5555240334297640412 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3714599111458508935} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3714599111458508935 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5555240334297640412} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.1475, y: -0.1551, z: 0.0115} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 349610352732120075} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5601786248135789498 @@ -6775,6 +7250,68 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6323416925032525140 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7083546871195749123} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7083546871195749123 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6323416925032525140} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.12533, y: -0.11951, z: 0.00973} + m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3204363607286772227} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6353080852345845249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1550595196841573540} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1550595196841573540 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6353080852345845249} + m_LocalRotation: {x: -0.000000029802322, y: -0.000000014901161, z: 0.000000029802322, w: 1} + m_LocalPosition: {x: -0.07803345, y: -0.10945487, z: 0.0061035156} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 2934023190944179320} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6511082357181118172 GameObject: m_ObjectHideFlags: 0 @@ -6858,6 +7395,103 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6576278650721410473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4099021113884915599} + - component: {fileID: 1008511097488504380} + - component: {fileID: 6392824759122556777} + - component: {fileID: 1462848302560442084} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4099021113884915599 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6576278650721410473} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.23339735, y: 0.0014952376, z: -0.028147891} + m_LocalScale: {x: 0.0049999994, y: 0.005, z: 0.0049999994} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8437581056151983874} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1008511097488504380 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6576278650721410473} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6392824759122556777 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6576278650721410473} + 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: 10303, guid: 0000000000000000f000000000000000, type: 0} + 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!65 &1462848302560442084 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6576278650721410473} + 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!1 &6673438718697515059 GameObject: m_ObjectHideFlags: 0 @@ -7119,6 +7753,7 @@ GameObject: - component: {fileID: 8478896421601465729} - component: {fileID: 3668159798548186940} - component: {fileID: 8250888995601658847} + - component: {fileID: 2047799600482650311} m_Layer: 0 m_Name: "\u4E09\u76F8_\u7535\u7BB1_\u6709\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_\u8868\u8BA1_\u87BA\u4E1D" m_TagString: Untagged @@ -7198,13 +7833,27 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6815735151846439504} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} m_Name: m_EditorClassIdentifier: name: "\u87BA\u4E1D" ammeterSon: {fileID: 9070024887499795132} +--- !u!64 &2047799600482650311 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815735151846439504} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 1009856069859996744, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3} --- !u!1 &6925641176516033899 GameObject: m_ObjectHideFlags: 0 @@ -7901,37 +8550,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &7958380611471871807 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9163812536152159309} - m_Layer: 0 - m_Name: "\u7528\u7535_AA3" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &9163812536152159309 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7958380611471871807} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.23939972, y: 0.054888483, z: -0.030174464} - m_LocalScale: {x: 0.0049999985, y: 0.005, z: 0.0049999985} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 8177684096262903697} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8009383296320980012 GameObject: m_ObjectHideFlags: 0 @@ -9296,7 +9914,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isInteractive: 0 - g1: {fileID: 5510298771229176834} + g1: {fileID: 1084194590559137801} name: "\u7528\u7535_CA3" linearMeasure: 0 floats: [] @@ -9328,6 +9946,7 @@ GameObject: - component: {fileID: 1026370706737484030} - component: {fileID: 2884551554955159124} - component: {fileID: 9070024887499795132} + - component: {fileID: 932184075840410917} m_Layer: 0 m_Name: "\u8BA1\u91CF\u8868_\u7535\u538B\u6D4B_\u76D6\u5B50_P005" m_TagString: Untagged @@ -9407,13 +10026,27 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9086354361704048330} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} m_Name: m_EditorClassIdentifier: name: "\u76D6\u5B50" ammeterSon: {fileID: 0} +--- !u!64 &932184075840410917 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9086354361704048330} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -584779548939971659, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3} --- !u!1 &9143895427873660446 GameObject: m_ObjectHideFlags: 0 @@ -9875,6 +10508,10 @@ PrefabInstance: propertyPath: VV value: V objectReference: {fileID: 0} + - target: {fileID: 7641420671573522198, guid: da6ea3cb628035c4c9834bb12ae3761b, type: 3} + propertyPath: isBlack + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7726381461732452939, guid: da6ea3cb628035c4c9834bb12ae3761b, type: 3} propertyPath: VV value: V diff --git a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/钳形电流表.prefab b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/钳形电流表.prefab index 861cf9be..9cdaf24c 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/钳形电流表.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/钳形电流表.prefab @@ -1028,8 +1028,8 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.1543576, y: 0.03646712, z: 0.27555346} - m_Center: {x: -0.049798988, y: -0.005653805, z: -0.13292134} + m_Size: {x: 0.09950634, y: 0.03646712, z: 0.26431698} + m_Center: {x: -0.047818907, y: -0.005653806, z: -0.1273031} --- !u!114 &6158171241742345500 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs index 99d192d1..52ecb94c 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs @@ -91,29 +91,29 @@ public class GameManager : MonoBehaviour private void Update() { - //switch (interactiveEnum) - //{ - // case Interactive.none: - // for (int i = 0; i < interactive.Count; i++) - // { - // interactive[i].transform.GetComponent().ý = true; - // } - // break; - // case Interactive.YanDian: - // for (int i = 0; i < interactive.Count; i++) - // { - // interactive[i].transform.GetComponent().ý = false; - // } - // break; - // case Interactive.QianXing: - // for (int i = 0; i < interactive.Count; i++) - // { - // interactive[i].transform.GetComponent().ý = true; - // } - // break; - // default: - // break; - //} + switch (interactiveEnum) + { + //case Interactive.none: + // for (int i = 0; i < interactive.Count; i++) + // { + // interactive[i].transform.GetComponent().ý = true; + // } + // break; + case Interactive.YanDian: + for (int i = 0; i < interactive.Count; i++) + { + interactive[i].transform.GetComponent().ý = false; + } + break; + case Interactive.QianXing: + for (int i = 0; i < interactive.Count; i++) + { + interactive[i].transform.GetComponent().ý = true; + } + break; + default: + break; + } if (Input.GetKeyDown(KeyCode.K)) { ToolsShow(QianXing); @@ -124,6 +124,7 @@ public class GameManager : MonoBehaviour /// public void ToolsShow(GameObject tools) { + Camera.main.fieldOfView = 60; FirstPersonController.enabled = false; if (temp != null) { @@ -149,7 +150,7 @@ public class GameManager : MonoBehaviour break; case "ǯε": interactiveEnum = Interactive.QianXing; - temp.transform.localRotation = Quaternion.Euler(new Vector3(90, 180, 0)); + temp.transform.localEulerAngles = new Vector3(90, 180, 0); QianStopValve.trans = temp.transform.Find("ת"); WanStopValve.gameObject.SetActive(false); QianStopValve.gameObject.SetActive(true); diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs index 2f51a259..af60dd98 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs @@ -32,9 +32,9 @@ public class ClampAmmetersInteractive : MonoBehaviour { GameManager.ins.DianFuIm.gameObject.SetActive(true); GameManager.ins.temp.transform.parent = g1.transform; - GameManager.ins.temp.transform.DOLocalRotate(new Vector3(40.35f,186.12f,-142.8f), 0.25f); - GameManager.ins.temp.transform.DOScale(new Vector3(30,30,30), 0.25f); - GameManager.ins.temp.transform.DOLocalMove(new Vector3(0.6f,-5.43f,-7.09f), 0.25f); + GameManager.ins.temp.transform.DOLocalRotate(new Vector3(47.52f,0,53.88f), 0.25f); + GameManager.ins.temp.transform.DOScale(new Vector3(50,50,50), 0.25f); + GameManager.ins.temp.transform.DOLocalMove(new Vector3(1.42f,-6.02f,8.35f), 0.25f); GameManager.ins.DianFuTex.text = Fuan +" "+ unit; for (int i = 0; i < floats.Count; i++) { diff --git a/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json b/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json index 0cbeb9db..f98f7bdf 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.15", + "com.unity.ide.rider": "3.0.16", "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.0.1" + "com.unity.testtools.codecoverage": "1.2.2" } }, "com.unity.ide.rider": { @@ -92,7 +92,7 @@ "url": "https://packages.unity.cn" }, "com.unity.services.core": { - "version": "1.4.2", + "version": "1.6.0", "depth": 1, "source": "registry", "dependencies": { @@ -121,7 +121,7 @@ "url": "https://packages.unity.cn" }, "com.unity.testtools.codecoverage": { - "version": "1.0.1", + "version": "1.2.2", "depth": 1, "source": "registry", "dependencies": {