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

Browse Source

# Conflicts:dsdsgaaggdag
#	Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity

...

This commit is contained in:

dldydtn9755-crypto

2026-06-25 13:14:57 +09:00

parent 0e06e168dc 51288052b7

commit 0b8ccf6036

4 changed files with 15 additions and 8 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/MemoryPieceScene.unity LFS

Binary file not shown.

BIN

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

Binary file not shown.