Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation

# Conflicts:ㅇㅇ # Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-15 15:03:57 +09:00
parent b081fa01b7 18160cc301
commit 789d9fd8ec
10 changed files with 10 additions and 2 deletions
--- a/Assets/04_Models/Characters/Real
+++ b/Assets/04_Models/Characters/Real
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8d85806184ff75d4e8f23ecb2a298db3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/04_Models/Characters/Real
+++ b/Assets/04_Models/Characters/Real
--- a/Dinosaurs/D4/Carnotaurus.prefab.meta
+++ b/Dinosaurs/D4/Carnotaurus.prefab.meta
--- a/Dinosaurs/D4/Pachycephalosaurus.prefab
+++ b/Dinosaurs/D4/Pachycephalosaurus.prefab
--- a/Dinosaurs/D4/Pachycephalosaurus.prefab.meta
+++ b/Dinosaurs/D4/Pachycephalosaurus.prefab.meta
--- a/Dinosaurs/D4/Styracosaurus.prefab
+++ b/Dinosaurs/D4/Styracosaurus.prefab
--- a/Dinosaurs/D4/Styracosaurus.prefab.meta
+++ b/Dinosaurs/D4/Styracosaurus.prefab.meta
--- a/Assets/04_Models/Characters/Real
+++ b/Assets/04_Models/Characters/Real
--- a/Dinosaurs/D4/Troodon.prefab.meta
+++ b/Dinosaurs/D4/Troodon.prefab.meta
--- a/Assets/XR/Settings/OpenXR
+++ b/Assets/XR/Settings/OpenXR