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:
#	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
This commit is contained in:
aswew1538
2026-06-29 17:44:36 +09:00
parent 50ff5e4ae9 b688a14be4
commit 7f6e04485c
7 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/My project/Fishing Scripts/model/New Material.mat.meta
View File

@@ -1,8 +1,15 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/My project/Fishing Scripts/model/New Material.mat.meta
guid: 803c199824d061648a60dcefbaab9c14
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
========
guid: 9c0e704ea9510154c87905364d1e2058
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
>>>>>>>> b688a14be4642113a27a5e81d7c3f9922d9c34f4:Assets/XR/Settings/OpenXR Package Settings.asset.meta
userData:
assetBundleName:
assetBundleVariant: