Browse Source

Fixed Extend Previous option.

Removed Move dialog option (doesn’t work).
Removed text writing code from Dialog.cs
Changed WaitForInput to work by adding a {wi} tag.
Exit tag now just breaks out of processing loop.
Updated TheExperiment scene to use new Say Dialog.
master
chrisgregan 10 years ago
parent
commit
013de03035
  1. 33
      Assets/Fungus/Narrative/Scripts/Commands/Say.cs
  2. 410
      Assets/Fungus/Narrative/Scripts/Dialog.cs
  3. 9
      Assets/Fungus/Narrative/Scripts/MenuDialog.cs
  4. 44
      Assets/Fungus/Narrative/Scripts/SayDialog.cs
  5. 7
      Assets/Fungus/UI/Scripts/Commands/Write.cs
  6. 34
      Assets/Fungus/UI/Scripts/Writer.cs
  7. 729
      Assets/FungusExamples/Sherlock/TheExperiment.unity
  8. 49
      Assets/Tests/Narrative/NarrativeTests.unity

33
Assets/Fungus/Narrative/Scripts/Commands/Say.cs

@ -79,19 +79,15 @@ namespace Fungus
sayDialog.SetCharacterImage(portrait);
bool fadingIn = false;
bool movingIn = false;
if (sayDialog.alwaysFadeDialog || fadeIn)
{
sayDialog.FadeInDialog();
fadingIn = true;
}
if (sayDialog.alwaysMoveDialog)
{
sayDialog.MoveInDialog();
movingIn = true;
}
if (!fadingIn && !movingIn)
if (!fadingIn)
{
// Show immediately
sayDialog.ShowDialog(true);
}
@ -99,38 +95,21 @@ namespace Fungus
foreach (CustomTag ct in CustomTag.activeCustomTags)
{
displayText = displayText.Replace(ct.tagStartSymbol,ct.replaceTagStartWith);
displayText = displayText.Replace(ct.tagStartSymbol, ct.replaceTagStartWith);
if (ct.tagEndSymbol != "" && ct.replaceTagEndWith != "")
{
displayText = displayText.Replace(ct.tagEndSymbol,ct.replaceTagEndWith);
displayText = displayText.Replace(ct.tagEndSymbol, ct.replaceTagEndWith);
}
}
if (extendPrevious)
{
displayText = "{s=0}" + Dialog.prevStoryText + "{/s}" + displayText;
}
string subbedText = flowchart.SubstituteVariables(displayText);
sayDialog.Say(subbedText, waitForClick, voiceOverClip, delegate {
sayDialog.Say(subbedText, !extendPrevious, waitForClick, voiceOverClip, delegate {
if (waitForClick)
{
bool fadingOut = false;
bool movingOut = false;
if (sayDialog.alwaysFadeDialog || fadeOut)
{
sayDialog.FadeOutDialog();
fadingOut = true;
}
if (sayDialog.alwaysMoveDialog)
{
sayDialog.MoveOutDialog();
movingOut = true;
}
if (!fadingOut && !movingOut)
{
sayDialog.ShowDialog(false);
}
}
Continue();

410
Assets/Fungus/Narrative/Scripts/Dialog.cs

@ -11,8 +11,7 @@ namespace Fungus
public class Dialog : MonoBehaviour, IDialogInputListener
{
public static Character speakingCharacter;
public static string prevStoryText;
public float writingSpeed = 60;
public AudioClip writingSound;
[Range(0,1)]
@ -25,11 +24,6 @@ namespace Fungus
public bool alwaysFadeDialog = false;
public float fadeDuration = 1f;
public LeanTweenType fadeEaseType;
public bool alwaysMoveDialog = false;
public Vector2 startPosition;
protected Vector2 endPosition;
public float moveSpeed = 1000f;
public LeanTweenType moveEaseType;
public Canvas dialogCanvas;
public Text nameText;
@ -82,79 +76,48 @@ namespace Fungus
canvasGroup.alpha = 0;
}
dialogCanvas.gameObject.SetActive(true);
if (fadeDuration == 0) fadeDuration = float.Epsilon;
LeanTween.value(dialogCanvas.gameObject,0,1,fadeDuration).setEase(fadeEaseType).setOnUpdate(
(float fadeAmount)=>{
if (fadeDuration == 0)
{
fadeDuration = float.Epsilon;
}
LeanTween.value(dialogCanvas.gameObject,0,1,fadeDuration).setEase(fadeEaseType).setOnUpdate( (float fadeAmount)=> {
if (canvasGroup != null)
{
canvasGroup.alpha = fadeAmount;
}
}
).setOnComplete(
()=>{
}).setOnComplete( ()=> {
if (canvasGroup != null)
{
canvasGroup.alpha = 1;
}
}
);
});
}
public virtual void MoveInDialog()
{
endPosition = this.transform.position;
float moveDuration = (Vector3.Distance(startPosition,this.transform.position)/moveSpeed);
if (moveSpeed == 0) moveDuration = float.Epsilon;
LeanTween.value(this.gameObject,(Vector2)startPosition,(Vector2)endPosition,moveDuration).setEase(moveEaseType).setOnUpdate(
(Vector3 updatePosition)=>{
this.transform.position = updatePosition;
}
).setOnComplete(
()=>{
this.transform.position = endPosition;
}
);
}
public virtual void FadeOutDialog()
{
CanvasGroup canvasGroup = dialogCanvas.GetComponent<CanvasGroup>();
LeanTween.cancel(dialogCanvas.gameObject);
if (fadeDuration == 0) fadeDuration = float.Epsilon;
LeanTween.value(dialogCanvas.gameObject,1,0,fadeDuration).setEase(fadeEaseType).setOnUpdate(
(float fadeAmount)=>{
if (fadeDuration == 0)
{
fadeDuration = float.Epsilon;
}
LeanTween.value(dialogCanvas.gameObject,1,0,fadeDuration).setEase(fadeEaseType).setOnUpdate( (float fadeAmount)=> {
if (canvasGroup != null)
{
canvasGroup.alpha = fadeAmount;
}
}
).setOnComplete(
()=>{
}).setOnComplete( ()=> {
dialogCanvas.gameObject.SetActive(false);
if (canvasGroup != null)
{
canvasGroup.alpha = 1;
}
}
);
});
}
public virtual void MoveOutDialog()
{
endPosition = this.transform.position;
float moveDuration = (Vector3.Distance(startPosition,this.transform.position)/moveSpeed);
if (moveSpeed == 0) moveDuration = float.Epsilon;
LeanTween.value(this.gameObject,(Vector2)endPosition,(Vector2)startPosition,moveDuration).setEase(moveEaseType).setOnUpdate(
(Vector3 updatePosition)=>{
this.transform.position = updatePosition;
}
).setOnComplete(
()=>{
this.transform.position = endPosition;
}
);
}
public virtual void SetCharacter(Character character, Flowchart flowchart = null)
{
if (character == null)
@ -236,290 +199,6 @@ namespace Fungus
}
}
protected virtual IEnumerator WriteText(string text, AudioClip voiceOverClip, Action onWritingComplete, Action onExitTag)
{
storyText.text = "";
// Parse the story text & tag markup to produce a list of tokens for processing
DialogParser parser = new DialogParser();
parser.Tokenize(text);
if (parser.tokens.Count == 0)
{
if (onWritingComplete != null)
{
onWritingComplete();
}
yield break;
}
DialogText dialogText = new DialogText();
dialogText.parentDialog = this;
dialogText.writingSpeed = writingSpeed;
dialogText.punctuationPause = punctuationPause;
dialogText.beepPerCharacter = beepPerCharacter;
dialogText.slowBeepsAt = slowBeepsAt;
dialogText.fastBeepsAt = fastBeepsAt;
audioController.audioSource = GetComponent<AudioSource>();
audioController.volume = writingVolume;
audioController.loop = loopWritingSound;
if (voiceOverClip != null)
{
audioController.audioClip = voiceOverClip;
}
else if (characterTypingSound != null)
{
audioController.audioClip = characterTypingSound;
}
else if (writingSound != null)
{
audioController.audioClip = writingSound;
}
audioController.Play();
foreach (Token token in parser.tokens)
{
switch (token.type)
{
case TokenType.Words:
dialogText.Append(token.param);
break;
case TokenType.BoldStart:
dialogText.boldActive = true;
break;
case TokenType.BoldEnd:
dialogText.boldActive = false;
break;
case TokenType.ItalicStart:
dialogText.italicActive = true;
break;
case TokenType.ItalicEnd:
dialogText.italicActive = false;
break;
case TokenType.ColorStart:
dialogText.colorActive = true;
dialogText.colorText = token.param;
break;
case TokenType.ColorEnd:
dialogText.colorActive = false;
break;
case TokenType.Wait:
float duration = 1f;
if (!Single.TryParse(token.param, out duration))
{
duration = 1f;
}
yield return StartCoroutine(WaitForSecondsOrInput(duration));
break;
case TokenType.WaitForInputNoClear:
OnWaitForInputTag(true);
yield return StartCoroutine(WaitForInput(null));
OnWaitForInputTag(false);
break;
case TokenType.WaitForInputAndClear:
OnWaitForInputTag(true);
yield return StartCoroutine(WaitForInput(null));
OnWaitForInputTag(false);
currentSpeed = writingSpeed;
dialogText.Clear();
audioController.Stop();
break;
case TokenType.WaitOnPunctuationStart:
float newPunctuationPause = 0f;
if (!Single.TryParse(token.param, out newPunctuationPause))
{
newPunctuationPause = 0f;
}
dialogText.punctuationPause = newPunctuationPause;
break;
case TokenType.WaitOnPunctuationEnd:
dialogText.punctuationPause = punctuationPause;
break;
case TokenType.Clear:
dialogText.Clear();
break;
case TokenType.SpeedStart:
float newSpeed = 0;
if (!Single.TryParse(token.param, out newSpeed))
{
newSpeed = 0f;
}
dialogText.writingSpeed = newSpeed;
break;
case TokenType.SpeedEnd:
dialogText.writingSpeed = writingSpeed;
break;
case TokenType.Exit:
if (onExitTag != null)
{
prevStoryText = storyText.text;
audioController.Stop();
onExitTag();
}
yield break;
case TokenType.Message:
Flowchart.BroadcastFungusMessage(token.param);
break;
case TokenType.VerticalPunch:
float vPunchIntensity = 0;
if (!Single.TryParse(token.param, out vPunchIntensity))
{
vPunchIntensity = 0f;
}
VerticalPunch(vPunchIntensity);
break;
case TokenType.HorizontalPunch:
float hPunchIntensity = 0;
if (!Single.TryParse(token.param, out hPunchIntensity))
{
hPunchIntensity = 0f;
}
HorizontalPunch(hPunchIntensity);
break;
case TokenType.Shake:
float shakeIntensity = 0;
if (!Single.TryParse(token.param, out shakeIntensity))
{
shakeIntensity = 0f;
}
Shake(shakeIntensity);
break;
case TokenType.Shiver:
float shiverIntensity = 0;
if (!Single.TryParse(token.param, out shiverIntensity))
{
shiverIntensity = 0f;
}
Shiver(shiverIntensity);
break;
case TokenType.Flash:
float flashDuration = 0;
if (!Single.TryParse(token.param, out flashDuration))
{
flashDuration = 0f;
}
Flash(flashDuration);
break;
case TokenType.Audio:
{
AudioSource audioSource = FindAudio(token.param);
if (audioSource != null)
{
audioSource.PlayOneShot(audioSource.clip);
}
}
break;
case TokenType.AudioLoop:
{
AudioSource audioSource = FindAudio(token.param);
if (audioSource != null)
{
audioSource.Play();
audioSource.loop = true;
}
}
break;
case TokenType.AudioPause:
{
AudioSource audioSource = FindAudio(token.param);
if (audioSource != null)
{
audioSource.Pause ();
}
}
break;
case TokenType.AudioStop:
{
AudioSource audioSource = FindAudio(token.param);
if (audioSource != null)
{
audioSource.Pause ();
}
}
break;
}
// Update text writing
while (!dialogText.UpdateGlyphs(wasPointerClicked))
{
storyText.text = dialogText.GetDialogText();
yield return null;
}
storyText.text = dialogText.GetDialogText();
wasPointerClicked = false;
// Now process next token
}
prevStoryText = storyText.text;
audioController.Stop();
if (onWritingComplete != null)
{
onWritingComplete();
}
yield break;
}
protected virtual AudioSource FindAudio(string audioObjectName)
{
GameObject go = GameObject.Find(audioObjectName);
if (go == null)
{
return null;
}
return go.GetComponent<AudioSource>();
}
protected virtual void VerticalPunch(float intensity)
{
iTween.ShakePosition(this.gameObject, new Vector3(0f, intensity, 0f), 0.5f);
}
protected virtual void HorizontalPunch(float intensity)
{
iTween.ShakePosition(this.gameObject, new Vector3(intensity, 0f, 0f), 0.5f);
}
protected virtual void Shake(float intensity)
{
iTween.ShakePosition(this.gameObject, new Vector3(intensity, intensity, 0f), 0.5f);
}
protected virtual void Shiver(float intensity)
{
iTween.ShakePosition(this.gameObject, new Vector3(intensity, intensity, 0f), 1f);
}
protected virtual void Flash(float duration)
{
CameraController cameraController = CameraController.GetInstance();
cameraController.screenFadeTexture = CameraController.CreateColorTexture(new Color(1f,1f,1f,1f), 32, 32);
cameraController.Fade(1f, duration, delegate {
cameraController.screenFadeTexture = CameraController.CreateColorTexture(new Color(1f,1f,1f,1f), 32, 32);
cameraController.Fade(0f, duration, null);
});
}
public virtual void Clear()
{
ClearStoryText();
@ -544,56 +223,31 @@ namespace Fungus
}
}
protected virtual IEnumerator WaitForInput(Action onInput)
public static void StopPortraitTweens()
{
while (!wasPointerClicked)
{
yield return null;
}
wasPointerClicked = false;
if (onInput != null)
// Stop all tweening portraits
foreach( Character c in Character.activeCharacters )
{
// Stop all tweening portraits
foreach( Character c in Character.activeCharacters )
if (c.state.portraitImage != null)
{
if (c.state.portraitImage != null)
if (LeanTween.isTweening(c.state.portraitImage.gameObject))
{
if (LeanTween.isTweening(c.state.portraitImage.gameObject))
{
LeanTween.cancel(c.state.portraitImage.gameObject, true);
LeanTween.cancel(c.state.portraitImage.gameObject, true);
Portrait.SetRectTransform(c.state.portraitImage.rectTransform, c.state.position);
if (c.state.dimmed == true)
{
c.state.portraitImage.color = new Color(0.5f, 0.5f, 0.5f, 1f);
}
else
{
c.state.portraitImage.color = Color.white;
}
Portrait.SetRectTransform(c.state.portraitImage.rectTransform, c.state.position);
if (c.state.dimmed == true)
{
c.state.portraitImage.color = new Color(0.5f, 0.5f, 0.5f, 1f);
}
else
{
c.state.portraitImage.color = Color.white;
}
}
}
onInput();
}
}
protected virtual IEnumerator WaitForSecondsOrInput(float duration)
{
float timer = duration;
while (timer > 0 && !wasPointerClicked)
{
timer -= Time.deltaTime;
yield return null;
}
wasPointerClicked = false;
}
protected virtual void OnWaitForInputTag(bool waiting)
{}
//
// IDialogInput implementation
//

9
Assets/Fungus/Narrative/Scripts/MenuDialog.cs

@ -145,18 +145,13 @@ namespace Fungus
if (sayDialog != null)
{
bool fadingOut = false;
bool movingOut = false;
if (sayDialog.alwaysFadeDialog)
{
sayDialog.FadeOutDialog();
fadingOut = true;
}
if (sayDialog.alwaysMoveDialog)
{
sayDialog.MoveOutDialog();
movingOut = true;
}
if (!fadingOut && !movingOut)
if (!fadingOut)
{
sayDialog.ShowDialog(false);
}

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

@ -43,7 +43,7 @@ namespace Fungus
return activeSayDialog;
}
public virtual void Say(string text, bool waitForInput, AudioClip voiceOverClip, Action onComplete)
public virtual void Say(string text, bool clearPrevious, bool waitForInput, AudioClip voiceOverClip, Action onComplete)
{
Writer writer = GetComponent<Writer>();
if (writer == null)
@ -51,47 +51,9 @@ namespace Fungus
writer = gameObject.AddComponent<Writer>();
}
Action onWritingComplete = delegate {
if (waitForInput)
{
ShowContinueImage(true);
StartCoroutine(WaitForInput(delegate {
if (continueSound != null)
{
AudioSource.PlayClipAtPoint(continueSound, Vector3.zero);
}
Clear();
audioController.Stop();
if (onComplete != null)
{
onComplete();
}
}));
}
else
{
if (onComplete != null)
{
onComplete();
}
}
};
Action onExitTag = delegate {
Clear();
if (onComplete != null)
{
onComplete();
}
};
ShowContinueImage(false);
writer.Write(text, true, onWritingComplete, onExitTag);
writer.Write(text, clearPrevious, waitForInput, onComplete);
}
public override void Clear()
@ -100,7 +62,7 @@ namespace Fungus
ShowContinueImage(false);
}
protected override void OnWaitForInputTag(bool waiting)
protected virtual void OnWaitForInputTag(bool waiting)
{
ShowContinueImage(waiting);
}

