diff --git a/Assets/ScenesPX/BuildingScene.unity b/Assets/ScenesPX/BuildingScene.unity index 619574c..9b1222f 100644 --- a/Assets/ScenesPX/BuildingScene.unity +++ b/Assets/ScenesPX/BuildingScene.unity @@ -118,6 +118,188 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &1085207957 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 344888801008083170} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalPosition.x + value: 1285.9 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalPosition.y + value: 19.39 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalPosition.z + value: 269.3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7054693 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7054693 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalRotation.y + value: -0.048094034 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalRotation.z + value: -0.048094034 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -7.8 + 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: -8913868966496605525, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + insertIndex: -1 + addedObject: {fileID: 1085207966} + - targetCorrespondingSourceObject: {fileID: -6882725452452647097, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + insertIndex: -1 + addedObject: {fileID: 1085207965} + - targetCorrespondingSourceObject: {fileID: -6363791474017935533, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + insertIndex: -1 + addedObject: {fileID: 1085207964} + - targetCorrespondingSourceObject: {fileID: -768422595545973595, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + insertIndex: -1 + addedObject: {fileID: 1085207963} + m_SourcePrefab: {fileID: 100100000, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} +--- !u!4 &1085207958 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 1085207957} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1085207959 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -768422595545973595, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 1085207957} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1085207960 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6363791474017935533, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 1085207957} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1085207961 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6882725452452647097, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 1085207957} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1085207962 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8913868966496605525, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} + m_PrefabInstance: {fileID: 1085207957} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1085207963 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1085207959} + 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 &1085207964 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1085207960} + 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 &1085207965 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1085207961} + 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!64 &1085207966 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1085207962} + 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: -3189427797568355340, guid: 885fda30148d6014c993a9d5bc141f87, type: 3} --- !u!1001 &344888801008083169 PrefabInstance: m_ObjectHideFlags: 0 @@ -170,11 +352,60 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8329891142216603180, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8329891142216603180, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8329891142216603180, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} + propertyPath: m_LocalPosition.x + value: 1306 + objectReference: {fileID: 0} + - target: {fileID: 8329891142216603180, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} + propertyPath: m_LocalPosition.y + value: 19.5 + objectReference: {fileID: 0} + - target: {fileID: 8329891142216603180, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} + propertyPath: m_LocalPosition.z + value: 269 + objectReference: {fileID: 0} + - target: {fileID: 8329891142216603180, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} + propertyPath: m_LocalRotation.w + value: 0.70551103 + objectReference: {fileID: 0} + - target: {fileID: 8329891142216603180, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} + propertyPath: m_LocalRotation.x + value: -0.70551103 + objectReference: {fileID: 0} + - target: {fileID: 8329891142216603180, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} + propertyPath: m_LocalRotation.y + value: -0.047478423 + objectReference: {fileID: 0} + - target: {fileID: 8329891142216603180, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} + propertyPath: m_LocalRotation.z + value: -0.047478423 + objectReference: {fileID: 0} + - target: {fileID: 8329891142216603180, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -7.7 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 8706134763344104598, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7828731996229260504, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} + insertIndex: -1 + addedObject: {fileID: 1085207958} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} +--- !u!4 &344888801008083170 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7828731996229260504, guid: daf998873f6bbca47a2edde3e4c6eb78, type: 3} + m_PrefabInstance: {fileID: 344888801008083169} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Settings/Mobile_RPAsset.asset b/Assets/Settings/Mobile_RPAsset.asset index 0fdefd1..08a0815 100644 --- a/Assets/Settings/Mobile_RPAsset.asset +++ b/Assets/Settings/Mobile_RPAsset.asset @@ -78,11 +78,11 @@ MonoBehaviour: m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 + m_AllowPostProcessAlphaOutput: 0 m_UseFastSRGBLinearConversion: 1 m_SupportDataDrivenLensFlare: 1 m_SupportScreenSpaceLensFlare: 1 m_GPUResidentDrawerMode: 0 - m_UseLegacyLightmaps: 0 m_SmallMeshScreenPercentage: 0 m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 m_ShadowType: 1 @@ -100,23 +100,24 @@ MonoBehaviour: m_Keys: [] m_Values: m_PrefilteringModeMainLightShadows: 3 - m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLight: 0 m_PrefilteringModeAdditionalLightShadows: 0 m_PrefilterXRKeywords: 1 - m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeForwardPlus: 2 m_PrefilteringModeDeferredRendering: 0 m_PrefilteringModeScreenSpaceOcclusion: 0 m_PrefilterDebugKeywords: 1 m_PrefilterWriteRenderingLayers: 1 m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 m_PrefilterSSAODepthNormals: 1 m_PrefilterSSAOSourceDepthLow: 1 - m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthMedium: 1 m_PrefilterSSAOSourceDepthHigh: 1 - m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOInterleaved: 1 m_PrefilterSSAOBlueNoise: 1 m_PrefilterSSAOSampleCountLow: 1 - m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountMedium: 1 m_PrefilterSSAOSampleCountHigh: 1 m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT2: 1 diff --git a/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/PXDKCYGQ b/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/PXDKCYGQ index d90bcd5..95d7f79 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/PXDKCYGQ and b/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/PXDKCYGQ differ diff --git a/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/PXDKCYGQ.manifest b/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/PXDKCYGQ.manifest index 8e03a2c..f73765a 100644 --- a/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/PXDKCYGQ.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/PXDKCYGQ.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 1950212596 +CRC: 1777452393 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/mainbuilding b/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/mainbuilding index 0e89d1a..6339e82 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/mainbuilding and b/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/mainbuilding differ diff --git a/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/mainbuilding.manifest b/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/mainbuilding.manifest index a0c6ba1..fd5318a 100644 --- a/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/mainbuilding.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 1145075347 +CRC: 936658002 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 21506986887e7a73c9c6c22d3decb642 + Hash: 171b98791569208f6b73eda5ec205b4c TypeTreeHash: serializedVersion: 2 Hash: bdca4f395863a9a028ad2b0ba8cc1541 IncrementalBuildHash: serializedVersion: 2 - Hash: a822b61afd89e849914ca008852c8325 + Hash: 3f08a4c1e01bb1ac0281951db917b330 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/PXDKCYGQ b/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/PXDKCYGQ index 18bd503..8101a49 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/PXDKCYGQ and b/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/PXDKCYGQ differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/PXDKCYGQ.manifest b/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/PXDKCYGQ.manifest index b314fa0..71d7cc8 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/PXDKCYGQ.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/PXDKCYGQ.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 2984839983 +CRC: 3660923288 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/mainbuilding b/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/mainbuilding index 147abd4..b9e4c5f 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/mainbuilding and b/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/mainbuilding differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/mainbuilding.manifest b/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/mainbuilding.manifest index 12a48c7..806c1e7 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/mainbuilding.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 2580005424 +CRC: 731428429 Hashes: AssetFileHash: serializedVersion: 2 - Hash: bd09939c2362ea3b8bdf390c3213ee1b + Hash: 91ec16f258992c0e31d19966e9c6223d TypeTreeHash: serializedVersion: 2 Hash: bdca4f395863a9a028ad2b0ba8cc1541 IncrementalBuildHash: serializedVersion: 2 - Hash: 6f77948682b714d3e269694fc97b8e5b + Hash: 77ff241633fa16fdb4f9597e97ff01bf HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx index 8202ed1..5f9bbbc 100644 Binary files a/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx and b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx differ