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

Browse Source

# Conflicts:yyhh
#	Assets/09_UI/talk/menu_panel_REAL_transparent_cropped.png.meta
#	Assets/09_UI/talk/pinocchio_title_banner_REAL_transparent_cropped.png.meta
#	Assets/09_UI/talk/wood_button_plain_REAL_transparent.png.meta
#	Assets/XR/Settings/OpenXR Package Settings.asset.meta

...

This commit is contained in:

aswew1538

2026-06-30 10:48:53 +09:00

parent 161c6f625f dace938039

commit 8e8f8daf29

16 changed files with 469 additions and 20 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/WhaleAdventure_VR/Normal/WhaleAttackScene.unity LFS

Binary file not shown.