diff --git a/Assets/ScenesKH/BuildingScene.unity b/Assets/ScenesKH/BuildingScene.unity index 189664a..5bf5ee4 100644 --- a/Assets/ScenesKH/BuildingScene.unity +++ b/Assets/ScenesKH/BuildingScene.unity @@ -210,7 +210,7 @@ Transform: m_GameObject: {fileID: 321718139} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 61.6625, y: -18.726074, z: 19.799976} + m_LocalPosition: {x: 189, y: -18.726074, z: 12} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -469,7 +469,7 @@ Transform: m_GameObject: {fileID: 476974710} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.5724964, y: -18.726074, z: -52.018303} + m_LocalPosition: {x: -62.9, y: -18.726074, z: -225.4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1260,7 +1260,7 @@ Transform: m_GameObject: {fileID: 1830560846} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 27.872498, y: -18.726074, z: -105.0183} + m_LocalPosition: {x: -61, y: -18.726074, z: 253} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] 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/KHCJY/KHCJY b/Assets/StreamingAssets/AssetBundles/KHCJY/KHCJY index fa34214..2af1183 100644 Binary files a/Assets/StreamingAssets/AssetBundles/KHCJY/KHCJY and b/Assets/StreamingAssets/AssetBundles/KHCJY/KHCJY differ diff --git a/Assets/StreamingAssets/AssetBundles/KHCJY/KHCJY.manifest b/Assets/StreamingAssets/AssetBundles/KHCJY/KHCJY.manifest index 6a1820a..22d4c6f 100644 --- a/Assets/StreamingAssets/AssetBundles/KHCJY/KHCJY.manifest +++ b/Assets/StreamingAssets/AssetBundles/KHCJY/KHCJY.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 3923941381 +CRC: 1980447805 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/AssetBundles/KHCJY/buildingscene b/Assets/StreamingAssets/AssetBundles/KHCJY/buildingscene index 36232bd..781b9b0 100644 Binary files a/Assets/StreamingAssets/AssetBundles/KHCJY/buildingscene and b/Assets/StreamingAssets/AssetBundles/KHCJY/buildingscene differ diff --git a/Assets/StreamingAssets/AssetBundles/KHCJY/buildingscene.manifest b/Assets/StreamingAssets/AssetBundles/KHCJY/buildingscene.manifest index 617670a..7fa769e 100644 --- a/Assets/StreamingAssets/AssetBundles/KHCJY/buildingscene.manifest +++ b/Assets/StreamingAssets/AssetBundles/KHCJY/buildingscene.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 1096536927 +CRC: 3306485546 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 87406f18c7851db9712aaf4a58789435 + Hash: 728b34af8f73c8413f36b7b9e4b31c88 TypeTreeHash: serializedVersion: 2 - Hash: 2bee9907838794cb147ad8424421ae0d + Hash: 07ce3983c7ee66d1f8f35dd33e8c6b1e IncrementalBuildHash: serializedVersion: 2 - Hash: 8d372efb61efd0a02d33262c3723627f + Hash: 41c89020ba9b8a18a3c16ba33fce92d4 HashAppended: 0 ClassTypes: - Class: 1 @@ -37,26 +37,26 @@ ClassTypes: Script: {instanceID: 0} - Class: 104 Script: {instanceID: 0} -- Class: 114 - Script: {fileID: 11500000, guid: d00f7578dda0a1c41b151766a6426479, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 43929be615d468749bba2f9917117a45, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: 1c0e57298488ae54aba3ef60b0b26920, type: 3} + Script: {fileID: 11500000, guid: 6eeb5dc026fdf4b488bc7ae0138ab719, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: ad1ddb7b6b473ac4ea26f44aea624e2b, type: 3} + Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 5627e6832e9378c4e8632a52efa22183, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: 6eeb5dc026fdf4b488bc7ae0138ab719, type: 3} + Script: {fileID: 11500000, guid: d00f7578dda0a1c41b151766a6426479, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} + Script: {fileID: 11500000, guid: 43929be615d468749bba2f9917117a45, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} + Script: {fileID: 11500000, guid: 1c0e57298488ae54aba3ef60b0b26920, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: ad1ddb7b6b473ac4ea26f44aea624e2b, type: 3} - Class: 115 Script: {instanceID: 0} - Class: 157 diff --git a/Assets/StreamingAssets/WebAssetBundles/KHCJY/KHCJY b/Assets/StreamingAssets/WebAssetBundles/KHCJY/KHCJY index 9e875f1..cdb1325 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/KHCJY/KHCJY and b/Assets/StreamingAssets/WebAssetBundles/KHCJY/KHCJY differ diff --git a/Assets/StreamingAssets/WebAssetBundles/KHCJY/KHCJY.manifest b/Assets/StreamingAssets/WebAssetBundles/KHCJY/KHCJY.manifest index e05aa55..b1596b2 100644 --- a/Assets/StreamingAssets/WebAssetBundles/KHCJY/KHCJY.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/KHCJY/KHCJY.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 1320246857 +CRC: 1927702962 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/WebAssetBundles/KHCJY/buildingscene b/Assets/StreamingAssets/WebAssetBundles/KHCJY/buildingscene index 5396812..a5ea981 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/KHCJY/buildingscene and b/Assets/StreamingAssets/WebAssetBundles/KHCJY/buildingscene differ diff --git a/Assets/StreamingAssets/WebAssetBundles/KHCJY/buildingscene.manifest b/Assets/StreamingAssets/WebAssetBundles/KHCJY/buildingscene.manifest index b56c8f1..29615cc 100644 --- a/Assets/StreamingAssets/WebAssetBundles/KHCJY/buildingscene.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/KHCJY/buildingscene.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 2561877817 +CRC: 82158072 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 205a64118d05cc5fd48baeb17f5c80a3 + Hash: 3855be8682ff29a8070d833f89f00557 TypeTreeHash: serializedVersion: 2 - Hash: 2bee9907838794cb147ad8424421ae0d + Hash: 07ce3983c7ee66d1f8f35dd33e8c6b1e IncrementalBuildHash: serializedVersion: 2 - Hash: ad7716e4709e0a6999a68f4e08fa246f + Hash: 11ff8f26a59a11325f57b58206b99931 HashAppended: 0 ClassTypes: - Class: 1 @@ -37,26 +37,26 @@ ClassTypes: Script: {instanceID: 0} - Class: 104 Script: {instanceID: 0} -- Class: 114 - Script: {fileID: 11500000, guid: d00f7578dda0a1c41b151766a6426479, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 43929be615d468749bba2f9917117a45, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: 1c0e57298488ae54aba3ef60b0b26920, type: 3} + Script: {fileID: 11500000, guid: 6eeb5dc026fdf4b488bc7ae0138ab719, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: ad1ddb7b6b473ac4ea26f44aea624e2b, type: 3} + Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 5627e6832e9378c4e8632a52efa22183, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: 6eeb5dc026fdf4b488bc7ae0138ab719, type: 3} + Script: {fileID: 11500000, guid: d00f7578dda0a1c41b151766a6426479, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} + Script: {fileID: 11500000, guid: 43929be615d468749bba2f9917117a45, type: 3} - Class: 114 - Script: {fileID: 11500000, guid: b0f36456c352b534cb76fe2cc683b76d, type: 3} + Script: {fileID: 11500000, guid: 1c0e57298488ae54aba3ef60b0b26920, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: ad1ddb7b6b473ac4ea26f44aea624e2b, type: 3} - Class: 115 Script: {instanceID: 0} - Class: 157 diff --git a/Assets/URPPublic b/Assets/URPPublic index 7d63da1..ba00aa6 160000 --- a/Assets/URPPublic +++ b/Assets/URPPublic @@ -1 +1 @@ -Subproject commit 7d63da1f1a18b0f313ee83a367f823f35f3cf6d0 +Subproject commit ba00aa62deb2407da947f6c33cd3151df858bad8 diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 440fbe0..8f8837d 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,14 +7,14 @@ "dependencies": { "com.unity.modules.ai": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, -"com.unity.assetbundlebrowser": { + "com.unity.assetbundlebrowser": { "version": "1.7.0", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.burst": { "version": "1.8.17", @@ -24,33 +24,33 @@ "com.unity.mathematics": "1.2.1", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { "version": "2.4.4", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.4.3", + "version": "2.4.1", "depth": 2, "source": "registry", "dependencies": { "com.unity.burst": "1.8.13", - "com.unity.nuget.mono-cecil": "1.11.4", "com.unity.test-framework": "1.4.3", + "com.unity.nuget.mono-cecil": "1.11.4", "com.unity.test-framework.performance": "3.0.3" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { "version": "2.0.5", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.rider": { "version": "3.0.31", @@ -59,7 +59,7 @@ "dependencies": { "com.unity.ext.nunit": "1.0.6" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { "version": "2.0.22", @@ -68,7 +68,7 @@ "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.inputsystem": { "version": "1.9.0", @@ -77,21 +77,21 @@ "dependencies": { "com.unity.modules.uielements": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.mathematics": { "version": "1.3.2", "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.nuget.mono-cecil": { "version": "1.11.4", "depth": 3, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { "version": "17.0.3", @@ -141,7 +141,7 @@ "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.shadergraph": { "version": "17.0.3", @@ -161,7 +161,7 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.test-framework.performance": { "version": "3.0.3", @@ -171,19 +171,19 @@ "com.unity.test-framework": "1.1.31", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.timeline": { "version": "1.8.7", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ugui": { "version": "2.0.0", @@ -202,7 +202,7 @@ "com.unity.ugui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.modules.accessibility": { "version": "1.0.0",