sharedacc520k/WhaleAdventure_VR_Diet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/XR/Settings/OpenXR Package Settings.asset LFS
View File

Binary file not shown.

4
Assets/XR/Settings/OpenXR Package Settings.asset.meta
View File

@@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 0ebc173c38e576e46af1152cd6521c4c
=======
guid: 0d7aaa1930bdf854dbc499330b88fc84
>>>>>>> dace9380396749ea751e95697f4b74adaecb007d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0