Merge pull request #9 from Studio-23-xyz/dev

Set graph when startdialogue is called
Studio-23-xyz · Jan 11, 2024 · e66859f · e66859f
2 parents e125554 + ed67b34
commit e66859f
Show file tree

Hide file tree

Showing 38 changed files with 53 additions and 65 deletions.
diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset
@@ -16,13 +16,7 @@ MonoBehaviour:
   m_Data:
     m_SerializedData: []
   m_GUID: 1040aa312d4f02443b5e508db1e56754
-  m_SerializeEntries:
-  - m_GUID: 86a08eccdabf3a24e812720793183e8e
-    m_Address: Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String
-      Table 1 Shared Data.asset
-    m_ReadOnly: 1
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: 45bcaa0f9119bdc44b426e7814210719, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset
@@ -17,14 +17,14 @@ MonoBehaviour:
     m_SerializedData: []
   m_GUID: 03f27369841114447820ea1aa4fd2b91
   m_SerializeEntries:
-  - m_GUID: 6548a8cc5dd1d4b4fa1daabffe00c346
-    m_Address: English (en)
+  - m_GUID: cb3b6415cc22f1e40a0a2b90ca61e7ee
+    m_Address: Japanese (ja)
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: f3f0d6029270a944ea77ab0c23ee3d61
-    m_Address: Japanese (ja)
+  - m_GUID: 984fc40b570c0554e8360d17f7a4bc82
+    m_Address: English (en)
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset
@@ -16,13 +16,7 @@ MonoBehaviour:
   m_Data:
     m_SerializedData: []
   m_GUID: 3cd2dd60838011f4889bda962aee86d4
-  m_SerializeEntries:
-  - m_GUID: d4da86ebffb58044493a4c0cb8f68e1f
-    m_Address: String Table 1_en
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-en
-    FlaggedDuringContentUpdateRestriction: 0
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: 45bcaa0f9119bdc44b426e7814210719, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset
@@ -16,13 +16,7 @@ MonoBehaviour:
   m_Data:
     m_SerializedData: []
   m_GUID: 299b8fcb43493c24dab08422c770f08d
-  m_SerializeEntries:
-  - m_GUID: b7ac3b9cc332a4d489a6248958a7992c
-    m_Address: String Table 1_ja
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-ja
-    FlaggedDuringContentUpdateRestriction: 0
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: 45bcaa0f9119bdc44b426e7814210719, type: 2}
   m_SchemaSet:

diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Core/DialogueSystem.cs b/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Core/DialogueSystem.cs
@@ -36,7 +36,14 @@ public class DialogueSystem : MonoBehaviour
 
         void Awake()
         {
-            Instance = this;
+            if (Instance != null)
+            {
+                Destroy(gameObject);
+            }
+            else
+            {
+                Instance = this;
+            }
         }
 
         /// <summary>
@@ -52,14 +59,14 @@ public void InitializeDialogueGraph(DialogueGraph newGraph)
         /// <summary>
         /// Start playing dialogue and it Fires the Start event
         /// </summary>
-        public void StartDialogue()
+        public void StartDialogue(DialogueGraph graph)
         {
-            PlayDialogue();
+            PlayDialogue(graph);
         }
 
-        public async UniTask PlayDialogue()
+        public async UniTask PlayDialogue(DialogueGraph graph)
         {
-            Debug.Log("START");
+            _currentGraph = graph;
             _currentGraph.Initialize();
 
             _currentGraph.HandleDialogueStarted();
@@ -76,7 +83,7 @@ public async UniTask PlayDialogue()
 
             OnDialogueEnded?.Invoke(_currentGraph);
 
-            Debug.Log("dialogue completed");
+            Debug.Log($"{graph} dialogue completed");
         }
 
         public void AdvanceDialogue()

diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo.meta b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo.meta
diff --git a/...ts/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration.meta b/...ts/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration.meta
diff --git a/...om.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization.meta b/...om.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization.meta
diff --git a/...loguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/English (en).asset.meta b/...loguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/English (en).asset.meta
diff --git a/...oguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/Japanese (ja).asset.meta b/...oguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/Japanese (ja).asset.meta
diff --git a/...em/Samples/DialogueChoiceDemo/Configuration/Localization/Localization Settings.asset.meta b/...em/Samples/DialogueChoiceDemo/Configuration/Localization/Localization Settings.asset.meta
diff --git a/...mples/DialogueChoiceDemo/Configuration/Localization/String Table 1 Shared Data.asset.meta b/...mples/DialogueChoiceDemo/Configuration/Localization/String Table 1 Shared Data.asset.meta
diff --git a/...guesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1.asset.meta b/...guesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1.asset.meta
diff --git a/...system/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_en.asset.meta b/...system/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_en.asset.meta
diff --git a/...system/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_ja.asset.meta b/...system/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_ja.asset.meta
diff --git a/....studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/SubtitleSettings.cs b/....studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/SubtitleSettings.cs
@@ -3,9 +3,8 @@
 public class SubtitleSettings : ScriptableObject
 {
     public Color SubtitleColor = Color.black;
-    public int SubtitleFontSize = 24;
+    public int SubtitleFontSize = 25;
     public bool DropShadow = false;
-
     public bool EnableCharacterColor = true;
     public bool ShowBackground;
     public Color BackGroundColor = Color.white;

diff --git a/...io23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/SubtitleSettings.cs.meta b/...io23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/SubtitleSettings.cs.meta
diff --git a/...Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/DialogueBoxUI.cs.meta b/...Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/DialogueBoxUI.cs.meta
diff --git a/...s/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/DialogueChoiceButton.cs.meta b/...s/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/DialogueChoiceButton.cs.meta
diff --git a/...kages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/DialogueChoiceUI.cs.meta b/...kages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/DialogueChoiceUI.cs.meta
diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Prefabs.meta b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Prefabs.meta
diff --git a/...23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Prefabs/DialogueChoiceButton.prefab.meta b/...23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Prefabs/DialogueChoiceButton.prefab.meta
diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources.meta b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources.meta
diff --git a/.../com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem.meta b/.../com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem.meta
diff --git a/...loguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/CharacterTable.asset.meta b/...loguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/CharacterTable.asset.meta
diff --git a/...23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters.meta b/...23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters.meta
diff --git a/...oguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Alan.asset.meta b/...oguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Alan.asset.meta
diff --git a/...guesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Linda.asset.meta b/...guesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Linda.asset.meta
diff --git a/...uesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Marcus.asset.meta b/...uesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Marcus.asset.meta
diff --git a/...uesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Victor.asset.meta b/...uesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Characters/Victor.asset.meta
diff --git a/...udio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Graphs.meta b/...udio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Graphs.meta
diff --git a/...em/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Graphs/Dialogue Graph 1.asset.meta b/...em/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Graphs/Dialogue Graph 1.asset.meta
diff --git a/...guesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/SubtitleSettings.asset.meta b/...guesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/SubtitleSettings.asset.meta
diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Scene.meta b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Scene.meta
diff --git a/...s/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Scene/SampleScene.unity.meta b/...s/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Scene/SampleScene.unity.meta
diff --git a/.../Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/TestBoolNode.cs.meta b/.../Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/TestBoolNode.cs.meta
diff --git a/...om.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/TestBoolNodeInteraction.cs.meta b/...om.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/TestBoolNodeInteraction.cs.meta
diff --git a/...s/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/TextMeshProLocalizer.cs.meta b/...s/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/TextMeshProLocalizer.cs.meta