diff --git a/Assets/MainBuilding.prefab b/Assets/MainBuilding.prefab index 06b91f1..c74a7de 100644 --- a/Assets/MainBuilding.prefab +++ b/Assets/MainBuilding.prefab @@ -10729,6 +10729,7 @@ Transform: - {fileID: 1508990580572156360} - {fileID: 2548676047521473572} - {fileID: 4585142857100596263} + - {fileID: 1075825590918565756} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3390233383090126232 @@ -21505,3 +21506,65 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4106f4debb5a9dc4fafca22ec3838730, type: 3} m_PrefabInstance: {fileID: 4047340096873821132} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7813636241001992878 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7828731996229260504} + m_Modifications: + - target: {fileID: 663570021966237506, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} + propertyPath: m_Name + value: Reflection Probes_DKCYGQ + objectReference: {fileID: 0} + - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} + propertyPath: m_LocalPosition.x + value: -3458 + objectReference: {fileID: 0} + - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} + propertyPath: m_LocalPosition.y + value: 28.78 + objectReference: {fileID: 0} + - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} + propertyPath: m_LocalPosition.z + value: -3089 + objectReference: {fileID: 0} + - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} +--- !u!4 &1075825590918565756 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} + m_PrefabInstance: {fileID: 7813636241001992878} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ScenesPX/BuildingScene.unity b/Assets/ScenesPX/BuildingScene.unity index f89173f..260aa26 100644 --- a/Assets/ScenesPX/BuildingScene.unity +++ b/Assets/ScenesPX/BuildingScene.unity @@ -42,8 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 - m_BakeOnSceneLoad: 0 + serializedVersion: 12 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -134,7 +133,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &79835075 Transform: m_ObjectHideFlags: 0 @@ -150,63 +149,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &640198674 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 663570021966237506, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} - propertyPath: m_Name - value: Reflection Probes_DKCYGQ - objectReference: {fileID: 0} - - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} - propertyPath: m_LocalPosition.x - value: -3458 - objectReference: {fileID: 0} - - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} - propertyPath: m_LocalPosition.y - value: 28.78 - objectReference: {fileID: 0} - - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} - propertyPath: m_LocalPosition.z - value: -3089 - objectReference: {fileID: 0} - - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7098101201915551186, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 11dabe33d06a7b94e81a23d105be9066, type: 3} --- !u!1001 &1626233697 PrefabInstance: m_ObjectHideFlags: 0 @@ -316,6 +258,10 @@ PrefabInstance: propertyPath: m_Name value: Global Volume objectReference: {fileID: 0} + - target: {fileID: 3820501177425279086, guid: 1d71627acfda873449b22d23b56a7d07, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -385,5 +331,4 @@ SceneRoots: - {fileID: 344888801008083169} - {fileID: 1626233697} - {fileID: 1937539031} - - {fileID: 640198674} - {fileID: 79835075} diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index a52cc11..b1e24bf 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -200,12 +200,12 @@ MonoBehaviour: dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, type: 3} subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, type: 3} voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3} - traceVirtualOffsetCS: {fileID: -6772857160820960102, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} - traceVirtualOffsetRT: {fileID: -5126288278712620388, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} - skyOcclusionCS: {fileID: -6772857160820960102, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} - skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} - renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} + traceVirtualOffsetCS: {fileID: 7200000, guid: 805f10d263aac4b4098c0279cd37a4f3, type: 3} + traceVirtualOffsetRT: {fileID: 4807578003741378534, guid: b60511f4aa1443f4d8c0b18f4fec92f4, type: 3} + skyOcclusionCS: {fileID: 7200000, guid: 798f52ec82fa04048a12826bbbbcf7b4, type: 3} + skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3} + renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3} + renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3} - rid: 6852985685364965389 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: diff --git a/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/PXDKCYGQ b/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/PXDKCYGQ index cee7899..5ce09e1 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 e367160..cb9c2b3 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: 550133054 +UnityVersion: 6000.0.13f1 +CRC: 973573200 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/mainbuilding b/Assets/StreamingAssets/AssetBundles/PXDKCYGQ/mainbuilding index 726ae34..ed8ff3e 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 bf01f5f..08aa6e1 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: 3688065660 +UnityVersion: 6000.0.13f1 +CRC: 2952215140 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 2a238d73c1a48c0a447130b146dab587 + Hash: bdb495ee5eda9044194c43c88b77b3f6 TypeTreeHash: serializedVersion: 2 - Hash: bdca4f395863a9a028ad2b0ba8cc1541 + Hash: c748fa370785de0406d4f5837c667cef IncrementalBuildHash: serializedVersion: 2 - Hash: 93ddbeb57a18d0d0a80b41554f8bdf4b + Hash: 099bb4a83e5cb8f850e1ce647093202e HashAppended: 0 ClassTypes: - Class: 1 @@ -35,6 +35,8 @@ ClassTypes: Script: {fileID: 11500000, guid: 5627e6832e9378c4e8632a52efa22183, type: 3} - Class: 115 Script: {instanceID: 0} +- Class: 215 + Script: {instanceID: 0} SerializeReferenceClassIdentifiers: [] Assets: - Assets/MainBuilding.prefab diff --git a/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/PXDKCYGQ b/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/PXDKCYGQ index e4d1b91..d2da3ed 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 e78c8c6..8fb941b 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: 3844423967 +UnityVersion: 6000.0.13f1 +CRC: 2046847722 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/mainbuilding b/Assets/StreamingAssets/WebAssetBundles/PXDKCYGQ/mainbuilding index 6f5ce3b..85cddc1 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 95a4043..c7c2cb9 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: 1111791941 +UnityVersion: 6000.0.13f1 +CRC: 2412642076 Hashes: AssetFileHash: serializedVersion: 2 - Hash: e041bf450cb240c1ea7fc8f7d5f243dd + Hash: b7399d46d2eac46fb5b9866117805591 TypeTreeHash: serializedVersion: 2 - Hash: bdca4f395863a9a028ad2b0ba8cc1541 + Hash: c748fa370785de0406d4f5837c667cef IncrementalBuildHash: serializedVersion: 2 - Hash: 81083e555bd3686cb0930f85c35d5749 + Hash: 01ab526d50c9d3789ee8cff4ca1bd6f8 HashAppended: 0 ClassTypes: - Class: 1 @@ -35,6 +35,8 @@ ClassTypes: Script: {fileID: 11500000, guid: 5627e6832e9378c4e8632a52efa22183, type: 3} - Class: 115 Script: {instanceID: 0} +- Class: 215 + Script: {instanceID: 0} SerializeReferenceClassIdentifiers: [] Assets: - Assets/MainBuilding.prefab diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 2750f74..26eaeeb 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -25,12 +25,12 @@ QualitySettings: antiAliasing: 0 softParticles: 0 softVegetation: 1 - realtimeReflectionProbes: 0 + realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 useLegacyDetailDistribution: 1 adaptiveVsync: 0 - vSyncCount: 0 - realtimeGICPUUsage: 100 + vSyncCount: 1 + realtimeGICPUUsage: 25 adaptiveVsyncExtraA: 0 adaptiveVsyncExtraB: 0 lodBias: 1