diff --git a/Assets/ScenesPX/BuildingScene.unity b/Assets/ScenesPX/BuildingScene.unity index ea6d525..ad7598d 100644 --- a/Assets/ScenesPX/BuildingScene.unity +++ b/Assets/ScenesPX/BuildingScene.unity @@ -166,15 +166,179 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4982175904630757565, guid: a48d97aad91128c4aba0170258820fde, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5496199957488390049, guid: a48d97aad91128c4aba0170258820fde, type: 3} propertyPath: m_Name value: MainBuilding objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3905562868815676231, guid: a48d97aad91128c4aba0170258820fde, type: 3} + insertIndex: 10 + addedObject: {fileID: 1724768977} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a48d97aad91128c4aba0170258820fde, type: 3} +--- !u!4 &539881815 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3905562868815676231, guid: a48d97aad91128c4aba0170258820fde, type: 3} + m_PrefabInstance: {fileID: 539881814} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1724768976 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 539881815} + 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: -6.6 + 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: 1724768983} + - targetCorrespondingSourceObject: {fileID: -6363791474017935533, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724768982} + - targetCorrespondingSourceObject: {fileID: -768422595545973595, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724768981} + m_SourcePrefab: {fileID: 100100000, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} +--- !u!4 &1724768977 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 1724768976} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1724768978 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -768422595545973595, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 1724768976} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1724768979 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6363791474017935533, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 1724768976} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1724768980 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6882725452452647097, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 1724768976} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1724768981 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724768978} + 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!64 &1724768982 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724768979} + 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!64 &1724768983 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724768980} + 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!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/ScenesPX/MainBuilding.prefab b/Assets/ScenesPX/MainBuilding.prefab index a5d176d..6322dc6 100644 --- a/Assets/ScenesPX/MainBuilding.prefab +++ b/Assets/ScenesPX/MainBuilding.prefab @@ -40,6 +40,7 @@ Transform: - {fileID: 1626547147184240095} - {fileID: 6608376547113342539} - {fileID: 286998566059059990} + - {fileID: 7312031535639491090} - {fileID: 5651997991166706183} - {fileID: 9129601669876066923} m_Father: {fileID: 0} @@ -19076,7 +19077,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8722270692863499749, guid: 70907499e811e1e408694ca18daf8669, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -37966,6 +37967,158 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 5912943685194160142, guid: 924d3dd742dd7d34691d7cae08546a29, type: 3} +--- !u!1001 &7130100417979192825 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3905562868815676231} + 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: -6.6 + 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: 5952114412130033765} + - targetCorrespondingSourceObject: {fileID: -6363791474017935533, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + insertIndex: -1 + addedObject: {fileID: 6830562203428624737} + - targetCorrespondingSourceObject: {fileID: -768422595545973595, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + insertIndex: -1 + addedObject: {fileID: 6111187978580419234} + m_SourcePrefab: {fileID: 100100000, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} +--- !u!1 &1703828738453186908 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -768422595545973595, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 7130100417979192825} + m_PrefabAsset: {fileID: 0} +--- !u!64 &6111187978580419234 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1703828738453186908} + 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 &4794241401947077310 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6882725452452647097, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 7130100417979192825} + m_PrefabAsset: {fileID: 0} +--- !u!64 &5952114412130033765 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4794241401947077310} + 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!1 &4997994835983190698 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6363791474017935533, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 7130100417979192825} + m_PrefabAsset: {fileID: 0} +--- !u!64 &6830562203428624737 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4997994835983190698} + 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 &7312031535639491090 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 7130100417979192825} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7481403927183623027 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Settings/PC_RPAsset.asset b/Assets/Settings/PC_RPAsset.asset index 4a232a6..0f00f1e 100644 --- a/Assets/Settings/PC_RPAsset.asset +++ b/Assets/Settings/PC_RPAsset.asset @@ -91,7 +91,7 @@ MonoBehaviour: m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_VolumeFrameworkUpdateMode: 0 - m_VolumeProfile: {fileID: 11400000, guid: 10fc4df2da32a41aaa32d77bc913491c, type: 2} + m_VolumeProfile: {fileID: 0} apvScenesData: obsoleteSceneBounds: m_Keys: [] diff --git a/Assets/StreamingAssets/AssetBundles/PXEOEG/PXEOEG b/Assets/StreamingAssets/AssetBundles/PXEOEG/PXEOEG index 7a81a7f..d8e5ace 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXEOEG/PXEOEG and b/Assets/StreamingAssets/AssetBundles/PXEOEG/PXEOEG differ diff --git a/Assets/StreamingAssets/AssetBundles/PXEOEG/PXEOEG.manifest b/Assets/StreamingAssets/AssetBundles/PXEOEG/PXEOEG.manifest index 0138fc7..82d23a7 100644 --- a/Assets/StreamingAssets/AssetBundles/PXEOEG/PXEOEG.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXEOEG/PXEOEG.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 1296130537 +CRC: 1052453181 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/AssetBundles/PXEOEG/mainbuilding b/Assets/StreamingAssets/AssetBundles/PXEOEG/mainbuilding index a5ea657..a03f06f 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXEOEG/mainbuilding and b/Assets/StreamingAssets/AssetBundles/PXEOEG/mainbuilding differ diff --git a/Assets/StreamingAssets/AssetBundles/PXEOEG/mainbuilding.manifest b/Assets/StreamingAssets/AssetBundles/PXEOEG/mainbuilding.manifest index b25c752..7a4df71 100644 --- a/Assets/StreamingAssets/AssetBundles/PXEOEG/mainbuilding.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXEOEG/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 2284693712 +CRC: 2642247581 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 619e8c15e0a9121613497c07e8083c18 + Hash: 908a0131002a958e64ac2bd07654ca5f TypeTreeHash: serializedVersion: 2 Hash: 8c543a89a1a0e1fba358decc0d14ae8c IncrementalBuildHash: serializedVersion: 2 - Hash: f5b5b01970a42825f712f9ef822e5ea1 + Hash: 1a9a1db3a417d2d63d340ebe7638b001 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/WebAssetBundles/PXEOEG/PXEOEG b/Assets/StreamingAssets/WebAssetBundles/PXEOEG/PXEOEG index 8b6dea1..557f0f5 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXEOEG/PXEOEG and b/Assets/StreamingAssets/WebAssetBundles/PXEOEG/PXEOEG differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXEOEG/PXEOEG.manifest b/Assets/StreamingAssets/WebAssetBundles/PXEOEG/PXEOEG.manifest index cf6654f..ca8ac7d 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXEOEG/PXEOEG.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXEOEG/PXEOEG.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 2824225957 +CRC: 3871460309 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/WebAssetBundles/PXEOEG/mainbuilding b/Assets/StreamingAssets/WebAssetBundles/PXEOEG/mainbuilding index 5ddc468..aa4293b 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXEOEG/mainbuilding and b/Assets/StreamingAssets/WebAssetBundles/PXEOEG/mainbuilding differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXEOEG/mainbuilding.manifest b/Assets/StreamingAssets/WebAssetBundles/PXEOEG/mainbuilding.manifest index 5325342..c7f09fb 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXEOEG/mainbuilding.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXEOEG/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 2399612612 +CRC: 3386202077 Hashes: AssetFileHash: serializedVersion: 2 - Hash: d35bce8043cbb4a26c68a8c4af0c0ad3 + Hash: 59c55bb9d13c2007b9993c57c3c0bdf4 TypeTreeHash: serializedVersion: 2 Hash: 8c543a89a1a0e1fba358decc0d14ae8c IncrementalBuildHash: serializedVersion: 2 - Hash: ab28a7f9b674ff87564219e21a7c75c3 + Hash: 0d6f74271c3c2d67c133140de579a568 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx index 0b8b5c0..1226dce 100644 Binary files a/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx and b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx differ