From 3bc441c642e6d8c7c6b2f42df807c0762dd6d0a5 Mon Sep 17 00:00:00 2001 From: njh Date: Tue, 10 Feb 2026 15:57:24 +0900 Subject: [PATCH] fix - renderPipe and lightmap --- .../Models/Materials/Decals_01.mat | 1 + .../{ => Factory_Interior}/OCTODAY_Twin.meta | 2 +- .../Factory_Interior/OCTODAY_Twin.unity | 45 ------------------ .../OCTODAY_Twin/LightingData.asset} | Bin 280749 -> 280744 bytes .../OCTODAY_Twin/LightingData.asset.meta} | 0 .../OCTODAY_Twin/Lightmap-0_comp_dir.png | Bin .../OCTODAY_Twin/Lightmap-0_comp_dir.png.meta | 0 .../OCTODAY_Twin/Lightmap-0_comp_light.exr | Bin .../Lightmap-0_comp_light.exr.meta | 0 .../OCTODAY_Twin/Lightmap-1_comp_dir.png | Bin .../OCTODAY_Twin/Lightmap-1_comp_dir.png.meta | 0 .../OCTODAY_Twin/Lightmap-1_comp_light.exr | Bin .../Lightmap-1_comp_light.exr.meta | 0 .../OCTODAY_Twin/Lightmap-2_comp_dir.png | Bin .../OCTODAY_Twin/Lightmap-2_comp_dir.png.meta | 0 .../OCTODAY_Twin/Lightmap-2_comp_light.exr | Bin .../Lightmap-2_comp_light.exr.meta | 0 .../OCTODAY_Twin/Lightmap-3_comp_dir.png | Bin .../OCTODAY_Twin/Lightmap-3_comp_dir.png.meta | 0 .../OCTODAY_Twin/Lightmap-3_comp_light.exr | Bin .../Lightmap-3_comp_light.exr.meta | 0 .../OCTODAY_Twin/Lightmap-4_comp_dir.png | Bin .../OCTODAY_Twin/Lightmap-4_comp_dir.png.meta | 0 .../OCTODAY_Twin/Lightmap-4_comp_light.exr | Bin .../Lightmap-4_comp_light.exr.meta | 0 .../OCTODAY_Twin/Lightmap-5_comp_dir.png | Bin .../OCTODAY_Twin/Lightmap-5_comp_dir.png.meta | 0 .../OCTODAY_Twin/Lightmap-5_comp_light.exr | Bin .../Lightmap-5_comp_light.exr.meta | 0 .../OCTODAY_Twin/Lightmap-6_comp_dir.png | Bin .../OCTODAY_Twin/Lightmap-6_comp_dir.png.meta | 0 .../OCTODAY_Twin/Lightmap-6_comp_light.exr | Bin .../Lightmap-6_comp_light.exr.meta | 0 .../OCTODAY_Twin/Lightmap-7_comp_dir.png | Bin .../OCTODAY_Twin/Lightmap-7_comp_dir.png.meta | 0 .../OCTODAY_Twin/Lightmap-7_comp_light.exr | Bin .../Lightmap-7_comp_light.exr.meta | 0 .../OCTODAY_Twin/Lightmap-8_comp_dir.png | Bin .../OCTODAY_Twin/Lightmap-8_comp_dir.png.meta | 0 .../OCTODAY_Twin/Lightmap-8_comp_light.exr | Bin .../Lightmap-8_comp_light.exr.meta | 0 .../OCTODAY_Twin/ReflectionProbe-0.exr | Bin .../OCTODAY_Twin/ReflectionProbe-0.exr.meta | 0 .../OCTODAY_Twin/ReflectionProbe-1.exr | Bin .../OCTODAY_Twin/ReflectionProbe-1.exr.meta | 0 Assets/Scripts/Data/Data_KEPCO.asset | 4 +- Assets/Settings/PC/PC_Renderer.asset | 28 +++++------ ProjectSettings/GraphicsSettings.asset | 2 +- 48 files changed, 19 insertions(+), 63 deletions(-) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin.meta (77%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{OCTODAY_Twin/LightingData_1F.asset => Factory_Interior/OCTODAY_Twin/LightingData.asset} (98%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{OCTODAY_Twin/LightingData_1F.asset.meta => Factory_Interior/OCTODAY_Twin/LightingData.asset.meta} (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-0_comp_dir.png (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-0_comp_dir.png.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-0_comp_light.exr (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-0_comp_light.exr.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-1_comp_dir.png (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-1_comp_dir.png.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-1_comp_light.exr (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-1_comp_light.exr.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-2_comp_dir.png (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-2_comp_dir.png.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-2_comp_light.exr (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-2_comp_light.exr.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-3_comp_dir.png (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-3_comp_dir.png.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-3_comp_light.exr (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-3_comp_light.exr.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-4_comp_dir.png (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-4_comp_dir.png.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-4_comp_light.exr (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-4_comp_light.exr.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-5_comp_dir.png (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-5_comp_dir.png.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-5_comp_light.exr (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-5_comp_light.exr.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-6_comp_dir.png (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-6_comp_dir.png.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-6_comp_light.exr (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-6_comp_light.exr.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-7_comp_dir.png (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-7_comp_dir.png.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-7_comp_light.exr (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-7_comp_light.exr.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-8_comp_dir.png (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-8_comp_dir.png.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-8_comp_light.exr (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/Lightmap-8_comp_light.exr.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/ReflectionProbe-0.exr (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/ReflectionProbe-0.exr.meta (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/ReflectionProbe-1.exr (100%) rename Assets/OCTODAY_Twin/Factory_Interior/Scenes/{ => Factory_Interior}/OCTODAY_Twin/ReflectionProbe-1.exr.meta (100%) diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Models/Materials/Decals_01.mat b/Assets/OCTODAY_Twin/Factory_Interior/Models/Materials/Decals_01.mat index 91a19348..3fdb5f05 100644 --- a/Assets/OCTODAY_Twin/Factory_Interior/Models/Materials/Decals_01.mat +++ b/Assets/OCTODAY_Twin/Factory_Interior/Models/Materials/Decals_01.mat @@ -118,6 +118,7 @@ Material: - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin.meta similarity index 77% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin.meta index cfc90fbe..1402c975 100644 --- a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin.meta +++ b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2da7d32d861fd1b4e9384673d2428437 +guid: 52c50fd356583c548aa8e049aeab3f01 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin.unity b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin.unity index 0fb66cd6..1a507ecc 100644 --- a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin.unity +++ b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin.unity @@ -37629,50 +37629,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 9064307636745932545, guid: 003e85a18ed389742ac31602abe72cf3, type: 3} m_PrefabInstance: {fileID: 823300557} m_PrefabAsset: {fileID: 0} ---- !u!1 &823954767 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 823954768} - - component: {fileID: 823954769} - m_Layer: 0 - m_Name: Scene Volume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &823954768 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823954767} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1548654985} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &823954769 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823954767} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &824935375 MonoBehaviour: m_ObjectHideFlags: 2 @@ -72047,7 +72003,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 823954768} - {fileID: 254110339} - {fileID: 101921141} - {fileID: 791170168} diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/LightingData_1F.asset b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/LightingData.asset similarity index 98% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/LightingData_1F.asset rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/LightingData.asset index dfd21f433fb287b5414c4b04df2f71d236dae571..493cb1d5222bc2a6176b72a05751c489af05cacc 100644 GIT binary patch delta 147 zcmZ2GQE!+xG}!!kQD3v)U~{VTX+}oQ$%?M(?HpSfftYDK$5!U0lP4>=YEL$B cW8v}1OwTCE%u9DkEJ