Browse Source

Merge pull request #139 from FungusGames/backwards-compatibility-with-2.1

Backwards compatibility with 2.1
master
Chris Gregan 10 years ago
parent
commit
19ea57a689
  1. 7
      Assets/Fungus/Narrative/Scripts/SayDialog.cs
  2. 899
      Assets/Tests/Localisation/LocalisationTests.unity
  3. 83
      Assets/Tests/Narrative/NarrativeTests.unity

7
Assets/Fungus/Narrative/Scripts/SayDialog.cs

@ -120,6 +120,13 @@ namespace Fungus
{ {
// Dialog always starts invisible, will be faded in when writing starts // Dialog always starts invisible, will be faded in when writing starts
GetCanvasGroup().alpha = 0f; GetCanvasGroup().alpha = 0f;
// Add a raycaster if none already exists so we can handle dialog input
GraphicRaycaster raycaster = GetComponent<GraphicRaycaster>();
if (raycaster == null)
{
gameObject.AddComponent<GraphicRaycaster>();
}
} }
public virtual void Say(string text, bool clearPrevious, bool waitForInput, bool fadeWhenDone, AudioClip audioClip, Action onComplete) public virtual void Say(string text, bool clearPrevious, bool waitForInput, bool fadeWhenDone, AudioClip audioClip, Action onComplete)

899
Assets/Tests/Localisation/LocalisationTests.unity

File diff suppressed because it is too large Load Diff

83
Assets/Tests/Narrative/NarrativeTests.unity

@ -114,7 +114,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
selectedFlowchart: {fileID: 1913435020} selectedFlowchart: {fileID: 736071350}
--- !u!4 &11556238 --- !u!4 &11556238
Transform: Transform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@ -1910,7 +1910,6 @@ GameObject:
- 114: {fileID: 594837302} - 114: {fileID: 594837302}
- 114: {fileID: 594837303} - 114: {fileID: 594837303}
- 114: {fileID: 594837304} - 114: {fileID: 594837304}
- 114: {fileID: 594837305}
m_Layer: 0 m_Layer: 0
m_Name: TestAssertions m_Name: TestAssertions
m_TagString: Untagged m_TagString: Untagged
@ -2035,27 +2034,6 @@ MonoBehaviour:
checkMethods: 1 checkMethods: 1
m_ActionBase: {fileID: 1613545005} m_ActionBase: {fileID: 1613545005}
checksPerformed: 0 checksPerformed: 0
--- !u!114 &594837305
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 594837298}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8bafa54482a87ac4cbd7ff1bfd1ac93a, type: 3}
m_Name:
m_EditorClassIdentifier:
checkAfterTime: 12.5
repeatCheckTime: 0
repeatEveryTime: 1
checkAfterFrames: 1
repeatCheckFrame: 1
repeatEveryFrame: 1
hasFailed: 0
checkMethods: 1
m_ActionBase: {fileID: 1216870120}
checksPerformed: 0
--- !u!1 &620765065 --- !u!1 &620765065
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2268,7 +2246,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!4 &685425359 --- !u!4 &685425359
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2550,9 +2528,9 @@ MonoBehaviour:
y: -350 y: -350
width: 1121 width: 1121
height: 870 height: 870
selectedBlock: {fileID: 736071355} selectedBlock: {fileID: 736071349}
selectedCommands: selectedCommands:
- {fileID: 736071368} - {fileID: 736071366}
variables: [] variables: []
description: description:
stepPause: 0 stepPause: 0
@ -2599,7 +2577,7 @@ MonoBehaviour:
setSayDialog: {fileID: 0} setSayDialog: {fileID: 0}
--- !u!114 &736071353 --- !u!114 &736071353
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2626,7 +2604,7 @@ MonoBehaviour:
callMode: 0 callMode: 0
--- !u!114 &736071354 --- !u!114 &736071354
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2641,7 +2619,7 @@ MonoBehaviour:
duration: 2 duration: 2
--- !u!114 &736071355 --- !u!114 &736071355
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2673,7 +2651,7 @@ MonoBehaviour:
- {fileID: 736071367} - {fileID: 736071367}
--- !u!114 &736071356 --- !u!114 &736071356
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2700,7 +2678,7 @@ MonoBehaviour:
callMode: 0 callMode: 0
--- !u!114 &736071357 --- !u!114 &736071357
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2715,7 +2693,7 @@ MonoBehaviour:
duration: 4 duration: 4
--- !u!114 &736071358 --- !u!114 &736071358
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2742,7 +2720,7 @@ MonoBehaviour:
sayDialog: {fileID: 1714427708} sayDialog: {fileID: 1714427708}
--- !u!114 &736071360 --- !u!114 &736071360
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2767,7 +2745,7 @@ MonoBehaviour:
setSayDialog: {fileID: 0} setSayDialog: {fileID: 0}
--- !u!114 &736071361 --- !u!114 &736071361
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2794,7 +2772,7 @@ MonoBehaviour:
callMode: 0 callMode: 0
--- !u!114 &736071362 --- !u!114 &736071362
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2809,7 +2787,7 @@ MonoBehaviour:
duration: 2 duration: 2
--- !u!114 &736071363 --- !u!114 &736071363
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2836,7 +2814,7 @@ MonoBehaviour:
callMode: 0 callMode: 0
--- !u!114 &736071364 --- !u!114 &736071364
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2851,7 +2829,7 @@ MonoBehaviour:
duration: 2 duration: 2
--- !u!114 &736071365 --- !u!114 &736071365
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2876,7 +2854,7 @@ MonoBehaviour:
setSayDialog: {fileID: 0} setSayDialog: {fileID: 0}
--- !u!114 &736071366 --- !u!114 &736071366
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2920,7 +2898,7 @@ MonoBehaviour:
callMode: 0 callMode: 0
--- !u!114 &736071367 --- !u!114 &736071367
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -2947,7 +2925,7 @@ MonoBehaviour:
callMode: 0 callMode: 0
--- !u!114 &736071368 --- !u!114 &736071368
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 736071346} m_GameObject: {fileID: 736071346}
@ -5050,23 +5028,6 @@ MonoBehaviour:
otherPropertyPath: otherPropertyPath:
constantValueGeneric: 4 constantValueGeneric: 4
compareType: 0 compareType: 0
--- !u!114 &1216870120
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2586c8e41f35d2f4fadde53020bf4207, type: 3}
m_Name:
m_EditorClassIdentifier:
go: {fileID: 1714427702}
thisPropertyPath: AudioSource.isPlaying
compareToType: 1
other: {fileID: 0}
otherPropertyPath:
constantValueGeneric: 0
--- !u!114 &1300618896 --- !u!114 &1300618896
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -6298,8 +6259,8 @@ MonoBehaviour:
indentLevel: 0 indentLevel: 0
storyText: A long block of text that runs all the way to the end of the text box{w=1}{x} storyText: A long block of text that runs all the way to the end of the text box{w=1}{x}
description: description:
character: {fileID: 1045375690} character: {fileID: 0}
portrait: {fileID: 21300000, guid: 10cc2fec4b8aa4db983981588b06b591, type: 3} portrait: {fileID: 0}
voiceOverClip: {fileID: 0} voiceOverClip: {fileID: 0}
showAlways: 1 showAlways: 1
showCount: 1 showCount: 1
@ -6337,7 +6298,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!4 &1929911610 --- !u!4 &1929911610
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

Loading…
Cancel
Save