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:

dldydtn9755-crypto

2026-06-25 12:09:19 +09:00

parent a254c2282d afc1043637

commit 9597cbe8d2

39 changed files with 1445 additions and 32 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.

BIN

Assets/01_Scenes/MemoryPieceScene.unity LFS

Binary file not shown.

BIN

Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity LFS

Binary file not shown.

BIN

Assets/01_Scenes/blackjack.unity LFS

Binary file not shown.