diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab index 5a1a945d..b886bab8 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab @@ -881,6 +881,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 5 + unit: A --- !u!114 &1791810255 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2571,6 +2572,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 10 + unit: A --- !u!1 &2848851287756016752 GameObject: m_ObjectHideFlags: 0 @@ -2794,7 +2796,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7c87fecd3e21b334ba6ebe2ad40d106c, type: 3} m_Name: m_EditorClassIdentifier: - mesh: {fileID: 7518181732797652832} + mesh: {fileID: 828720081697923098} --- !u!1 &3257671273237242133 GameObject: m_ObjectHideFlags: 0 @@ -3337,6 +3339,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 6 + unit: A --- !u!114 &1791810253 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3665,6 +3668,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 5 + unit: A --- !u!114 &1791810254 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4679,6 +4683,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 2 + unit: A --- !u!64 &7534600608170525114 MeshCollider: m_ObjectHideFlags: 0 @@ -4901,6 +4906,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 10 + unit: A --- !u!114 &1791810252 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5556,6 +5562,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6482818628852478495} + - component: {fileID: 6276449713238507259} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F" m_TagString: Untagged @@ -5585,6 +5592,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6276449713238507259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8814916775944311458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf85d7ecb61a07b44af353b4076e57ff, type: 3} + m_Name: + m_EditorClassIdentifier: + clampAmmetersInteractives: [] --- !u!1 &8891900236170593541 GameObject: m_ObjectHideFlags: 0 @@ -6100,7 +6120,7 @@ MeshCollider: m_GameObject: {fileID: 4728026782583967234} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 0 + m_Enabled: 1 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -6133,7 +6153,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4728026782583967234} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 79f17ac2192e9a74f84269fd2ddb5b32, type: 3} m_Name: diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab index 6f35f019..b0e43038 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab @@ -558,7 +558,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &149286869561454452 GameObject: m_ObjectHideFlags: 0 @@ -787,7 +787,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &388133477525614068 GameObject: m_ObjectHideFlags: 0 @@ -850,7 +850,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &405557464819870593 GameObject: m_ObjectHideFlags: 0 @@ -1773,7 +1773,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &1032632914913527736 GameObject: m_ObjectHideFlags: 0 @@ -2059,6 +2059,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!1 &1134823686227163403 GameObject: m_ObjectHideFlags: 0 @@ -3061,7 +3062,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &1519430449556794234 GameObject: m_ObjectHideFlags: 0 @@ -3656,6 +3657,7 @@ GameObject: - component: {fileID: 6931970306247314652} - component: {fileID: 2558781257956375212} - component: {fileID: 4094227035277307297} + - component: {fileID: 4681088921823662914} m_Layer: 0 m_Name: Cube (1) m_TagString: Untagged @@ -3741,6 +3743,23 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &4681088921823662914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1786457713556060575} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3} + m_Name: + m_EditorClassIdentifier: + electricity: 0 + activation: 0 + name: + isBlack: 0 + VV: V --- !u!1 &1853984071587902525 GameObject: m_ObjectHideFlags: 0 @@ -3927,6 +3946,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 10 + unit: A --- !u!1 &1955535642318241800 GameObject: m_ObjectHideFlags: 0 @@ -4145,6 +4165,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!1 &2008518560071678347 GameObject: m_ObjectHideFlags: 0 @@ -4769,7 +4790,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &2784251787084848411 GameObject: m_ObjectHideFlags: 0 @@ -5539,7 +5560,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &3257939491376546498 GameObject: m_ObjectHideFlags: 0 @@ -5740,7 +5761,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &3324344962978644052 GameObject: m_ObjectHideFlags: 0 @@ -5753,6 +5774,7 @@ GameObject: - component: {fileID: 6191908511743875125} - component: {fileID: 6239190711429060227} - component: {fileID: 2121709549542606771} + - component: {fileID: 3601069248955905985} m_Layer: 0 m_Name: Cube m_TagString: Untagged @@ -5838,6 +5860,23 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &3601069248955905985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3324344962978644052} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3} + m_Name: + m_EditorClassIdentifier: + electricity: 0 + activation: 0 + name: + isBlack: 0 + VV: V --- !u!1 &3369078227917110732 GameObject: m_ObjectHideFlags: 0 @@ -6454,6 +6493,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 10 + unit: A --- !u!1 &3581289492504554486 GameObject: m_ObjectHideFlags: 0 @@ -7129,7 +7169,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &4147770098453098543 GameObject: m_ObjectHideFlags: 0 @@ -7358,7 +7398,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &4357971326663085255 GameObject: m_ObjectHideFlags: 0 @@ -7619,7 +7659,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &4509565183205377274 GameObject: m_ObjectHideFlags: 0 @@ -8087,6 +8127,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 10 + unit: A --- !u!1 &4704354016240891966 GameObject: m_ObjectHideFlags: 0 @@ -9346,6 +9387,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 10 + unit: A --- !u!1 &5474855114193124813 GameObject: m_ObjectHideFlags: 0 @@ -9532,6 +9574,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!1 &5665595963479227047 GameObject: m_ObjectHideFlags: 0 @@ -10359,6 +10402,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!1 &6198007651436644694 GameObject: m_ObjectHideFlags: 0 @@ -11719,6 +11763,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 636805822675921613} + - component: {fileID: 7323531522477303901} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u6709\u5149\u4F0F" m_TagString: Untagged @@ -11754,6 +11799,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7323531522477303901 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7067006512732022887} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf85d7ecb61a07b44af353b4076e57ff, type: 3} + m_Name: + m_EditorClassIdentifier: + clampAmmetersInteractives: [] --- !u!1 &7130868757477969731 GameObject: m_ObjectHideFlags: 0 @@ -11816,7 +11874,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &7171766864873220075 GameObject: m_ObjectHideFlags: 0 @@ -12282,6 +12340,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!1 &7732102390116573455 GameObject: m_ObjectHideFlags: 0 @@ -12583,6 +12642,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 10 + unit: A --- !u!1 &7848068579051495581 GameObject: m_ObjectHideFlags: 0 @@ -12884,6 +12944,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!1 &7936017779960656771 GameObject: m_ObjectHideFlags: 0 @@ -12946,7 +13007,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &7968447109443682862 GameObject: m_ObjectHideFlags: 0 @@ -13458,6 +13519,8 @@ GameObject: - component: {fileID: 5186565924294684637} - component: {fileID: 1446396379125881897} - component: {fileID: 5935945536750827710} + - component: {fileID: 414639752995528745} + - component: {fileID: 3362478488862286754} m_Layer: 0 m_Name: Object423 m_TagString: Untagged @@ -13530,6 +13593,32 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &414639752995528745 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8156069321181338908} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.012151215, y: 0.027755149, z: 0.008852846} + m_Center: {x: 0.0000005215407, y: 0.00000048615044, z: 0.0000027094502} +--- !u!114 &3362478488862286754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8156069321181338908} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c87fecd3e21b334ba6ebe2ad40d106c, type: 3} + m_Name: + m_EditorClassIdentifier: + mesh: {fileID: 2412848822791683035} --- !u!1 &8208070238796160115 GameObject: m_ObjectHideFlags: 0 @@ -13592,7 +13681,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &8335546110959047487 GameObject: m_ObjectHideFlags: 0 @@ -13738,7 +13827,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &8580617168033895453 GameObject: m_ObjectHideFlags: 0 @@ -14124,6 +14213,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 10 + unit: A --- !u!1 &9048269487564603909 GameObject: m_ObjectHideFlags: 0 @@ -14384,7 +14474,7 @@ MonoBehaviour: activation: 0 name: isBlack: 0 - VV: + VV: V --- !u!1 &9128625144620952930 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 fc883410..f1ef12b6 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab @@ -373,6 +373,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!64 &802787404017427454 MeshCollider: m_ObjectHideFlags: 0 @@ -1087,6 +1088,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!1 &882740240257928397 GameObject: m_ObjectHideFlags: 0 @@ -1720,6 +1722,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!64 &3779270377983782145 MeshCollider: m_ObjectHideFlags: 0 @@ -1921,6 +1924,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!64 &9124662342473540606 MeshCollider: m_ObjectHideFlags: 0 @@ -2465,6 +2469,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!64 &203956982629035202 MeshCollider: m_ObjectHideFlags: 0 @@ -2614,6 +2619,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!64 &8330858888387296803 MeshCollider: m_ObjectHideFlags: 0 @@ -3125,6 +3131,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!64 &7137907560168321248 MeshCollider: m_ObjectHideFlags: 0 @@ -3658,6 +3665,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!64 &1191074510302990370 MeshCollider: m_ObjectHideFlags: 0 @@ -4874,6 +4882,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!64 &1483003281333461482 MeshCollider: m_ObjectHideFlags: 0 @@ -5241,6 +5250,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!64 &3459726206515330861 MeshCollider: m_ObjectHideFlags: 0 @@ -6356,6 +6366,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3739678117119996221} + - component: {fileID: 8238197037551929153} m_Layer: 0 m_Name: "\u4E09\u76F8_\u6709\u4E92\u611F\u5668_\u65E0\u5149\u4F0F" m_TagString: Untagged @@ -6387,6 +6398,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8238197037551929153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5869344655596831337} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf85d7ecb61a07b44af353b4076e57ff, type: 3} + m_Name: + m_EditorClassIdentifier: + clampAmmetersInteractives: [] --- !u!1 &5972927993521893981 GameObject: m_ObjectHideFlags: 0 @@ -8786,6 +8810,8 @@ GameObject: - component: {fileID: 4921245831698629337} - component: {fileID: 6641481192770031696} - component: {fileID: 7414918683389844903} + - component: {fileID: 6242103556353999212} + - component: {fileID: 6695749481864774285} m_Layer: 0 m_Name: Object414 m_TagString: Untagged @@ -8858,6 +8884,33 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &6242103556353999212 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8817509929777487262} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 258591531374413408, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3} +--- !u!114 &6695749481864774285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8817509929777487262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c87fecd3e21b334ba6ebe2ad40d106c, type: 3} + m_Name: + m_EditorClassIdentifier: + mesh: {fileID: 8703856849897999536} --- !u!1 &8968105329856881069 GameObject: m_ObjectHideFlags: 0 @@ -9129,6 +9182,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!64 &7267157407081037942 MeshCollider: m_ObjectHideFlags: 0 @@ -9247,6 +9301,7 @@ MonoBehaviour: linearMeasure: 0 floats: [] Fuan: 0 + unit: A --- !u!64 &2307476709251360141 MeshCollider: m_ObjectHideFlags: 0 @@ -9812,10 +9867,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1549940567543248317} m_Modifications: + - target: {fileID: 5246147610555160698, guid: da6ea3cb628035c4c9834bb12ae3761b, type: 3} + propertyPath: VV + value: V + objectReference: {fileID: 0} + - target: {fileID: 7641420671573522198, guid: da6ea3cb628035c4c9834bb12ae3761b, type: 3} + propertyPath: VV + value: V + objectReference: {fileID: 0} + - target: {fileID: 7726381461732452939, guid: da6ea3cb628035c4c9834bb12ae3761b, type: 3} + propertyPath: VV + value: V + objectReference: {fileID: 0} - target: {fileID: 8116465655200401029, guid: da6ea3cb628035c4c9834bb12ae3761b, type: 3} propertyPath: m_Name value: "\u7535\u538B\u89E6\u78B0\u70B9" objectReference: {fileID: 0} + - target: {fileID: 8206516948370009046, guid: da6ea3cb628035c4c9834bb12ae3761b, type: 3} + propertyPath: VV + value: V + objectReference: {fileID: 0} - target: {fileID: 8695571647825121107, guid: da6ea3cb628035c4c9834bb12ae3761b, type: 3} propertyPath: m_RootOrder value: 35 diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab index e28b09ce..bdcabae5 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab @@ -990,6 +990,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1281350692733807052} + - component: {fileID: 5154148772792602419} m_Layer: 0 m_Name: "\u5355\u9879_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F" m_TagString: Untagged @@ -1013,6 +1014,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5154148772792602419 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4358485102403047296} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf85d7ecb61a07b44af353b4076e57ff, type: 3} + m_Name: + m_EditorClassIdentifier: + clampAmmetersInteractives: [] --- !u!1 &4536213603823072826 GameObject: m_ObjectHideFlags: 0 @@ -1467,6 +1481,7 @@ GameObject: - component: {fileID: 6537657585278089496} - component: {fileID: 1212982477888520073} - component: {fileID: 1767016721318962665} + - component: {fileID: 8197923010207683825} m_Layer: 0 m_Name: Cube m_TagString: Untagged @@ -1552,6 +1567,25 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &8197923010207683825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5160934536123890940} + 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: A --- !u!1 &5212337995932975501 GameObject: m_ObjectHideFlags: 0 @@ -1709,6 +1743,7 @@ GameObject: - component: {fileID: 2165562875724244635} - component: {fileID: 8842432876491479579} - component: {fileID: 7746830116685398759} + - component: {fileID: 6302226075843317434} m_Layer: 0 m_Name: Cube (2) m_TagString: Untagged @@ -1794,6 +1829,25 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &6302226075843317434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5588630746499621630} + 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: A --- !u!1 &5982637422382916246 GameObject: m_ObjectHideFlags: 0 @@ -2511,6 +2565,7 @@ GameObject: - component: {fileID: 9209109392834754406} - component: {fileID: 7184405967805637078} - component: {fileID: 6105149369182064439} + - component: {fileID: 8129728896665383273} m_Layer: 0 m_Name: Cube (3) m_TagString: Untagged @@ -2596,6 +2651,25 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &8129728896665383273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7768802114381553643} + 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: A --- !u!1 &7868346936396067874 GameObject: m_ObjectHideFlags: 0 @@ -2778,6 +2852,7 @@ GameObject: - component: {fileID: 6946322289921225406} - component: {fileID: 1581057759612490857} - component: {fileID: 143325299643025178} + - component: {fileID: 5210950029859728950} m_Layer: 0 m_Name: Cube (1) m_TagString: Untagged @@ -2863,6 +2938,25 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &5210950029859728950 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8291716159056416811} + 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: A --- !u!1 &8755456981224617160 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 fdadcd78..c789cfa3 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab @@ -71,6 +71,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8778434969602832201} + - component: {fileID: 2333959920688638985} m_Layer: 0 m_Name: "\u5355\u9879_\u65E0\u4E92\u611F\u5668_\u6709\u5149\u4F0F" m_TagString: Untagged @@ -95,6 +96,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2333959920688638985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6770620356190950818} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf85d7ecb61a07b44af353b4076e57ff, type: 3} + m_Name: + m_EditorClassIdentifier: + clampAmmetersInteractives: [] --- !u!1001 &1895296105669336917 PrefabInstance: m_ObjectHideFlags: 0 @@ -483,6 +497,8 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 + unit: A --- !u!4 &2071851086393313155 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} @@ -581,6 +597,8 @@ MonoBehaviour: name: linearMeasure: 0 floats: [] + Fuan: 0 + unit: A --- !u!1 &7014173801403137452 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8799278309008104900, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity index 681f6a4c..908e2eb6 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity @@ -10218,7 +10218,7 @@ Transform: m_Children: - {fileID: 647771132} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &311259347 PrefabInstance: @@ -12980,7 +12980,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &388288287 GameObject: @@ -26578,6 +26578,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: 1 +--- !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 @@ -26861,7 +26961,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3} propertyPath: m_RootOrder - value: 28 + value: 24 objectReference: {fileID: 0} - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3} propertyPath: m_LocalPosition.x @@ -32428,7 +32528,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c494ecc284aba354aae4fc93fffe7399, type: 3} propertyPath: m_RootOrder - value: 24 + value: 21 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c494ecc284aba354aae4fc93fffe7399, type: 3} propertyPath: m_LocalPosition.x @@ -34548,7 +34648,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &905697366 MonoBehaviour: @@ -37724,7 +37824,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &963586247 GameObject: @@ -38307,7 +38407,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &977773623 PrefabInstance: @@ -42333,7 +42433,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1064186729 MonoBehaviour: @@ -44979,7 +45079,7 @@ Transform: - {fileID: 2142689831} - {fileID: 1625562541981183860} m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1151031604 PrefabInstance: @@ -54283,7 +54383,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1428010675 GameObject: @@ -54935,7 +55035,7 @@ Transform: m_Children: - {fileID: 772200475} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1437685154 PrefabInstance: @@ -59187,7 +59287,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1543654488 MonoBehaviour: @@ -63697,7 +63797,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 30e501bfe66ef934eb01a02524bd336c, type: 3} propertyPath: m_RootOrder - value: 6 + value: 3 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 30e501bfe66ef934eb01a02524bd336c, type: 3} propertyPath: m_LocalPosition.x @@ -68116,7 +68216,7 @@ Transform: - {fileID: 1400298970} - {fileID: 2111073202} m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1797272987 GameObject: @@ -68221,7 +68321,7 @@ RectTransform: - {fileID: 1677353489} - {fileID: 2132026558} m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -70049,7 +70149,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: -1.965, y: -18.759, z: 24.526} --- !u!1 &1846113665 GameObject: @@ -70318,7 +70418,7 @@ RectTransform: m_Children: - {fileID: 273619911} m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -72590,7 +72690,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 48e36ea59837ea244852e73183f1a373, type: 3} propertyPath: m_RootOrder - value: 14 + value: 11 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 48e36ea59837ea244852e73183f1a373, type: 3} propertyPath: m_LocalPosition.x @@ -73014,7 +73114,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1930586703 GameObject: @@ -75110,7 +75210,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1967702553 PrefabInstance: @@ -76002,7 +76102,7 @@ Transform: - {fileID: 1446289608} - {fileID: 696764694} m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1987230714 GameObject: @@ -77079,7 +77179,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2013425241 MonoBehaviour: @@ -83238,7 +83338,7 @@ Transform: - {fileID: 8278156440674586169} - {fileID: 1472106633} m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &554189251323931874 MonoBehaviour: @@ -92817,7 +92917,7 @@ Transform: - {fileID: 4240377296742345613} - {fileID: 50144230157523243} m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!4 &2397982214548926677 Transform: @@ -92983,7 +93083,7 @@ Transform: - {fileID: 2401820166598484376} - {fileID: 1223518925} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 83.982, z: 0} --- !u!33 &2401820165377604995 MeshFilter: @@ -94492,7 +94592,7 @@ Transform: - {fileID: 1182854318} - {fileID: 1964103505} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2630887752870060410 Transform: @@ -95500,7 +95600,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3} propertyPath: m_RootOrder - value: 9 + value: 6 objectReference: {fileID: 0} - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3} propertyPath: m_LocalPosition.x @@ -129527,7 +129627,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5537173360887175222, guid: 15526cc793435654cad09098a46a9caf, type: 3} propertyPath: m_RootOrder - value: 5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5537173360887175222, guid: 15526cc793435654cad09098a46a9caf, type: 3} propertyPath: m_LocalPosition.x @@ -141484,7 +141584,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4300732867488139875, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3} propertyPath: m_RootOrder - value: 29 + value: 25 objectReference: {fileID: 0} - target: {fileID: 4300732867488139875, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3} propertyPath: m_LocalPosition.x diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/DoolsPlayer.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/DoolsPlayer.cs index 7ab84d1a..6c533a0b 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/DoolsPlayer.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/DoolsPlayer.cs @@ -4,16 +4,16 @@ using UnityEngine; public class DoolsPlayer : MonoBehaviour { - [SerializeField] MeshCollider mesh; + [SerializeField] door_control mesh; // Start is called before the first frame update void Start() { - + mesh.���ý��� = false; } private void OnMouseDown() { - mesh.enabled = true; + mesh.���ý��� = true; gameObject.SetActive(false); } } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/BoxDools.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/BoxDools.cs index 68fe21d6..ba850721 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/BoxDools.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/BoxDools.cs @@ -16,7 +16,10 @@ public class BoxDools : MonoBehaviour { for (int i = 0; i < GameManager.ins.interactive.Count; i++) { - GameManager.ins.interactive[i].GetComponent<door_control>().���ý��� = true; + if (!GameManager.ins.interactive[i].GetComponent<door_control>().���ý���) + { + GameManager.ins.interactive[i].GetComponent<door_control>().���ý��� = true; + } } } } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs index e6485706..2f51a259 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs @@ -12,6 +12,7 @@ public class ClampAmmetersInteractive : MonoBehaviour public float linearMeasure;//Ĭ�ϵĴ�С public List<float> floats; public float Fuan; + public string unit; private void Start() { transform.AddComponent<MeshCollider>(); @@ -34,7 +35,7 @@ public class ClampAmmetersInteractive : MonoBehaviour 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.DianFuTex.text = Fuan + " V"; + GameManager.ins.DianFuTex.text = Fuan +" "+ unit; for (int i = 0; i < floats.Count; i++) { diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs new file mode 100644 index 00000000..cb1602b8 --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs @@ -0,0 +1,33 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; + +public class ClampAmmetersManager : MonoBehaviour +{ + [SerializeField] List<ClampAmmetersInteractive> clampAmmetersInteractives= new List<ClampAmmetersInteractive>(); + public Dictionary<int,float> data = new Dictionary<int,float>(); + private void Awake() + { + run(); + } + // Start is called before the first frame update + void Start() + { + + } + /// <summary> + /// ��ȡ����Ԥ������ + /// </summary> + void run() + { + clampAmmetersInteractives = GetComponentsInChildren<ClampAmmetersInteractive>().ToList(); + } + void init() + { + for (int i = 0; i < data.Count; i++) + { + clampAmmetersInteractives[i].Fuan = data[i]; + } + } +} diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs.meta b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs.meta new file mode 100644 index 00000000..50dd35e8 --- /dev/null +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cf85d7ecb61a07b44af353b4076e57ff +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: