diff --git a/Assets/ScenesPX/MainBuilding.prefab b/Assets/ScenesPX/MainBuilding.prefab index 5444324..f0d86a1 100644 --- a/Assets/ScenesPX/MainBuilding.prefab +++ b/Assets/ScenesPX/MainBuilding.prefab @@ -722,7 +722,7 @@ Transform: - {fileID: 5127463813014511209} - {fileID: 5734150122289391433} - {fileID: 1426484360236607723} - - {fileID: 8245921271055333749} + - {fileID: 8750453551524026513} - {fileID: 6915386537167195500} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9538,92 +9538,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &6093543833506917346 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8245921271055333749} - - component: {fileID: 6897680088107317200} - - component: {fileID: 2891430350633444469} - m_Layer: 0 - m_Name: SatelliteMap - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8245921271055333749 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6093543833506917346} - serializedVersion: 2 - m_LocalRotation: {x: -0.7054693, y: -0.048094034, z: -0.048094034, w: 0.7054693} - m_LocalPosition: {x: -2202.931, y: 6.7999268, z: -2933.1016} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7275199989174734519} - m_LocalEulerAnglesHint: {x: -90, y: -7.8, z: 0} ---- !u!33 &6897680088107317200 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6093543833506917346} - m_Mesh: {fileID: 3246366808938264244, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} ---- !u!23 &2891430350633444469 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6093543833506917346} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 9df545a812c385347aaab1b652e34481, 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 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &6174715208976992969 GameObject: m_ObjectHideFlags: 0 @@ -14288,3 +14202,155 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &9143822756404035450 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7275199989174734519} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalPosition.x + value: -2158.9429 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalPosition.y + value: 0.048337094 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalPosition.z + value: -2953.7249 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalRotation.w + value: 0.70546806 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalRotation.x + value: -0.70546806 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalRotation.y + value: -0.04811254 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalRotation.z + value: -0.04811254 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_Name + value: SatelliteMap + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: -6882725452452647097, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + insertIndex: -1 + addedObject: {fileID: 1758646834062267673} + - targetCorrespondingSourceObject: {fileID: -6363791474017935533, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + insertIndex: -1 + addedObject: {fileID: 2466284553751129853} + - targetCorrespondingSourceObject: {fileID: -768422595545973595, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + insertIndex: -1 + addedObject: {fileID: 3648359399628850587} + m_SourcePrefab: {fileID: 100100000, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} +--- !u!1 &843125177188434911 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -768422595545973595, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 9143822756404035450} + m_PrefabAsset: {fileID: 0} +--- !u!64 &3648359399628850587 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 843125177188434911} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -7408863102737442089, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} +--- !u!1 &6433997927900258345 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6363791474017935533, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 9143822756404035450} + m_PrefabAsset: {fileID: 0} +--- !u!64 &2466284553751129853 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6433997927900258345} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -5826702118321648356, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} +--- !u!1 &6818106732453908541 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6882725452452647097, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 9143822756404035450} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1758646834062267673 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6818106732453908541} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 5030479551232738066, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} +--- !u!4 &8750453551524026513 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 9143822756404035450} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/PXDKQYLGQ b/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/PXDKQYLGQ index 62459ce..4502dba 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/PXDKQYLGQ and b/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/PXDKQYLGQ differ diff --git a/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/PXDKQYLGQ.manifest b/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/PXDKQYLGQ.manifest index 439d0dc..6d69b8b 100644 --- a/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/PXDKQYLGQ.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/PXDKQYLGQ.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 2019215393 +CRC: 118751034 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/mainbuilding b/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/mainbuilding index 032b305..8165118 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/mainbuilding and b/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/mainbuilding differ diff --git a/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/mainbuilding.manifest b/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/mainbuilding.manifest index 17d0de6..73def37 100644 --- a/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/mainbuilding.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXDKQYLGQ/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 824496889 +CRC: 980819096 Hashes: AssetFileHash: serializedVersion: 2 - Hash: f239ee09b4ce12537ebe7c0322bb8282 + Hash: 2e6b6d7e6b9af3ccca0dc2da817820fd TypeTreeHash: serializedVersion: 2 - Hash: e7b2853f65ee4eab169b4ddcd60e2f2f + Hash: 8c543a89a1a0e1fba358decc0d14ae8c IncrementalBuildHash: serializedVersion: 2 - Hash: b01e885d720afa3d85273de854058643 + Hash: 65766f5cd3785df66a8c8b22ef6c68b1 HashAppended: 0 ClassTypes: - Class: 1 @@ -29,6 +29,8 @@ ClassTypes: Script: {instanceID: 0} - Class: 48 Script: {instanceID: 0} +- Class: 64 + Script: {instanceID: 0} - Class: 114 Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3} - Class: 114 diff --git a/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/PXDKQYLGQ b/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/PXDKQYLGQ index 7130273..2d3879c 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/PXDKQYLGQ and b/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/PXDKQYLGQ differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/PXDKQYLGQ.manifest b/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/PXDKQYLGQ.manifest index 8590707..1c11a9e 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/PXDKQYLGQ.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/PXDKQYLGQ.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 3476467003 +CRC: 2230242723 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/mainbuilding b/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/mainbuilding index b92eb5f..3e091f9 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/mainbuilding and b/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/mainbuilding differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/mainbuilding.manifest b/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/mainbuilding.manifest index 6a65b28..281c5fe 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/mainbuilding.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXDKQYLGQ/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 1843534039 +CRC: 464950908 Hashes: AssetFileHash: serializedVersion: 2 - Hash: cdbf1fbe5142e0ae0e5ed46abe81848d + Hash: 869b9d68a6a17c75ebd8805a35870372 TypeTreeHash: serializedVersion: 2 - Hash: e7b2853f65ee4eab169b4ddcd60e2f2f + Hash: 8c543a89a1a0e1fba358decc0d14ae8c IncrementalBuildHash: serializedVersion: 2 - Hash: 554d6158204077787e156d78e4f23edc + Hash: 98280839b062cafb23f51ff2973a0ad6 HashAppended: 0 ClassTypes: - Class: 1 @@ -29,6 +29,8 @@ ClassTypes: Script: {instanceID: 0} - Class: 48 Script: {instanceID: 0} +- Class: 64 + Script: {instanceID: 0} - Class: 114 Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3} - Class: 114 diff --git a/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx index 67bff6a..bcab9af 100644 Binary files a/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx and b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx differ