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

Browse Source

# Conflicts:
#	Assets/My project/Fonts/Pretendard-Black SDF.asset

...

This commit is contained in:

nakjun

2026-06-24 15:13:05 +09:00

parent ef7705aa89 6ab3a68928

commit 695f9b7a14

87 changed files with 326835 additions and 1002 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

Assets/01_Scenes/Cave_Test_2.unity LFS

Binary file not shown.

BIN

Assets/01_Scenes/MazeRoom.unity LFS

Binary file not shown.