7
Assets/Fungus/UI/Scripts/Commands/Write.cs

@ -73,14 +73,13 @@ namespace Fungus
if (!waitUntilFinished)
{
writer.Write(newText, clearText, null, null);
writer.Write(newText, clearText, false, null);
Continue();
}
else
{
writer.Write(newText, clearText,
() => { Continue (); },
() => { Continue (); }
writer.Write(newText, clearText, false,
() => { Continue (); }
);
}
}

34
Assets/Fungus/UI/Scripts/Writer.cs

@ -187,7 +187,7 @@ namespace Fungus
}
}
public virtual void Write(string content, bool clear, Action onComplete, Action onExit)
public virtual void Write(string content, bool clear, bool waitForInput, Action onComplete)
{
if (clear)
{
@ -198,17 +198,21 @@ namespace Fungus
{
return;
}
string tokenText = content;
if (waitForInput)
{
tokenText += "{wi}";
}
TextTagParser tagParser = new TextTagParser();
List<TextTagParser.Token> tokens = tagParser.Tokenize(content);
StartCoroutine(ProcessTokens(tokens, onComplete, onExit));
List<TextTagParser.Token> tokens = tagParser.Tokenize(tokenText);
StartCoroutine(ProcessTokens(tokens, onComplete));
}
protected virtual IEnumerator ProcessTokens(List<TextTagParser.Token> tokens, Action onComplete, Action onExit)
protected virtual IEnumerator ProcessTokens(List<TextTagParser.Token> tokens, Action onComplete)
{
text = "";
// Reset control members
boldActive = false;
italicActive = false;
@ -219,6 +223,8 @@ namespace Fungus
foreach (TextTagParser.Token token in tokens)
{
bool exit = false;
switch (token.type)
{
case TextTagParser.TokenType.Words:
@ -289,11 +295,8 @@ namespace Fungus
break;
case TextTagParser.TokenType.Exit:
if (onExit != null)
{
onExit();
}
yield break;
exit = true;
break;
case TextTagParser.TokenType.Message:
Flowchart.BroadcastFungusMessage(token.param);
@ -379,6 +382,11 @@ namespace Fungus
}
inputFlag = false;
if (exit)
{
break;
}
}
if (onComplete != null)

729
Assets/FungusExamples/Sherlock/TheExperiment.unity

@ -141,6 +141,75 @@ Transform:
m_Children: []
m_Father: {fileID: 1782167289}
m_RootOrder: 3
--- !u!1 &43764833
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 188898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 43764836}
- 222: {fileID: 43764835}
- 114: {fileID: 43764834}
m_Layer: 5
m_Name: NameText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &43764834
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 43764833}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: .258823544, g: .254901975, b: .262745112, a: 1}
m_FontData:
m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Character Name
--- !u!222 &43764835
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22288898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 43764833}
--- !u!224 &43764836
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 43764833}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1635298695}
m_RootOrder: 0
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 622.25, y: 281}
m_SizeDelta: {x: 1178.5, y: 71}
m_Pivot: {x: .5, y: .5}
--- !u!1 &44771030
GameObject:
m_ObjectHideFlags: 0
@ -1146,6 +1215,90 @@ RectTransform:
m_PrefabParentObject: {fileID: 22410270, guid: c6289d5f8fa843145a2355af9cb09719,
type: 2}
m_PrefabInternal: {fileID: 1297790152}
--- !u!1 &515191723
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 515191724}
- 222: {fileID: 515191727}
- 114: {fileID: 515191726}
- 114: {fileID: 515191725}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &515191724
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 515191723}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1635298695}
m_RootOrder: 1
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 1435, y: 404}
m_SizeDelta: {x: 300, y: 300}
m_Pivot: {x: .5, y: .5}
--- !u!114 &515191725
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11439142, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 515191723}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: 350
m_PreferredHeight: 350
m_FlexibleWidth: -1
m_FlexibleHeight: -1
--- !u!114 &515191726
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 515191723}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &515191727
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22248914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 515191723}
--- !u!1 &529798542
GameObject:
m_ObjectHideFlags: 0
@ -2166,7 +2319,7 @@ Transform:
- {fileID: 491891010}
- {fileID: 684540985}
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 3
--- !u!1 &950051498
GameObject:
m_ObjectHideFlags: 0
@ -2300,6 +2453,250 @@ MonoBehaviour:
tagEndSymbol: '{/slow}'
replaceTagStartWith: '{s=15}'
replaceTagEndWith: '{/s}'
--- !u!1 &981838182
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 188902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 981838183}
- 223: {fileID: 981838191}
- 114: {fileID: 981838190}
- 225: {fileID: 981838189}
- 114: {fileID: 981838188}
- 114: {fileID: 981838187}
- 114: {fileID: 981838186}
- 114: {fileID: 981838184}
- 82: {fileID: 981838185}
m_Layer: 5
m_Name: SayDialog
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &981838183
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 981838182}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1635298695}
m_Father: {fileID: 0}
m_RootOrder: 0
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &981838184
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11481894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 981838182}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 43b85556abd314f3f870c18c013fdcef, type: 3}
m_Name:
m_EditorClassIdentifier:
clickMode: 2
keyPressMode: 2
nextClickDelay: .200000003
keyList: 0900000020000000
--- !u!82 &981838185
AudioSource:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 8294266, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 981838182}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!114 &981838186
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11487070, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 981838182}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a676940fce6344af1a70043b089a6c14, type: 3}
m_Name:
m_EditorClassIdentifier:
targetTextObject: {fileID: 1116800860}
writingSpeed: 60
punctuationPause: .25
hiddenTextColor: {r: 1, g: 1, b: 1, a: 0}
writeWholeWords: 0
--- !u!114 &981838187
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 981838182}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3a0bbe22c246e4c78ad8e9816cbae9d5, type: 3}
m_Name:
m_EditorClassIdentifier:
writingSpeed: 30
writingSound: {fileID: 8300000, guid: f637c5ce9d10e45c7855ed89bfc6b97e, type: 3}
writingVolume: 1
loopWritingSound: 1
beepPerCharacter: 0
slowBeepsAt: 10
fastBeepsAt: 30
punctuationPause: .200000003
alwaysFadeDialog: 0
fadeDuration: .25
fadeEaseType: 0
dialogCanvas: {fileID: 981838191}
nameText: {fileID: 43764834}
storyText: {fileID: 1116800863}
characterImage: {fileID: 515191726}
characterTypingSound: {fileID: 0}
continueImage: {fileID: 1330472049}
continueSound: {fileID: 0}
--- !u!114 &981838188
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11486804, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 981838182}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!225 &981838189
CanvasGroup:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22588896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 981838182}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &981838190
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11488906, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 981838182}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 32
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1600, y: 1200}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 1
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!223 &981838191
Canvas:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22388894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 981838182}
m_Enabled: 1
serializedVersion: 2
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 1
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingLayerID: 0
m_SortingOrder: 1
--- !u!1 &1094705495
GameObject:
m_ObjectHideFlags: 0
@ -2329,7 +2726,7 @@ Transform:
- {fileID: 720879694}
- {fileID: 1167501258}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
--- !u!1 &1103817140
GameObject:
m_ObjectHideFlags: 0
@ -2586,6 +2983,95 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!1 &1116800860
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 188894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 1116800861}
- 222: {fileID: 1116800864}
- 114: {fileID: 1116800863}
- 114: {fileID: 1116800862}
m_Layer: 5
m_Name: StoryText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1116800861
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1116800860}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1635298695}
m_RootOrder: 2
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 803, y: 145.630005}
m_SizeDelta: {x: 1539, y: 199.75}
m_Pivot: {x: .5, y: .5}
--- !u!114 &1116800862
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11439138, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1116800860}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: 1150
m_PreferredHeight: 200
m_FlexibleWidth: 1
m_FlexibleHeight: -1
--- !u!114 &1116800863
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1116800860}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FontData:
m_Font: {fileID: 12800000, guid: 79197ecfbc3a4294a89ce589dac02cf2, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Story text
--- !u!222 &1116800864
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22288894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1116800860}
--- !u!1 &1167501257
GameObject:
m_ObjectHideFlags: 0
@ -2838,6 +3324,117 @@ Prefab:
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: c6289d5f8fa843145a2355af9cb09719, type: 2}
m_IsPrefabParent: 0
--- !u!1 &1330472045
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 188896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 1330472046}
- 222: {fileID: 1330472050}
- 114: {fileID: 1330472049}
- 212: {fileID: 1330472048}
- 95: {fileID: 1330472047}
m_Layer: 5
m_Name: Continue
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1330472046
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22488898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1330472045}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1635298695}
m_RootOrder: 3
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 1533.64929, y: 83.8302612}
m_SizeDelta: {x: 78, y: 77}
m_Pivot: {x: .500000417, y: .5}
--- !u!95 &1330472047
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 9588894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1330472045}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 1
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
--- !u!212 &1330472048
SpriteRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 21288894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1330472045}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_ReflectionProbeUsage: 1
m_ProbeAnchor: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_ImportantGI: 0
m_AutoUVMaxDistance: .5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 226248ac6f184e448af731df91b91958, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!114 &1330472049
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11488898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1330472045}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 21300000, guid: 226248ac6f184e448af731df91b91958, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &1330472050
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22288896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1330472045}
--- !u!1 &1345583021
GameObject:
m_ObjectHideFlags: 0
@ -3255,8 +3852,9 @@ MonoBehaviour:
y: -1729.35046
width: 5969.4458
height: 2818.85034
selectedBlock: {fileID: 1390555308}
selectedCommands: []
selectedBlock: {fileID: 1390555298}
selectedCommands:
- {fileID: 1390555297}
variables:
- {fileID: 1390555396}
description: 'Example scene from Sherlock: The Game Is On'
@ -3276,7 +3874,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 7
--- !u!114 &1390555297
MonoBehaviour:
m_ObjectHideFlags: 2
@ -6139,6 +6737,119 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!1 &1635298694
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 188900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 1635298695}
- 222: {fileID: 1635298699}
- 114: {fileID: 1635298698}
- 225: {fileID: 1635298697}
- 114: {fileID: 1635298696}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1635298695
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1635298694}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 43764836}
- {fileID: 515191724}
- {fileID: 1116800861}
- {fileID: 1330472046}
m_Father: {fileID: 981838183}
m_RootOrder: 0
m_AnchorMin: {x: .5, y: 0}
m_AnchorMax: {x: .5, y: 0}
m_AnchoredPosition: {x: -805, y: 0}
m_SizeDelta: {x: 1605, y: 335}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1635298696
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11478524, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1635298694}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Delegates:
- eventID: 4
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 981838184}
m_MethodName: SetDialogClickedFlag
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
delegates: []
--- !u!225 &1635298697
CanvasGroup:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22588894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1635298694}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &1635298698
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11488904, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1635298694}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 21300000, guid: eeb00f6cd27e9ef4d9174551b3342dec, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 0
m_FillMethod: 0
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &1635298699
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22288900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1635298694}
--- !u!1 &1657662358
GameObject:
m_ObjectHideFlags: 0
@ -6236,7 +6947,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 8
--- !u!1 &1782167288
GameObject:
m_ObjectHideFlags: 0
@ -6268,7 +6979,7 @@ Transform:
- {fileID: 31336595}
- {fileID: 2016355052}
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 6
--- !u!1 &1789234733
GameObject:
m_ObjectHideFlags: 0
@ -6428,7 +7139,7 @@ Transform:
- {fileID: 1880195409}
- {fileID: 137130843}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
--- !u!1 &1986911339
GameObject:
m_ObjectHideFlags: 0
@ -6782,7 +7493,7 @@ Transform:
- {fileID: 950051499}
- {fileID: 2072265257}
m_Father: {fileID: 0}
m_RootOrder: 0
m_RootOrder: 1
--- !u!1 &2143908450
GameObject:
m_ObjectHideFlags: 0

