Commit Graph

6 Commits

Author SHA1 Message Date
8e8f8daf29 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR_Diet
# 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
2026-06-30 10:48:53 +09:00
161c6f625f 2026.06.30 2026-06-30 10:47:50 +09:00
dldydtn9755-crypto
1ae4c2b0a2 수정 2026-06-30 10:13:46 +09:00
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
dldydtn9755-crypto
61bddc92ff 일단 2026-06-29 15:41:13 +09:00
c748bbd21b First commit 2026-06-26 23:53:39 +09:00