diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/光伏板/Material/GuangFuBanBuXian.mat b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/光伏板/Material/GuangFuBanBuXian.mat index edb0a432..93812a28 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/光伏板/Material/GuangFuBanBuXian.mat +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/光伏板/Material/GuangFuBanBuXian.mat @@ -77,6 +77,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.509434, g: 0.509434, b: 0.509434, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/三相_无互感器_无光伏_电箱门.controller b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/三相_无互感器_无光伏_电箱门.controller index 6d2c5dff..05fbc3aa 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/三相_无互感器_无光伏_电箱门.controller +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/三相_无互感器_无光伏_电箱门.controller @@ -14,6 +14,32 @@ AnimatorTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 1 +--- !u!1102 &-3444231149080556909 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_\u7535\u7BB1\u95E8\u5F00\u95E8" + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 29ef77b3cb8fb374d88d0c58a7373702, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -58,40 +84,14 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &3490287157574482233 +--- !u!1102 &1983691943020202626 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u5F00\u95E8" - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 21737596690f60343b70cf49b940e905, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &6125014772270544797 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: "\u5173\u95E8" + m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_\u7535\u7BB1\u95E8\u5173\u95E8" m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] @@ -104,7 +104,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 1ecd9f2f42c56df4085ee701fdb04173, type: 2} + m_Motion: {fileID: 7400000, guid: ebb590b709b436b448205a250a2abaec, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -146,15 +146,15 @@ AnimatorStateMachine: m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 6125014772270544797} - m_Position: {x: 430, y: 140, z: 0} - - serializedVersion: 1 - m_State: {fileID: 3490287157574482233} - m_Position: {x: 430, y: 90, z: 0} - serializedVersion: 1 m_State: {fileID: 6206190852733703189} m_Position: {x: 220, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1983691943020202626} + m_Position: {x: 430, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3444231149080556909} + m_Position: {x: 430, y: 80, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab index f73f1cac..fc890790 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab @@ -789,6 +789,7 @@ GameObject: - component: {fileID: 6707722244231200529} - component: {fileID: 289895967043914219} - component: {fileID: 1749495300} + - component: {fileID: 1791810255} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_A\u76F8\u7535\u6D412" m_TagString: Untagged @@ -877,6 +878,29 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 346597898} name: "\u7528\u7535_AA2" + linearMeasure: 0 + floats: [] +--- !u!114 &1791810255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 675359599343669253} + 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.3 + name: + orderName: --- !u!1 &698469440408970119 GameObject: m_ObjectHideFlags: 0 @@ -927,7 +951,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 698469440408970119} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -1539,7 +1563,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1196252981789200300} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -1902,7 +1926,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1904772013827979845} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -2540,6 +2564,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 1601408198} name: "\u7528\u7535_CA2" + linearMeasure: 0 + floats: [] --- !u!1 &2848851287756016752 GameObject: m_ObjectHideFlags: 0 @@ -2991,7 +3017,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3774496203919668041} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -3185,6 +3211,7 @@ GameObject: - component: {fileID: 8330917849904042642} - component: {fileID: 4442592396840122678} - component: {fileID: 1749495298} + - component: {fileID: 1791810253} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_B\u76F8\u7535\u6D412" m_TagString: Untagged @@ -3273,6 +3300,29 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 1593461399} name: "\u7528\u7535_BA2" + linearMeasure: 0 + floats: [] +--- !u!114 &1791810253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3950599454043995376} + 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.3 + name: + orderName: --- !u!1 &4026387663913184460 GameObject: m_ObjectHideFlags: 0 @@ -3371,7 +3421,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &5450154534790158872 Transform: m_ObjectHideFlags: 0 @@ -3488,6 +3538,7 @@ GameObject: - component: {fileID: 3790004301751882295} - component: {fileID: 7506557016462798912} - component: {fileID: 1749495299} + - component: {fileID: 1791810254} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_B\u76F8\u7535\u6D411" m_TagString: FuAn @@ -3576,6 +3627,29 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 372821878} name: "\u7528\u70B9_BA2" + linearMeasure: 0 + floats: [] +--- !u!114 &1791810254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4189062048988151872} + 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.3 + name: + orderName: --- !u!1 &4304487100521420004 GameObject: m_ObjectHideFlags: 0 @@ -3875,7 +3949,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5157055573690827056} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -4476,6 +4550,7 @@ GameObject: - component: {fileID: 7844992493397010747} - component: {fileID: 1749495301} - component: {fileID: 7534600608170525114} + - component: {fileID: 1791810256} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_A\u76F8\u7535\u6D411" m_TagString: Untagged @@ -4564,6 +4639,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 1595917109} name: "\u7528\u7535_AA2" + linearMeasure: 0 + floats: [] --- !u!64 &7534600608170525114 MeshCollider: m_ObjectHideFlags: 0 @@ -4578,6 +4655,27 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -1878190799926891084, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3} +--- !u!114 &1791810256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6708985574009128475} + 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.3 + name: + orderName: --- !u!1 &6945789609735402900 GameObject: m_ObjectHideFlags: 0 @@ -4673,6 +4771,7 @@ GameObject: - component: {fileID: 3235060042426608402} - component: {fileID: 7876653092697616274} - component: {fileID: 1749495297} + - component: {fileID: 1791810252} m_Layer: 0 m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_C\u76F8\u7535\u6D411" m_TagString: Untagged @@ -4761,6 +4860,29 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 1082754022} name: "\u7528\u7535_CA2" + linearMeasure: 0 + floats: [] +--- !u!114 &1791810252 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7422967581352539548} + 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.3 + name: + orderName: --- !u!1 &8027062368083026089 GameObject: m_ObjectHideFlags: 0 @@ -5039,7 +5161,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8595511565545722400} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -5236,7 +5358,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8648335584504507506} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -5743,6 +5865,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -5260060894338397145, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.00006103506 + objectReference: {fileID: 0} + - target: {fileID: -5260060894338397145, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.000030517756 + objectReference: {fileID: 0} + - target: {fileID: -5260060894338397145, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.00016784667 + objectReference: {fileID: 0} - target: {fileID: -3013769497943921491, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3} propertyPath: m_LocalScale.x value: 0.5318197 @@ -5823,6 +5957,10 @@ PrefabInstance: propertyPath: m_AABB.m_Extent.z value: 0.0780723 objectReference: {fileID: 0} + - target: {fileID: 5213865969853075656, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3} + propertyPath: m_BlendShapeWeights.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8526372940484349156, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3} propertyPath: m_TagString value: YanDian @@ -5878,38 +6016,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 2918851358235381822, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3} ---- !u!114 &828720081697923098 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4728026782583967234} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 79f17ac2192e9a74f84269fd2ddb5b32, type: 3} - m_Name: - m_EditorClassIdentifier: - mouseButton: 0 - "\u542F\u7528\u4EA4\u4E92": 1 - "\u662F\u5426\u5F00\u95E8": 0 - "\u9A8C\u7535\u7B14": {fileID: 0} - "\u5F00\u95E8\u52A8\u753B": "\u5F00\u95E8" - "\u5173\u95E8\u52A8\u753B": "\u5173\u95E8" - animator: {fileID: 3090814324080011782} ---- !u!114 &4974320779076594325 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4728026782583967234} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a03c7d4228cb1324bb890b453bae6f08, type: 3} - m_Name: - m_EditorClassIdentifier: - isDian: 0 --- !u!114 &1791810248 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5931,3 +6037,35 @@ MonoBehaviour: scorercontinuer: 5 name: "\u9A8C\u7535\u7B14(Clone)" orderName: "\u9A8C\u7535" +--- !u!114 &828720081697923098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4728026782583967234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79f17ac2192e9a74f84269fd2ddb5b32, type: 3} + m_Name: + m_EditorClassIdentifier: + mouseButton: 0 + "\u542F\u7528\u4EA4\u4E92": 1 + "\u662F\u5426\u5F00\u95E8": 0 + "\u9A8C\u7535\u7B14": {fileID: 0} + "\u5F00\u95E8\u52A8\u753B": "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_\u7535\u7BB1\u95E8\u5F00\u95E8" + "\u5173\u95E8\u52A8\u753B": "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F_\u7535\u7BB1\u95E8\u5173\u95E8" + animator: {fileID: 3090814324080011782} +--- !u!114 &4974320779076594325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4728026782583967234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a03c7d4228cb1324bb890b453bae6f08, type: 3} + m_Name: + m_EditorClassIdentifier: + isDian: 0 diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab index 970719de..e35f7e60 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab @@ -557,6 +557,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &149286869561454452 GameObject: m_ObjectHideFlags: 0 @@ -784,6 +785,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &388133477525614068 GameObject: m_ObjectHideFlags: 0 @@ -845,6 +847,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &405557464819870593 GameObject: m_ObjectHideFlags: 0 @@ -1766,6 +1769,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &1032632914913527736 GameObject: m_ObjectHideFlags: 0 @@ -2048,6 +2052,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 2063995441} name: "\u53D1\u7535_AA2" + linearMeasure: 0 + floats: [] --- !u!1 &1134823686227163403 GameObject: m_ObjectHideFlags: 0 @@ -2456,6 +2462,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u7528\u7535_CV3" + isBlack: 0 --- !u!1 &1169093305794350635 GameObject: m_ObjectHideFlags: 0 @@ -2569,6 +2576,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u53D1\u7535_BV2" + isBlack: 0 --- !u!1 &1266349338653065856 GameObject: m_ObjectHideFlags: 0 @@ -3045,6 +3053,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &1519430449556794234 GameObject: m_ObjectHideFlags: 0 @@ -3907,6 +3916,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 259277289} name: "\u7528\u7535_CA2" + linearMeasure: 0 + floats: [] --- !u!1 &1955535642318241800 GameObject: m_ObjectHideFlags: 0 @@ -4020,6 +4031,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u53D1\u7535_N" + isBlack: 0 --- !u!1 &1955674640215973765 GameObject: m_ObjectHideFlags: 0 @@ -4120,6 +4132,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 1501701349} name: "\u53D1\u7535_BA2" + linearMeasure: 0 + floats: [] --- !u!1 &2008518560071678347 GameObject: m_ObjectHideFlags: 0 @@ -4233,6 +4247,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u53D1\u7535_CV2" + isBlack: 0 --- !u!1 &2089376836906460348 GameObject: m_ObjectHideFlags: 0 @@ -4512,6 +4527,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u7528\u7535_AV2" + isBlack: 0 --- !u!1 &2457045891919377070 GameObject: m_ObjectHideFlags: 0 @@ -4739,6 +4755,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &2784251787084848411 GameObject: m_ObjectHideFlags: 0 @@ -5465,6 +5482,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &3257939491376546498 GameObject: m_ObjectHideFlags: 0 @@ -5664,6 +5682,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &3324344962978644052 GameObject: m_ObjectHideFlags: 0 @@ -6374,6 +6393,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 169289927} name: "\u7528\u7535_BA2" + linearMeasure: 0 + floats: [] --- !u!1 &3581289492504554486 GameObject: m_ObjectHideFlags: 0 @@ -6819,6 +6840,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u7528\u7535_CV2" + isBlack: 0 --- !u!1 &4002838555360234922 GameObject: m_ObjectHideFlags: 0 @@ -7046,6 +7068,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &4147770098453098543 GameObject: m_ObjectHideFlags: 0 @@ -7273,6 +7296,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &4357971326663085255 GameObject: m_ObjectHideFlags: 0 @@ -7386,6 +7410,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u53D1\u7535_BV3" + isBlack: 0 --- !u!1 &4444430629899505157 GameObject: m_ObjectHideFlags: 0 @@ -7530,6 +7555,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &4509565183205377274 GameObject: m_ObjectHideFlags: 0 @@ -7809,6 +7835,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u53D1\u7535_AV3" + isBlack: 0 --- !u!1 &4663678044794773321 GameObject: m_ObjectHideFlags: 0 @@ -7992,6 +8019,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 1345630707} name: "\u7528\u7535_AA2" + linearMeasure: 0 + floats: [] --- !u!1 &4704354016240891966 GameObject: m_ObjectHideFlags: 0 @@ -8271,6 +8300,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u7528\u7535_N" + isBlack: 0 --- !u!1 &4826068160248301606 GameObject: m_ObjectHideFlags: 0 @@ -9204,6 +9234,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 1566322250} name: "\u7528\u7535_AA2" + linearMeasure: 0 + floats: [] --- !u!1 &5474855114193124813 GameObject: m_ObjectHideFlags: 0 @@ -9387,6 +9419,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 324500578} name: "\u53D1\u7535_BA2" + linearMeasure: 0 + floats: [] --- !u!1 &5665595963479227047 GameObject: m_ObjectHideFlags: 0 @@ -9666,6 +9700,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u53D1\u7535_CV3" + isBlack: 0 --- !u!1 &5766396300497150387 GameObject: m_ObjectHideFlags: 0 @@ -10167,6 +10202,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 532590893} name: "\u53D1\u7535_CA2" + linearMeasure: 0 + floats: [] --- !u!1 &6198007651436644694 GameObject: m_ObjectHideFlags: 0 @@ -11579,6 +11616,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &7171766864873220075 GameObject: m_ObjectHideFlags: 0 @@ -12041,6 +12079,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 1485530019} name: "\u53D1\u7535_AA2" + linearMeasure: 0 + floats: [] --- !u!1 &7732102390116573455 GameObject: m_ObjectHideFlags: 0 @@ -12237,6 +12277,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u7528\u7535_AV3" + isBlack: 0 --- !u!1 &7831470432150598566 GameObject: m_ObjectHideFlags: 0 @@ -12337,6 +12378,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 692526297} name: "\u7528\u7535_BA2" + linearMeasure: 0 + floats: [] --- !u!1 &7848068579051495581 GameObject: m_ObjectHideFlags: 0 @@ -12450,6 +12493,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u7528\u7535_BV3" + isBlack: 0 --- !u!1 &7911749650068601817 GameObject: m_ObjectHideFlags: 0 @@ -12633,6 +12677,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 227954946} name: "\u53D1\u7535_CA2" + linearMeasure: 0 + floats: [] --- !u!1 &7936017779960656771 GameObject: m_ObjectHideFlags: 0 @@ -12694,6 +12740,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &7968447109443682862 GameObject: m_ObjectHideFlags: 0 @@ -13338,6 +13385,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &8335546110959047487 GameObject: m_ObjectHideFlags: 0 @@ -13482,6 +13530,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &8580617168033895453 GameObject: m_ObjectHideFlags: 0 @@ -13679,6 +13728,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u7528\u7535_AV2" + isBlack: 0 --- !u!1 &8873502433770450856 GameObject: m_ObjectHideFlags: 0 @@ -13862,6 +13912,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 447041114} name: "\u7528\u7535_CA2" + linearMeasure: 0 + floats: [] --- !u!1 &9048269487564603909 GameObject: m_ObjectHideFlags: 0 @@ -14058,6 +14110,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: "\u7528\u7535_BV2" + isBlack: 0 --- !u!1 &9078081554792651254 GameObject: m_ObjectHideFlags: 0 @@ -14119,6 +14172,7 @@ MonoBehaviour: electricity: 0 activation: 0 name: + isBlack: 0 --- !u!1 &9128625144620952930 GameObject: m_ObjectHideFlags: 0 @@ -14455,7 +14509,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -4914844396518296654, guid: 52b05e392bba9ba47979c46f8f9277cc, type: 3} propertyPath: m_LocalPosition.z - value: 322.115 + value: 323.401 objectReference: {fileID: 0} - target: {fileID: -3594283037972853338, guid: 52b05e392bba9ba47979c46f8f9277cc, type: 3} propertyPath: m_DirtyAABB diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab index 6934fd56..e28b09ce 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab @@ -3154,7 +3154,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -1551357950959418269, guid: e3e9f4bb87aa03546b0aa500d71c9a5f, type: 3} propertyPath: m_LocalPosition.z - value: 326.802 + value: 327.36 objectReference: {fileID: 0} - target: {fileID: -1369604958866158889, guid: e3e9f4bb87aa03546b0aa500d71c9a5f, type: 3} propertyPath: m_DirtyAABB diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab index 4fd969b3..fdadcd78 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab @@ -188,7 +188,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3} propertyPath: m_LocalPosition.z - value: 328.297 + value: 329.098 objectReference: {fileID: 0} - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -481,6 +481,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 5398975006695019102} name: + linearMeasure: 0 + floats: [] --- !u!4 &2071851086393313155 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} @@ -577,6 +579,8 @@ MonoBehaviour: isInteractive: 0 g1: {fileID: 4737607472722466619} name: + linearMeasure: 0 + floats: [] --- !u!1 &7014173801403137452 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8799278309008104900, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3} diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/Material/NiBianQi_02.mat b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/Material/NiBianQi_02.mat index 577296e3..e229a73a 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/Material/NiBianQi_02.mat +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/Material/NiBianQi_02.mat @@ -76,6 +76,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.7830189, g: 0.7830189, b: 0.7830189, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/Material/验电插座.mat b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/Material/验电插座.mat index 5d53598e..b9b61150 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/Material/验电插座.mat +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/Material/验电插座.mat @@ -123,6 +123,6 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _Int_E: {r: 0, g: 0, b: 0, a: 0} - - _MainCol: {r: 1, g: 1, b: 1, a: 0} + - _MainCol: {r: 0.5188679, g: 0.5188679, b: 0.5188679, a: 0} - _SubCol: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/逆变器.fbx.meta b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/逆变器.fbx.meta index 6711cc61..2da7a5b6 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/逆变器.fbx.meta +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/逆变器.fbx.meta @@ -4,6 +4,11 @@ ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: GuangFuBanBuXian + second: {fileID: 2100000, guid: 262637b02a0ec804a93a2e1ba82a9322, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule @@ -54,6 +59,11 @@ ModelImporter: assembly: UnityEngine.CoreModule name: "\u9540\u950C\u91D1\u5C5E" second: {fileID: 2100000, guid: bdf33331ea28f474282648a8455ff2e6, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: "\u9A8C\u7535\u63D2\u5EA7" + second: {fileID: 2100000, guid: 638b8d604e461034f9d8c503fd542c0e, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/逆变器.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/逆变器.prefab index beca5793..1df5b0f1 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/逆变器.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/逆变器/逆变器.prefab @@ -61,7 +61,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: -5243214149314673089, guid: 5ebe6b5e90aeda04dbab980c00340515, type: 3} + - {fileID: 2100000, guid: 262637b02a0ec804a93a2e1ba82a9322, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/验电插座_盒子.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/验电插座_盒子.prefab index 889f8fa9..227e0fbf 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/验电插座_盒子.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/验电插座_盒子.prefab @@ -286,7 +286,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1919437118783914597, guid: 5ebe6b5e90aeda04dbab980c00340515, type: 3} + - {fileID: 2100000, guid: 638b8d604e461034f9d8c503fd542c0e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/万用表.prefab b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/万用表.prefab index d1161a3f..71cea62c 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/万用表.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/万用表.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 2131893627768175837} - component: {fileID: 2131893627768175835} - component: {fileID: 2131893627768175836} - m_Layer: 0 + m_Layer: 7 m_Name: hongbi m_TagString: Untagged m_Icon: {fileID: 0} @@ -95,7 +95,7 @@ GameObject: - component: {fileID: 2131893627877410962} - component: {fileID: 2131893627877410960} - component: {fileID: 2131893627877410961} - m_Layer: 0 + m_Layer: 7 m_Name: Mesh5 m_TagString: Untagged m_Icon: {fileID: 0} @@ -178,7 +178,7 @@ GameObject: - component: {fileID: 2131893627910883965} - component: {fileID: 2131893627910883963} - component: {fileID: 2131893627910883964} - m_Layer: 0 + m_Layer: 7 m_Name: wanyongbiao m_TagString: Untagged m_Icon: {fileID: 0} @@ -263,7 +263,7 @@ GameObject: - component: {fileID: 2131893627991473034} - component: {fileID: 2131893627991473032} - component: {fileID: 2131893627991473033} - m_Layer: 0 + m_Layer: 7 m_Name: wanyongbiaoxuanniu m_TagString: Untagged m_Icon: {fileID: 0} @@ -346,7 +346,7 @@ GameObject: - component: {fileID: 2131893627708546015} - component: {fileID: 2131893627708546013} - component: {fileID: 2131893627708546014} - m_Layer: 0 + m_Layer: 7 m_Name: "ND_\u4E07\u7528\u8868_02" m_TagString: "\u65CB\u8F6C" m_Icon: {fileID: 0} @@ -429,7 +429,7 @@ GameObject: - component: {fileID: 2131893628059037701} - component: {fileID: 2131893628059037699} - component: {fileID: 2131893628059037700} - m_Layer: 0 + m_Layer: 7 m_Name: "ND_\u4E07\u7528\u8868_01" m_TagString: Untagged m_Icon: {fileID: 0} @@ -514,7 +514,7 @@ GameObject: - component: {fileID: 2131893628021589509} - component: {fileID: 2131893628021589510} - component: {fileID: 8256763883766496110} - m_Layer: 0 + m_Layer: 7 m_Name: "\u4E07\u7528\u8868" m_TagString: Untagged m_Icon: {fileID: 0} @@ -676,7 +676,7 @@ GameObject: - component: {fileID: 2131893628421216302} - component: {fileID: 2131893628421216300} - component: {fileID: 2131893628421216301} - m_Layer: 0 + m_Layer: 7 m_Name: heibi m_TagString: Untagged m_Icon: {fileID: 0} @@ -760,7 +760,7 @@ GameObject: - component: {fileID: 2131893628616976540} - component: {fileID: 2131893628616976538} - component: {fileID: 2131893628616976539} - m_Layer: 0 + m_Layer: 7 m_Name: Object001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -843,7 +843,7 @@ GameObject: - component: {fileID: 2131893628653560327} - component: {fileID: 2131893628653560325} - component: {fileID: 2131893628653560326} - m_Layer: 0 + m_Layer: 7 m_Name: "ND_\u4E07\u7528\u8868_03" m_TagString: Untagged m_Icon: {fileID: 0} @@ -924,7 +924,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2131893629604357092} - m_Layer: 0 + m_Layer: 7 m_Name: "\u4E07\u7528\u8868" m_TagString: Untagged m_Icon: {fileID: 0} @@ -961,7 +961,7 @@ GameObject: - component: {fileID: 2131893629643006702} - component: {fileID: 2131893629643006700} - component: {fileID: 2131893629643006701} - m_Layer: 0 + m_Layer: 7 m_Name: "ND_\u4E07\u7528\u8868_04" m_TagString: Untagged m_Icon: {fileID: 0} @@ -1084,14 +1084,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -6980580695861291056, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: -5199085484305155300, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3} propertyPath: m_Name value: RedWanYon objectReference: {fileID: 0} + - target: {fileID: -5199085484305155300, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3} propertyPath: m_Name value: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF" objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3} propertyPath: m_IsActive value: 1 @@ -1104,6 +1116,14 @@ PrefabInstance: propertyPath: m_Name value: BlackWanYon objectReference: {fileID: 0} + - target: {fileID: 2517699313204552174, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5772668992839476294, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3} --- !u!4 &3988769801855775873 stripped diff --git a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/相位伏安表.prefab b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/相位伏安表.prefab index becb8dd6..1ee6215b 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/相位伏安表.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/相位伏安表.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 8476362767614743788} - component: {fileID: 8052482939551060366} - component: {fileID: 1646795805} - m_Layer: 7 + m_Layer: 0 m_Name: polySurface10 m_TagString: FuAn m_Icon: {fileID: 0} @@ -108,7 +108,7 @@ GameObject: - component: {fileID: 1131244986981442936} - component: {fileID: 6795272889377326132} - component: {fileID: 1449641519212438285} - m_Layer: 7 + m_Layer: 0 m_Name: polySurface5 m_TagString: Untagged m_Icon: {fileID: 0} @@ -192,9 +192,9 @@ GameObject: - component: {fileID: 2095932101935723654} - component: {fileID: 8294673237149712167} - component: {fileID: 5368955186713773247} - m_Layer: 7 + m_Layer: 0 m_Name: "\u76F8\u4F4D\u4F0F\u5B89\u8868" - m_TagString: FuAn + m_TagString: FuAnBiao m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity index f44fbf08..e2c726ee 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity @@ -20753,6 +20753,67 @@ GameObject: m_CorrespondingSourceObject: {fileID: 322936463316669892, guid: e6024f57cedac6a40be3574b2630b881, type: 3} m_PrefabInstance: {fileID: 542974415} m_PrefabAsset: {fileID: 0} +--- !u!1001 &543033771 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2401820165377604994} + m_Modifications: + - target: {fileID: 6158171241742345501, guid: b3831f69955b0974288d5a6149b06332, type: 3} + propertyPath: m_Name + value: "\u94B3\u5F62\u7535\u6D41\u8868" + objectReference: {fileID: 0} + - target: {fileID: 6158171241742345501, guid: b3831f69955b0974288d5a6149b06332, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8567120291302249890, guid: b3831f69955b0974288d5a6149b06332, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8567120291302249890, guid: b3831f69955b0974288d5a6149b06332, type: 3} + propertyPath: m_LocalPosition.x + value: 0.12 + objectReference: {fileID: 0} + - target: {fileID: 8567120291302249890, guid: b3831f69955b0974288d5a6149b06332, type: 3} + propertyPath: m_LocalPosition.y + value: 0.46 + objectReference: {fileID: 0} + - target: {fileID: 8567120291302249890, guid: b3831f69955b0974288d5a6149b06332, type: 3} + propertyPath: m_LocalPosition.z + value: 0.81 + objectReference: {fileID: 0} + - target: {fileID: 8567120291302249890, guid: b3831f69955b0974288d5a6149b06332, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8567120291302249890, guid: b3831f69955b0974288d5a6149b06332, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8567120291302249890, guid: b3831f69955b0974288d5a6149b06332, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8567120291302249890, guid: b3831f69955b0974288d5a6149b06332, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8567120291302249890, guid: b3831f69955b0974288d5a6149b06332, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8567120291302249890, guid: b3831f69955b0974288d5a6149b06332, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 8567120291302249890, guid: b3831f69955b0974288d5a6149b06332, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b3831f69955b0974288d5a6149b06332, type: 3} --- !u!1 &543641208 GameObject: m_ObjectHideFlags: 0 @@ -26533,7 +26594,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &695784800 MonoBehaviour: m_ObjectHideFlags: 0 @@ -47241,6 +47302,16 @@ GameObject: m_CorrespondingSourceObject: {fileID: 322936463316669892, guid: e6024f57cedac6a40be3574b2630b881, type: 3} m_PrefabInstance: {fileID: 1223025199} m_PrefabAsset: {fileID: 0} +--- !u!1 &1223518924 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6158171241742345501, guid: b3831f69955b0974288d5a6149b06332, type: 3} + m_PrefabInstance: {fileID: 543033771} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1223518925 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8567120291302249890, guid: b3831f69955b0974288d5a6149b06332, type: 3} + m_PrefabInstance: {fileID: 543033771} + m_PrefabAsset: {fileID: 0} --- !u!1 &1223603105 GameObject: m_ObjectHideFlags: 0 @@ -50365,17 +50436,33 @@ PrefabInstance: propertyPath: url value: http://111.229.30.246:10015/ objectReference: {fileID: 0} + - target: {fileID: 7809819629956257520, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_Enabled + value: 0 + 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_LocalScale.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_LocalScale.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} + propertyPath: m_LocalScale.z + value: 0 + 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 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} propertyPath: m_LocalPosition.z @@ -50387,15 +50474,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -67771,138 +67858,12 @@ PrefabInstance: propertyPath: m_Name value: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F" objectReference: {fileID: 0} + - target: {fileID: 8814916775944311458, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} ---- !u!1 &1791810247 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7422967581352539548, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} - m_PrefabInstance: {fileID: 1791810246} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1791810248 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3950599454043995376, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} - m_PrefabInstance: {fileID: 1791810246} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1791810249 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4189062048988151872, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} - m_PrefabInstance: {fileID: 1791810246} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1791810250 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 675359599343669253, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} - m_PrefabInstance: {fileID: 1791810246} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1791810251 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6708985574009128475, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} - m_PrefabInstance: {fileID: 1791810246} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1791810252 -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.3 - name: - orderName: ---- !u!114 &1791810253 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1791810248} - 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.3 - name: - orderName: ---- !u!114 &1791810254 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1791810249} - 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.3 - name: - orderName: ---- !u!114 &1791810255 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1791810250} - 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.3 - name: - orderName: ---- !u!114 &1791810256 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1791810251} - 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.3 - name: - orderName: --- !u!1 &1794701649 GameObject: m_ObjectHideFlags: 0 @@ -68136,6 +68097,7 @@ RectTransform: - {fileID: 2111405328} - {fileID: 315001513} - {fileID: 1677353489} + - {fileID: 2132026558} m_Father: {fileID: 0} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -71090,6 +71052,86 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1873301362} m_Mesh: {fileID: -3480814548964899137, guid: 85f9d26d36537954f95a692c5501ca00, type: 3} +--- !u!1 &1874428841 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1874428842} + - component: {fileID: 1874428844} + - component: {fileID: 1874428843} + m_Layer: 0 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1874428842 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874428841} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2132026558} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1874428843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874428841} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1874428844 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874428841} + m_CullTransparentMesh: 1 --- !u!1 &1877522085 GameObject: m_ObjectHideFlags: 0 @@ -74919,7 +74961,7 @@ MonoBehaviour: QianStopValve: {fileID: 73554406} NiBianQi: {fileID: 696764695} XiangWeiUI: {fileID: 1677353491} - temp: {fileID: 0} + temp: {fileID: 1223518924} interactive: [] RedWanYon: {fileID: 0} BlackWanYon: {fileID: 0} @@ -74928,6 +74970,8 @@ MonoBehaviour: biaojiPos: {fileID: 696870980} toolsCam: {fileID: 4250994751713770047} MultimeterIm: {fileID: 607572847} + DianFuIm: {fileID: 2132026559} + DianFuTex: {fileID: 1874428843} --- !u!4 &1965873574 Transform: m_ObjectHideFlags: 0 @@ -80725,6 +80769,83 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131667811} m_Mesh: {fileID: -5747103049204816996, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3} +--- !u!1 &2132026557 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2132026558} + - component: {fileID: 2132026560} + - component: {fileID: 2132026559} + m_Layer: 0 + m_Name: "\u7535\u4F0F\u7535\u538BUI" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2132026558 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132026557} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1874428842} + m_Father: {fileID: 1797272991} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 746.2654, y: -83.01744} + m_SizeDelta: {x: 390.7727, y: 97.681} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2132026559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132026557} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: cd34b7efa35ecc846b301324e969bd2e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2132026560 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132026557} + m_CullTransparentMesh: 1 --- !u!1 &2132926181 GameObject: m_ObjectHideFlags: 0 @@ -92708,7 +92829,7 @@ CapsuleCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - m_Radius: 0.2 + m_Radius: 0.3 m_Height: 2 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} @@ -92727,6 +92848,7 @@ Transform: - {fileID: 4250994750885528242} - {fileID: 4250994751310936222} - {fileID: 2401820166598484376} + - {fileID: 1223518925} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 83.982, z: 0} diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs index 08603c3d..93c43bbb 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs @@ -38,12 +38,12 @@ public class MultimeterManager : MonoBehaviour // ײ if (hit.collider.name.Equals("RedWanYon")) { - GameManager.ins.BlackWanYon = null; + //GameManager.ins.BlackWanYon = null; GameManager.ins.RedWanYon = RedXian.gameObject; } if (hit.collider.name.Equals("BlackWanYon")) { - GameManager.ins.RedWanYon = null; + //GameManager.ins.RedWanYon = null; GameManager.ins.BlackWanYon = blackXian.gameObject; } Debug.Log(hit.collider.name); diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/AmpereMeter.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/AmpereMeter.cs index 3cc61c5c..6439035e 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/AmpereMeter.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/AmpereMeter.cs @@ -7,6 +7,7 @@ using UnityEngine.UI; public class AmpereMeter : MonoBehaviour { public Image im; + public Camera cam; int sum = 0; // Start is called before the first frame update void Start() @@ -20,23 +21,16 @@ public class AmpereMeter : MonoBehaviour if (Input.GetMouseButton(0)) { //1.ray ΪײĹ(һĻλõĹ) - Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + Ray ray = cam.ScreenPointToRay(Input.mousePosition); RaycastHit hit; if (Physics.Raycast(ray, out hit, 50) && !EventSystem.current.IsPointerOverGameObject()) //ײ⵽ { - //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) { - sum++; + im.gameObject.SetActive(true); } } } diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs index d436a285..7dbb75cb 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs @@ -24,8 +24,8 @@ public class GameManager : MonoBehaviour [SerializeField] SceneData SceneData;//ʱ [SerializeField] List Inverter; [SerializeField] Transform trans; - public StopValve WanStopValve; - public StopValve QianStopValve; + public StopValve WanStopValve;//ñUIť + public StopValve QianStopValve;//ǯαUIť [SerializeField] GameObject NiBianQi; [SerializeField] Image XiangWeiUI;//λUI public GameObject temp; @@ -37,6 +37,8 @@ public class GameManager : MonoBehaviour public Transform biaojiPos; public Camera toolsCam; public Image MultimeterIm; + public Image DianFuIm; + public Text DianFuTex; public void Awake() { if (ins != null) @@ -101,6 +103,10 @@ public class GameManager : MonoBehaviour default: break; } + if (Input.GetKeyDown(KeyCode.K)) + { + ToolsShow(QianXing); + } } /// /// ɷ @@ -145,7 +151,9 @@ public class GameManager : MonoBehaviour case "λ": temp.transform.localEulerAngles = new Vector3(0, 180, 0); temp.AddComponent(); + temp.AddComponent().cam = toolsCam; temp.GetComponent().im = XiangWeiUI; + FuAnBiao = temp; break; default: Insta(temp); diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs index d6c8f3e5..aef8595b 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs @@ -29,9 +29,9 @@ public class ClampAmmetersInteractive : MonoBehaviour if (GameManager.ins.temp.transform != null && GameManager.ins.temp.transform.name.Equals("ǯε(Clone)") || GameManager.ins.temp.transform.name.Equals("ǯε_(Clone)")) { GameManager.ins.temp.transform.parent = g1.transform; - GameManager.ins.temp.transform.DOLocalRotate(new Vector3(44.98f, 0, 0), 0.25f); - GameManager.ins.temp.transform.DOScale(new Vector3(20, 20, 20), 0.25f); - GameManager.ins.temp.transform.DOLocalMove(new Vector3(1.04f, -3.91f, 3.82f), 0.25f); + 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); for (int i = 0; i < floats.Count; i++) { if (floats[(int)(GameManager.ins.QianStopValve.linearMeasure / 10)]> linearMeasure) diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs index 63c162d5..d6ec4309 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs @@ -20,23 +20,26 @@ public class door_control : MonoBehaviour } private void OnMouseDown() { - // Ƿ = !Ƿ; - if (ý == true) - {//sssssssss - Ƿ = !Ƿ; - if (Ƿ == true) - { - //Ƿ = false; - animator.Play(Ŷ); - //Ƿ = false; - } - else - { - //Ƿ = true; - animator.Play(Ŷ); - //Ƿ = true; + if (!EventSystem.current.IsPointerOverGameObject()) + { + // Ƿ = !Ƿ; + if (ý == true) + {//sssssssss + Ƿ = !Ƿ; + if (Ƿ == true) + { + //Ƿ = false; + animator.Play(Ŷ); + //Ƿ = false; + } + else + { + //Ƿ = true; + animator.Play(Ŷ); + //Ƿ = true; + } } } } diff --git a/Electrical_inspectionCompetitionSystem/Packages/manifest.json b/Electrical_inspectionCompetitionSystem/Packages/manifest.json index 163e1005..6d9db300 100644 --- a/Electrical_inspectionCompetitionSystem/Packages/manifest.json +++ b/Electrical_inspectionCompetitionSystem/Packages/manifest.json @@ -7,6 +7,7 @@ "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", "com.unity.postprocessing": "3.2.2", + "com.unity.shadergraph": "12.1.8", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", diff --git a/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json b/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json index 0cbeb9db..01ba379e 100644 --- a/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json +++ b/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json @@ -91,6 +91,23 @@ }, "url": "https://packages.unity.cn" }, + "com.unity.render-pipelines.core": { + "version": "12.1.8", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.searcher": { + "version": "4.9.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.cn" + }, "com.unity.services.core": { "version": "1.4.2", "depth": 1, @@ -109,6 +126,15 @@ "dependencies": {}, "url": "https://packages.unity.cn" }, + "com.unity.shadergraph": { + "version": "12.1.8", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "12.1.8", + "com.unity.searcher": "4.9.1" + } + }, "com.unity.test-framework": { "version": "1.1.31", "depth": 0, diff --git a/Electrical_inspectionCompetitionSystem/ProjectSettings/InputManager.asset b/Electrical_inspectionCompetitionSystem/ProjectSettings/InputManager.asset index 17c8f538..05cf9550 100644 --- a/Electrical_inspectionCompetitionSystem/ProjectSettings/InputManager.asset +++ b/Electrical_inspectionCompetitionSystem/ProjectSettings/InputManager.asset @@ -293,3 +293,196 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: Enable Debug Button 1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left ctrl + altNegativeButton: + altPositiveButton: joystick button 8 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Enable Debug Button 2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: backspace + altNegativeButton: + altPositiveButton: joystick button 9 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Reset + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left alt + altNegativeButton: + altPositiveButton: joystick button 1 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Next + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: page down + altNegativeButton: + altPositiveButton: joystick button 5 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Previous + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: page up + altNegativeButton: + altPositiveButton: joystick button 4 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Validate + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: return + altNegativeButton: + altPositiveButton: joystick button 0 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Persistent + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: right shift + altNegativeButton: + altPositiveButton: joystick button 2 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Multiplier + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left shift + altNegativeButton: + altPositiveButton: joystick button 3 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 2 + axis: 6 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 2 + axis: 5 + joyNum: 0 + m_UsePhysicalKeys: 0