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

# Conflicts: # Assets/XR/Settings/OpenXR Package Settings.asset
다이얼로그 완성
2026-07-21 16:59:10 +09:00 · 2026-07-21 16:57:02 +09:00 · 2026-07-21 13:10:28 +09:00 · 2026-07-21 13:10:04 +09:00 · 2026-07-21 09:50:45 +09:00 · 2026-07-21 09:50:22 +09:00
7 changed files with 4836 additions and 9 deletions
--- a/Assets/01_Scenes/Hischool_Chapter3.unity
+++ b/Assets/01_Scenes/Hischool_Chapter3.unity
--- a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg
+++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg
--- a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg.meta
+++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 994d4cd539b7fb1448767b7c2c6bbbc3
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 2ae5ca89bbed445479d9023586f0c041, type: 3}
--- a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg
+++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg
--- a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_group.dlg
+++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_group.dlg
--- a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_group.dlg.meta
+++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_group.dlg.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 5c310320d02dd1c46aec7e88b849cb91
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 2ae5ca89bbed445479d9023586f0c041, type: 3}
--- a/Assets/XR/Settings/OpenXR
+++ b/Assets/XR/Settings/OpenXR
Author	SHA1	Message	Date
dldydtn9755-crypto	0f0e6c6f63	Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation # Conflicts: # Assets/XR/Settings/OpenXR Package Settings.asset	2026-07-21 16:59:10 +09:00
dldydtn9755-crypto	df5839f78d	다이얼로그 완성	2026-07-21 16:57:02 +09:00
dldydtn9755-crypto	18f496e503	Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation # Conflicts: # Assets/XR/Settings/OpenXR Package Settings.asset	2026-07-21 13:10:28 +09:00
dldydtn9755-crypto	4491741ce2	dd	2026-07-21 13:10:04 +09:00
dldydtn9755-crypto	4f60232566	Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation # Conflicts: # Assets/XR/Settings/OpenXR Package Settings.asset	2026-07-21 09:50:45 +09:00
dldydtn9755-crypto	e29c9071fe	no message	2026-07-21 09:50:22 +09:00