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

# Conflicts: # Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/ReflectionProbe-0.exr.meta # Assets/01_Scenes/Hischool_Chapter4/Festival_Test Baking Set.asset.meta
2026-07-27 20:09:59 +09:00
parent 5235999588 3558b85ce3
commit 87f5eb6ed5
270 changed files with 61705 additions and 968 deletions
--- a/Assets/07_Data/DialogGraph/Chapter4/Styracosaurus
+++ b/Assets/07_Data/DialogGraph/Chapter4/Styracosaurus
@@ -56,9 +56,9 @@ MonoBehaviour:
        m_LastKnownBounds:
          serializedVersion: 2
          x: -44
-          y: -437
+          y: -435
          width: 3374
-          height: 1359
+          height: 1357
        m_GraphElementMetaData:
        - m_Guid:
            m_Value0: 8626403947206528014
@@ -522,7 +522,8 @@ MonoBehaviour:
      type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
      data:
        m_Value:
-          Value: "\uC7A0\uAE50 \uAD6C\uACBD\uB9CC \uD558\uBA74 \uC548 \uB3FC"
+          Value: "\uC7A0\uAE50 \uB4E4\uC5B4\uAC00\uC11C \uAD6C\uACBD\uB9CC \uD558\uBA74
+            \uC548 \uB3FC?"
    - rid: 8016363972690968612
      type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
      data:
@@ -888,7 +889,7 @@ MonoBehaviour:
          serializedVersion: 2
          Hash: dd22c7e6e3c6515012f0d8936c4dbfcc
        m_Version: 2
-        m_Position: {x: 1900.2726, y: -437.40826}
+        m_Position: {x: 1900.2726, y: -434.76328}
        m_Title: 
        m_Tooltip: 
        m_NodePreviewModel:
@@ -1025,7 +1026,8 @@ MonoBehaviour:
      type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
      data:
        m_Value:
-          Value: "\uC54C\uC558\uC5B4 \uAD6C\uACBD\uB9CC \uD558\uBA74 \uB418\uC790\uB098"
+          Value: "\uC54C\uC558\uC5B4 \uC5EC\uAE30\uC11C \uAD6C\uACBD\uB9CC \uD558\uBA74
+            \uB418\uC790\uB098"
    - rid: 8016363972690968669
      type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
      data:
@@ -1232,7 +1234,7 @@ MonoBehaviour:
    - rid: 8016363972690968694
      type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
      data:
-        m_Value: {fileID: 0}
+        m_Value: {fileID: 11400000, guid: a4375c096497ea742a741d57c1c14e34, type: 2}
    - rid: 8016363972690968695
      type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
      data:
@@ -1431,7 +1433,8 @@ MonoBehaviour:
      type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
      data:
        m_Value:
-          Value: "\uC54C\uC558\uC5B4 \uAD6C\uACBD\uB9CC \uD558\uBA74 \uB418\uC790\uB098"
+          Value: "\uC54C\uC558\uC5B4 \uC5EC\uAE30\uC11C \uAD6C\uACBD\uB9CC \uD558\uBA74
+            \uB418\uC790\uB098"
    - rid: 8016363972690968719
      type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
      data: