From 61e7bde1a9d09aada867cda8073286475e478d85 Mon Sep 17 00:00:00 2001 From: guyuan9527 <2533167850@qq.com> Date: Sun, 17 Sep 2023 11:04:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=9E=8D=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefeb/三相_无互感器_无光伏.prefab | 38 +++++++++++++ .../Prefeb/三相_无互感器_有光伏.prefab | 57 +++++++++++++++++++ .../Prefeb/三相_无带互感器_无光伏.prefab | 38 +++++++++++++ .../Prefeb/三相_有互感器_无光伏.prefab | 38 +++++++++++++ .../Prefeb/单项_无互感器_无光伏.prefab | 38 +++++++++++++ .../Prefeb/单项_无互感器_有光伏.prefab | 50 ++++++++++++++++ .../ProjectSettings/ProjectVersion.txt | 4 +- 7 files changed, 261 insertions(+), 2 deletions(-) diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab index 73a29496..54b6862f 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab @@ -4564,3 +4564,41 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4728026782583967234 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8526372940484349156, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3} + m_PrefabInstance: {fileID: 4021310176675087078} + m_PrefabAsset: {fileID: 0} +--- !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!64 &7518181732797652832 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4728026782583967234} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 2918851358235381822, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3} diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab index e23b1870..92793480 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab @@ -10878,8 +10878,65 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &5583058523313270159 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7130258515840813519} + 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: 8939706241020236899} --- !u!4 &7617861838836142965 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 52b05e392bba9ba47979c46f8f9277cc, type: 3} m_PrefabInstance: {fileID: 7940599885343519902} m_PrefabAsset: {fileID: 0} +--- !u!1 &7981768135690056596 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 69315767618635530, guid: 52b05e392bba9ba47979c46f8f9277cc, type: 3} + m_PrefabInstance: {fileID: 7940599885343519902} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2412848822791683035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7981768135690056596} + 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: 8939706241020236899} +--- !u!64 &6702075516517741688 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7981768135690056596} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -9064291388347621121, guid: 52b05e392bba9ba47979c46f8f9277cc, type: 3} diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无带互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无带互感器_无光伏.prefab index 0e98a537..1faea240 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无带互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无带互感器_无光伏.prefab @@ -4628,3 +4628,41 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4728026782583967234 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8526372940484349156, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3} + m_PrefabInstance: {fileID: 4021310176675087078} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7068980952787671044 +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!64 &1472471439317772280 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4728026782583967234} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 2918851358235381822, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3} diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab index eac1c972..f7030d49 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab @@ -9314,3 +9314,41 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6357565668127796194 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -491602864608504868, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3} + m_PrefabInstance: {fileID: 2384626891547736126} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8703856849897999536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6357565668127796194} + 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: 5853630784691286474} +--- !u!64 &591350019840623951 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6357565668127796194} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -688124394491253374, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3} diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab index 1f603044..d1baff89 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_无光伏.prefab @@ -2805,3 +2805,41 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e3e9f4bb87aa03546b0aa500d71c9a5f, type: 3} m_PrefabInstance: {fileID: 948111705343448191} m_PrefabAsset: {fileID: 0} +--- !u!1 &6340578653018048517 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -2677921994058359686, guid: e3e9f4bb87aa03546b0aa500d71c9a5f, type: 3} + m_PrefabInstance: {fileID: 948111705343448191} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8229035447924824421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6340578653018048517} + 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: 4067675147558325534} +--- !u!64 &1344509172604348657 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6340578653018048517} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 5188857828942908881, guid: e3e9f4bb87aa03546b0aa500d71c9a5f, type: 3} diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab index 2d17fb9d..9bbaf8de 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab +++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab @@ -116,6 +116,18 @@ PrefabInstance: propertyPath: m_AABB.m_Extent.z value: 0.055623785 objectReference: {fileID: 0} + - target: {fileID: 6318823686192672528, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3} + propertyPath: m_BlendShapeWeights.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3} --- !u!1 &1624700047647515140 stripped @@ -148,6 +160,44 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3} m_PrefabInstance: {fileID: 1895296105669336917} m_PrefabAsset: {fileID: 0} +--- !u!1 &7273636919654661170 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -91101163219016857, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3} + m_PrefabInstance: {fileID: 1895296105669336917} + m_PrefabAsset: {fileID: 0} +--- !u!64 &7986659195515356069 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7273636919654661170} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 2869555831153141094, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3} +--- !u!114 &3242825642925887410 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7273636919654661170} + 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: 487428305963732029} --- !u!1001 &1966393981994950760 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt b/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt index bc2ff943..cda402b2 100644 --- a/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt +++ b/Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.10f1c2 -m_EditorVersionWithRevision: 2021.3.10f1c2 (5a059dbcdda5) +m_EditorVersion: 2021.3.15f1c1 +m_EditorVersionWithRevision: 2021.3.15f1c1 (080beb55ecda)