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

# Conflicts: # Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset # Assets/XR/Settings/OpenXRPackageSettings.asset
2026-07-07 18:12:25 +09:00
parent f385c661da 0b3263e353
commit fb64493648
14 changed files with 555 additions and 27 deletions
--- a/Assets/09_UI/Dialog/ChoiceRow.prefab
+++ b/Assets/09_UI/Dialog/ChoiceRow.prefab
--- a/Assets/09_UI/Dialog/ChoiceRow.prefab.meta
+++ b/Assets/09_UI/Dialog/ChoiceRow.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2beaedbeb265d9843b112ed8ff68287d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/09_UI/Dialog/WorldDialogCanvas.prefab
+++ b/Assets/09_UI/Dialog/WorldDialogCanvas.prefab