diff --git a/Assets/New Character Data.asset b/Assets/New Character Data.asset new file mode 100644 index 0000000..89d52ce --- /dev/null +++ b/Assets/New Character Data.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c9b81d87e51f0f4197c65dca5fe6aec, type: 3} + m_Name: New Character Data + m_EditorClassIdentifier: + CharacterName: + DialogueColor: {r: 0, g: 0, b: 0, a: 0} + Expressions: [] diff --git a/Assets/New Character Data.asset.meta b/Assets/New Character Data.asset.meta new file mode 100644 index 0000000..afe3f5a --- /dev/null +++ b/Assets/New Character Data.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb83984e2589f95409d92539539f966b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Editor/Data/LineSpeakerDataPropertyDrawer.cs b/Assets/Packages/com.studio23.ss2.dialoguesystem/Editor/Data/LineSpeakerDataPropertyDrawer.cs index 05f5b91..bec2d14 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Editor/Data/LineSpeakerDataPropertyDrawer.cs +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Editor/Data/LineSpeakerDataPropertyDrawer.cs @@ -36,7 +36,9 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten if (lineSpeakerData.Character != null) { position.y += EditorGUIUtility.singleLineHeight; - var expressions = lineSpeakerData.Character.Expressions.Select(ced => ced.ExpressionName).ToArray(); + var expressions = lineSpeakerData.Character.Expressions + .Where(ced => ced != null) + .Select(ced => ced.ExpressionName).ToArray(); // EditorGUI.LabelField(position," :" + lineSpeakerData); if (expressions.Length == 0) { diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Narupo.asset b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Narupo.asset new file mode 100644 index 0000000..a4b8102 --- /dev/null +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Narupo.asset @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6522073147610097109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ea1a97ac8dd4be5aa1587a59f11d10d, type: 3} + m_Name: Victor_U DARE SHOOT ME + m_EditorClassIdentifier: + Character: {fileID: 11400000} + ExpressionName: U DARE SHOOT ME + Image: {fileID: 0} +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c9b81d87e51f0f4197c65dca5fe6aec, type: 3} + m_Name: Narupo + m_EditorClassIdentifier: + CharacterName: Victor + DialogueColor: {r: 0, g: 0.4576635, b: 0.49056602, a: 1} + Expressions: [] diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Narupo.asset.meta b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Narupo.asset.meta new file mode 100644 index 0000000..e5cf667 --- /dev/null +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Narupo.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f206f19a5eeee3b4282901b5353fd9ea +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Graphs/Dialogue Graph 1.asset b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Graphs/Dialogue Graph 1.asset index 6566eeb..bd68ae4 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Graphs/Dialogue Graph 1.asset +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Graphs/Dialogue Graph 1.asset @@ -824,7 +824,7 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] SpeakerData: - Character: {fileID: 0} + Character: {fileID: 11400000, guid: 0480fe1505a2908449d82e07dffcbca0, type: 2} Expression: {fileID: 0} FMODEvent: Exit: {fileID: 0} @@ -897,7 +897,7 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] SpeakerData: - Character: {fileID: 0} + Character: {fileID: 11400000, guid: f206f19a5eeee3b4282901b5353fd9ea, type: 2} Expression: {fileID: 0} FMODEvent: Exit: {fileID: 0}