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

# Conflicts:
#	ChivaTechFramework/Assets/GameAssets/03.Models/09.10kV开关柜-KYN28型/Materials/推车_AlbedoTransparency.mat
#	ChivaTechFramework/Assets/GameAssets/StreamingAssets.meta
#	ChivaTechFramework/Assets/GameAssets/StreamingAssets/AssetBundles.meta
#	ChivaTechFramework/Assets/GameAssets/尖嘴钳&链条钳&摇把&二次插头/尖嘴钳&链条钳&摇把_Tex.meta
#	ChivaTechFramework/Assets/GameAssets/推车.meta
#	ChivaTechFramework/Assets/StreamingAssets/Config/Audios/10kV开关柜-KYN28型接地回路检修.meta

ChivaTechFramework/Assets/GameAssets/03.Models/09.10kV开关柜-KYN28型/配电室_10kV_开关柜极柱修改9_6.FBX.meta

@@ -0,0 +1,467 @@
+fileFormatVersion: 2
+guid: 34e846e058a7aa0448c5c44e86067cfd
+ModelImporter:
+  serializedVersion: 19301
+  internalIDToNameTable: []
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #160
+    second: {fileID: 2100000, guid: 3706837fbf3b5fe4f9e9b2fd794b3bbb, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #161
+    second: {fileID: 2100000, guid: 6c7eecdb91883694baf04b83e3d897b4, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #162
+    second: {fileID: 2100000, guid: 6cdb99e5d1cb9ef4fbe648def2627897, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #163
+    second: {fileID: 2100000, guid: 6d14a5bd94762844db169e64f19943a3, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #164
+    second: {fileID: 2100000, guid: 3706837fbf3b5fe4f9e9b2fd794b3bbb, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #165
+    second: {fileID: 2100000, guid: ca39b60adaae3514ca0fd82c0ec9de20, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #166
+    second: {fileID: 2100000, guid: 4bb5462f9731d6444895c409df8b2dce, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #167
+    second: {fileID: 2100000, guid: 7dfa510aaa73ab645a4138199ee12a0f, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #168
+    second: {fileID: 2100000, guid: 780d5232efdac8348a4c1107db229d80, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #169
+    second: {fileID: 2100000, guid: 89c1ab1bdc106eb4b9fb247beaacba85, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #170
+    second: {fileID: 2100000, guid: 3706837fbf3b5fe4f9e9b2fd794b3bbb, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #171
+    second: {fileID: 2100000, guid: f87640bb53d9e5042bd17bfd99972a67, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #172
+    second: {fileID: 2100000, guid: 4bb5462f9731d6444895c409df8b2dce, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #173
+    second: {fileID: 2100000, guid: 3706837fbf3b5fe4f9e9b2fd794b3bbb, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #174
+    second: {fileID: 2100000, guid: 6cdb99e5d1cb9ef4fbe648def2627897, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #175
+    second: {fileID: 2100000, guid: 0789f08deb8f7c04d95adf807c825a24, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #176
+    second: {fileID: 2100000, guid: 89c1ab1bdc106eb4b9fb247beaacba85, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #177
+    second: {fileID: 2100000, guid: 3d8588a18b449784496c183a04af9530, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #191
+    second: {fileID: 2100000, guid: 4d39fa8e963055c49988f16e9ac87d03, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #192
+    second: {fileID: 2100000, guid: 3706837fbf3b5fe4f9e9b2fd794b3bbb, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #195
+    second: {fileID: 2100000, guid: f87640bb53d9e5042bd17bfd99972a67, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #196
+    second: {fileID: 2100000, guid: 4bb5462f9731d6444895c409df8b2dce, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material #63
+    second: {fileID: 2100000, guid: f0ef9d51493c9e8498e078a02deae05b, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: hongse
+    second: {fileID: 2100000, guid: 3d8588a18b449784496c183a04af9530, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: huangse
+    second: {fileID: 2100000, guid: 6b26d43c148bc0c4a8b505b4753f2cd3, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: lvse
+    second: {fileID: 2100000, guid: 22ad0114149952a46961f35f4f8fc1b5, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u4E94\u9632\u9501_02"
+    second: {fileID: 2100000, guid: 8dc3077708ef74d4492d8075d323b55b, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u5185\u51F9\u900F\u8D34"
+    second: {fileID: 2100000, guid: 58e06547e6b1bf4419a61c450fd5f518, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u57AB\u7247"
+    second: {fileID: 2100000, guid: 4bb5462f9731d6444895c409df8b2dce, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u57AB\u7247_\u5C3C\u9F99_01"
+    second: {fileID: 2100000, guid: eb3332341de199449bcb8e2fca21556d, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u5851\u6599_01"
+    second: {fileID: 2100000, guid: f41f2ef60a0d17c4ca09d82a9c4295c5, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u5957\u7BA1"
+    second: {fileID: 2100000, guid: e532eb7a5fb79e543a64fea79a856e89, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u5C0F\u6807\u8BC6"
+    second: {fileID: 2100000, guid: 0920a1f48e41a43408f9cce6c86d1d9d, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u5F00\u5173\u67DC_\u5185\u90E8"
+    second: {fileID: 2100000, guid: 1ded7e24fee117a4b8b4f880e14ecef1, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u6307\u793A\u706F_01"
+    second: {fileID: 2100000, guid: e1708ba95651d3046bff23ad3b4a050b, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u6307\u793A\u706F_02"
+    second: {fileID: 2100000, guid: a41cea4a71e4274429b7da24f4138ed1, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u63A8\u8F66"
+    second: {fileID: 2100000, guid: 0b52ce6ae530c4345941b3d2ad8c8390, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u65AD\u8DEF\u5668_01"
+    second: {fileID: 2100000, guid: 3706837fbf3b5fe4f9e9b2fd794b3bbb, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u65AD\u8DEF\u5668_02"
+    second: {fileID: 2100000, guid: 6cdb99e5d1cb9ef4fbe648def2627897, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u65AD\u8DEF\u5668_03"
+    second: {fileID: 2100000, guid: 6d14a5bd94762844db169e64f19943a3, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u65AD\u8DEF\u5668_04"
+    second: {fileID: 2100000, guid: 5fd0fe99611dca54fbed213b6b2afacd, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u6F06\u9762_01"
+    second: {fileID: 2100000, guid: 6c7eecdb91883694baf04b83e3d897b4, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u7167\u660E\u706F"
+    second: {fileID: 2100000, guid: 53a3ef92668ea6447b6d788afb86d261, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u7167\u660E\u706F2"
+    second: {fileID: 2100000, guid: 403813ce34c331f44ba627054ecdcd7f, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u7167\u660E\u706F3"
+    second: {fileID: 2100000, guid: eb3332341de199449bcb8e2fca21556d, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u7167\u660E\u706F\u6CE1"
+    second: {fileID: 2100000, guid: 4a8cac01c10121346beaec3f9c249cac, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u7535\u6D41\u4E92\u611F\u5668\u94ED\u724C"
+    second: {fileID: 2100000, guid: 7067b189bec1451409cb398721cfd07d, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u7535\u6D41\u8868\u9762"
+    second: {fileID: 2100000, guid: 4cef1aac7e905294eba36d002603a855, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u7535\u78C1\u9501"
+    second: {fileID: 2100000, guid: cffd9f6838566024c95ab6b3075b00c4, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u7535\u7F06\u94ED\u724C"
+    second: {fileID: 2100000, guid: e7416d006422cbc408015af9de590625, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u771F\u7A7A\u65AD\u8DEF\u5668_\u9644\u4EF6_01"
+    second: {fileID: 2100000, guid: 5bd4be079efbc7742a1995b2e2b30c0b, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u7AEF\u5B50\u6392"
+    second: {fileID: 2100000, guid: c11a22c125b96f44fbd431ddf200cd0e, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u7EAF\u9ED1\u8272"
+    second: {fileID: 2100000, guid: 5fba31f89897e4141b4735a8808a2c1d, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u80CC\u9762"
+    second: {fileID: 2100000, guid: 1b76e7fa47ac6134e93e8e2c0b4a09c2, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u87BA\u4E1D"
+    second: {fileID: 2100000, guid: f87640bb53d9e5042bd17bfd99972a67, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u87BA\u4E1D_\u5C3C\u9F99_01"
+    second: {fileID: 2100000, guid: eb3332341de199449bcb8e2fca21556d, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u91D1\u5C5E_01"
+    second: {fileID: 2100000, guid: 8dc3077708ef74d4492d8075d323b55b, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u91D1\u5C5E_02"
+    second: {fileID: 2100000, guid: 0789f08deb8f7c04d95adf807c825a24, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u91D1\u5C5E_03"
+    second: {fileID: 2100000, guid: 89c1ab1bdc106eb4b9fb247beaacba85, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u91D1\u5C5E_04"
+    second: {fileID: 2100000, guid: 0adef18389308b14d8f404076de65855, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u91D1\u5C5E_05"
+    second: {fileID: 2100000, guid: 780d5232efdac8348a4c1107db229d80, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u94A2"
+    second: {fileID: 2100000, guid: 3226233abf269884c8818685b29928bf, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u94DC_01"
+    second: {fileID: 2100000, guid: a9245e01da3ee6b4788e7acbb7fa8b52, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u94DC_02"
+    second: {fileID: 2100000, guid: 7164c9809b00b7e4387fce75717588ed, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u94DC_03"
+    second: {fileID: 2100000, guid: 7d94f5a0b9d144d42945e628ee461efa, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u94DC_04"
+    second: {fileID: 2100000, guid: 68652a6158176034a8f2675cb59d0c84, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u94DC_05"
+    second: {fileID: 2100000, guid: f0ef9d51493c9e8498e078a02deae05b, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u94DC\u8272"
+    second: {fileID: 2100000, guid: f0ef9d51493c9e8498e078a02deae05b, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u94ED\u724C_01"
+    second: {fileID: 2100000, guid: f6eeb43fff9c576438c6635b82f2e383, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u94ED\u724C_02"
+    second: {fileID: 2100000, guid: 4d39fa8e963055c49988f16e9ac87d03, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u94ED\u724C_03"
+    second: {fileID: 2100000, guid: 50d75520e578ee143a5dda5d8c9e975a, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u94F6\u8272\u91D1\u5C5E"
+    second: {fileID: 2100000, guid: 89c1ab1bdc106eb4b9fb247beaacba85, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u9ED1\u8272"
+    second: {fileID: 2100000, guid: 5fba31f89897e4141b4735a8808a2c1d, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "\u9ED1\u8272\u6750\u8D28"
+    second: {fileID: 2100000, guid: 1267952babbe88841b9ecbe94e6be9e1, type: 2}
+  materials:
+    materialImportMode: 1
+    materialName: 0
+    materialSearch: 1
+    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: 

ChivaTechFramework/Assets/StreamingAssets/Config/Audios/10kV开关柜-KYN28型接地回路检修.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:ChivaTechFramework/Assets/StreamingAssets/Config/Audios/10kV开关柜-KYN28型接地回路检修.meta
 guid: 7e40782b398b73542ae2c242c8a6ba5d
+========
+guid: f1ac3f6535b449744a8559d7677b4851
+>>>>>>>> feature/BASE:ChivaTechFramework/Assets/GameAssets/尖嘴钳&链条钳&摇把&二次插头/尖嘴钳&链条钳&摇把_Tex.meta
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}