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

Samples Tilda fix
Studio-23-xyz · Jan 24, 2024 · b0bb342 · b0bb342
2 parents 61b0e6b + f088a29
commit b0bb342
Show file tree

Hide file tree

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

diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset
@@ -16,7 +16,13 @@ MonoBehaviour:
   m_Data:
     m_SerializedData: []
   m_GUID: 3cd2dd60838011f4889bda962aee86d4
-  m_SerializeEntries: []
+  m_SerializeEntries:
+  - m_GUID: b116f7f945ba841459985a93b349b0db
+    m_Address: New Table_en
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-en
+    FlaggedDuringContentUpdateRestriction: 0
   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,7 +16,13 @@ MonoBehaviour:
   m_Data:
     m_SerializedData: []
   m_GUID: 299b8fcb43493c24dab08422c770f08d
-  m_SerializeEntries: []
+  m_SerializeEntries:
+  - m_GUID: daf8da3f04f5bbb4e9ea7ce90731c0f8
+    m_Address: New Table_ja
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-ja
+    FlaggedDuringContentUpdateRestriction: 0
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: 45bcaa0f9119bdc44b426e7814210719, type: 2}
   m_SchemaSet:

diff --git a/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset
@@ -0,0 +1,34 @@
+%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: 7e3976da977cb49238499ea3b4c237ae, type: 3}
+  m_Name: ProfileDataSourceSettings
+  m_EditorClassIdentifier: 
+  profileGroupTypes:
+  - m_GroupTypePrefix: Built-In
+    m_Variables:
+    - m_Suffix: BuildPath
+      m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
+    - m_Suffix: LoadPath
+      m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
+  - m_GroupTypePrefix: Editor Hosted
+    m_Variables:
+    - m_Suffix: BuildPath
+      m_Value: ServerData/[BuildTarget]
+    - m_Suffix: LoadPath
+      m_Value: http://[PrivateIpAddress]:[HostingServicePort]
+  environments: []
+  currentEnvironment:
+    id: 
+    projectId: 
+    projectGenesisId: 
+    name: 
+    isDefault: 0
diff --git a/...Localization/String Table 1_en.asset.meta → ...Data/ProfileDataSourceSettings.asset.meta b/...Localization/String Table 1_en.asset.meta → ...Data/ProfileDataSourceSettings.asset.meta
diff --git a/Assets/AddressableAssetsData/Windows.meta b/Assets/AddressableAssetsData/Windows.meta
diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Core/DialogueSystem.cs b/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Core/DialogueSystem.cs
@@ -64,6 +64,11 @@ public void StartDialogue(DialogueGraph graph)
             PlayDialogue(graph);
         }
 
+        public void StartDialogue()
+        {
+            PlayDialogue(_currentGraph);
+        }
+
         public async UniTask PlayDialogue(DialogueGraph graph)
         {
             _currentGraph = graph;
@@ -82,7 +87,7 @@ public async UniTask PlayDialogue(DialogueGraph graph)
             }
 
             _currentGraph.HandleDialogueEnded();
-        OnDialogueEnded?.Invoke(_currentGraph);
+            OnDialogueEnded?.Invoke(_currentGraph);
 
             Debug.Log($"{graph} dialogue completed");
         }

diff --git a/.../Packages/com.studio23.ss2.dialoguesystem/Runtime/Data/xNode/Node/DialogueLineNodeBase.cs b/.../Packages/com.studio23.ss2.dialoguesystem/Runtime/Data/xNode/Node/DialogueLineNodeBase.cs
@@ -38,16 +38,17 @@ public virtual void InvokePostPlayEvents()
                 {
                     if (eventNodeConnection.node is EventNode eventNode)
                     {
-                        eventNode.Event.Invoke();
+                        Debug.Log($"Invoke event {eventNode} on {this}", this);
+                        eventNode.Invoke();
                     }
                     else
                     {
-                        Debug.LogWarning($"{this} Events port no {i} is connected to {eventNodeConnection.node} but it's not an event node");
+                        Debug.LogWarning($"{this} Events port no {i} is connected to {eventNodeConnection.node} but it's not an event node", this);
                     }
                 }
                 else
                 {
-                    Debug.LogWarning($"{this} Events port no {i} is connected to {eventNodeConnection} but connection null");
+                    Debug.LogWarning($"{this} Events port no {i} is connected to {eventNodeConnection} but connection null", this);
                 }
             }
         }

diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Data/xNode/Node/EventNode.cs b/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Data/xNode/Node/EventNode.cs
@@ -1,3 +1,4 @@
+using UnityEngine;
 using UnityEngine.Events;
 using XNode;
 
@@ -9,7 +10,12 @@ public class EventNode : DialogueGraphNodeBase
         [Input]
         public int Entry;
 
-        public UnityEvent Event;
+        [SerializeField] UnityEvent Event;
+
+        public void Invoke()
+        {
+            Event.Invoke();
+        }
         public override void Initialize()
         {
             //do nothing

diff --git a/...lization/String Table 1 Shared Data.asset → .../Localization/New Table Shared Data.asset b/...lization/String Table 1 Shared Data.asset → .../Localization/New Table Shared Data.asset
@@ -10,59 +10,59 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5b11a58205ec3474ca216360e9fa74a8, type: 3}
-  m_Name: String Table 1 Shared Data
+  m_Name: New Table Shared Data
   m_EditorClassIdentifier: 
-  m_TableCollectionName: String Table 1
-  m_TableCollectionNameGuidString: 86a08eccdabf3a24e812720793183e8e
+  m_TableCollectionName: New Table
+  m_TableCollectionNameGuidString: 2fefaa175576a0e48bf5b28cb5260137
   m_Entries:
-  - m_Id: 48421580800
-    m_Key: Ehe
+  - m_Id: 57598717952
+    m_Key: Start
     m_Metadata:
       m_Items: []
-  - m_Id: 5198200614912
-    m_Key: YAMATE KUDASTOP
+  - m_Id: 162359848960
+    m_Key: next line
     m_Metadata:
       m_Items: []
-  - m_Id: 5591559221248
-    m_Key: hehe
+  - m_Id: 297877811200
+    m_Key: before choice
     m_Metadata:
       m_Items: []
-  - m_Id: 5729732177920
-    m_Key: OH NOES
+  - m_Id: 379343777792
+    m_Key: Choice 1
     m_Metadata:
       m_Items: []
-  - m_Id: 41327062855680
-    m_Key: INFINITE LOOP
+  - m_Id: 714133123072
+    m_Key: YAMETEKUDASTOP
     m_Metadata:
       m_Items: []
-  - m_Id: 41376861827072
-    m_Key: TOHOO
+  - m_Id: 819397570560
+    m_Key: Choice 2
     m_Metadata:
       m_Items: []
-  - m_Id: 41524757180416
-    m_Key: BOOL IS ON
+  - m_Id: 1000310484992
+    m_Key: Ehe
     m_Metadata:
       m_Items: []
-  - m_Id: 41708056653824
-    m_Key: START
+  - m_Id: 1087413596160
+    m_Key: Bool test
     m_Metadata:
       m_Items: []
-  - m_Id: 41751006326784
-    m_Key: HEHEHEHEHEHE
+  - m_Id: 1245450776576
+    m_Key: Loop convesation
     m_Metadata:
       m_Items: []
-  - m_Id: 41789728141312
-    m_Key: HOHOHO
+  - m_Id: 1312790327296
+    m_Key: STAND BACK
     m_Metadata:
       m_Items: []
   m_Metadata:
     m_Items: []
   m_KeyGenerator:
-    rid: 4806151239593623577
+    rid: 4806151557843517450
   references:
     version: 2
     RefIds:
-    - rid: 4806151239593623577
+    - rid: 4806151557843517450
       type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization}
       data:
-        m_CustomEpoch: 1704355215275
+        m_CustomEpoch: 1705566415762
diff --git a/...ion/String Table 1 Shared Data.asset.meta → ...lization/New Table Shared Data.asset.meta b/...ion/String Table 1 Shared Data.asset.meta → ...lization/New Table Shared Data.asset.meta
diff --git a/...uration/Localization/String Table 1.asset → ...onfiguration/Localization/New Table.asset b/...uration/Localization/String Table 1.asset → ...onfiguration/Localization/New Table.asset
@@ -10,12 +10,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5be51871efa6c3e4eae1703925c8f5ac, type: 3}
-  m_Name: String Table 1
+  m_Name: New Table
   m_EditorClassIdentifier: 
