[+]检修修改

35kVPSADS_Platform/Assets/GameAssets/配电相关工具/柱上变/Materials/BYQ_Room_AlbedoTransparency.mat

@@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BYQ_Room_AlbedoTransparency
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _NORMALMAP
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: 45f28fb1874a8e34686f133c127aaa24, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: df9ccc88ae125b843976badd3580ef0f, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

35kVPSADS_Platform/Assets/Art/Scripts.meta → 35kVPSADS_Platform/Assets/GameAssets/配电相关工具/柱上变/Materials/BYQ_Room_AlbedoTransparency.mat.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 8309d4efa5b343749a98ee602c696d90
-folderAsset: yes
-DefaultImporter:
+guid: 9c4c195e36a0e914095d054a843bfd6c
+NativeFormatImporter:
   externalObjects: {}
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

35kVPSADS_Platform/Assets/GameAssets/配电相关工具/柱上变/箱变防护网.FBX.meta

@@ -0,0 +1,97 @@
+fileFormatVersion: 2
+guid: 5ef589ac394251c40b9cbbb864b3e39a
+ModelImporter:
+  serializedVersion: 19301
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 0
+  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: 

35kVPSADS_Platform/Assets/Scenes/10kV箱式变压器断路器更换检修.unity

@@ -2087,7 +2087,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1488815b0493dd54eb9c7cbdec7d1edf, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  obj: {fileID: 3714704941427853691}
 --- !u!4 &55214362
 Transform:
   m_ObjectHideFlags: 0
@@ -12118,6 +12117,7 @@ MonoBehaviour:
     - {fileID: 1688553133}
     - {fileID: 1461239562}
     - {fileID: 839213551}
+    - {fileID: 1623971229}
     SerializedBytesString: 
     Prefab: {fileID: 0}
     PrefabModificationsReferencedUnityObjects: []
@@ -12129,7 +12129,7 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 3
+      Data: 4
     - Name: 
       Entry: 7
       Data: 1|AniDriver_SimpleMoveRot, Assembly-CSharp
@@ -12175,6 +12175,34 @@ MonoBehaviour:
     - Name: 
       Entry: 8
       Data: 
+    - Name: 
+      Entry: 7
+      Data: 4|AniDriver_ActiveObjs, Assembly-CSharp
+    - Name: animationSequence
+      Entry: 3
+      Data: 0
+    - Name: objs
+      Entry: 7
+      Data: 5|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+        mscorlib
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 10
+      Data: 3
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: activeObjs
+      Entry: 5
+      Data: true
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: 
       Entry: 13
       Data: 
@@ -15002,6 +15030,7 @@ MonoBehaviour:
     ReferencedUnityObjects:
     - {fileID: 850556699}
     - {fileID: 839213551}
+    - {fileID: 1623971229}
     SerializedBytesString: 
     Prefab: {fileID: 0}
     PrefabModificationsReferencedUnityObjects: []
@@ -15013,7 +15042,7 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 5
+      Data: 7
     - Name: 
       Entry: 7
       Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
@@ -15109,6 +15138,46 @@ MonoBehaviour:
     - Name: 
       Entry: 8
       Data: 
+    - Name: 
+      Entry: 7
+      Data: 8|AniDriver_WaitTime, Assembly-CSharp
+    - Name: animationSequence
+      Entry: 3
+      Data: 1
+    - Name: waitTime
+      Entry: 4
+      Data: 0.5
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 9|AniDriver_ActiveObjs, Assembly-CSharp
+    - Name: animationSequence
+      Entry: 3
+      Data: 0
+    - Name: objs
+      Entry: 7
+      Data: 10|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+        mscorlib
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 10
+      Data: 2
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: activeObjs
+      Entry: 5
+      Data: false
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: 
       Entry: 13
       Data: 
@@ -16310,12 +16379,11 @@ MonoBehaviour:
   m_AddAnimationDataNames: 
   aniDataSelectReName: 
   m_AniDataReName: 
-  jumpTargetAnimation: "30\u5DE5\u4F5C\u7EC8\u7ED3\r"
+  jumpTargetAnimation: "31\u6253\u5F00\u4F4E\u538B\u4FA7\u67DC\u95E8"
   m_CurrentAniData: {fileID: 607898373}
   aniName: "01\u786E\u8BA4\u68C0\u4FEE\u65B9\u6848\r"
   currentStepID: 1
-  selection:
-  - {fileID: 2220282049137503034}
+  selection: []
 --- !u!4 &634000278 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 400000, guid: 3bd600bd6ad25274c91c12e6a282c1e2,
