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 dfd21f43..493cb1d5 100644 Binary files a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/LightingData_1F.asset and b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/LightingData.asset differ diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/LightingData_1F.asset.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/LightingData.asset.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/LightingData_1F.asset.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/LightingData.asset.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-0_comp_dir.png b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-0_comp_dir.png similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-0_comp_dir.png rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-0_comp_dir.png diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-0_comp_dir.png.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-0_comp_dir.png.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-0_comp_dir.png.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-0_comp_dir.png.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-0_comp_light.exr b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-0_comp_light.exr similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-0_comp_light.exr rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-0_comp_light.exr diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-0_comp_light.exr.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-0_comp_light.exr.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-0_comp_light.exr.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-0_comp_light.exr.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-1_comp_dir.png b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-1_comp_dir.png similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-1_comp_dir.png rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-1_comp_dir.png diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-1_comp_dir.png.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-1_comp_dir.png.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-1_comp_dir.png.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-1_comp_dir.png.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-1_comp_light.exr b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-1_comp_light.exr similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-1_comp_light.exr rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-1_comp_light.exr diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-1_comp_light.exr.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-1_comp_light.exr.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-1_comp_light.exr.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-1_comp_light.exr.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-2_comp_dir.png b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-2_comp_dir.png similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-2_comp_dir.png rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-2_comp_dir.png diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-2_comp_dir.png.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-2_comp_dir.png.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-2_comp_dir.png.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-2_comp_dir.png.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-2_comp_light.exr b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-2_comp_light.exr similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-2_comp_light.exr rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-2_comp_light.exr diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-2_comp_light.exr.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-2_comp_light.exr.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-2_comp_light.exr.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-2_comp_light.exr.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-3_comp_dir.png b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-3_comp_dir.png similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-3_comp_dir.png rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-3_comp_dir.png diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-3_comp_dir.png.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-3_comp_dir.png.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-3_comp_dir.png.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-3_comp_dir.png.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-3_comp_light.exr b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-3_comp_light.exr similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-3_comp_light.exr rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-3_comp_light.exr diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-3_comp_light.exr.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-3_comp_light.exr.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-3_comp_light.exr.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-3_comp_light.exr.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-4_comp_dir.png b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-4_comp_dir.png similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-4_comp_dir.png rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-4_comp_dir.png diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-4_comp_dir.png.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-4_comp_dir.png.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-4_comp_dir.png.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-4_comp_dir.png.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-4_comp_light.exr b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-4_comp_light.exr similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-4_comp_light.exr rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-4_comp_light.exr diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-4_comp_light.exr.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-4_comp_light.exr.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-4_comp_light.exr.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-4_comp_light.exr.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-5_comp_dir.png b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-5_comp_dir.png similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-5_comp_dir.png rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-5_comp_dir.png diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-5_comp_dir.png.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-5_comp_dir.png.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-5_comp_dir.png.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-5_comp_dir.png.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-5_comp_light.exr b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-5_comp_light.exr similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-5_comp_light.exr rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-5_comp_light.exr diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-5_comp_light.exr.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-5_comp_light.exr.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-5_comp_light.exr.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-5_comp_light.exr.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-6_comp_dir.png b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-6_comp_dir.png similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-6_comp_dir.png rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-6_comp_dir.png diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-6_comp_dir.png.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-6_comp_dir.png.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-6_comp_dir.png.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-6_comp_dir.png.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-6_comp_light.exr b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-6_comp_light.exr similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-6_comp_light.exr rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-6_comp_light.exr diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-6_comp_light.exr.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-6_comp_light.exr.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-6_comp_light.exr.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-6_comp_light.exr.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-7_comp_dir.png b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-7_comp_dir.png similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-7_comp_dir.png rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-7_comp_dir.png diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-7_comp_dir.png.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-7_comp_dir.png.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-7_comp_dir.png.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-7_comp_dir.png.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-7_comp_light.exr b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-7_comp_light.exr similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-7_comp_light.exr rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-7_comp_light.exr diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-7_comp_light.exr.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-7_comp_light.exr.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-7_comp_light.exr.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-7_comp_light.exr.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-8_comp_dir.png b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-8_comp_dir.png similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-8_comp_dir.png rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-8_comp_dir.png diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-8_comp_dir.png.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-8_comp_dir.png.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-8_comp_dir.png.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-8_comp_dir.png.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-8_comp_light.exr b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-8_comp_light.exr similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-8_comp_light.exr rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-8_comp_light.exr diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-8_comp_light.exr.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-8_comp_light.exr.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/Lightmap-8_comp_light.exr.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/Lightmap-8_comp_light.exr.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/ReflectionProbe-0.exr b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/ReflectionProbe-0.exr similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/ReflectionProbe-0.exr rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/ReflectionProbe-0.exr diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/ReflectionProbe-0.exr.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/ReflectionProbe-0.exr.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/ReflectionProbe-0.exr.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/ReflectionProbe-0.exr.meta diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/ReflectionProbe-1.exr b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/ReflectionProbe-1.exr similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/ReflectionProbe-1.exr rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/ReflectionProbe-1.exr diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/ReflectionProbe-1.exr.meta b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/ReflectionProbe-1.exr.meta similarity index 100% rename from Assets/OCTODAY_Twin/Factory_Interior/Scenes/OCTODAY_Twin/ReflectionProbe-1.exr.meta rename to Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin/ReflectionProbe-1.exr.meta diff --git a/Assets/Scripts/Data/Data_KEPCO.asset b/Assets/Scripts/Data/Data_KEPCO.asset index 628d606c..915ab13b 100644 --- a/Assets/Scripts/Data/Data_KEPCO.asset +++ b/Assets/Scripts/Data/Data_KEPCO.asset @@ -19,8 +19,8 @@ MonoBehaviour: hover: {fileID: 21300000, guid: afe44b78cbec59948ad9053bc2a686e0, type: 3} curSceneStatus: 2 modelPrefab: {fileID: 1364758469199115521, guid: 423036aa0a8d7e54896acc2d79cf08b5, type: 3} - sceneAssets: - - {fileID: 102900000, guid: 34945c1e977e7bb40ba70b8af5eac756, type: 3} + sceneNames: + - KEPCOScene volumeProfiles: - {fileID: 11400000, guid: 10fc4df2da32a41aaa32d77bc913491c, type: 2} staticCanvasPrefab: {fileID: 9115987721486925841, guid: df39e435fbc6b27458c0ced9b20b0bd7, type: 3} diff --git a/Assets/Settings/PC/PC_Renderer.asset b/Assets/Settings/PC/PC_Renderer.asset index 5d8b1be0..7f5cac88 100644 --- a/Assets/Settings/PC/PC_Renderer.asset +++ b/Assets/Settings/PC/PC_Renderer.asset @@ -1,18 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-8006698140242247387 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f586353d1af964a4982ede88d6e5898c, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp-firstpass::RTGLite.RTMainSRF - m_Active: 1 --- !u!114 &-5654392999832741519 MonoBehaviour: m_ObjectHideFlags: 0 @@ -53,7 +40,7 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 7833122117494664109} - {fileID: -5654392999832741519} - - {fileID: -8006698140242247387} + - {fileID: 3063689431275813258} m_RendererFeatureMap: ad6b866f10d7b46c7b554bc0a79cde49 m_UseNativeRenderPass: 1 xrSystemData: {fileID: 0} @@ -83,6 +70,19 @@ MonoBehaviour: m_DepthTextureFormat: 0 m_AccurateGbufferNormals: 0 m_IntermediateTextureMode: 0 +--- !u!114 &3063689431275813258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f586353d1af964a4982ede88d6e5898c, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp-firstpass::RTGLite.RTMainSRF + m_Active: 1 --- !u!114 &7833122117494664109 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index fcb3199a..a148e490 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -62,6 +62,6 @@ GraphicsSettings: m_LightsUseLinearIntensity: 1 m_LightsUseColorTemperature: 1 m_LogWhenShaderIsCompiled: 0 - m_LightProbeOutsideHullStrategy: 1 + m_LightProbeOutsideHullStrategy: 0 m_CameraRelativeLightCulling: 0 m_CameraRelativeShadowCulling: 0