diff --git a/Assets/MainBuilding.prefab b/Assets/MainBuilding.prefab index ba857d3..85ce994 100644 --- a/Assets/MainBuilding.prefab +++ b/Assets/MainBuilding.prefab @@ -7043,6 +7043,115 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 931339566956887568, guid: 6420006bd4540d4469ccf306478de618, type: 3} +--- !u!1 &468541269408964051 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9071329886718888843} + - component: {fileID: 5836455047523060472} + - component: {fileID: 4365825816551447736} + - component: {fileID: 6785536600685792479} + m_Layer: 0 + m_Name: SatelliteMap(9) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9071329886718888843 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 468541269408964051} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -2202.931, y: 6.7990437, z: -2933.1016} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8513860222506148666} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5836455047523060472 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 468541269408964051} + m_Mesh: {fileID: 3246366808938264244, guid: 34f08e7a4109dd140ba9d67a56f168cf, type: 3} +--- !u!23 &4365825816551447736 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 468541269408964051} + 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!64 &6785536600685792479 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 468541269408964051} + 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: 3246366808938264244, guid: 34f08e7a4109dd140ba9d67a56f168cf, type: 3} --- !u!1 &471559911463889736 GameObject: m_ObjectHideFlags: 0 @@ -41654,6 +41763,7 @@ Transform: - {fileID: 557329826552547084} - {fileID: 952240646216496157} - {fileID: 8630877878908255106} + - {fileID: 9071329886718888843} - {fileID: 4170968360529915778} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -101647,7 +101757,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8630877878908255106 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Settings/WEB_RPAsset.asset b/Assets/Settings/WEB_RPAsset.asset index d6c1602..8f9daab 100644 --- a/Assets/Settings/WEB_RPAsset.asset +++ b/Assets/Settings/WEB_RPAsset.asset @@ -100,28 +100,28 @@ MonoBehaviour: m_Keys: [] m_Values: m_PrefilteringModeMainLightShadows: 3 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLightShadows: 2 m_PrefilterXRKeywords: 1 - m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeForwardPlus: 0 m_PrefilteringModeDeferredRendering: 0 m_PrefilteringModeScreenSpaceOcclusion: 0 m_PrefilterDebugKeywords: 1 m_PrefilterWriteRenderingLayers: 1 m_PrefilterHDROutput: 1 - m_PrefilterAlphaOutput: 0 + 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 - m_PrefilterDBufferMRT3: 1 + m_PrefilterDBufferMRT3: 0 m_PrefilterSoftShadowsQualityLow: 1 m_PrefilterSoftShadowsQualityMedium: 1 m_PrefilterSoftShadowsQualityHigh: 1 diff --git a/Assets/StreamingAssets/AssetBundles/PXJYXAB/PXJYXAB b/Assets/StreamingAssets/AssetBundles/PXJYXAB/PXJYXAB index 12764f7..62cca5b 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXJYXAB/PXJYXAB and b/Assets/StreamingAssets/AssetBundles/PXJYXAB/PXJYXAB differ diff --git a/Assets/StreamingAssets/AssetBundles/PXJYXAB/PXJYXAB.manifest b/Assets/StreamingAssets/AssetBundles/PXJYXAB/PXJYXAB.manifest index 8c0972d..b5234b8 100644 --- a/Assets/StreamingAssets/AssetBundles/PXJYXAB/PXJYXAB.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXJYXAB/PXJYXAB.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 174069041 +CRC: 2616052592 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/AssetBundles/PXJYXAB/mainbuilding b/Assets/StreamingAssets/AssetBundles/PXJYXAB/mainbuilding index f3064da..adac505 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXJYXAB/mainbuilding and b/Assets/StreamingAssets/AssetBundles/PXJYXAB/mainbuilding differ diff --git a/Assets/StreamingAssets/AssetBundles/PXJYXAB/mainbuilding.manifest b/Assets/StreamingAssets/AssetBundles/PXJYXAB/mainbuilding.manifest index 873a245..680334f 100644 --- a/Assets/StreamingAssets/AssetBundles/PXJYXAB/mainbuilding.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXJYXAB/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 3423986608 +CRC: 2039590943 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 6c5ebe44731227ff501687ba6fb768bc + Hash: 019ee28485b52fe73045f6c1eed60a10 TypeTreeHash: serializedVersion: 2 Hash: 8c543a89a1a0e1fba358decc0d14ae8c IncrementalBuildHash: serializedVersion: 2 - Hash: 5abaff9776eb088896ed4c364b5a50c2 + Hash: 97d2e9df1edc1c69b53e67a5b03c1ee7 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/PXJYXAB b/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/PXJYXAB index 8b12813..b294841 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/PXJYXAB and b/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/PXJYXAB differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/PXJYXAB.manifest b/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/PXJYXAB.manifest index 750d29c..a143a45 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/PXJYXAB.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/PXJYXAB.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 3541307719 +CRC: 4085155532 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/mainbuilding b/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/mainbuilding index 603a473..29f1f39 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/mainbuilding and b/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/mainbuilding differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/mainbuilding.manifest b/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/mainbuilding.manifest index ba5c319..273fe81 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/mainbuilding.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXJYXAB/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 3838094976 +CRC: 3642433547 Hashes: AssetFileHash: serializedVersion: 2 - Hash: b13a82fd8c241476e06f6d134a22f827 + Hash: 6fe4aee590801e0a173c4f40d5ee63fd TypeTreeHash: serializedVersion: 2 Hash: 8c543a89a1a0e1fba358decc0d14ae8c IncrementalBuildHash: serializedVersion: 2 - Hash: 9c02af267ef1fe1e8f4357b85c9a8980 + Hash: 174c97f78f9286b8e9158885e11557f6 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/URPPublic b/Assets/URPPublic index 7d63da1..d35ff77 160000 --- a/Assets/URPPublic +++ b/Assets/URPPublic @@ -1 +1 @@ -Subproject commit 7d63da1f1a18b0f313ee83a367f823f35f3cf6d0 +Subproject commit d35ff776f0a7235591ccc78fb8a45102588fed36 diff --git a/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap(9).FBX b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap(9).FBX new file mode 100644 index 0000000..b97b6c1 Binary files /dev/null and b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap(9).FBX differ diff --git a/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap(9).FBX.meta b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap(9).FBX.meta new file mode 100644 index 0000000..2e9f9b8 --- /dev/null +++ b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap(9).FBX.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: 34f08e7a4109dd140ba9d67a56f168cf +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index aa5a1c3..4e0c870 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -34,12 +34,13 @@ GraphicsSettings: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: -6465566751694194690, guid: 7b1c4e4ea54233842b20756e575d9bec, type: 3} + - {fileID: -6465566751694194690, guid: bbab727ad9d048f4aa346fc273f36bb6, type: 3} + - {fileID: -6465566751694194690, guid: 9f5a418d4f6bac44893beb57058994bc, type: 3} m_PreloadedShaders: [] m_PreloadShadersBatchTimeLimit: -1 - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, - type: 0} - m_CustomRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, - type: 2} + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_CustomRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 @@ -60,8 +61,7 @@ GraphicsSettings: m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] m_RenderPipelineGlobalSettingsMap: - UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa, - type: 2} + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa, type: 2} m_LightsUseLinearIntensity: 1 m_LightsUseColorTemperature: 1 m_LogWhenShaderIsCompiled: 0