From dce69c296deb2afb2d008cc62337a34e7ea76685 Mon Sep 17 00:00:00 2001 From: guyuan9527 <2533167850@qq.com> Date: Sun, 17 Sep 2023 20:30:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefeb/三相_无互感器_无光伏.prefab | 4 +- .../Prefeb/三相_有互感器_无光伏.prefab | 60 +++ .../Prefeb/单项_无互感器_无光伏.prefab | 17 +- .../Prefeb/单项_无互感器_有光伏.prefab | 393 ++++++++++++++++++ .../Resources/New/Models/相位伏安表.prefab | 4 +- .../Assets/Scenes/农家乐.unity | 378 +++++++++++++++++ .../Assets/Script/AmpereMeter/AmpereMeter.cs | 21 +- .../Script/AmpereMeter/VoltAmpereMeter.cs | 1 + .../Assets/Script/FractionManager/Fraction.cs | 15 +- .../Script/FractionManager/FractionManager.cs | 15 +- .../Assets/Script/GameManager/GameManager.cs | 5 - .../Script/Interactive/BoxPengZhuang.cs | 2 + .../ProjectSettings/TagManager.asset | 1 + 13 files changed, 889 insertions(+), 27 deletions(-) diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab index 41606ad2..f26e2e48 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab @@ -3490,7 +3490,7 @@ GameObject: - component: {fileID: 1749495299} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_B\u76F8\u7535\u6D411" - m_TagString: Untagged + m_TagString: FuAn m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -5761,7 +5761,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1934297243589407246, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3} propertyPath: m_LocalPosition.y diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab index 0e354cd9..d694c3cc 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab @@ -2568,6 +2568,8 @@ GameObject: - component: {fileID: 5585873155285301365} - component: {fileID: 482156600636930221} - component: {fileID: 1520886377568347211} + - component: {fileID: 4206987047023075760} + - component: {fileID: 5493443039770701883} m_Layer: 0 m_Name: "\u4E09\u76F8_\u7535\u7BB1_\u6709\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_\u8868\u8BA1_\u5C01\u5370" m_TagString: Untagged @@ -2640,6 +2642,34 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &4206987047023075760 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2129227902162038298} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -7611319514675676910, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3} +--- !u!114 &5493443039770701883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2129227902162038298} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} + m_Name: + m_EditorClassIdentifier: + name: "\u5C01\u5370" + ammeterSon: {fileID: 8250888995601658847} --- !u!1 &2182817448382862060 GameObject: m_ObjectHideFlags: 0 @@ -6949,6 +6979,7 @@ GameObject: - component: {fileID: 6846929195567778051} - component: {fileID: 8478896421601465729} - component: {fileID: 3668159798548186940} + - component: {fileID: 8250888995601658847} m_Layer: 0 m_Name: "\u4E09\u76F8_\u7535\u7BB1_\u6709\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_\u8868\u8BA1_\u87BA\u4E1D" m_TagString: Untagged @@ -7021,6 +7052,20 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &8250888995601658847 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815735151846439504} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} + m_Name: + m_EditorClassIdentifier: + name: "\u87BA\u4E1D" + ammeterSon: {fileID: 9070024887499795132} --- !u!1 &6925641176516033899 GameObject: m_ObjectHideFlags: 0 @@ -9106,6 +9151,7 @@ GameObject: - component: {fileID: 4034256579046904270} - component: {fileID: 1026370706737484030} - component: {fileID: 2884551554955159124} + - component: {fileID: 9070024887499795132} m_Layer: 0 m_Name: "\u8BA1\u91CF\u8868_\u7535\u538B\u6D4B_\u76D6\u5B50_P005" m_TagString: Untagged @@ -9178,6 +9224,20 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &9070024887499795132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9086354361704048330} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} + m_Name: + m_EditorClassIdentifier: + name: "\u76D6\u5B50" + ammeterSon: {fileID: 0} --- !u!1 &9143895427873660446 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 f382587c..6934fd56 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab @@ -1024,13 +1024,14 @@ GameObject: - component: {fileID: 26838130385129358} - component: {fileID: 4539351873064707178} - component: {fileID: 8488636788146484830} + - component: {fileID: 6523113618066786090} m_Layer: 0 m_Name: polySurface53 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &26838130385129358 Transform: m_ObjectHideFlags: 0 @@ -1096,6 +1097,20 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &6523113618066786090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4536213603823072826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} + m_Name: + m_EditorClassIdentifier: + name: "\u76D6\u5B50" + ammeterSon: {fileID: 0} --- !u!1 &4740725675525284815 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 9bbaf8de..4fd969b3 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab @@ -1,5 +1,67 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &4737607472722466619 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3526213122720024242} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3526213122720024242 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4737607472722466619} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.0254, y: 0.1235, z: 0} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8707336716010502868} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5398975006695019102 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8978261383813541305} + 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 &8978261383813541305 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5398975006695019102} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.03610229, y: -0.017140627, z: -0.000015247613} + m_LocalScale: {x: 0.009999999, y: 0.01, z: 0.009999999} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 2884146482280011232} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6770620356190950818 GameObject: m_ObjectHideFlags: 0 @@ -120,6 +182,14 @@ PrefabInstance: propertyPath: m_BlendShapeWeights.Array.size value: 1 objectReference: {fileID: 0} + - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3} + propertyPath: m_LocalPosition.y + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3} + propertyPath: m_LocalPosition.z + value: 328.297 + objectReference: {fileID: 0} - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90 @@ -205,6 +275,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8778434969602832201} m_Modifications: + - target: {fileID: -9021046742488011362, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} propertyPath: m_RootOrder value: 0 @@ -249,10 +323,30 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8468581881331942519, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -2335845201703978257, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 99922233302058237, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} propertyPath: m_Name value: "\u5355\u9879_\u65E0\u4E92\u611F\u5668_\u6709\u5149\u4F0F_\u7535\u7BB1" objectReference: {fileID: 0} + - target: {fileID: 3943071812045326304, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6219781433053871467, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6318823686192672528, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} propertyPath: m_DirtyAABB value: 0 @@ -281,10 +375,309 @@ PrefabInstance: propertyPath: m_AABB.m_Extent.z value: 0.056115218 objectReference: {fileID: 0} + - target: {fileID: 7430668689091171852, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} +--- !u!1 &1239480889199565793 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8468581881331942519, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + m_PrefabInstance: {fileID: 1966393981994950760} + m_PrefabAsset: {fileID: 0} +--- !u!64 &704764672211568758 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1239480889199565793} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -6775655358706108209, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} +--- !u!114 &5346731935379730579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1239480889199565793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} + m_Name: + m_EditorClassIdentifier: + name: "\u76D6\u5B50" + ammeterSon: {fileID: 0} +--- !u!1 &1643495785429700410 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8249232922227904686, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + m_PrefabInstance: {fileID: 1966393981994950760} + m_PrefabAsset: {fileID: 0} +--- !u!64 &3053478329168771784 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1643495785429700410} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 3699944247514194168, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} +--- !u!114 &99382509721698302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1643495785429700410} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} + m_Name: + m_EditorClassIdentifier: + name: "\u87BA\u4E1D" + ammeterSon: {fileID: 5346731935379730579} +--- !u!1 &1833639503502020946 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 159998189017690426, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + m_PrefabInstance: {fileID: 1966393981994950760} + m_PrefabAsset: {fileID: 0} +--- !u!64 &7973128963756307185 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1833639503502020946} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -8376435407023986718, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} +--- !u!114 &1122033410550832767 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1833639503502020946} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3} + m_Name: + m_EditorClassIdentifier: + isInteractive: 0 + g1: {fileID: 5398975006695019102} + name: --- !u!4 &2071851086393313155 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} m_PrefabInstance: {fileID: 1966393981994950760} m_PrefabAsset: {fileID: 0} +--- !u!4 &2884146482280011232 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3696473539125736840, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + m_PrefabInstance: {fileID: 1966393981994950760} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5556055090688204035 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6219781433053871467, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + m_PrefabInstance: {fileID: 1966393981994950760} + m_PrefabAsset: {fileID: 0} +--- !u!64 &9140387827133255827 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5556055090688204035} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 711298320292806674, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} +--- !u!114 &931463958385218829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5556055090688204035} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} + m_Name: + m_EditorClassIdentifier: + name: "\u76D6\u5B50" + ammeterSon: {fileID: 0} +--- !u!1 &5934706453412920569 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5266494653353647249, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + m_PrefabInstance: {fileID: 1966393981994950760} + m_PrefabAsset: {fileID: 0} +--- !u!64 &6329292238073338591 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5934706453412920569} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 5258816659638213554, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} +--- !u!114 &9011777028579056402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5934706453412920569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} + m_Name: + m_EditorClassIdentifier: + name: "\u5C01\u5370" + ammeterSon: {fileID: 5025331774182887892} +--- !u!1 &5952964257958112552 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -3902609203009237696, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + m_PrefabInstance: {fileID: 1966393981994950760} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4028878535299181004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5952964257958112552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3} + m_Name: + m_EditorClassIdentifier: + isInteractive: 0 + g1: {fileID: 4737607472722466619} + name: +--- !u!1 &7014173801403137452 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8799278309008104900, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + m_PrefabInstance: {fileID: 1966393981994950760} + m_PrefabAsset: {fileID: 0} +--- !u!64 &4136185624148187689 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7014173801403137452} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 5425504016342940380, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} +--- !u!114 &5025331774182887892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7014173801403137452} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} + m_Name: + m_EditorClassIdentifier: + name: "\u87BA\u4E1D" + ammeterSon: {fileID: 931463958385218829} +--- !u!1 &7387676191130023632 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -158676354786912584, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + m_PrefabInstance: {fileID: 1966393981994950760} + m_PrefabAsset: {fileID: 0} +--- !u!64 &8887339058093458921 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7387676191130023632} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 5065391621373678586, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} +--- !u!114 &2829421229753288734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7387676191130023632} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} + m_Name: + m_EditorClassIdentifier: + name: + ammeterSon: {fileID: 0} +--- !u!1 &8210758798105662891 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7690021121139553731, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + m_PrefabInstance: {fileID: 1966393981994950760} + m_PrefabAsset: {fileID: 0} +--- !u!64 &5566995073895026437 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8210758798105662891} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 6225934987614527772, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} +--- !u!114 &8770281538905765949 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8210758798105662891} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3} + m_Name: + m_EditorClassIdentifier: + name: "\u5C01\u5370" + ammeterSon: {fileID: 99382509721698302} +--- !u!4 &8707336716010502868 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7177792726807861948, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} + m_PrefabInstance: {fileID: 1966393981994950760} + m_PrefabAsset: {fileID: 0} diff --git a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/相位伏安表.prefab b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/相位伏安表.prefab index 94fe1162..74917da2 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/相位伏安表.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/相位伏安表.prefab @@ -194,7 +194,7 @@ GameObject: - component: {fileID: 5368955186713773247} m_Layer: 7 m_Name: "\u76F8\u4F4D\u4F0F\u5B89\u8868" - m_TagString: FuAn + m_TagString: FuAnBiao m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -317,3 +317,5 @@ MonoBehaviour: onExit: m_PersistentCalls: m_Calls: [] + line: {fileID: 0} + Higth: {fileID: 0} diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity index 744e151d..149b9a2b 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity @@ -12934,6 +12934,53 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 383671817} m_Mesh: {fileID: 5453168165145652545, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3} +--- !u!1 &383966896 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 383966898} + - component: {fileID: 383966897} + m_Layer: 0 + m_Name: FractionManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &383966897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 383966896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3811b0893edc7c841a6ce93262914e87, type: 3} + m_Name: + m_EditorClassIdentifier: + fractions: [] + Totalscore: 0 + Btn: {fileID: 0} +--- !u!4 &383966898 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 383966896} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 109.83067, y: 1.4664354, z: 322.04004} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 28 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &388288287 GameObject: m_ObjectHideFlags: 0 @@ -14709,6 +14756,7 @@ GameObject: - component: {fileID: 423830456} - component: {fileID: 423830458} - component: {fileID: 423830457} + - component: {fileID: 423830459} m_Layer: 0 m_Name: Cube m_TagString: Untagged @@ -14746,6 +14794,7 @@ MonoBehaviour: g1: {fileID: 2111405329} name: "\u5DE5\u4F5C\u8BC1" dialogue: "\u4F60\u597D\uFF0C\u6211\u4EEC\u662Fxx\u4F9B\u7535\u516C\u53F8\u5DE5\u4F5C\u4EBA\u5458\uFF0C\u8FD9\u662F\u6211\u7684\u5DE5\u4F5C\u8BC1\uFF0C\u73B0\u5728\u6211\u4EEC\u8981\u5BF9\u8D35\u6237\u8FDB\u884C\u73B0\u573A\u68C0\u67E5\u3002" + fraction: {fileID: 0} --- !u!65 &423830458 BoxCollider: m_ObjectHideFlags: 0 @@ -14759,6 +14808,26 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1.1492687, y: 0.5887949, z: 1.532468} m_Center: {x: 0.07463557, y: -0.20560117, z: 0.24949467} +--- !u!114 &423830459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 423830455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ecf0517a4c6b1754da4221d7dc7f81d0, type: 3} + m_Name: + m_EditorClassIdentifier: + fractions: [] + Totalscore: 0 + Btn: {fileID: 0} + id: 0 + CompletedorNot: 0 + Erroritem: 0 + scorercontinuer: 0 + name: --- !u!4 &426491808 stripped Transform: m_CorrespondingSourceObject: {fileID: 8248288153746938395, guid: 07ac2788930297046a9a9aaff8c97b2c, type: 3} @@ -16036,6 +16105,7 @@ MonoBehaviour: CompletedorNot: 0 Erroritem: 0 scorercontinuer: 0 + name: --- !u!114 &451662891 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16055,6 +16125,7 @@ MonoBehaviour: CompletedorNot: 0 Erroritem: 0 scorercontinuer: 0 + name: --- !u!1001 &458864385 PrefabInstance: m_ObjectHideFlags: 0 @@ -26439,6 +26510,106 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 695748606} m_Mesh: {fileID: -4756368310934348443, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3} +--- !u!1 &695784799 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 695784803} + - component: {fileID: 695784802} + - component: {fileID: 695784801} + - component: {fileID: 695784800} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &695784800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 695784799} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &695784801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 695784799} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &695784802 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 695784799} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &695784803 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 695784799} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 27 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &696055430 GameObject: m_ObjectHideFlags: 0 @@ -29180,6 +29351,7 @@ MonoBehaviour: CompletedorNot: 0 Erroritem: 0 scorercontinuer: 0 + name: --- !u!4 &766006828 stripped Transform: m_CorrespondingSourceObject: {fileID: 946436029104906300, guid: 568d8d8f18356ad4caa6547c08ceaab3, type: 3} @@ -36252,6 +36424,31 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 933577329} m_Mesh: {fileID: 5893259174252141057, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3} +--- !u!1 &934802418 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 786925773, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3} + m_PrefabInstance: {fileID: 8918807177048577653} + m_PrefabAsset: {fileID: 0} +--- !u!114 &934802422 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 934802418} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ecf0517a4c6b1754da4221d7dc7f81d0, type: 3} + m_Name: + m_EditorClassIdentifier: + fractions: [] + Totalscore: 0 + Btn: {fileID: 0} + id: 0 + CompletedorNot: 0 + Erroritem: 0 + scorercontinuer: 2.5 + name: "\u9A8C\u7535\u7B14(Clone)" --- !u!1 &939356159 GameObject: m_ObjectHideFlags: 0 @@ -50116,6 +50313,75 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 77b1d460d8db5724689f54dfac596fd9, type: 3} m_PrefabInstance: {fileID: 4904017274524683914} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1324113580 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7809819629956257518, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_Name + value: SceneManager + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257518, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257520, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: url + value: http://111.229.30.246:10015/ + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_RootOrder + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_LocalPosition.y + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257523, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: InstructionMessage + value: + objectReference: {fileID: 695784799} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} --- !u!1 &1329373387 GameObject: m_ObjectHideFlags: 0 @@ -55627,6 +55893,31 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1474759858} m_Mesh: {fileID: -6602562783221240905, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3} +--- !u!1 &1477057142 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1114701755, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3} + m_PrefabInstance: {fileID: 8918807177048577653} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1477057146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1477057142} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ecf0517a4c6b1754da4221d7dc7f81d0, type: 3} + m_Name: + m_EditorClassIdentifier: + fractions: [] + Totalscore: 0 + Btn: {fileID: 0} + id: 0 + CompletedorNot: 0 + Erroritem: 0 + scorercontinuer: 2.5 + name: "\u9A8C\u7535\u7B14(Clone)" --- !u!1 &1477332144 GameObject: m_ObjectHideFlags: 0 @@ -66825,6 +67116,7 @@ MonoBehaviour: CompletedorNot: 0 Erroritem: 0 scorercontinuer: 0 + name: --- !u!1 &1775938654 GameObject: m_ObjectHideFlags: 0 @@ -67367,6 +67659,88 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1790762391} m_Mesh: {fileID: 9139875253702286471, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3} +--- !u!1001 &1791810246 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + propertyPath: m_RootOrder + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + propertyPath: m_LocalPosition.x + value: 110.747 + objectReference: {fileID: 0} + - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + propertyPath: m_LocalPosition.y + value: 1.515 + objectReference: {fileID: 0} + - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + propertyPath: m_LocalPosition.z + value: 322.1 + objectReference: {fileID: 0} + - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8814916775944311458, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + propertyPath: m_Name + value: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} +--- !u!1 &1791810247 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4728026782583967234, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + m_PrefabInstance: {fileID: 1791810246} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1791810248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1791810247} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ecf0517a4c6b1754da4221d7dc7f81d0, type: 3} + m_Name: + m_EditorClassIdentifier: + fractions: [] + Totalscore: 0 + Btn: {fileID: 0} + id: 0 + CompletedorNot: 0 + Erroritem: 0 + scorercontinuer: 0 + name: --- !u!1 &1794701649 GameObject: m_ObjectHideFlags: 0 @@ -140637,6 +141011,10 @@ PrefabInstance: propertyPath: m_Name value: "\u9A8C\u7535\u63D2\u5EA7_\u76D2\u5B50" objectReference: {fileID: 0} + - target: {fileID: 353101046227663719, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 353101046227663719, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3} propertyPath: m_TagString value: Untagged diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/AmpereMeter.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/AmpereMeter.cs index 10ee9da8..3cc61c5c 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/AmpereMeter.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/AmpereMeter.cs @@ -7,10 +7,11 @@ using UnityEngine.UI; public class AmpereMeter : MonoBehaviour { public Image im; + int sum = 0; // Start is called before the first frame update void Start() { - + } // Update is called once per frame @@ -23,20 +24,22 @@ public class AmpereMeter : MonoBehaviour RaycastHit hit; if (Physics.Raycast(ray, out hit, 50) && !EventSystem.current.IsPointerOverGameObject()) //ײ⵽ { - if (hit.collider.transform.tag.Equals("FuAn")) + //if (sum != 0) + //{ + // if (hit.collider.CompareTag("FuAn")) + // { + // im.gameObject.SetActive(true); + // } + //} + if (hit.collider.transform.tag.Equals("FuAnBiao")) { Debug.Log(hit.collider.name); - if (im != null&& GameManager.ins.FuAnBiao!=null) + if (im != null && GameManager.ins.FuAnBiao != null) { - im.gameObject.SetActive(true); - } - else - { - GameManager.ins.FuAnBiao = hit.collider.gameObject; + sum++; } } } } - } } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/VoltAmpereMeter.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/VoltAmpereMeter.cs index 3cca18a7..76bdf1c9 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/VoltAmpereMeter.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/VoltAmpereMeter.cs @@ -4,6 +4,7 @@ using UnityEngine; public class VoltAmpereMeter : MonoBehaviour { + [SerializeField] // Start is called before the first frame update void Start() { diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/Fraction.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/Fraction.cs index b60b027e..4352496f 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/Fraction.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/Fraction.cs @@ -10,10 +10,21 @@ public class Fraction : FractionManager [Header("ǷǴ")] public bool Erroritem; [Header("ǰ")] - public int scorercontinuer; + public float scorercontinuer; + [Header("ײ")] + public string name; + [Header("")] + public string orderName; private void OnDisable() { - base.id.Enqueue(id); + base.order.Add(id,orderName); + } + public void OnCollisionEnter(Collision collision) + { + if (collision.collider.name.Equals(name)) + { + CompletedorNot = true; + } } //public } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/FractionManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/FractionManager.cs index 97b4fd1d..dc1cbf52 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/FractionManager.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/FractionManager.cs @@ -6,24 +6,25 @@ using UnityEngine.UI; public class FractionManager : MonoBehaviour { [SerializeField] List fractions; - [SerializeField] int Totalscore; - public Queue id = new Queue(); + [SerializeField] float Totalscore; + public Dictionary order = new Dictionary(); [SerializeField] Button Btn; + // Start is called before the first frame update void Start() { Btn = GetComponent