-  m_SharedTableData: {fileID: 11400000, guid: 86a08eccdabf3a24e812720793183e8e, type: 2}
+  m_SharedTableData: {fileID: 11400000, guid: 2fefaa175576a0e48bf5b28cb5260137, type: 2}
   m_Tables:
-  - {fileID: 11400000, guid: d4da86ebffb58044493a4c0cb8f68e1f, type: 2}
-  - {fileID: 11400000, guid: b7ac3b9cc332a4d489a6248958a7992c, type: 2}
+  - {fileID: 11400000, guid: b116f7f945ba841459985a93b349b0db, type: 2}
+  - {fileID: 11400000, guid: daf8da3f04f5bbb4e9ea7ce90731c0f8, type: 2}
   m_Extensions: []
   m_Group: String Table
   references:

diff --git a/...Localization/String Table 1_ja.asset.meta → ...uration/Localization/New Table.asset.meta b/...Localization/String Table 1_ja.asset.meta → ...uration/Localization/New Table.asset.meta
diff --git a/...tion/Localization/String Table 1_en.asset → ...iguration/Localization/New Table_en.asset b/...tion/Localization/String Table 1_en.asset → ...iguration/Localization/New Table_en.asset
@@ -10,52 +10,52 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3}
-  m_Name: String Table 1_en
+  m_Name: New Table_en
   m_EditorClassIdentifier: 
   m_LocaleId:
     m_Code: en
-  m_SharedData: {fileID: 11400000, guid: 86a08eccdabf3a24e812720793183e8e, type: 2}
+  m_SharedData: {fileID: 11400000, guid: 2fefaa175576a0e48bf5b28cb5260137, type: 2}
   m_Metadata:
     m_Items: []
   m_TableData:
-  - m_Id: 48421580800
-    m_Localized: Ehe
+  - m_Id: 57598717952
+    m_Localized: Start
     m_Metadata:
       m_Items: []
-  - m_Id: 5198200614912
-    m_Localized: YAMATE KUDASTOP
+  - m_Id: 162359848960
+    m_Localized: next line
     m_Metadata:
       m_Items: []
-  - m_Id: 5591559221248
-    m_Localized: hehe
+  - m_Id: 297877811200
+    m_Localized: before choice
     m_Metadata:
       m_Items: []
-  - m_Id: 5729732177920
-    m_Localized: OH NOES
+  - m_Id: 379343777792
+    m_Localized: Choice 1
     m_Metadata:
       m_Items: []
-  - m_Id: 41327062855680
-    m_Localized: INFINITE LOOP
+  - m_Id: 714133123072
+    m_Localized: YAMETEKUDASTOP
     m_Metadata:
       m_Items: []
-  - m_Id: 41376861827072
-    m_Localized: TOHOO
+  - m_Id: 819397570560
+    m_Localized: Choice 2
     m_Metadata:
       m_Items: []
-  - m_Id: 41524757180416
-    m_Localized: BOOL IS ON
+  - m_Id: 1000310484992
+    m_Localized: Ehe
     m_Metadata:
       m_Items: []
-  - m_Id: 41708056653824
-    m_Localized: START
+  - m_Id: 1087413596160
+    m_Localized: Shown if bool is on
     m_Metadata:
       m_Items: []
-  - m_Id: 41751006326784
-    m_Localized: HEHEHEHEHEHE
+  - m_Id: 1245450776576
+    m_Localized: Loop convesation
     m_Metadata:
       m_Items: []
-  - m_Id: 41789728141312
-    m_Localized: HOHOHO
+  - m_Id: 1312790327296
+    m_Localized: STAND BACK I'M ABOUT TO LOOP
     m_Metadata:
       m_Items: []
   references:

diff --git a/...on/Localization/String Table 1.asset.meta → ...tion/Localization/New Table_en.asset.meta b/...on/Localization/String Table 1.asset.meta → ...tion/Localization/New Table_en.asset.meta