diff --git a/Assets/02_Scripts/_Data/Communication/Dialog/TypewriterStyle.cs b/Assets/02_Scripts/_Data/Communication/Dialog/TypewriterStyle.cs index 482f821..bc71b63 100644 --- a/Assets/02_Scripts/_Data/Communication/Dialog/TypewriterStyle.cs +++ b/Assets/02_Scripts/_Data/Communication/Dialog/TypewriterStyle.cs @@ -18,12 +18,19 @@ public class TypewriterStyle : ScriptableObject [Tooltip("문장 끝(. ! ? … 。) 뒤에 추가로 쉬는 시간(초)")] [Min(0f)] public float SentencePause = 0.3f; - [Header("Color")] + [Header("Text")] [Tooltip("켜면 글자 색을 아래 색으로 덮는다. 끄면 USS에 지정된 색 그대로")] public bool OverrideColor; public Color TextColor = Color.white; + [Tooltip("켜면 대사 정렬을 아래 값으로 덮는다. 끄면 USS에 지정된 정렬 그대로. " + + "서술처럼 화자 없이 가운데에 띄우는 연출에 쓴다")] + public bool OverrideAlign; + + [Tooltip("대사 텍스트 정렬 — 세로·가로가 함께 정해진다")] + public TextAnchor TextAlign = TextAnchor.MiddleCenter; + [Header("Emphasis")] [Tooltip("대사에 [[강조]] 로 감싼 부분이 이 색으로 표시된다")] public Color EmphasisColor = new Color(1f, 0.23f, 0.19f); diff --git a/Assets/02_Scripts/_UI/Communication/DialogHud.cs b/Assets/02_Scripts/_UI/Communication/DialogHud.cs index e20d9ed..c3cc2d6 100644 --- a/Assets/02_Scripts/_UI/Communication/DialogHud.cs +++ b/Assets/02_Scripts/_UI/Communication/DialogHud.cs @@ -136,12 +136,18 @@ private void ApplyState() { _dialogText.text = _typewriter.Composed; - // 스타일이 색을 덮으면 인라인으로 지정하고, 아니면 인라인을 걷어 USS 색으로 되돌린다 + // 스타일이 덮도록 지정한 항목만 인라인으로 넣고, 아니면 인라인을 걷어 USS 값으로 되돌린다 var style = _typewriter.Style; + if (style != null && style.OverrideColor) _dialogText.style.color = style.TextColor; else _dialogText.style.color = StyleKeyword.Null; + + if (style != null && style.OverrideAlign) + _dialogText.style.unityTextAlign = style.TextAlign; + else + _dialogText.style.unityTextAlign = StyleKeyword.Null; } if (_panel != null) diff --git a/Assets/07_Data/DialogGraph/TestDescDialog.dlg b/Assets/07_Data/DialogGraph/TestDescDialog.dlg index a3695a7..ac32cbe 100644 --- a/Assets/07_Data/DialogGraph/TestDescDialog.dlg +++ b/Assets/07_Data/DialogGraph/TestDescDialog.dlg @@ -26,7 +26,7 @@ MonoBehaviour: - rid: 4848514907161231425 type: {class: 'Constant`1[[TypewriterStyle, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 0} + m_Value: {fileID: 11400000, guid: cc6cf445487174e4da99aeb8c950940f, type: 2} - rid: 4848514907161231443 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -144,7 +144,7 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: "[[\uB370\uBC15]] \uC774\uC9C0\uB098!" + Value: "\uD14C\uC2A4\uD2B8 [[\uC11C\uC220]] \uC774\uC790\uB098!!" - rid: 4848514907161231451 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -284,9 +284,9 @@ MonoBehaviour: m_LastKnownBounds: serializedVersion: 2 x: -404 - y: -53 + y: -65 width: 1461 - height: 466 + height: 468 m_GraphElementMetaData: - m_Guid: m_Value0: 8557079674992562767 @@ -373,7 +373,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 4f92a586a0dac076e9c61595bc9ef81c m_Version: 2 - m_Position: {x: -85.50522, y: -42.782944} + m_Position: {x: -127.74372, y: -64.907875} m_Title: m_Tooltip: m_NodePreviewModel: @@ -440,7 +440,7 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: "\uD14C\uC2A4\uD2B8 [[\uC11C\uC220]] \uC774\uC790\uB098!!" + Value: "2026\uB144 7\uC6D4 31\uC77C \uD559\uC6D0 \uBAA8 \uC2DC\uAC01" - rid: 6600512887158735097 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: diff --git a/Assets/07_Data/Items.meta b/Assets/07_Data/Items.meta new file mode 100644 index 0000000..04f8378 --- /dev/null +++ b/Assets/07_Data/Items.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8cd3a83cf799e7a49a51dfda95eade5a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07_Data/Items/ItemDataBase.asset.meta b/Assets/07_Data/Items/ItemDataBase.asset.meta new file mode 100644 index 0000000..562885d --- /dev/null +++ b/Assets/07_Data/Items/ItemDataBase.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c6e4c61d950ba9c4e94fa04bbd7a7817 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07_Data/Items/TestItem.asset.meta b/Assets/07_Data/Items/TestItem.asset.meta new file mode 100644 index 0000000..c630956 --- /dev/null +++ b/Assets/07_Data/Items/TestItem.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8440086115385fc4d816202951c8f05e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07_Data/Items/TestItem2.asset.meta b/Assets/07_Data/Items/TestItem2.asset.meta new file mode 100644 index 0000000..6f5ed61 --- /dev/null +++ b/Assets/07_Data/Items/TestItem2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc403c58472178e4cb6742bbc9d5fd0c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07_Data/TypewriterStyle/TWS_Location.asset b/Assets/07_Data/TypewriterStyle/TWS_Location.asset new file mode 100644 index 0000000..f82c03a --- /dev/null +++ b/Assets/07_Data/TypewriterStyle/TWS_Location.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e2cb836b3bd43d26a82bd3da783e7b82a7eb8efc0ce5b37da2995152de4ae63 +size 736 diff --git a/Assets/07_Data/TypewriterStyle/TWS_Location.asset.meta b/Assets/07_Data/TypewriterStyle/TWS_Location.asset.meta new file mode 100644 index 0000000..fceb195 --- /dev/null +++ b/Assets/07_Data/TypewriterStyle/TWS_Location.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc6cf445487174e4da99aeb8c950940f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/12_Font/Limgul24 SDF.asset b/Assets/12_Font/Limgul24 SDF.asset index da13374..eb642fd 100644 --- a/Assets/12_Font/Limgul24 SDF.asset +++ b/Assets/12_Font/Limgul24 SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35e18a723b05e4920eac8a321fca97a716b81eac17788b0ae0eed0e836e92a6c -size 134261554 +oid sha256:3abe2377dfc831dd72db9ba2277196655f2450b0877f0dad519f95bfe8ee1fa0 +size 134266178