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:

rainylinjing-reboot

2026-06-22 17:04:21 +09:00

parent 74afff5be8 5bd8dd771c

commit 33bad1f50a

119 changed files with 6158 additions and 437 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

ProjectSettings/EditorBuildSettings.asset LFS

Binary file not shown.

BIN

ProjectSettings/NavMeshAreas.asset LFS

Binary file not shown.

BIN

ProjectSettings/VFXManager.asset LFS

Binary file not shown.