场景问题修复重新合成AB

Assets/MainBuilding.prefab

@@ -9515,7 +9515,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 9098985721527966194, guid: 1ab58c58898d21c4a811de54d5863473, type: 3}
+  - {fileID: 2100000, guid: acb85f379521a5f47851b7d6f7a8f88d, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

Assets/ScenesKH/BuildingScene.unity

@@ -118,6 +118,127 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &1392733877
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1392733880}
+  - component: {fileID: 1392733879}
+  - component: {fileID: 1392733878}
+  m_Layer: 0
+  m_Name: Directional Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1392733878
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1392733877}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_UsePipelineSettings: 1
+  m_AdditionalLightsShadowResolutionTier: 2
+  m_LightLayerMask: 1
+  m_RenderingLayers: 1
+  m_CustomShadowLayers: 0
+  m_ShadowLayerMask: 1
+  m_ShadowRenderingLayers: 1
+  m_LightCookieSize: {x: 1, y: 1}
+  m_LightCookieOffset: {x: 0, y: 0}
+  m_SoftShadowQuality: 0
+--- !u!108 &1392733879
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1392733877}
+  m_Enabled: 1
+  serializedVersion: 11
+  m_Type: 1
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 0
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_UseBoundingSphereOverride: 0
+  m_UseViewFrustumForShadowCasterCull: 1
+  m_ForceVisible: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+  m_LightUnit: 1
+  m_LuxAtDistance: 1
+  m_EnableSpotReflector: 1
+--- !u!4 &1392733880
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1392733877}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+  m_LocalPosition: {x: -3317.7769, y: 54.68615, z: -3597.021}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1001 &6733472625323956548
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -180,3 +301,4 @@ SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
   - {fileID: 6733472625323956548}
+  - {fileID: 1392733880}

Assets/StreamingAssets/AssetBundles/PXJYXAB/PXJYXAB.manifest

@@ -1,6 +1,6 @@
 ManifestFileVersion: 0
 UnityVersion: 6000.0.13f1
-CRC: 3222255393
+CRC: 2939554988
 HashAppended: 0
 AssetBundleManifest:
   AssetBundleInfos:

Assets/StreamingAssets/AssetBundles/PXJYXAB/mainbuilding.manifest

@@ -1,16 +1,16 @@
 ManifestFileVersion: 0
 UnityVersion: 6000.0.13f1
-CRC: 4070850520
+CRC: 1542179936
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: 8cab4530de9be4477b77d39f03f39b1b
+    Hash: 6c2b4d11a1ed7830078f7ad5968656b9
   TypeTreeHash:
     serializedVersion: 2
     Hash: 3e4898902a241424dacad96dafc48830
   IncrementalBuildHash:
     serializedVersion: 2
-    Hash: 435fe4d75660cf2b8f5ee426ef0ac011
+    Hash: afbb8e3ca6593836d2ea672773147b5e
 HashAppended: 0
 ClassTypes:
 - Class: 1

Assets/StreamingAssets/WebAssetBundles/PXJYXAB/PXJYXAB.manifest

@@ -1,6 +1,6 @@
 ManifestFileVersion: 0
 UnityVersion: 6000.0.13f1
-CRC: 4125495558
+CRC: 4208173202
 HashAppended: 0
 AssetBundleManifest:
   AssetBundleInfos:

Assets/StreamingAssets/WebAssetBundles/PXJYXAB/mainbuilding.manifest

@@ -1,16 +1,16 @@
 ManifestFileVersion: 0
 UnityVersion: 6000.0.13f1
-CRC: 3740762851
+CRC: 2350694992
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: e7606b57e3114f84c3bd94f9d82cab9b
+    Hash: 6f8326bcd46c794ce9d1a99846959463
   TypeTreeHash:
     serializedVersion: 2
     Hash: 3e4898902a241424dacad96dafc48830
   IncrementalBuildHash:
     serializedVersion: 2
-    Hash: cdad57802c9af7593b31558576aad747
+    Hash: 18157571e3faa257da86547030314529
 HashAppended: 0
 ClassTypes:
 - Class: 1

Assets/ZhenHaiLiaHua/2#PolyethyleneUnit/Models/SatelliteMap.FBX.meta

@@ -3,11 +3,41 @@ guid: 1ab58c58898d21c4a811de54d5863473
 ModelImporter:
   serializedVersion: 22200
   internalIDToNameTable: []
-  externalObjects: {}
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: CJ_DI1
+    second: {fileID: 2100000, guid: 207db93e118474f41977070fd621d68e, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: CJ_MAlu
+    second: {fileID: 2100000, guid: 298c420f53897e741bcb96b43f482ded, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: CJ_MAlu1
+    second: {fileID: 2100000, guid: acb85f379521a5f47851b7d6f7a8f88d, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: CJ_RXD
+    second: {fileID: 2100000, guid: 18d73290f97fe5743aa26d9f4c50573d, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: HL_AA_HunNingTuDiMian_JiaoCuo
+    second: {fileID: 2100000, guid: 2bc7d25aa4a229a488a7eb6e5b429ab3, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: YL_LvBan_1
+    second: {fileID: 2100000, guid: 2e94528a0a0956a49998b25289a3427e, type: 2}
   materials:
     materialImportMode: 2
-    materialName: 0
-    materialSearch: 1
+    materialName: 1
+    materialSearch: 2
     materialLocation: 1
   animations:
     legacyGenerateAnimations: 4