diff --git a/Assets/ScenesPX.meta b/Assets/ScenesPX.meta index e59fb45..3496165 100644 --- a/Assets/ScenesPX.meta +++ b/Assets/ScenesPX.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9c53962885c2c4f449125a979d6ad240 +guid: d67f467aa8c964e4c95b65eccb05c68e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ScenesPX/BuildingScene.unity.meta b/Assets/ScenesPX/BuildingScene.unity.meta index 9531828..e2c4fd7 100644 --- a/Assets/ScenesPX/BuildingScene.unity.meta +++ b/Assets/ScenesPX/BuildingScene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 99c9720ab356a0642a771bea13969a05 +guid: 02e3a50aabd7ea346951b3dff6273e29 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/ScenesPX/MainBuilding.prefab b/Assets/ScenesPX/MainBuilding.prefab index bda6e51..8ce143a 100644 --- a/Assets/ScenesPX/MainBuilding.prefab +++ b/Assets/ScenesPX/MainBuilding.prefab @@ -37,6 +37,7 @@ Transform: - {fileID: 8344676188388531362} - {fileID: 7624939651772166094} - {fileID: 2232861648952422405} + - {fileID: 3865222864585810447} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3184217892541169613 @@ -5455,6 +5456,132 @@ Transform: m_CorrespondingSourceObject: {fileID: 8232697041002530655, guid: 84ef1f64346ed6c4fa788140ade63818, type: 3} m_PrefabInstance: {fileID: 1986457291980155025} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3616037325951698404 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2648534425741370506} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalScale.x + value: 0.9850001 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalPosition.x + value: 974.2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalPosition.y + value: 166.7 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalPosition.z + value: -292.4 + 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: -6363791474017935533, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + insertIndex: -1 + addedObject: {fileID: 1565241959464975319} + - targetCorrespondingSourceObject: {fileID: -768422595545973595, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + insertIndex: -1 + addedObject: {fileID: 1473496400198215780} + m_SourcePrefab: {fileID: 100100000, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} +--- !u!1 &1549796364519987895 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6363791474017935533, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 3616037325951698404} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1565241959464975319 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549796364519987895} + 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!4 &3865222864585810447 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 3616037325951698404} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5150074472983607617 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -768422595545973595, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 3616037325951698404} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1473496400198215780 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5150074472983607617} + 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!1001 &4235170315936466662 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/StreamingAssets/AssetBundles/PXYX/PXYX b/Assets/StreamingAssets/AssetBundles/PXYX/PXYX index c4e1b9a..3d3a522 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXYX/PXYX and b/Assets/StreamingAssets/AssetBundles/PXYX/PXYX differ diff --git a/Assets/StreamingAssets/AssetBundles/PXYX/PXYX.manifest b/Assets/StreamingAssets/AssetBundles/PXYX/PXYX.manifest index 7e41ce2..814d12d 100644 --- a/Assets/StreamingAssets/AssetBundles/PXYX/PXYX.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXYX/PXYX.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 910807649 +CRC: 293186008 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/AssetBundles/PXYX/mainbuilding b/Assets/StreamingAssets/AssetBundles/PXYX/mainbuilding index 1675a1b..5c808b8 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXYX/mainbuilding and b/Assets/StreamingAssets/AssetBundles/PXYX/mainbuilding differ diff --git a/Assets/StreamingAssets/AssetBundles/PXYX/mainbuilding.manifest b/Assets/StreamingAssets/AssetBundles/PXYX/mainbuilding.manifest index 91b6c73..3b50e86 100644 --- a/Assets/StreamingAssets/AssetBundles/PXYX/mainbuilding.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXYX/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 458201581 +CRC: 1010256954 Hashes: AssetFileHash: serializedVersion: 2 - Hash: d00331229d928cde8c05e05165296f05 + Hash: 1ec115a43ed68c636495c0e7eb731703 TypeTreeHash: serializedVersion: 2 Hash: 8c543a89a1a0e1fba358decc0d14ae8c IncrementalBuildHash: serializedVersion: 2 - Hash: 875a55fdde32310943e731c43f23b5bd + Hash: e273a2b32874f14962aa86306623a5f9 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/WebAssetBundles/PXYX/PXYX b/Assets/StreamingAssets/WebAssetBundles/PXYX/PXYX index f11d3e1..354f57c 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXYX/PXYX and b/Assets/StreamingAssets/WebAssetBundles/PXYX/PXYX differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXYX/PXYX.manifest b/Assets/StreamingAssets/WebAssetBundles/PXYX/PXYX.manifest index 4ac63e0..cdf11df 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXYX/PXYX.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXYX/PXYX.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 188868383 +CRC: 3180949745 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/WebAssetBundles/PXYX/mainbuilding b/Assets/StreamingAssets/WebAssetBundles/PXYX/mainbuilding index 8523531..b7921cf 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXYX/mainbuilding and b/Assets/StreamingAssets/WebAssetBundles/PXYX/mainbuilding differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXYX/mainbuilding.manifest b/Assets/StreamingAssets/WebAssetBundles/PXYX/mainbuilding.manifest index 6037bd6..c7b5ed4 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXYX/mainbuilding.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXYX/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 4291142813 +CRC: 4183980468 Hashes: AssetFileHash: serializedVersion: 2 - Hash: f5b2924773dffb70392cf481cac8faf2 + Hash: 3c68643e8171e8ba27490e43b60535d6 TypeTreeHash: serializedVersion: 2 Hash: 8c543a89a1a0e1fba358decc0d14ae8c IncrementalBuildHash: serializedVersion: 2 - Hash: 81f54acdc9e8d7986dff24197ff8f6d0 + Hash: e8f2b7a2618d7feadd88af8608c44140 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx index a3eb9f1..09ec1ca 100644 Binary files a/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx and b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx differ