diff --git a/Assets/FungusExamples/Conversation/Conversation.unity b/Assets/FungusExamples/Conversation/Conversation.unity index f8687635..aa9c8a0c 100644 --- a/Assets/FungusExamples/Conversation/Conversation.unity +++ b/Assets/FungusExamples/Conversation/Conversation.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -54,11 +55,10 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 0 @@ -934,8 +934,10 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlocks: [] - selectedCommands: [] + selectedBlocks: + - {fileID: 1755499608} + selectedCommands: + - {fileID: 1755499607} variables: [] description: stepPause: 0 diff --git a/Docs/command_ref/narrative_commands.md b/Docs/command_ref/narrative_commands.md index 3ef6338d..7e737027 100644 --- a/Docs/command_ref/narrative_commands.md +++ b/Docs/command_ref/narrative_commands.md @@ -25,9 +25,14 @@ Wait Until Finished | System.Boolean | Wait until the tween has finished before Display | Fungus.StageDisplayType | Display type # Conversation # {#Conversation} -Do multiple say and portrait commands in a single block of text. Format is: [character] [portrait] [stage position] [: Story text] +Do multiple say and portrait commands in a single block of text. Format is: [character] [portrait] [stage position] [hide] [<<< | >>>] [clear | noclear] [wait | nowait] [fade | nofade] [: Story text] Defined in Fungus.Conversation + +Property | Type | Description + --- | --- | --- +Wait For Seconds | Fungus.FloatData | a wait for seconds added to each item of the conversation. + # Menu # {#Menu} Displays a button in a multiple choice menu