Bladeren bron

Merge branch 'feature/JNHJ' into develop_合作分支

2809621200 3 maanden geleden
bovenliggende
commit
87bd530970

BIN
ChivaTechFramework/Assets/GameAssets/03.Models/02.220kV变压器-SFPSZ10-180000型/有载分接开关V2_250910/管子.FBX


+ 105 - 0
ChivaTechFramework/Assets/GameAssets/03.Models/02.220kV变压器-SFPSZ10-180000型/有载分接开关V2_250910/管子.FBX.meta

@@ -0,0 +1,105 @@
+fileFormatVersion: 2
+guid: c927340b9beb43b4ebeba193681a86ad
+ModelImporter:
+  serializedVersion: 19301
+  internalIDToNameTable:
+  - first:
+      74: 1827226128182048838
+    second: Take 001
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: YouGuan
+    second: {fileID: 2100000, guid: 1efc889012e4fd4498046ed2cee2d96d, type: 2}
+  materials:
+    materialImportMode: 1
+    materialName: 1
+    materialSearch: 2
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 350 - 74
ChivaTechFramework/Assets/Scenes/云南/220kV主变-主变解体大修(吊罩检修)-上.unity

@@ -245884,80 +245884,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 753379088}
   m_Mesh: {fileID: 1577970659463737415, guid: 04df3306d305ed840b1b6992bbb783c9, type: 3}
---- !u!1001 &753508424
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: ead89a899afd18d49b68e8237d71b8c9,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 35
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ead89a899afd18d49b68e8237d71b8c9,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ead89a899afd18d49b68e8237d71b8c9,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ead89a899afd18d49b68e8237d71b8c9,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ead89a899afd18d49b68e8237d71b8c9,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ead89a899afd18d49b68e8237d71b8c9,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ead89a899afd18d49b68e8237d71b8c9,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ead89a899afd18d49b68e8237d71b8c9,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ead89a899afd18d49b68e8237d71b8c9,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ead89a899afd18d49b68e8237d71b8c9,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ead89a899afd18d49b68e8237d71b8c9,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: ead89a899afd18d49b68e8237d71b8c9,
-        type: 3}
-      propertyPath: m_Name
-      value: "\u9AD8\u538B\u4FA7\u5957\u7BA1\u66F4\u6362\u68C0\u4FEE"
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: ead89a899afd18d49b68e8237d71b8c9,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: ead89a899afd18d49b68e8237d71b8c9, type: 3}
 --- !u!1 &753678654
 GameObject:
   m_ObjectHideFlags: 0
@@ -697435,6 +697361,14 @@ Transform:
   m_Father: {fileID: 5252642016066953333}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &185566353213727044
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5465158057985668519}
+  m_Mesh: {fileID: 4683118920321661993, guid: c927340b9beb43b4ebeba193681a86ad, type: 3}
 --- !u!23 &185650187121156840
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -704930,6 +704864,20 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+--- !u!4 &248889242774714124
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 328039285971743598}
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 69.14426, y: 0.020652466, z: 96.65197}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1855031974785729350}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &249013118510099544
 GameObject:
   m_ObjectHideFlags: 0
@@ -715431,6 +715379,24 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1059049657802950768}
   m_Mesh: {fileID: -7869976868609869325, guid: 6123dcc237acebf46aa55014607f3599, type: 3}
+--- !u!1 &328039285971743598
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 248889242774714124}
+  - component: {fileID: 2264993057630192219}
+  - component: {fileID: 3795895739966449231}
+  m_Layer: 0
+  m_Name: Line006
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!33 &328406574092222501
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -718325,6 +718291,14 @@ Transform:
   m_Father: {fileID: 906834444885450609}
   m_RootOrder: 254
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &349865124071426282
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3657912343770219709}
+  m_Mesh: {fileID: -8543024111160955710, guid: c927340b9beb43b4ebeba193681a86ad, type: 3}
 --- !u!23 &349870774350210673
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -849431,6 +849405,22 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7794032410049116933}
   m_Mesh: {fileID: 1270493306821677554, guid: 04df3306d305ed840b1b6992bbb783c9, type: 3}
+--- !u!1 &1366197538153568764
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1855031974785729350}
+  m_Layer: 0
+  m_Name: "\u7BA1\u5B50"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!4 &1366201946745716854
 Transform:
   m_ObjectHideFlags: 0
