Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation

# Conflicts: # Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-24 14:40:50 +09:00
parent dba67d5874 52a0f6ea39
commit 310c186407
102 changed files with 8726 additions and 131 deletions
--- a/Assets/01_Scenes/Festival_Chapter5.unity
+++ b/Assets/01_Scenes/Festival_Chapter5.unity
--- a/Assets/01_Scenes/Hischool_Chapter1/Hischool_Chapter1
+++ b/Assets/01_Scenes/Hischool_Chapter1/Hischool_Chapter1
--- a/Assets/01_Scenes/Hischool_Chapter1/LightingData.asset
+++ b/Assets/01_Scenes/Hischool_Chapter1/LightingData.asset
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter2.unity
+++ b/Assets/01_Scenes/Hischool_Chapter2.unity
--- a/Assets/01_Scenes/Hischool_Chapter2/Hischool_Chapter2
+++ b/Assets/01_Scenes/Hischool_Chapter2/Hischool_Chapter2
--- a/Assets/01_Scenes/Hischool_Chapter2/LightingData.asset
+++ b/Assets/01_Scenes/Hischool_Chapter2/LightingData.asset
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter3.unity
+++ b/Assets/01_Scenes/Hischool_Chapter3.unity
--- a/Assets/01_Scenes/Hischool_Chapter4.meta
+++ b/Assets/01_Scenes/Hischool_Chapter4.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b15be0b0cf9c37a43960258a77f96d26
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/01_Scenes/Hischool_Chapter4.unity
+++ b/Assets/01_Scenes/Hischool_Chapter4.unity
--- a/Assets/01_Scenes/Hischool_Chapter4.unity.meta
+++ b/Assets/01_Scenes/Hischool_Chapter4.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 05d4e25b0f27b4c4d84909ebbfa76af7
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/01_Scenes/Hischool_Chapter4/Festival_Test
+++ b/Assets/01_Scenes/Hischool_Chapter4/Festival_Test
--- a/Assets/01_Scenes/Hischool_Chapter4/Festival_Test
+++ b/Assets/01_Scenes/Hischool_Chapter4/Festival_Test
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 071c17c850f04c346b6aa9b42fecb81b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: