Merge branch 'main' of https://github.com/YarnSpinnerTool/YarnSpinner…

…-Unity
YarnSpinnerTool · Jan 24, 2025 · 8ff4efa · 8ff4efa
2 parents fdeaf66 + 9acfc86
commit 8ff4efa
Show file tree

Hide file tree

Showing 526 changed files with 72,935 additions and 8,524 deletions.
diff --git a/Samples~/3D Samples/BackgroundChatter/Dialogue/RoamingCharacter.yarn b/Samples~/3D Samples/BackgroundChatter/Dialogue/RoamingCharacter.yarn
@@ -0,0 +1,17 @@
+title: RoamingCharacter
+---
+=> Wanderer: Look, I'm a-roamin' about!
+=> Wanderer: Hey, cool stalls at the market!
+=> Wanderer: Woo, look at me go!
+=> Wanderer: Yep, it's market day!
+===
+title: RoamingCharacterTalkTo
+---
+<<pause_walking Wanderer>>
+
+Player: Hello!
+Wanderer: Can't stop! Gotta check out the market!
+
+<<unpause_walking Wanderer>>
+
+===
diff --git a/Samples~/3D Samples/BackgroundChatter/Dialogue/RoamingCharacter.yarn.meta b/Samples~/3D Samples/BackgroundChatter/Dialogue/RoamingCharacter.yarn.meta
diff --git a/Samples~/3D Samples/BackgroundChatter/Main.unity b/Samples~/3D Samples/BackgroundChatter/Main.unity
diff --git a/Samples~/3D Samples/BackgroundChatter/Prefabs/ChatterNPC.prefab b/Samples~/3D Samples/BackgroundChatter/Prefabs/ChatterNPC.prefab
@@ -0,0 +1,128 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5761379921799506701
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1031324393084317696}
+  m_Layer: 0
+  m_Name: Chatter Anchor
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1031324393084317696
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5761379921799506701}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.95, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1510181811365383404}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &3073522217913416566
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1604627835431571621, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      propertyPath: m_Name
+      value: Townsperson1 Variant
+      objectReference: {fileID: 0}
+    - target: {fileID: 3255585012628313904, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      propertyPath: dialogue.project
+      value: 
+      objectReference: {fileID: 7545569452688597077, guid: f8f29dc92f07e4ac39b2f7f4fe74392a, type: 3}
+    - target: {fileID: 3255585012628313904, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      propertyPath: dialogue.nodeName
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490764441529317274, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 3.22
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490764441529317274, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490764441529317274, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 5.04
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490764441529317274, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.409324
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490764441529317274, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490764441529317274, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.9123891
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490764441529317274, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490764441529317274, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490764441529317274, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 131.675
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490764441529317274, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 4490764441529317274, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1031324393084317696}
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 1604627835431571621, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 5565313489849796680}
+  m_SourcePrefab: {fileID: 100100000, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+--- !u!4 &1510181811365383404 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4490764441529317274, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+  m_PrefabInstance: {fileID: 3073522217913416566}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4387509547450084307 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1604627835431571621, guid: 0b3eff3c7e4554fa9beeeed968894f36, type: 3}
+  m_PrefabInstance: {fileID: 3073522217913416566}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5565313489849796680
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4387509547450084307}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 84b5ae92bbeb44bddb16f6c2f64296f9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  NPCName: Townsperson1
+  backgroundChatterPoint: {fileID: 1031324393084317696}
diff --git a/Samples~/3D Samples/BackgroundChatter/Prefabs/ChatterNPC.prefab.meta b/Samples~/3D Samples/BackgroundChatter/Prefabs/ChatterNPC.prefab.meta
diff --git a/Samples~/3D Samples/BackgroundChatter/Scripts/ChatterNPC.cs b/Samples~/3D Samples/BackgroundChatter/Scripts/ChatterNPC.cs
@@ -8,8 +8,6 @@ namespace Yarn.Unity.Samples
 
     public class ChatterNPC : MonoBehaviour
     {
-        public string? NPCName;
-
         [SerializeField] Transform? backgroundChatterPoint;
 
         public Transform BackgroundChatterPoint => backgroundChatterPoint != null ? backgroundChatterPoint : this.transform;
@@ -20,7 +18,7 @@ public class ChatterNPC : MonoBehaviour
 
             foreach (var npc in allNPCs)
             {
-                if (npc.NPCName == name)
+                if (npc.name == name)
                 {
                     return npc;
                 }

diff --git a/Samples~/3D Samples/Shared Assets/Art/Characters/Attach_Hat_Helmet.fbx b/Samples~/3D Samples/Shared Assets/Art/Characters/Attach_Hat_Helmet.fbx
diff --git a/Samples~/3D Samples/Shared Assets/Art/Characters/Attach_Hat_Helmet.fbx.meta b/Samples~/3D Samples/Shared Assets/Art/Characters/Attach_Hat_Helmet.fbx.meta
diff --git a/Samples~/3D Samples/Shared Assets/Art/Characters/Attach_Spear.fbx b/Samples~/3D Samples/Shared Assets/Art/Characters/Attach_Spear.fbx