@@ -910103,6 +910093,24 @@ Transform:
   m_Father: {fileID: 8418775442300171166}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &1855031974785729350
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1366197538153568764}
+  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_Children:
+  - {fileID: 248889242774714124}
+  - {fileID: 7085116771002521138}
+  - {fileID: 4621555374466711768}
+  - {fileID: 8352916684168780842}
+  m_Father: {fileID: 0}
+  m_RootOrder: 35
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1855218059323823673
 GameObject:
   m_ObjectHideFlags: 0
@@ -962993,6 +963001,14 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!33 &2264993057630192219
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 328039285971743598}
+  m_Mesh: {fileID: -7332506622660098701, guid: c927340b9beb43b4ebeba193681a86ad, type: 3}
 --- !u!33 &2265087219579812587
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -1137548,6 +1137564,24 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8032281698103647772}
   m_Mesh: {fileID: 6742268153349674437, guid: 04df3306d305ed840b1b6992bbb783c9, type: 3}
+--- !u!1 &3657912343770219709
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7085116771002521138}
+  - component: {fileID: 349865124071426282}
+  - component: {fileID: 5816457923391931814}
+  m_Layer: 0
+  m_Name: Line894
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!33 &3657930741636224692
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -1155661,6 +1155695,45 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!23 &3795895739966449231
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 328039285971743598}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 1efc889012e4fd4498046ed2cee2d96d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
 --- !u!4 &3795910572402407313
 Transform:
   m_ObjectHideFlags: 0
@@ -1259038,6 +1259111,20 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+--- !u!4 &4621555374466711768
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5465158057985668519}
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 64.54184, y: 0.7993534, z: 81.63868}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1855031974785729350}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &4621650667737364879
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -1366706,6 +1366793,24 @@ Transform:
   m_Father: {fileID: 7740642315420711197}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5465158057985668519
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4621555374466711768}
+  - component: {fileID: 185566353213727044}
+  - component: {fileID: 8002165856042277946}
+  m_Layer: 0
+  m_Name: Line899
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!23 &5465228911762730834
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -1386966,6 +1387071,24 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6423815125409962970}
   m_Mesh: {fileID: -2287308695963432554, guid: b11acb6ea96f51b4fa8b706675a18fac, type: 3}
+--- !u!1 &5628735998111458308
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8352916684168780842}
+  - component: {fileID: 8579568810919500025}
+  - component: {fileID: 7768617634861906527}
+  m_Layer: 0
+  m_Name: Line900
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!23 &5628747628323001062
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -1410648,6 +1410771,45 @@ Transform:
   m_Father: {fileID: 4090725083861135994}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &5816457923391931814
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3657912343770219709}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 1efc889012e4fd4498046ed2cee2d96d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
 --- !u!33 &5816487129407919369
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -1572399,6 +1572561,20 @@ Transform:
   m_Father: {fileID: 2041998314285599157}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &7085116771002521138
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3657912343770219709}
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 64.54184, y: 0.7993534, z: 81.63868}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1855031974785729350}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &7085135211712047643
 Transform:
   m_ObjectHideFlags: 0
@@ -1663272,6 +1663448,45 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6741776854712447913}
   m_Mesh: {fileID: 5784522840025258663, guid: b11acb6ea96f51b4fa8b706675a18fac, type: 3}
+--- !u!23 &7768617634861906527
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5628735998111458308}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 1efc889012e4fd4498046ed2cee2d96d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
 --- !u!4 &7768714213033006314
 Transform:
   m_ObjectHideFlags: 0
@@ -1693501,6 +1693716,45 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 22
   m_IsActive: 1
+--- !u!23 &8002165856042277946
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5465158057985668519}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 1efc889012e4fd4498046ed2cee2d96d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
 --- !u!1 &8002575599531733178
 GameObject:
   m_ObjectHideFlags: 0
@@ -1737940,6 +1738194,20 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!4 &8352916684168780842
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5628735998111458308}
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 69.14426, y: 0.020652466, z: 96.65197}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1855031974785729350}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8352965382337228306
 GameObject:
   m_ObjectHideFlags: 0
@@ -1766858,6 +1767126,14 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+--- !u!33 &8579568810919500025
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5628735998111458308}
+  m_Mesh: {fileID: -2717912653368089758, guid: c927340b9beb43b4ebeba193681a86ad, type: 3}
 --- !u!33 &8579606431243872840
 MeshFilter:
   m_ObjectHideFlags: 0

File diff suppressed because it is too large
+ 356 - 319
ChivaTechFramework/Assets/Scenes/云南/220kV主变-主变解体大修(吊罩检修)-下.unity


