Dino_Love_Simulation/Assets/XR/Settings/OpenXR Package Settings.asset at 4a048adf7384b8474e8eb96400b0c74112da23ad - Dino_Love_Simulation - NJ-Gitea

sharedacc520k/Dino_Love_Simulation

Files

dldydtn9755-crypto 4a048adf73 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation

# Conflicts:ff
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-27.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-4.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-5.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-6.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-7.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-8.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-9.exr.meta
#	Assets/XR/Settings/OpenXR Package Settings.asset

2026-07-22 21:27:27 +09:00

9 lines

287 BLFS

Plaintext

Raw Blame History

 version https://git-lfs.github.com/spec/v1
 <<<<<<< HEAD
 oid sha256:fbcb53629c9c0c99ae7dc599926ffe17f9ff3faa4a3c63f2815a664f2d59fd54
 size 66105
 =======
 oid sha256:0da38aad1a74caafbc709428faefa609bb9d6dad84c7d201c08f731aea0e2011
 size 93935
 >>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13