Compare commits

...

8 Commits

Author SHA1 Message Date
dldydtn9755-crypto
45b5d46019 세팅은 완 2026-07-24 21:10:38 +09:00
dldydtn9755-crypto
310c186407 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-24 14:40:50 +09:00
dldydtn9755-crypto
dba67d5874 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-23 17:58:13 +09:00
dldydtn9755-crypto
be755323fc 현재 2026-07-23 17:58:02 +09:00
dldydtn9755-crypto
3618615ea8 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-23 15:42:38 +09:00
dldydtn9755-crypto
993e5f7960 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-23 15:17:51 +09:00
dldydtn9755-crypto
b14e94e4bc Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/04_Models/Festival/Canopy/swing-sofa/shaded 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_diffuse 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_metallic 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_normal 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_roughness 1.png.meta
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-23 15:13:40 +09:00
dldydtn9755-crypto
3274990163 dd 2026-07-23 15:07:03 +09:00
466 changed files with 4353 additions and 884 deletions

Binary file not shown.

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 05c9464a84f2f4b44987432e72f5eefa
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d36af084c5a465740b97e374b44ddba5
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e5816375fe68fdc4bbd921132ae148fa
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4573a0b717ae1b4408a74fbb73549931
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 583e2044440fb8149b26bb46b3505294
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: bd2d823d3940a4f4ea649130606a3c97
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c2189a55f86ae1d4ead51e3accba3332
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More