File diff suppressed because it is too large
+ 439 - 354
ChivaTechFramework/Assets/Scenes/云南/220kV主变-调压机构吊出及检修.unity


File diff suppressed because it is too large
+ 362 - 100
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型解体大修.unity


File diff suppressed because it is too large
+ 163 - 628
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV断路器-LW13型控制、传动部分解体检修.unity


File diff suppressed because it is too large
+ 499 - 222
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV断路器-LW13型解体大修.unity


+ 8 - 8
ChivaTechFramework/ProjectSettings/EditorBuildSettings.asset

@@ -78,8 +78,8 @@ EditorBuildSettings:
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/500kV\u65AD\u8DEF\u5668-LW13\u578B\u706D\u5F27\u3001\u5BFC\u7535\u548C\u7EDD\u7F18\u90E8\u5206\u89E3\u4F53\u5927\u4FEE.unity"
     guid: 63c0c53724f21b04da1fffc22a4249f0
   - enabled: 1
-    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u89E3\u4F53\u5927\u4FEE_old.unity"
-    guid: c628b263750c9924da8656debc0c06af
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u89E3\u4F53\u5927\u4FEE.unity"
+    guid: 38f497fdfbf927342807a14b63ee1e8d
   - enabled: 1
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u64CD\u52A8\u673A\u6784\u89E3\u4F53\u68C0\u4FEE.unity"
     guid: d37c386efce20a24a94626defb42fede
@@ -93,8 +93,8 @@ EditorBuildSettings:
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u74F7\u8D28\u7EDD\u7F18\u68C0\u4FEE.unity"
     guid: 2f277fd29d6547b4d9907c31cf658029
   - enabled: 1
-    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u65AD\u8DEF\u5668-LW35\u578B\u89E3\u4F53\u5927\u4FEE_old.unity"
-    guid: 7a7584f0e9c365348ace86d37483e9b9
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u65AD\u8DEF\u5668-LW35\u578B\u89E3\u4F53\u5927\u4FEE.unity"
+    guid: 2170a3b8879362b47a9e0c1d792d2577
   - enabled: 1
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u65AD\u8DEF\u5668-LW35\u578B\u74F7\u8D28\u7EDD\u7F18\u68C0\u4FEE.unity"
     guid: 66d2c68eab6bd024796caeab2299aa1c
@@ -123,8 +123,8 @@ EditorBuildSettings:
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/500kV\u9694\u79BB\u5F00\u5173-GW12\u578B\u8F74\u627F\u5EA7\u68C0\u4FEE.unity"
     guid: 5368c015e6a48734a97645e829c18acc
   - enabled: 1
-    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u89E3\u4F53\u5927\u4FEE_old.unity"
-    guid: 230b3e331b8cf7543b6988b80e726c83
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u89E3\u4F53\u5927\u4FEE.unity"
+    guid: 3c49d791724867f4d8de3f203576b561
   - enabled: 1
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u8F74\u627F\u5EA7\u5927\u4FEE.unity"
     guid: c7cba51e2aaf1f747894ff7861d24de4
@@ -138,8 +138,8 @@ EditorBuildSettings:
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u4F20\u52A8\u673A\u6784\u548C\u8F6C\u52A8\u90E8\u4EF6\u5927\u4FEE.unity"
     guid: 341e1be39d9f9e04c8b95f76bfacef03
   - enabled: 1
-    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u89E3\u4F53\u5927\u4FEE_old.unity"
-    guid: 9263387a8745ebb499a01812f7fdbc77
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u89E3\u4F53\u5927\u4FEE.unity"
+    guid: 620e1602ffe96f842a1b37faba49464c
   - enabled: 1
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u63A5\u5730\u5200\u95F8\u53CA\u5173\u8054\u90E8\u4EF6\u5927\u4FEE.unity"
     guid: 6ec9392c15d394e4d80bc0c6ae16c532

+ 2 - 2
ChivaTechFramework/ProjectSettings/ProjectSettings.asset

@@ -17,8 +17,8 @@ PlayerSettings:
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
-  m_ShowUnitySplashScreen: 1
-  m_ShowUnitySplashLogo: 1
+  m_ShowUnitySplashScreen: 0
+  m_ShowUnitySplashLogo: 0
   m_SplashScreenOverlayOpacity: 1
   m_SplashScreenAnimation: 1
   m_SplashScreenLogoStyle: 1

Some files were not shown because too many files changed in this diff