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

Browse Source

# Conflicts:
#	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
#	Assets/XR/Settings/OpenXR Package Settings.asset.meta
#	ProjectSettings/EditorBuildSettings.asset

...

This commit is contained in:

nakjun

2026-06-30 10:15:07 +09:00

parent 02e5d737d0 1ae4c2b0a2

commit 9d7a092c97

13 changed files with 407 additions and 86 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.