49
Assets/Tests/Narrative/NarrativeTests.unity

@ -151,7 +151,7 @@ GameObject:
- 114: {fileID: 24983369}
- 114: {fileID: 24983372}
- 114: {fileID: 24983370}
- 114: {fileID: 24983371}
- 114: {fileID: 24983373}
m_Layer: 0
m_Name: Flowchart
m_TagString: Untagged
@ -173,11 +173,11 @@ MonoBehaviour:
itemId: 1
errorMessage:
indentLevel: 0
storyText: 'wi test{wi}{m=DoTest}
storyText: 'wi test{m=DoTest}{wi}
wc test{wc}{m=DoTest}
wc test{m=DoTest}{wc}
exit{x}{m=DoTest}'
exit{m=DoTest}{x}{m=DoTest}'
description:
character: {fileID: 0}
portrait: {fileID: 0}
@ -225,6 +225,7 @@ MonoBehaviour:
description:
eventHandler: {fileID: 24983356}
commandList:
- {fileID: 24983373}
- {fileID: 24983368}
- {fileID: 24983355}
--- !u!114 &24983358
@ -251,9 +252,9 @@ MonoBehaviour:
y: -350
width: 1289
height: 869
selectedBlock: {fileID: 24983361}
selectedBlock: {fileID: 24983357}
selectedCommands:
- {fileID: 24983371}
- {fileID: 24983355}
variables: []
description:
stepPause: 0
@ -311,7 +312,6 @@ MonoBehaviour:
eventHandler: {fileID: 24983363}
commandList:
- {fileID: 24983360}
- {fileID: 24983371}
- {fileID: 24983362}
- {fileID: 24983365}
- {fileID: 24983364}
@ -516,25 +516,20 @@ MonoBehaviour:
returnValueType: System.Void
showInherited: 0
callMode: 0
--- !u!114 &24983371
--- !u!114 &24983372
MonoBehaviour:
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 24983354}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2fab8abf0343545abbfebd9a7b7b34bd, type: 3}
m_Script: {fileID: 11500000, guid: 2d7d417659cd54a6787f70f763950c34, type: 3}
m_Name:
m_EditorClassIdentifier:
itemId: 0
errorMessage:
indentLevel: 0
logType: 0
logMessage:
stringRef: {fileID: 0}
stringVal: Should be a click
--- !u!114 &24983372
parentBlock: {fileID: 24983369}
message: DoTest
--- !u!114 &24983373
MonoBehaviour:
m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0}
@ -542,11 +537,13 @@ MonoBehaviour:
m_GameObject: {fileID: 24983354}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2d7d417659cd54a6787f70f763950c34, type: 3}
m_Script: {fileID: 11500000, guid: d65d551a201c94bc79950076ff3eaf2e, type: 3}
m_Name:
m_EditorClassIdentifier:
parentBlock: {fileID: 24983369}
message: DoTest
itemId: 14
errorMessage:
indentLevel: 0
sayDialog: {fileID: 1066357895}
--- !u!1 &41636568
GameObject:
m_ObjectHideFlags: 0
@ -1610,6 +1607,12 @@ RectTransform:
m_PrefabParentObject: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 1326340447}
--- !u!114 &1066357895 stripped
MonoBehaviour:
m_PrefabParentObject: {fileID: 11488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3,
type: 2}
m_PrefabInternal: {fileID: 1326340447}
m_Script: {fileID: 11500000, guid: 3a0bbe22c246e4c78ad8e9816cbae9d5, type: 3}
--- !u!1 &1083481054
GameObject:
m_ObjectHideFlags: 0
@ -1670,7 +1673,7 @@ MonoBehaviour:
compareToType: 1
other: {fileID: 0}
otherPropertyPath:
constantValueGeneric: 3
constantValueGeneric: 4
compareType: 0
--- !u!1001 &1326340447
Prefab:
@ -1820,7 +1823,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1731000812
Transform:
m_ObjectHideFlags: 0

Loading…
Cancel
Save