|
|
7f6e04485c
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR_Diet
# Conflicts:
# Assets/01_Scenes/Cave_Test_2/NavMesh-Cube (2).asset.meta
# 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/My project/Fishing Scripts/model/New Material.mat.meta
# Assets/XR/Settings/OpenXR Package Settings.asset.meta
# Assets/XR/Settings/OpenXRPackageSettings.asset
|
2026-06-29 17:44:36 +09:00 |
|