@@ -25543,8 +25611,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 963194225}
-  m_LocalRotation: {x: -0.0015481218, y: -0.91731334, z: 0.39814708, w: -0.003571272}
-  m_LocalPosition: {x: 244.53622, y: 6.3052497, z: -31.736053}
+  m_LocalRotation: {x: 0.20845884, y: -0.001467582, z: 0.00031277808, w: 0.97803}
+  m_LocalPosition: {x: 245.14008, y: 4.131976, z: -42.69586}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -45687,6 +45755,38 @@ Transform:
   m_Father: {fileID: 2135340612}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1623971229
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1623971230}
+  m_Layer: 0
+  m_Name: "\u7BB1\u5F0F\u53D8\u538B\u5668\u9632\u62A4\u7F51"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1623971230
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1623971229}
+  m_LocalRotation: {x: -0.000000053385087, y: 0.7071068, z: 0.7071068, w: 0.000000053385087}
+  m_LocalPosition: {x: 244.40865, y: 1.6764892, z: -34.62983}
+  m_LocalScale: {x: 0.73639077, y: 0.73639065, z: 0.73639065}
+  m_Children:
+  - {fileID: 1202734001373272162}
+  - {fileID: 8585451622568239737}
+  m_Father: {fileID: 0}
+  m_RootOrder: 25
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1625181171
 GameObject:
   m_ObjectHideFlags: 0
@@ -195054,6 +195154,20 @@ Transform:
   m_Father: {fileID: 339204420128031852}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &1202734001373272162
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4067985301722173714}
+  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: []
+  m_Father: {fileID: 1623971230}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1203049783337783313
 GameObject:
   m_ObjectHideFlags: 0
@@ -523813,6 +523927,24 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+--- !u!1 &4067985301722173714
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1202734001373272162}
+  - component: {fileID: 7542315109946223496}
+  - component: {fileID: 7774050995060423946}
+  m_Layer: 0
+  m_Name: HuWangMen003
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!4 &4068055682987342948
 Transform:
   m_ObjectHideFlags: 0
@@ -775119,6 +775251,45 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!23 &6273370871639309778
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7532525065703955574}
+  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: 9c4c195e36a0e914095d054a843bfd6c, 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 &6273461892357451756
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -919937,6 +920108,24 @@ Transform:
   m_Father: {fileID: 1168730603480774018}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7532525065703955574
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8585451622568239737}
+  - component: {fileID: 7993296336817179828}
+  - component: {fileID: 6273370871639309778}
+  m_Layer: 0
+  m_Name: HuWangMen004
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!23 &7532533443854198427
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -921095,6 +921284,14 @@ Transform:
   m_Father: {fileID: 59130853276988527}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &7542315109946223496
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4067985301722173714}
+  m_Mesh: {fileID: -1867919865215352912, guid: 5ef589ac394251c40b9cbbb864b3e39a, type: 3}
 --- !u!1 &7542499408904062189
 GameObject:
   m_ObjectHideFlags: 0
@@ -946441,6 +946638,45 @@ Transform:
   m_Father: {fileID: 121644368416655615}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &7774050995060423946
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4067985301722173714}
+  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: 9c4c195e36a0e914095d054a843bfd6c, 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 &7774075946721818978
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -971969,6 +972205,14 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!33 &7993296336817179828
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7532525065703955574}
+  m_Mesh: {fileID: 7337876448043312600, guid: 5ef589ac394251c40b9cbbb864b3e39a, type: 3}
 --- !u!23 &7993560115596190232
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -1039508,6 +1039752,20 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+--- !u!4 &8585451622568239737
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7532525065703955574}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 1.5416256, y: 0, z: 0.32975483}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1623971230}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &8585458162835530148
 MeshRenderer:
   m_ObjectHideFlags: 0

35kVPSADS_Platform/Assets/Scenes/工作原理/10kV柱上开关原理认知.unity.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1038.meta
-guid: 9097354a58fb5bf4191a509d482bf00a
+guid: de6a8cb747a2abf44a3736c948aba231
 folderAsset: yes
 ========
 guid: a7c3f8606dad3cb4db878f63d12ce34e

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1032.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 571dcad62d3462e42aa9340eb55bde90
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1037.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1037.meta
-guid: 2cee65e8de623034baac387ead867180
-========
-guid: e73ba98a0aa080843b82997a3329bd76
->>>>>>>> feature/cjy:35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1041.meta
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1038.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1038.meta
-guid: 9097354a58fb5bf4191a509d482bf00a
-folderAsset: yes
-========
-guid: a7c3f8606dad3cb4db878f63d12ce34e
->>>>>>>> feature/cjy:35kVPSADS_Platform/Assets/Scenes/工作原理/10kV柱上开关原理认知.unity.meta
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1041.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1041.meta
-guid: 4a5418deec5d0724fafb04c533aaa504
-========
-guid: a99a0778c9c4cf24c87615c5d89bfe3b
->>>>>>>> feature/cjy:35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1037.meta
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: