sharedacc520k/Dino_Love_Simulation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/ReflectionProbe-0.exr.meta
#	Assets/01_Scenes/Hischool_Chapter4/Festival_Test Baking Set.asset.meta
This commit is contained in:
dldydtn9755-crypto
2026-07-27 20:09:59 +09:00
parent 5235999588 3558b85ce3
commit 87f5eb6ed5
270 changed files with 61705 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/07_Data/DialogGraph/Chapter4/Carnotaurus ch4.dlg
View File

@@ -1442,8 +1442,8 @@ MonoBehaviour:
data:
m_Value:
Value: "\uB2E4\uC74C\uBD80\uD130\uB294 \uC704\uD5D8\uD55C \uB370 \uD63C\uC790
\uC11C \uC788\uC9C0 \uB9C8. \n\uB610 \uC774\uB7F0 \uC77C \uC0DD\uAE30\uBA74
\uB0B4\uAC00 \uC2E0\uACBD \uC4F0\uC774\uC796\uC544."
\uC11C \uC788\uC9C0 \uB9C8. \uC774\uC81C \uC800\uCABD\uC774\uB098 \uD655\uC778\uD558\uACE0
\uC640."
- rid: 8016363972690968874
type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
data:
@@ -1647,7 +1647,8 @@ MonoBehaviour:
data:
m_Value:
Value: "\uB2E4\uC74C\uBD80\uD130\uB294 \uB0B4 \uC2DC\uC57C \uBC16\uC5D0\uC11C
\uC0AC\uACE0 \uCE58\uC9C0 \uB9C8."
\uC0AC\uACE0 \uCE58\uC9C0 \uB9C8. \uC774\uC81C \uC800\uCABD\uC774\uB098
\uD655\uC778\uD558\uACE0 \uC640."
- rid: 8016363972690968899
type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
data: