From 035603a529244d5974551636d1a29831991522b3 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Wed, 4 May 2016 09:30:52 +0100 Subject: [PATCH 01/20] Added HelloWorld Lua example --- Assets/FungusExamples/Lua/HelloWorld.unity | 262 ++++++++++++++++++ .../FungusExamples/Lua/HelloWorld.unity.meta | 8 + Assets/FungusExamples/Lua/Scripts.meta | 9 + Assets/FungusExamples/Lua/Scripts/InfoText.cs | 24 ++ .../Lua/Scripts/InfoText.cs.meta | 12 + 5 files changed, 315 insertions(+) create mode 100644 Assets/FungusExamples/Lua/HelloWorld.unity create mode 100644 Assets/FungusExamples/Lua/HelloWorld.unity.meta create mode 100644 Assets/FungusExamples/Lua/Scripts.meta create mode 100644 Assets/FungusExamples/Lua/Scripts/InfoText.cs create mode 100644 Assets/FungusExamples/Lua/Scripts/InfoText.cs.meta diff --git a/Assets/FungusExamples/Lua/HelloWorld.unity b/Assets/FungusExamples/Lua/HelloWorld.unity new file mode 100644 index 00000000..a5887006 --- /dev/null +++ b/Assets/FungusExamples/Lua/HelloWorld.unity @@ -0,0 +1,262 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_GIWorkflowMode: 1 + m_LightmapsMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 3 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_ReflectionCompression: 2 + m_LightingDataAsset: {fileID: 0} + m_RuntimeCPUUsage: 25 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: 0.16666667 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &1524657877 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1524657882} + - 20: {fileID: 1524657881} + - 92: {fileID: 1524657880} + - 124: {fileID: 1524657879} + - 81: {fileID: 1524657878} + - 114: {fileID: 1524657883} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1524657878 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1524657877} + m_Enabled: 1 +--- !u!124 &1524657879 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1524657877} + m_Enabled: 1 +--- !u!92 &1524657880 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1524657877} + m_Enabled: 1 +--- !u!20 &1524657881 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1524657877} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!4 &1524657882 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1524657877} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!114 &1524657883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1524657877} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} + m_Name: + m_EditorClassIdentifier: + info: 'A simple example of using a LuaScript object + + to display "Hello World" by printing to the + + console and also by using the say() function. + + + Notice that Fungus automatically creates the + + LuaEnvironment, SayDialog objects automatically if none are already present.' +--- !u!1 &1590446708 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 139298, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1590446711} + - 114: {fileID: 1590446710} + - 114: {fileID: 1590446709} + m_Layer: 0 + m_Name: LuaScript + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1590446709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11472914, guid: c356764ac08ce4af2806a601a4f1e6e9, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1590446708} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} + m_Name: + m_EditorClassIdentifier: + luaEnvironment: {fileID: 0} + luaFile: {fileID: 0} + luaScript: "-- Print \"hello world\" to the console\nprint(\"Hello world\")\n\n-- + Display \"hello world\" using a \n-- Fungus SayDialog\nsay(\"Hello world\")\n" + runAsCoroutine: 1 +--- !u!114 &1590446710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11446228, guid: c356764ac08ce4af2806a601a4f1e6e9, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1590446708} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} + m_Name: + m_EditorClassIdentifier: + executeAfterTime: 1 + repeatExecuteTime: 1 + repeatEveryTime: 1 + executeAfterFrames: 1 + repeatExecuteFrame: 1 + repeatEveryFrame: 1 + hasFailed: 0 + executeMethods: 2 + executeMethodName: OnExecute +--- !u!4 &1590446711 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 449874, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1590446708} + 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: 0} + m_RootOrder: 1 diff --git a/Assets/FungusExamples/Lua/HelloWorld.unity.meta b/Assets/FungusExamples/Lua/HelloWorld.unity.meta new file mode 100644 index 00000000..db8af946 --- /dev/null +++ b/Assets/FungusExamples/Lua/HelloWorld.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c437c529a267c4d3e8ec5a238055173c +timeCreated: 1462349945 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/Lua/Scripts.meta b/Assets/FungusExamples/Lua/Scripts.meta new file mode 100644 index 00000000..d220dac7 --- /dev/null +++ b/Assets/FungusExamples/Lua/Scripts.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e2e93e4a664384c7592b4692703284e3 +folderAsset: yes +timeCreated: 1462350061 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/Lua/Scripts/InfoText.cs b/Assets/FungusExamples/Lua/Scripts/InfoText.cs new file mode 100644 index 00000000..a0fa5f7b --- /dev/null +++ b/Assets/FungusExamples/Lua/Scripts/InfoText.cs @@ -0,0 +1,24 @@ +using UnityEngine; +using System.Collections; + +namespace Fungus +{ + + /// + /// Displays information text at the top left of the screen. + /// + public class InfoText : MonoBehaviour + { + [Tooltip("The information text to display")] + [TextArea(10, 10)] + public string info = ""; + + void OnGUI() + { + Rect rect = new Rect(0,0, Screen.width / 2, Screen.height); + + GUI.Label(rect, info); + } + } + +} \ No newline at end of file diff --git a/Assets/FungusExamples/Lua/Scripts/InfoText.cs.meta b/Assets/FungusExamples/Lua/Scripts/InfoText.cs.meta new file mode 100644 index 00000000..afe88559 --- /dev/null +++ b/Assets/FungusExamples/Lua/Scripts/InfoText.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 8c0cbb63e218a4414a796a60ffe37dd3 +timeCreated: 1462350094 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 30d122a94ac33a9d7dbc3b846aa30d8448d58653 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Wed, 4 May 2016 14:47:20 +0100 Subject: [PATCH 02/20] Added localisation example --- .../{Lua.meta => FungusLua.meta} | 0 .../FungusExamples/FungusLua/HelloWorld.meta | 9 + .../HelloWorld}/HelloWorld.unity | 70 +- .../HelloWorld}/HelloWorld.unity.meta | 0 .../FungusLua/Localization.meta | 9 + .../FungusLua/Localization/Localization.unity | 632 ++++++++++++++++++ .../Localization/Localization.unity.meta | 8 + .../FungusLua/Localization/stringtable.txt | 7 + .../Localization/stringtable.txt.meta | 8 + .../{Lua => FungusLua}/Narrative.unity | 0 .../{Lua => FungusLua}/Narrative.unity.meta | 0 .../{Lua => FungusLua}/Scripts.meta | 0 .../{Lua => FungusLua}/Scripts/InfoText.cs | 0 .../Scripts/InfoText.cs.meta | 0 .../{Lua => FungusLua}/Trigger.unity | 0 .../{Lua => FungusLua}/Trigger.unity.meta | 0 16 files changed, 721 insertions(+), 22 deletions(-) rename Assets/FungusExamples/{Lua.meta => FungusLua.meta} (100%) create mode 100644 Assets/FungusExamples/FungusLua/HelloWorld.meta rename Assets/FungusExamples/{Lua => FungusLua/HelloWorld}/HelloWorld.unity (85%) rename Assets/FungusExamples/{Lua => FungusLua/HelloWorld}/HelloWorld.unity.meta (100%) create mode 100644 Assets/FungusExamples/FungusLua/Localization.meta create mode 100644 Assets/FungusExamples/FungusLua/Localization/Localization.unity create mode 100644 Assets/FungusExamples/FungusLua/Localization/Localization.unity.meta create mode 100644 Assets/FungusExamples/FungusLua/Localization/stringtable.txt create mode 100644 Assets/FungusExamples/FungusLua/Localization/stringtable.txt.meta rename Assets/FungusExamples/{Lua => FungusLua}/Narrative.unity (100%) rename Assets/FungusExamples/{Lua => FungusLua}/Narrative.unity.meta (100%) rename Assets/FungusExamples/{Lua => FungusLua}/Scripts.meta (100%) rename Assets/FungusExamples/{Lua => FungusLua}/Scripts/InfoText.cs (100%) rename Assets/FungusExamples/{Lua => FungusLua}/Scripts/InfoText.cs.meta (100%) rename Assets/FungusExamples/{Lua => FungusLua}/Trigger.unity (100%) rename Assets/FungusExamples/{Lua => FungusLua}/Trigger.unity.meta (100%) diff --git a/Assets/FungusExamples/Lua.meta b/Assets/FungusExamples/FungusLua.meta similarity index 100% rename from Assets/FungusExamples/Lua.meta rename to Assets/FungusExamples/FungusLua.meta diff --git a/Assets/FungusExamples/FungusLua/HelloWorld.meta b/Assets/FungusExamples/FungusLua/HelloWorld.meta new file mode 100644 index 00000000..beca484e --- /dev/null +++ b/Assets/FungusExamples/FungusLua/HelloWorld.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 5d2609b67f5f74f02b283d112721136b +folderAsset: yes +timeCreated: 1462353529 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/Lua/HelloWorld.unity b/Assets/FungusExamples/FungusLua/HelloWorld/HelloWorld.unity similarity index 85% rename from Assets/FungusExamples/Lua/HelloWorld.unity rename to Assets/FungusExamples/FungusLua/HelloWorld/HelloWorld.unity index a5887006..4fd644e7 100644 --- a/Assets/FungusExamples/Lua/HelloWorld.unity +++ b/Assets/FungusExamples/FungusLua/HelloWorld/HelloWorld.unity @@ -85,6 +85,54 @@ NavMeshSettings: cellSize: 0.16666667 manualCellSize: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &1314575962 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1314575964} + - 114: {fileID: 1314575963} + m_Layer: 0 + m_Name: InfoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1314575963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1314575962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} + m_Name: + m_EditorClassIdentifier: + info: 'A simple example of using a LuaScript object to display "Hello World" by + printing to the console and also by using the say() function. + + + Create a LuaScript object via Tools > Fungus > Create > LuaScript + + + Notice that Fungus automatically creates the LuaEnvironment and SayDialog objects + automatically if none are already present in the scene when you run it.' +--- !u!4 &1314575964 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1314575962} + 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: 0} + m_RootOrder: 2 --- !u!1 &1524657877 GameObject: m_ObjectHideFlags: 0 @@ -97,7 +145,6 @@ GameObject: - 92: {fileID: 1524657880} - 124: {fileID: 1524657879} - 81: {fileID: 1524657878} - - 114: {fileID: 1524657883} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -172,27 +219,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!114 &1524657883 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1524657877} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} - m_Name: - m_EditorClassIdentifier: - info: 'A simple example of using a LuaScript object - - to display "Hello World" by printing to the - - console and also by using the say() function. - - - Notice that Fungus automatically creates the - - LuaEnvironment, SayDialog objects automatically if none are already present.' --- !u!1 &1590446708 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/FungusExamples/Lua/HelloWorld.unity.meta b/Assets/FungusExamples/FungusLua/HelloWorld/HelloWorld.unity.meta similarity index 100% rename from Assets/FungusExamples/Lua/HelloWorld.unity.meta rename to Assets/FungusExamples/FungusLua/HelloWorld/HelloWorld.unity.meta diff --git a/Assets/FungusExamples/FungusLua/Localization.meta b/Assets/FungusExamples/FungusLua/Localization.meta new file mode 100644 index 00000000..78726399 --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Localization.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 7f083399d26074b678243198be891623 +folderAsset: yes +timeCreated: 1462353649 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/FungusLua/Localization/Localization.unity b/Assets/FungusExamples/FungusLua/Localization/Localization.unity new file mode 100644 index 00000000..68092b5f --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Localization/Localization.unity @@ -0,0 +1,632 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_GIWorkflowMode: 1 + m_LightmapsMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 3 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_ReflectionCompression: 2 + m_LightingDataAsset: {fileID: 0} + m_RuntimeCPUUsage: 25 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: 0.16666667 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &27151840 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 27151845} + - 20: {fileID: 27151844} + - 92: {fileID: 27151843} + - 124: {fileID: 27151842} + - 81: {fileID: 27151841} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &27151841 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 27151840} + m_Enabled: 1 +--- !u!124 &27151842 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 27151840} + m_Enabled: 1 +--- !u!92 &27151843 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 27151840} + m_Enabled: 1 +--- !u!20 &27151844 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 27151840} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!4 &27151845 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 27151840} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!1 &295881417 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 100640, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 295881420} + - 114: {fileID: 295881419} + - 114: {fileID: 295881418} + m_Layer: 0 + m_Name: LuaEnvironment + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &295881418 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11486636, guid: 49031c561e16d4fcf91c12153f8e0b25, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 295881417} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} + m_Name: + m_EditorClassIdentifier: + fungusModule: 0 + activeLanguage: en + stringTables: + - {fileID: 4900000, guid: 2b873932e07a74706a6b54d7ce17a53b, type: 3} + registerTypes: + - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} + - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3} +--- !u!114 &295881419 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11493126, guid: 49031c561e16d4fcf91c12153f8e0b25, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 295881417} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} + m_Name: + m_EditorClassIdentifier: + remoteDebugger: 0 +--- !u!4 &295881420 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 295881417} + 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: 0} + m_RootOrder: 1 +--- !u!1 &869541708 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 869541712} + - 114: {fileID: 869541711} + - 114: {fileID: 869541710} + - 114: {fileID: 869541709} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &869541709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 869541708} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ForceModuleActive: 0 +--- !u!114 &869541710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 869541708} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &869541711 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 869541708} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &869541712 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 869541708} + 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: 0} + m_RootOrder: 5 +--- !u!1 &931488961 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 931488963} + - 114: {fileID: 931488962} + m_Layer: 0 + m_Name: _FungusState + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &931488962 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 931488961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedFlowchart: {fileID: 1000755631} +--- !u!4 &931488963 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 931488961} + 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: 0} + m_RootOrder: 6 +--- !u!1 &1000755630 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1000755635} + - 114: {fileID: 1000755631} + - 114: {fileID: 1000755633} + - 114: {fileID: 1000755634} + - 114: {fileID: 1000755632} + m_Layer: 0 + m_Name: Flowchart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1000755631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1000755630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 400 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -343 + y: -340 + width: 1114 + height: 859 + selectedBlock: {fileID: 1000755633} + selectedCommands: + - {fileID: 1000755632} + variables: [] + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + showLineNumbers: 0 + hideCommands: [] +--- !u!114 &1000755632 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1000755630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2fab8abf0343545abbfebd9a7b7b34bd, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + errorMessage: + indentLevel: 0 + logType: 0 + logMessage: + stringRef: {fileID: 0} + stringVal: '{$hello_world}' +--- !u!114 &1000755633 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1000755630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 67 + y: 70 + width: 120 + height: 40 + itemId: 0 + blockName: Start + description: + eventHandler: {fileID: 1000755634} + commandList: + - {fileID: 1000755632} +--- !u!114 &1000755634 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1000755630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 1000755633} +--- !u!4 &1000755635 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1000755630} + 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: 0} + m_RootOrder: 3 +--- !u!1 &1304857493 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1304857494} + - 114: {fileID: 1304857495} + m_Layer: 0 + m_Name: InfoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1304857494 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1304857493} + 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: 0} + m_RootOrder: 4 +--- !u!114 &1304857495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1304857493} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} + m_Name: + m_EditorClassIdentifier: + info: 'This example shows how to use a string table to localize text for different + languages. + + + A string table JSON file has been added to the LuaUtils component in the LuaEnvironment + object. + + + The LuaScript object shows how to substitute in a localization string key and + change the active language in Lua. + + + The Flowchart object demonstrates using the same {$VarName} syntax in Fungus commands + like Say, Menu, Debug Log, etc. to substitute in localized strings. + + + +' +--- !u!1 &1834004033 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 139298, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1834004036} + - 114: {fileID: 1834004035} + - 114: {fileID: 1834004034} + m_Layer: 0 + m_Name: LuaScript + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1834004034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11472914, guid: c356764ac08ce4af2806a601a4f1e6e9, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1834004033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} + m_Name: + m_EditorClassIdentifier: + luaEnvironment: {fileID: 0} + luaFile: {fileID: 0} + luaScript: '-- First we use variable substitution to + + -- substitute the localized version of the + + -- ''hello_world'' string from the string table + + + -- Show English version + + setlanguage("en") + + say("{$hello_world}") + + + -- Show French version + + setlanguage("fr") + + say("{$hello_world}") + + + -- We can also use the sub() function to do the + + -- same substitution and return a Lua + + -- string variable + + + -- Show German version + + setlanguage("de") + + local s = sub("{$hello_world}") + + say(s) + + + + +' + runAsCoroutine: 1 +--- !u!114 &1834004035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11446228, guid: c356764ac08ce4af2806a601a4f1e6e9, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1834004033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} + m_Name: + m_EditorClassIdentifier: + executeAfterTime: 1 + repeatExecuteTime: 1 + repeatEveryTime: 1 + executeAfterFrames: 1 + repeatExecuteFrame: 1 + repeatEveryFrame: 1 + hasFailed: 0 + executeMethods: 2 + executeMethodName: OnExecute +--- !u!4 &1834004036 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 449874, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1834004033} + 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: 0} + m_RootOrder: 2 diff --git a/Assets/FungusExamples/FungusLua/Localization/Localization.unity.meta b/Assets/FungusExamples/FungusLua/Localization/Localization.unity.meta new file mode 100644 index 00000000..566656b9 --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Localization/Localization.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ff80aac95a9844bc918c25d2e99516c +timeCreated: 1462353745 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/FungusLua/Localization/stringtable.txt b/Assets/FungusExamples/FungusLua/Localization/stringtable.txt new file mode 100644 index 00000000..8fb4ece3 --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Localization/stringtable.txt @@ -0,0 +1,7 @@ +{ + "hello_world" : { + "en" : "Hello world!", + "fr" : "Bonjour le monde!", + "de" : "Hallo Welt!" + } +} \ No newline at end of file diff --git a/Assets/FungusExamples/FungusLua/Localization/stringtable.txt.meta b/Assets/FungusExamples/FungusLua/Localization/stringtable.txt.meta new file mode 100644 index 00000000..7cdfaedf --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Localization/stringtable.txt.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b873932e07a74706a6b54d7ce17a53b +timeCreated: 1462353779 +licenseType: Free +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/Lua/Narrative.unity b/Assets/FungusExamples/FungusLua/Narrative.unity similarity index 100% rename from Assets/FungusExamples/Lua/Narrative.unity rename to Assets/FungusExamples/FungusLua/Narrative.unity diff --git a/Assets/FungusExamples/Lua/Narrative.unity.meta b/Assets/FungusExamples/FungusLua/Narrative.unity.meta similarity index 100% rename from Assets/FungusExamples/Lua/Narrative.unity.meta rename to Assets/FungusExamples/FungusLua/Narrative.unity.meta diff --git a/Assets/FungusExamples/Lua/Scripts.meta b/Assets/FungusExamples/FungusLua/Scripts.meta similarity index 100% rename from Assets/FungusExamples/Lua/Scripts.meta rename to Assets/FungusExamples/FungusLua/Scripts.meta diff --git a/Assets/FungusExamples/Lua/Scripts/InfoText.cs b/Assets/FungusExamples/FungusLua/Scripts/InfoText.cs similarity index 100% rename from Assets/FungusExamples/Lua/Scripts/InfoText.cs rename to Assets/FungusExamples/FungusLua/Scripts/InfoText.cs diff --git a/Assets/FungusExamples/Lua/Scripts/InfoText.cs.meta b/Assets/FungusExamples/FungusLua/Scripts/InfoText.cs.meta similarity index 100% rename from Assets/FungusExamples/Lua/Scripts/InfoText.cs.meta rename to Assets/FungusExamples/FungusLua/Scripts/InfoText.cs.meta diff --git a/Assets/FungusExamples/Lua/Trigger.unity b/Assets/FungusExamples/FungusLua/Trigger.unity similarity index 100% rename from Assets/FungusExamples/Lua/Trigger.unity rename to Assets/FungusExamples/FungusLua/Trigger.unity diff --git a/Assets/FungusExamples/Lua/Trigger.unity.meta b/Assets/FungusExamples/FungusLua/Trigger.unity.meta similarity index 100% rename from Assets/FungusExamples/Lua/Trigger.unity.meta rename to Assets/FungusExamples/FungusLua/Trigger.unity.meta From 7f864e539a295b68d342743a1db876de50500a11 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Thu, 5 May 2016 07:20:34 +0100 Subject: [PATCH 03/20] Added Bindings/CustomScript example scene --- Assets/FungusExamples/FungusLua/Bindings.meta | 9 + .../FungusLua/Bindings/CustomScript.cs | 24 + .../FungusLua/Bindings/CustomScript.cs.meta | 12 + .../Bindings/CustomScriptExample.unity | 448 ++++++++++++++++++ .../Bindings/CustomScriptExample.unity.meta | 8 + 5 files changed, 501 insertions(+) create mode 100644 Assets/FungusExamples/FungusLua/Bindings.meta create mode 100644 Assets/FungusExamples/FungusLua/Bindings/CustomScript.cs create mode 100644 Assets/FungusExamples/FungusLua/Bindings/CustomScript.cs.meta create mode 100644 Assets/FungusExamples/FungusLua/Bindings/CustomScriptExample.unity create mode 100644 Assets/FungusExamples/FungusLua/Bindings/CustomScriptExample.unity.meta diff --git a/Assets/FungusExamples/FungusLua/Bindings.meta b/Assets/FungusExamples/FungusLua/Bindings.meta new file mode 100644 index 00000000..e8616762 --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Bindings.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: febd015a8b0f94c36b1a85a2b00b008a +folderAsset: yes +timeCreated: 1462369690 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/FungusLua/Bindings/CustomScript.cs b/Assets/FungusExamples/FungusLua/Bindings/CustomScript.cs new file mode 100644 index 00000000..eaa079dd --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Bindings/CustomScript.cs @@ -0,0 +1,24 @@ +using UnityEngine; +using System.Collections; + +public class CustomScript : MonoBehaviour +{ + public string myString = ""; + + public float timeToWait = 5f; + + public void MyFunction() + { + Debug.Log("Called my function"); + } + + public IEnumerator MyCoroutine() + { + Debug.Log("Called my coroutine"); + + yield return new WaitForSeconds(timeToWait); + + Debug.Log("Coroutine finished"); + } + +} diff --git a/Assets/FungusExamples/FungusLua/Bindings/CustomScript.cs.meta b/Assets/FungusExamples/FungusLua/Bindings/CustomScript.cs.meta new file mode 100644 index 00000000..6e56c5ff --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Bindings/CustomScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b86bc38308c3942b88cfbc3b0b068787 +timeCreated: 1462369741 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/FungusLua/Bindings/CustomScriptExample.unity b/Assets/FungusExamples/FungusLua/Bindings/CustomScriptExample.unity new file mode 100644 index 00000000..b672e28b --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Bindings/CustomScriptExample.unity @@ -0,0 +1,448 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_GIWorkflowMode: 1 + m_LightmapsMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 3 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_ReflectionCompression: 2 + m_LightingDataAsset: {fileID: 0} + m_RuntimeCPUUsage: 25 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: 0.16666667 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &588179116 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 588179121} + - 20: {fileID: 588179120} + - 92: {fileID: 588179119} + - 124: {fileID: 588179118} + - 81: {fileID: 588179117} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &588179117 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 588179116} + m_Enabled: 1 +--- !u!124 &588179118 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 588179116} + m_Enabled: 1 +--- !u!92 &588179119 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 588179116} + m_Enabled: 1 +--- !u!20 &588179120 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 588179116} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!4 &588179121 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 588179116} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!1 &613885368 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 178698, guid: e0c2b90c058ff43f4a56a266d4fa721b, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 613885370} + - 114: {fileID: 613885369} + m_Layer: 0 + m_Name: LuaBindings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &613885369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11414792, guid: e0c2b90c058ff43f4a56a266d4fa721b, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 613885368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} + m_Name: + m_EditorClassIdentifier: + tableName: + registerTypes: 1 + boundTypes: + - UnityEngine.GameObject, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.PrimitiveType, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Component, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Type, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - UnityEngine.SendMessageOptions, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.SceneManagement.Scene, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - CustomScript, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + boundObjects: + - key: customscript + obj: {fileID: 1496574807} + component: {fileID: 1496574809} +--- !u!4 &613885370 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 403334, guid: e0c2b90c058ff43f4a56a266d4fa721b, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 613885368} + 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: 0} + m_RootOrder: 3 +--- !u!1 &629527467 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 629527469} + - 114: {fileID: 629527468} + m_Layer: 0 + m_Name: InfoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &629527468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 629527467} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} + m_Name: + m_EditorClassIdentifier: + info: "This example shows how to access properties and call methods on a c# script + from Lua. When you run this scene, look at the Console window to see the messages + output as the script runs.\n\nThe CustomScript object has a custom c# script attached. + The LuaBindings object has a binding which links to this CustomScript component.\n\nThe + LuaScript object uses this binding to get the value of a public property and run + a method on the CustomScript component. A coroutine method (i.e. one that returns + IEnumerator) is also run. \n\nLuaScript uses the runwait() command to execute + coroutine methods asynchronously.\n" +--- !u!4 &629527469 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 629527467} + 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: 0} + m_RootOrder: 5 +--- !u!1 &701069093 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 139298, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 701069096} + - 114: {fileID: 701069095} + - 114: {fileID: 701069094} + m_Layer: 0 + m_Name: LuaScript + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &701069094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11472914, guid: c356764ac08ce4af2806a601a4f1e6e9, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 701069093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} + m_Name: + m_EditorClassIdentifier: + luaEnvironment: {fileID: 0} + luaFile: {fileID: 0} + luaScript: ' + + -- Getting a public property + + local s = customscript.myString; + + print (s) + + + -- Running a public method + + customscript.MyFunction() + + + -- Running public method as a coroutine + + runwait( customscript.MyCoroutine() ) + + + print ("Lua Script Finished!") + +' + runAsCoroutine: 1 +--- !u!114 &701069095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11446228, guid: c356764ac08ce4af2806a601a4f1e6e9, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 701069093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} + m_Name: + m_EditorClassIdentifier: + executeAfterTime: 1 + repeatExecuteTime: 1 + repeatEveryTime: 1 + executeAfterFrames: 1 + repeatExecuteFrame: 1 + repeatEveryFrame: 1 + hasFailed: 0 + executeMethods: 2 + executeMethodName: OnExecute +--- !u!4 &701069096 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 449874, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 701069093} + 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: 0} + m_RootOrder: 2 +--- !u!1 &1496574807 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1496574808} + - 114: {fileID: 1496574809} + m_Layer: 0 + m_Name: CustomScript + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1496574808 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1496574807} + 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: 0} + m_RootOrder: 4 +--- !u!114 &1496574809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1496574807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b86bc38308c3942b88cfbc3b0b068787, type: 3} + m_Name: + m_EditorClassIdentifier: + myString: Hi there + timeToWait: 5 +--- !u!1 &1875430289 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1875430291} + - 114: {fileID: 1875430290} + m_Layer: 0 + m_Name: _FungusState + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1875430290 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1875430289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedFlowchart: {fileID: 0} +--- !u!4 &1875430291 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1875430289} + 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: 0} + m_RootOrder: 1 diff --git a/Assets/FungusExamples/FungusLua/Bindings/CustomScriptExample.unity.meta b/Assets/FungusExamples/FungusLua/Bindings/CustomScriptExample.unity.meta new file mode 100644 index 00000000..bd7439ae --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Bindings/CustomScriptExample.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e6172f62580749419623b3b2c1098be +timeCreated: 1462369710 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: From 9c5b597941d0bd8b07fc0eb0b00c6fc0e436ccc6 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Thu, 5 May 2016 17:54:36 +0100 Subject: [PATCH 04/20] Portrait image is hidden by default --- Assets/Fungus/Narrative/Scripts/SayDialog.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Assets/Fungus/Narrative/Scripts/SayDialog.cs b/Assets/Fungus/Narrative/Scripts/SayDialog.cs index a9cddf72..101869e7 100644 --- a/Assets/Fungus/Narrative/Scripts/SayDialog.cs +++ b/Assets/Fungus/Narrative/Scripts/SayDialog.cs @@ -37,6 +37,8 @@ namespace Fungus protected float targetAlpha = 0f; protected float fadeCoolDownTimer = 0f; + protected Sprite currentCharacterImage; + public static SayDialog GetSayDialog() { if (activeSayDialog == null) @@ -124,6 +126,14 @@ namespace Fungus { gameObject.AddComponent(); } + + // It's possible that SetCharacterImage() has already been called from the + // Start method of another component, so check that no image has been set yet. + if (currentCharacterImage == null) + { + // Character image is hidden by default. + SetCharacterImage(null); + } } public virtual void Say(string text, bool clearPrevious, bool waitForInput, bool fadeWhenDone, bool stopVoiceover, AudioClip voiceOverClip, Action onComplete) @@ -298,6 +308,7 @@ namespace Fungus { characterImage.sprite = image; characterImage.gameObject.SetActive(true); + currentCharacterImage = image; } else { From b09a34b7fc602ed15260bc9c1d92d134df3de6b1 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Thu, 5 May 2016 17:54:57 +0100 Subject: [PATCH 05/20] Null check in SpriteFader --- Assets/Fungus/Sprite/Scripts/SpriteFader.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/Fungus/Sprite/Scripts/SpriteFader.cs b/Assets/Fungus/Sprite/Scripts/SpriteFader.cs index 416fbdf5..dfcd49b2 100644 --- a/Assets/Fungus/Sprite/Scripts/SpriteFader.cs +++ b/Assets/Fungus/Sprite/Scripts/SpriteFader.cs @@ -47,6 +47,7 @@ namespace Fungus // Destroy any existing fader component SpriteFader oldSpriteFader = spriteRenderer.GetComponent(); + if (oldSpriteFader != null) { Destroy(oldSpriteFader); } From 1069b7d0697d5403016fcf604997cde2538ba99f Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Thu, 5 May 2016 17:55:21 +0100 Subject: [PATCH 06/20] Increased size of text box --- Assets/FungusExamples/FungusLua/Scripts/InfoText.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/FungusExamples/FungusLua/Scripts/InfoText.cs b/Assets/FungusExamples/FungusLua/Scripts/InfoText.cs index a0fa5f7b..42380a9e 100644 --- a/Assets/FungusExamples/FungusLua/Scripts/InfoText.cs +++ b/Assets/FungusExamples/FungusLua/Scripts/InfoText.cs @@ -10,7 +10,7 @@ namespace Fungus public class InfoText : MonoBehaviour { [Tooltip("The information text to display")] - [TextArea(10, 10)] + [TextArea(20, 20)] public string info = ""; void OnGUI() From e185e8d2aa02a53472cdced1ad6112e45ab08acd Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Thu, 5 May 2016 17:55:45 +0100 Subject: [PATCH 07/20] Renamed narrative test --- .../FungusExamples/FungusLua/Narrative.meta | 9 ++ .../NarrativeExample.unity} | 143 +++++++++++------- .../NarrativeExample.unity.meta} | 0 3 files changed, 99 insertions(+), 53 deletions(-) create mode 100644 Assets/FungusExamples/FungusLua/Narrative.meta rename Assets/FungusExamples/FungusLua/{Narrative.unity => Narrative/NarrativeExample.unity} (95%) rename Assets/FungusExamples/FungusLua/{Narrative.unity.meta => Narrative/NarrativeExample.unity.meta} (100%) diff --git a/Assets/FungusExamples/FungusLua/Narrative.meta b/Assets/FungusExamples/FungusLua/Narrative.meta new file mode 100644 index 00000000..30aee9bc --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Narrative.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 39dccba44157a4764afec0335a7df616 +folderAsset: yes +timeCreated: 1462429277 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/FungusLua/Narrative.unity b/Assets/FungusExamples/FungusLua/Narrative/NarrativeExample.unity similarity index 95% rename from Assets/FungusExamples/FungusLua/Narrative.unity rename to Assets/FungusExamples/FungusLua/Narrative/NarrativeExample.unity index a19e09e7..7cec53a9 100644 --- a/Assets/FungusExamples/FungusLua/Narrative.unity +++ b/Assets/FungusExamples/FungusLua/Narrative/NarrativeExample.unity @@ -124,7 +124,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 --- !u!1 &269274605 GameObject: m_ObjectHideFlags: 0 @@ -648,8 +648,9 @@ MonoBehaviour: m_EditorClassIdentifier: luaEnvironment: {fileID: 0} luaFile: {fileID: 0} - luaScript: "setsaydialog(saydialog)\nsetmenudialog(menudialog)\n\nfunction start()\n - \ say \"Select an option\"\n\n menu(\"Option A\", optiona)\n menu(\"Option + luaScript: "-- Lua functions are the equivalent of Blocks \n-- in a Fungus flowchart.\n\nsetsaydialog(saydialog)\nsetmenudialog(menudialog)\n\nfunction + start()\n\n\n say \"Welcome!\"\n\n sayoptions.waitforinput = false\n sayoptions.fadewhendone + = false\n\n say \"Select an option\"\n\n menu(\"Option A\", optiona)\n menu(\"Option B\", optionb)\nend\n\nfunction optiona()\n say(\"You chose option a\")\nend\n\nfunction optionb()\n say(\"You chose option b\")\nend\n\nstart()\n" runAsCoroutine: 1 @@ -664,7 +665,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 --- !u!114 &519026842 MonoBehaviour: m_ObjectHideFlags: 0 @@ -684,6 +685,7 @@ MonoBehaviour: repeatEveryFrame: 1 hasFailed: 0 executeMethods: 2 + executeMethodName: OnExecute --- !u!1 &614649408 GameObject: m_ObjectHideFlags: 0 @@ -1270,6 +1272,61 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1115157303} +--- !u!1 &1215182813 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1215182815} + - 114: {fileID: 1215182814} + m_Layer: 0 + m_Name: InfoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1215182814 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1215182813} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} + m_Name: + m_EditorClassIdentifier: + info: 'This example shows how to use the say() and menu() Lua functions to create + a branching story. + + + In this example, we''ve added MenuDialog and SayDialog objects which you can customise. + These are bound in LuaBindings and activated using the setsaydialog() and setmenudialog() + functions in the LuaScript object. + + + If you don''t explicity create and register Say and Menu Dialogs like this then + default ones will automatically be created when you call the say() and menu() + functions. + + + The Menu dialogs require an Event System to be present in the scene. You can add + one using GameObject > UI > Event System if needed. ' +--- !u!4 &1215182815 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1215182813} + 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: 0} + m_RootOrder: 7 --- !u!1 &1225017617 GameObject: m_ObjectHideFlags: 0 @@ -1405,52 +1462,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1225017617} ---- !u!1001 &1228394773 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11486636, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: fungusModule - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - m_IsPrefabParent: 0 --- !u!1 &1229497280 GameObject: m_ObjectHideFlags: 0 @@ -1796,7 +1807,33 @@ MonoBehaviour: m_EditorClassIdentifier: tableName: registerTypes: 1 - boundTypes: [] + boundTypes: + - UnityEngine.GameObject, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.PrimitiveType, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Component, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Type, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - UnityEngine.SendMessageOptions, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.SceneManagement.Scene, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - Fungus.SayDialog, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.AudioClip, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - Fungus.Character, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Sprite, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Color, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.UI.Button, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Canvas, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.UI.Text, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.UI.Image, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.MenuDialog, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.UI.Slider, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null boundObjects: - key: saydialog obj: {fileID: 1531220777} @@ -1815,7 +1852,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 --- !u!1 &1531220777 GameObject: m_ObjectHideFlags: 0 @@ -2762,7 +2799,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 --- !u!1 &1851713324 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/FungusExamples/FungusLua/Narrative.unity.meta b/Assets/FungusExamples/FungusLua/Narrative/NarrativeExample.unity.meta similarity index 100% rename from Assets/FungusExamples/FungusLua/Narrative.unity.meta rename to Assets/FungusExamples/FungusLua/Narrative/NarrativeExample.unity.meta From 8e2e6ae15c37644e803a3f12865c6e96bb6ec983 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Thu, 5 May 2016 17:59:56 +0100 Subject: [PATCH 08/20] Added Round function to fungus module --- .../Thirdparty/FungusLua/Resources/Lua/fungus.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt b/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt index 0a665fe4..036fcda4 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt +++ b/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt @@ -12,6 +12,20 @@ function M.inspect(v) print (inspect.inspect(v)) end +------------ +-- Math +------------ + +-- rounds a number to the nearest decimal places +-- e.g. round(1.523, 100) -- 1.52 +function round(val, decimal) + if (decimal) then + return math.floor( (val * 10^decimal) + 0.5) / (10^decimal) + else + return math.floor(val+0.5) + end +end + ------------- -- Coroutines ------------- From 7c7897fa681df2fd33af120f5a60360d1861a0e0 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Thu, 5 May 2016 18:00:14 +0100 Subject: [PATCH 09/20] Added all-in-one Lua prefab --- .../FungusLua/Resources/Prefabs/Lua.prefab | 127 ++++++++++++++++++ .../Resources/Prefabs/Lua.prefab.meta | 8 ++ .../FungusLua/Scripts/Editor/MenuItems.cs | 50 ++++--- 3 files changed, 163 insertions(+), 22 deletions(-) create mode 100644 Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/Lua.prefab create mode 100644 Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/Lua.prefab.meta diff --git a/Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/Lua.prefab b/Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/Lua.prefab new file mode 100644 index 00000000..f64868fe --- /dev/null +++ b/Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/Lua.prefab @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &179118 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 466848} + - 114: {fileID: 11415008} + - 114: {fileID: 11417560} + - 114: {fileID: 11499092} + - 114: {fileID: 11483650} + - 114: {fileID: 11437776} + m_Layer: 0 + m_Name: Lua + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &466848 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 179118} + 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: 0} + m_RootOrder: 0 +--- !u!114 &11415008 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 179118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} + m_Name: + m_EditorClassIdentifier: + executeAfterTime: 1 + repeatExecuteTime: 1 + repeatEveryTime: 1 + executeAfterFrames: 1 + repeatExecuteFrame: 1 + repeatEveryFrame: 1 + hasFailed: 0 + executeMethods: 2 + executeMethodName: OnExecute +--- !u!114 &11417560 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 179118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} + m_Name: + m_EditorClassIdentifier: + luaEnvironment: {fileID: 11483650} + luaFile: {fileID: 0} + luaScript: + runAsCoroutine: 1 +--- !u!114 &11437776 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 179118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} + m_Name: + m_EditorClassIdentifier: + fungusModule: 0 + activeLanguage: en + stringTables: [] + registerTypes: + - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} + - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3} +--- !u!114 &11483650 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 179118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} + m_Name: + m_EditorClassIdentifier: + remoteDebugger: 0 +--- !u!114 &11499092 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 179118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} + m_Name: + m_EditorClassIdentifier: + tableName: + registerTypes: 1 + boundTypes: [] + boundObjects: + - key: + obj: {fileID: 0} + component: {fileID: 0} +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 179118} + m_IsPrefabParent: 1 diff --git a/Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/Lua.prefab.meta b/Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/Lua.prefab.meta new file mode 100644 index 00000000..5d5cc2c1 --- /dev/null +++ b/Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/Lua.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ddf9f33ba98e4b31ba4d2b9722bea00 +timeCreated: 1462457182 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs index 550c2f71..2ed9a8d9 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs @@ -8,31 +8,13 @@ namespace Fungus public class MenuItems { - [MenuItem("Tools/Fungus/Create/Lua Environment", false, 2000)] - static void CreateLuaEnvironment() + [MenuItem("Tools/Fungus/Create/Lua", false, 2000)] + static void CreateLua() { - SpawnPrefab("Prefabs/LuaEnvironment", false); - } - - [MenuItem("Tools/Fungus/Create/Lua Bindings", false, 2001)] - static void CreateLuaBindings() - { - SpawnPrefab("Prefabs/LuaBindings", false); + SpawnPrefab("Prefabs/Lua", false); } - [MenuItem("Tools/Fungus/Create/Lua Script", false, 2002)] - static void CreateLuaScript() - { - SpawnPrefab("Prefabs/LuaScript", false); - } - - [MenuItem("Tools/Fungus/Create/Lua Store", false, 2003)] - static void CreateLuaStore() - { - SpawnPrefab("Prefabs/LuaStore", false); - } - - [MenuItem("Tools/Fungus/Create/Lua File", false, 2100)] + [MenuItem("Tools/Fungus/Create/Lua File", false, 2001)] static void CreateLuaFile() { string path = EditorUtility.SaveFilePanelInProject("Create Lua File", "script.txt", "txt", "Please select a file name for the new Lua script. Note: Lua files in Unity use the .txt extension."); @@ -56,6 +38,30 @@ namespace Fungus } } + [MenuItem("Tools/Fungus/Create/Lua Environment", false, 2100)] + static void CreateLuaEnvironment() + { + SpawnPrefab("Prefabs/LuaEnvironment", false); + } + + [MenuItem("Tools/Fungus/Create/Lua Bindings", false, 2101)] + static void CreateLuaBindings() + { + SpawnPrefab("Prefabs/LuaBindings", false); + } + + [MenuItem("Tools/Fungus/Create/Lua Script", false, 2102)] + static void CreateLuaScript() + { + SpawnPrefab("Prefabs/LuaScript", false); + } + + [MenuItem("Tools/Fungus/Create/Lua Store", false, 2103)] + static void CreateLuaStore() + { + SpawnPrefab("Prefabs/LuaStore", false); + } + /// /// Spawns a prefab in the scene based on it's filename in a Resources folder in the project. /// If centerInScene is true then the object will be placed centered in the view window with z = 0. From 0351c0f1f9275c03c91de8c02a4f8d0c41f28b23 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Thu, 5 May 2016 18:27:37 +0100 Subject: [PATCH 10/20] All Environments option for LuaBindings Lua prefab only registers bindings with itself --- .../FungusLua/Resources/Prefabs/Lua.prefab | 2 ++ .../Scripts/Editor/LuaBindingsEditor.cs | 12 ++++++++++- .../FungusLua/Scripts/LuaBindings.cs | 20 +++++++++++++++++-- .../Thirdparty/FungusLua/Scripts/LuaStore.cs | 5 ++++- .../Thirdparty/FungusLua/Scripts/LuaUtils.cs | 6 ++---- 5 files changed, 37 insertions(+), 8 deletions(-) diff --git a/Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/Lua.prefab b/Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/Lua.prefab index f64868fe..bfd7cd1c 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/Lua.prefab +++ b/Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/Lua.prefab @@ -107,6 +107,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} m_Name: m_EditorClassIdentifier: + allEnvironments: 0 + luaEnvironment: {fileID: 11483650} tableName: registerTypes: 1 boundTypes: [] diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/LuaBindingsEditor.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/LuaBindingsEditor.cs index 0e9f0470..1817f201 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/LuaBindingsEditor.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/LuaBindingsEditor.cs @@ -15,8 +15,10 @@ namespace Fungus { protected ReorderableList boundObjectsList; + protected SerializedProperty allLuaEnvironmentsProp; + protected SerializedProperty luaEnvironmentProp; protected SerializedProperty tableNameProp; - protected SerializedProperty registerTypesProp; + protected SerializedProperty registerTypesProp; protected SerializedProperty boundObjectsProp; protected string bindingHelpItem = ""; @@ -24,6 +26,8 @@ namespace Fungus protected virtual void OnEnable() { + allLuaEnvironmentsProp = serializedObject.FindProperty("allEnvironments"); + luaEnvironmentProp = serializedObject.FindProperty("luaEnvironment"); tableNameProp = serializedObject.FindProperty("tableName"); registerTypesProp = serializedObject.FindProperty("registerTypes"); boundObjectsProp = serializedObject.FindProperty("boundObjects"); @@ -140,6 +144,12 @@ namespace Fungus { serializedObject.Update(); + EditorGUILayout.PropertyField(allLuaEnvironmentsProp); + if (!allLuaEnvironmentsProp.boolValue) + { + EditorGUILayout.PropertyField(luaEnvironmentProp); + } + EditorGUILayout.PropertyField(tableNameProp); EditorGUILayout.PropertyField(registerTypesProp); diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaBindings.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaBindings.cs index bee26ebc..1757402c 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaBindings.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaBindings.cs @@ -19,7 +19,7 @@ namespace Fungus /// /// Add all declared bindings to the globals table. /// - public abstract void AddBindings(Table globals); + public abstract void AddBindings(LuaEnvironment luaEnvironment); } /// @@ -39,6 +39,12 @@ namespace Fungus public Component component; } + [Tooltip("Add bindings to every Lua Environment in the scene. If false, only add bindings to a specific Lua Environment.")] + public bool allEnvironments = true; + + [Tooltip("The specific LuaEnvironment to register the bindings in.")] + public LuaEnvironment luaEnvironment; + /// /// Name of global table variable to store bindings in. If left blank then each binding will be added as a global variable. /// @@ -72,8 +78,18 @@ namespace Fungus /// /// Add all declared bindings to the globals table. /// - public override void AddBindings(Table globals) + public override void AddBindings(LuaEnvironment _luaEnvironment) { + if (!allEnvironments && + luaEnvironment != _luaEnvironment) + { + // Don't add bindings to this environment + return; + } + + MoonSharp.Interpreter.Script interpreter = _luaEnvironment.Interpreter; + Table globals = interpreter.Globals; + Table bindingsTable = null; if (tableName == "") { diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaStore.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaStore.cs index 02783c7c..b49f94bc 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaStore.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaStore.cs @@ -69,13 +69,16 @@ namespace Fungus /// /// Callback to bind this LuaStore component with the "unity" table in a LuaEnvironment component. /// - public override void AddBindings(Table globals) + public override void AddBindings(LuaEnvironment luaEnvironment) { if (!Init()) { return; } + MoonSharp.Interpreter.Script interpreter = luaEnvironment.Interpreter; + Table globals = interpreter.Globals; + if (globals == null) { Debug.LogError("Lua globals table is null"); diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs index ab6299ca..dd6bc8ef 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs @@ -165,16 +165,14 @@ namespace Fungus } /// - /// Binds all gameobjects and components defined in scene LuaBindings to the global table. + /// Binds all gameobjects and components defined in LuaBindings components to LuaEnvironments. /// protected virtual void InitBindings() { - MoonSharp.Interpreter.Script interpreter = luaEnvironment.Interpreter; - LuaBindingsBase[] bindings = GameObject.FindObjectsOfType(); foreach (LuaBindingsBase binding in bindings) { - binding.AddBindings(interpreter.Globals); + binding.AddBindings(luaEnvironment); } } From 27177e0e79e6fa46516510e5878c79e9a988de58 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Fri, 6 May 2016 18:43:44 +0100 Subject: [PATCH 11/20] Updated examples Moved InfoText.cs to FungusLua folder --- .../Thirdparty}/FungusLua/Scripts/InfoText.cs | 0 .../FungusLua/Scripts/InfoText.cs.meta | 0 .../Bindings/CustomScriptExample.unity | 321 +++++++++--------- .../FungusLua/HelloWorld/HelloWorld.unity | 243 +++++++++---- .../FungusLua/Localization/Localization.unity | 259 +++++++------- .../Narrative/NarrativeExample.unity | 178 +++++----- 6 files changed, 556 insertions(+), 445 deletions(-) rename Assets/{FungusExamples => Fungus/Thirdparty}/FungusLua/Scripts/InfoText.cs (100%) rename Assets/{FungusExamples => Fungus/Thirdparty}/FungusLua/Scripts/InfoText.cs.meta (100%) diff --git a/Assets/FungusExamples/FungusLua/Scripts/InfoText.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/InfoText.cs similarity index 100% rename from Assets/FungusExamples/FungusLua/Scripts/InfoText.cs rename to Assets/Fungus/Thirdparty/FungusLua/Scripts/InfoText.cs diff --git a/Assets/FungusExamples/FungusLua/Scripts/InfoText.cs.meta b/Assets/Fungus/Thirdparty/FungusLua/Scripts/InfoText.cs.meta similarity index 100% rename from Assets/FungusExamples/FungusLua/Scripts/InfoText.cs.meta rename to Assets/Fungus/Thirdparty/FungusLua/Scripts/InfoText.cs.meta diff --git a/Assets/FungusExamples/FungusLua/Bindings/CustomScriptExample.unity b/Assets/FungusExamples/FungusLua/Bindings/CustomScriptExample.unity index b672e28b..b88f34a6 100644 --- a/Assets/FungusExamples/FungusLua/Bindings/CustomScriptExample.unity +++ b/Assets/FungusExamples/FungusLua/Bindings/CustomScriptExample.unity @@ -85,6 +85,159 @@ NavMeshSettings: cellSize: 0.16666667 manualCellSize: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &201313715 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 179118, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 201313721} + - 114: {fileID: 201313720} + - 114: {fileID: 201313719} + - 114: {fileID: 201313718} + - 114: {fileID: 201313717} + - 114: {fileID: 201313716} + m_Layer: 0 + m_Name: Lua + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &201313716 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11437776, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 201313715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} + m_Name: + m_EditorClassIdentifier: + fungusModule: 0 + activeLanguage: en + stringTables: [] + registerTypes: + - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} + - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3} +--- !u!114 &201313717 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11483650, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 201313715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} + m_Name: + m_EditorClassIdentifier: + remoteDebugger: 0 +--- !u!114 &201313718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11499092, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 201313715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} + m_Name: + m_EditorClassIdentifier: + allEnvironments: 0 + luaEnvironment: {fileID: 201313717} + tableName: + registerTypes: 1 + boundTypes: + - UnityEngine.GameObject, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.PrimitiveType, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Component, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Type, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - UnityEngine.SendMessageOptions, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.SceneManagement.Scene, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - CustomScript, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + boundObjects: + - key: customscript + obj: {fileID: 1496574807} + component: {fileID: 1496574809} +--- !u!114 &201313719 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11417560, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 201313715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} + m_Name: + m_EditorClassIdentifier: + luaEnvironment: {fileID: 201313717} + luaFile: {fileID: 0} + luaScript: ' + + -- Getting a public property + + local s = customscript.myString; + + print (s) + + + -- Running a public method + + customscript.MyFunction() + + + -- Running public method as a coroutine + + runwait( customscript.MyCoroutine() ) + + + print ("Lua Script Finished!")' + runAsCoroutine: 1 +--- !u!114 &201313720 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11415008, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 201313715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} + m_Name: + m_EditorClassIdentifier: + executeAfterTime: 1 + repeatExecuteTime: 1 + repeatEveryTime: 1 + executeAfterFrames: 1 + repeatExecuteFrame: 1 + repeatEveryFrame: 1 + hasFailed: 0 + executeMethods: 2 + executeMethodName: OnExecute +--- !u!4 &201313721 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 466848, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 201313715} + 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: 0} + m_RootOrder: 1 --- !u!1 &588179116 GameObject: m_ObjectHideFlags: 0 @@ -171,66 +324,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!1 &613885368 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 178698, guid: e0c2b90c058ff43f4a56a266d4fa721b, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 613885370} - - 114: {fileID: 613885369} - m_Layer: 0 - m_Name: LuaBindings - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &613885369 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11414792, guid: e0c2b90c058ff43f4a56a266d4fa721b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 613885368} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} - m_Name: - m_EditorClassIdentifier: - tableName: - registerTypes: 1 - boundTypes: - - UnityEngine.GameObject, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.PrimitiveType, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.Component, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Type, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - UnityEngine.SendMessageOptions, UnityEngine, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null - - UnityEngine.SceneManagement.Scene, UnityEngine, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null - - UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - CustomScript, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - boundObjects: - - key: customscript - obj: {fileID: 1496574807} - component: {fileID: 1496574809} ---- !u!4 &613885370 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 403334, guid: e0c2b90c058ff43f4a56a266d4fa721b, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 613885368} - 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: 0} - m_RootOrder: 3 --- !u!1 &629527467 GameObject: m_ObjectHideFlags: 0 @@ -258,113 +351,33 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} m_Name: m_EditorClassIdentifier: - info: "This example shows how to access properties and call methods on a c# script + info: 'This example shows how to access properties and call methods on a c# script from Lua. When you run this scene, look at the Console window to see the messages - output as the script runs.\n\nThe CustomScript object has a custom c# script attached. - The LuaBindings object has a binding which links to this CustomScript component.\n\nThe - LuaScript object uses this binding to get the value of a public property and run - a method on the CustomScript component. A coroutine method (i.e. one that returns - IEnumerator) is also run. \n\nLuaScript uses the runwait() command to execute - coroutine methods asynchronously.\n" ---- !u!4 &629527469 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 629527467} - 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: 0} - m_RootOrder: 5 ---- !u!1 &701069093 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 139298, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 701069096} - - 114: {fileID: 701069095} - - 114: {fileID: 701069094} - m_Layer: 0 - m_Name: LuaScript - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &701069094 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11472914, guid: c356764ac08ce4af2806a601a4f1e6e9, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 701069093} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} - m_Name: - m_EditorClassIdentifier: - luaEnvironment: {fileID: 0} - luaFile: {fileID: 0} - luaScript: ' - - -- Getting a public property + output as the script runs. - local s = customscript.myString; - - print (s) + The CustomScript object has a custom c# script attached. The LuaBindings component + in the Lua object has a binding which links to this CustomScript component. - -- Running a public method - - customscript.MyFunction() - - - -- Running public method as a coroutine - - runwait( customscript.MyCoroutine() ) - - print ("Lua Script Finished!") + The LuaScript object uses this binding to get the value of a public property and + run a method on the CustomScript component. A coroutine method (i.e. one that + returns IEnumerator) is also run. The runwait() command executes coroutine methods + asynchronously. ' - runAsCoroutine: 1 ---- !u!114 &701069095 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11446228, guid: c356764ac08ce4af2806a601a4f1e6e9, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 701069093} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} - m_Name: - m_EditorClassIdentifier: - executeAfterTime: 1 - repeatExecuteTime: 1 - repeatEveryTime: 1 - executeAfterFrames: 1 - repeatExecuteFrame: 1 - repeatEveryFrame: 1 - hasFailed: 0 - executeMethods: 2 - executeMethodName: OnExecute ---- !u!4 &701069096 +--- !u!4 &629527469 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 449874, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 701069093} + m_GameObject: {fileID: 629527467} 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: 0} - m_RootOrder: 2 + m_RootOrder: 4 --- !u!1 &1496574807 GameObject: m_ObjectHideFlags: 0 @@ -392,7 +405,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 --- !u!114 &1496574809 MonoBehaviour: m_ObjectHideFlags: 0 @@ -445,4 +458,4 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 diff --git a/Assets/FungusExamples/FungusLua/HelloWorld/HelloWorld.unity b/Assets/FungusExamples/FungusLua/HelloWorld/HelloWorld.unity index 4fd644e7..72fba2e6 100644 --- a/Assets/FungusExamples/FungusLua/HelloWorld/HelloWorld.unity +++ b/Assets/FungusExamples/FungusLua/HelloWorld/HelloWorld.unity @@ -85,6 +85,168 @@ NavMeshSettings: cellSize: 0.16666667 manualCellSize: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &431938873 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 179118, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 431938879} + - 114: {fileID: 431938878} + - 114: {fileID: 431938877} + - 114: {fileID: 431938876} + - 114: {fileID: 431938875} + - 114: {fileID: 431938874} + m_Layer: 0 + m_Name: Lua + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &431938874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11437776, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 431938873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} + m_Name: + m_EditorClassIdentifier: + fungusModule: 0 + activeLanguage: en + stringTables: [] + registerTypes: + - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} + - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3} +--- !u!114 &431938875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11483650, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 431938873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} + m_Name: + m_EditorClassIdentifier: + remoteDebugger: 0 +--- !u!114 &431938876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11499092, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 431938873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} + m_Name: + m_EditorClassIdentifier: + allEnvironments: 0 + luaEnvironment: {fileID: 431938875} + tableName: + registerTypes: 1 + boundTypes: [] + boundObjects: + - key: + obj: {fileID: 0} + component: {fileID: 0} +--- !u!114 &431938877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11417560, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 431938873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} + m_Name: + m_EditorClassIdentifier: + luaEnvironment: {fileID: 431938875} + luaFile: {fileID: 0} + luaScript: "-- Print \"hello world\" to the console\nprint(\"Hello world\")\n\n-- + Display \"hello world\" using a \n-- Fungus SayDialog\nsay(\"Hello world\")" + runAsCoroutine: 1 +--- !u!114 &431938878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11415008, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 431938873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} + m_Name: + m_EditorClassIdentifier: + executeAfterTime: 1 + repeatExecuteTime: 1 + repeatEveryTime: 1 + executeAfterFrames: 1 + repeatExecuteFrame: 1 + repeatEveryFrame: 1 + hasFailed: 0 + executeMethods: 2 + executeMethodName: OnExecute +--- !u!4 &431938879 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 466848, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 431938873} + 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: 0} + m_RootOrder: 1 +--- !u!1 &1094179358 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1094179360} + - 114: {fileID: 1094179359} + m_Layer: 0 + m_Name: _FungusState + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1094179359 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1094179358} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedFlowchart: {fileID: 0} +--- !u!4 &1094179360 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1094179358} + 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: 0} + m_RootOrder: 3 --- !u!1 &1314575962 GameObject: m_ObjectHideFlags: 0 @@ -112,15 +274,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} m_Name: m_EditorClassIdentifier: - info: 'A simple example of using a LuaScript object to display "Hello World" by - printing to the console and also by using the say() function. + info: 'A simple example of using a Lua object to display "Hello World" by printing + to the console and also by using the say() function. - Create a LuaScript object via Tools > Fungus > Create > LuaScript + Create a Lua object via Tools > Fungus > Create > Lua - Notice that Fungus automatically creates the LuaEnvironment and SayDialog objects - automatically if none are already present in the scene when you run it.' + The Lua object provides a self-contained Lua environment and script execution + in one, which is great for simple one-off scripts. + + + You can use the LuaEnvironment, LuaScript and LuaBindings objects to handle more + complex scenarios - e.g. 2 LuaScript objects which share a LuaEnvironment.' --- !u!4 &1314575964 Transform: m_ObjectHideFlags: 0 @@ -219,70 +385,3 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!1 &1590446708 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 139298, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1590446711} - - 114: {fileID: 1590446710} - - 114: {fileID: 1590446709} - m_Layer: 0 - m_Name: LuaScript - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1590446709 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11472914, guid: c356764ac08ce4af2806a601a4f1e6e9, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1590446708} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} - m_Name: - m_EditorClassIdentifier: - luaEnvironment: {fileID: 0} - luaFile: {fileID: 0} - luaScript: "-- Print \"hello world\" to the console\nprint(\"Hello world\")\n\n-- - Display \"hello world\" using a \n-- Fungus SayDialog\nsay(\"Hello world\")\n" - runAsCoroutine: 1 ---- !u!114 &1590446710 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11446228, guid: c356764ac08ce4af2806a601a4f1e6e9, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1590446708} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} - m_Name: - m_EditorClassIdentifier: - executeAfterTime: 1 - repeatExecuteTime: 1 - repeatEveryTime: 1 - executeAfterFrames: 1 - repeatExecuteFrame: 1 - repeatEveryFrame: 1 - hasFailed: 0 - executeMethods: 2 - executeMethodName: OnExecute ---- !u!4 &1590446711 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 449874, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1590446708} - 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: 0} - m_RootOrder: 1 diff --git a/Assets/FungusExamples/FungusLua/Localization/Localization.unity b/Assets/FungusExamples/FungusLua/Localization/Localization.unity index 68092b5f..4abfa540 100644 --- a/Assets/FungusExamples/FungusLua/Localization/Localization.unity +++ b/Assets/FungusExamples/FungusLua/Localization/Localization.unity @@ -171,67 +171,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!1 &295881417 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100640, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 295881420} - - 114: {fileID: 295881419} - - 114: {fileID: 295881418} - m_Layer: 0 - m_Name: LuaEnvironment - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &295881418 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11486636, guid: 49031c561e16d4fcf91c12153f8e0b25, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 295881417} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} - m_Name: - m_EditorClassIdentifier: - fungusModule: 0 - activeLanguage: en - stringTables: - - {fileID: 4900000, guid: 2b873932e07a74706a6b54d7ce17a53b, type: 3} - registerTypes: - - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} - - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3} ---- !u!114 &295881419 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11493126, guid: 49031c561e16d4fcf91c12153f8e0b25, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 295881417} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} - m_Name: - m_EditorClassIdentifier: - remoteDebugger: 0 ---- !u!4 &295881420 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 295881417} - 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: 0} - m_RootOrder: 1 --- !u!1 &869541708 GameObject: m_ObjectHideFlags: 0 @@ -305,7 +244,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 --- !u!1 &931488961 GameObject: m_ObjectHideFlags: 1 @@ -345,7 +284,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 --- !u!1 &1000755630 GameObject: m_ObjectHideFlags: 0 @@ -390,8 +329,7 @@ MonoBehaviour: width: 1114 height: 859 selectedBlock: {fileID: 1000755633} - selectedCommands: - - {fileID: 1000755632} + selectedCommands: [] variables: [] description: stepPause: 0 @@ -467,94 +405,93 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 ---- !u!1 &1304857493 + m_RootOrder: 2 +--- !u!1 &1205061378 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 179118, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 4: {fileID: 1304857494} - - 114: {fileID: 1304857495} + - 4: {fileID: 1205061384} + - 114: {fileID: 1205061383} + - 114: {fileID: 1205061382} + - 114: {fileID: 1205061381} + - 114: {fileID: 1205061380} + - 114: {fileID: 1205061379} m_Layer: 0 - m_Name: InfoText + m_Name: Lua m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1304857494 -Transform: +--- !u!114 &1205061379 +MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 11437776, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1304857493} - 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: 0} - m_RootOrder: 4 ---- !u!114 &1304857495 + m_GameObject: {fileID: 1205061378} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} + m_Name: + m_EditorClassIdentifier: + fungusModule: 0 + activeLanguage: en + stringTables: + - {fileID: 4900000, guid: 2b873932e07a74706a6b54d7ce17a53b, type: 3} + registerTypes: + - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} + - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3} +--- !u!114 &1205061380 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 11483650, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1304857493} + m_GameObject: {fileID: 1205061378} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} + m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} m_Name: m_EditorClassIdentifier: - info: 'This example shows how to use a string table to localize text for different - languages. - - - A string table JSON file has been added to the LuaUtils component in the LuaEnvironment - object. - - - The LuaScript object shows how to substitute in a localization string key and - change the active language in Lua. - - - The Flowchart object demonstrates using the same {$VarName} syntax in Fungus commands - like Say, Menu, Debug Log, etc. to substitute in localized strings. - - - -' ---- !u!1 &1834004033 -GameObject: + remoteDebugger: 0 +--- !u!114 &1205061381 +MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 139298, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} + m_PrefabParentObject: {fileID: 11499092, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1834004036} - - 114: {fileID: 1834004035} - - 114: {fileID: 1834004034} - m_Layer: 0 - m_Name: LuaScript - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1834004034 + m_GameObject: {fileID: 1205061378} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} + m_Name: + m_EditorClassIdentifier: + allEnvironments: 0 + luaEnvironment: {fileID: 1205061380} + tableName: + registerTypes: 1 + boundTypes: [] + boundObjects: + - key: + obj: {fileID: 0} + component: {fileID: 0} +--- !u!114 &1205061382 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11472914, guid: c356764ac08ce4af2806a601a4f1e6e9, + m_PrefabParentObject: {fileID: 11417560, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1834004033} + m_GameObject: {fileID: 1205061378} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} m_Name: m_EditorClassIdentifier: - luaEnvironment: {fileID: 0} + luaEnvironment: {fileID: 1205061380} luaFile: {fileID: 0} luaScript: '-- First we use variable substitution to @@ -590,20 +527,15 @@ MonoBehaviour: local s = sub("{$hello_world}") - say(s) - - - - -' + say(s)' runAsCoroutine: 1 ---- !u!114 &1834004035 +--- !u!114 &1205061383 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11446228, guid: c356764ac08ce4af2806a601a4f1e6e9, + m_PrefabParentObject: {fileID: 11415008, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1834004033} + m_GameObject: {fileID: 1205061378} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} @@ -618,15 +550,72 @@ MonoBehaviour: hasFailed: 0 executeMethods: 2 executeMethodName: OnExecute ---- !u!4 &1834004036 +--- !u!4 &1205061384 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 449874, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} + m_PrefabParentObject: {fileID: 466848, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1834004033} + m_GameObject: {fileID: 1205061378} 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: 0} - m_RootOrder: 2 + m_RootOrder: 1 +--- !u!1 &1304857493 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1304857494} + - 114: {fileID: 1304857495} + m_Layer: 0 + m_Name: InfoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1304857494 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1304857493} + 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: 0} + m_RootOrder: 3 +--- !u!114 &1304857495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1304857493} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} + m_Name: + m_EditorClassIdentifier: + info: 'This example shows how to use a string table to localize text for different + languages. + + + A string table JSON file has been added to the LuaUtils component in the Lua object. + + + The script shows how to substitute in a localization string key and change the + active language in Lua. + + + The Flowchart object demonstrates using the same {$VarName} syntax in Fungus commands + like Say, Menu, Debug Log, etc. to substitute in localized strings from the string + table. + + + +' diff --git a/Assets/FungusExamples/FungusLua/Narrative/NarrativeExample.unity b/Assets/FungusExamples/FungusLua/Narrative/NarrativeExample.unity index 7cec53a9..ec325d08 100644 --- a/Assets/FungusExamples/FungusLua/Narrative/NarrativeExample.unity +++ b/Assets/FungusExamples/FungusLua/Narrative/NarrativeExample.unity @@ -124,7 +124,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 --- !u!1 &269274605 GameObject: m_ObjectHideFlags: 0 @@ -617,75 +617,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 461615209} ---- !u!1 &519026839 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 139298, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 519026841} - - 114: {fileID: 519026842} - - 114: {fileID: 519026840} - m_Layer: 0 - m_Name: LuaScript - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &519026840 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11472914, guid: c356764ac08ce4af2806a601a4f1e6e9, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 519026839} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} - m_Name: - m_EditorClassIdentifier: - luaEnvironment: {fileID: 0} - luaFile: {fileID: 0} - luaScript: "-- Lua functions are the equivalent of Blocks \n-- in a Fungus flowchart.\n\nsetsaydialog(saydialog)\nsetmenudialog(menudialog)\n\nfunction - start()\n\n\n say \"Welcome!\"\n\n sayoptions.waitforinput = false\n sayoptions.fadewhendone - = false\n\n say \"Select an option\"\n\n menu(\"Option A\", optiona)\n menu(\"Option - B\", optionb)\nend\n\nfunction optiona()\n say(\"You chose option a\")\nend\n\nfunction - optionb()\n say(\"You chose option b\")\nend\n\nstart()\n" - runAsCoroutine: 1 ---- !u!4 &519026841 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 449874, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 519026839} - 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: 0} - m_RootOrder: 5 ---- !u!114 &519026842 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 519026839} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} - m_Name: - m_EditorClassIdentifier: - executeAfterTime: 1 - repeatExecuteTime: 1 - repeatEveryTime: 1 - executeAfterFrames: 1 - repeatExecuteFrame: 1 - repeatEveryFrame: 1 - hasFailed: 0 - executeMethods: 2 - executeMethodName: OnExecute --- !u!1 &614649408 GameObject: m_ObjectHideFlags: 0 @@ -1326,7 +1257,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 --- !u!1 &1225017617 GameObject: m_ObjectHideFlags: 0 @@ -1777,34 +1708,71 @@ MonoBehaviour: m_Spacing: 5 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 ---- !u!1 &1265440900 +--- !u!1 &1308476103 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 178698, guid: e0c2b90c058ff43f4a56a266d4fa721b, type: 2} + m_PrefabParentObject: {fileID: 179118, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 4: {fileID: 1265440902} - - 114: {fileID: 1265440901} + - 4: {fileID: 1308476109} + - 114: {fileID: 1308476108} + - 114: {fileID: 1308476107} + - 114: {fileID: 1308476106} + - 114: {fileID: 1308476105} + - 114: {fileID: 1308476104} m_Layer: 0 - m_Name: LuaBindings + m_Name: Lua m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1265440901 +--- !u!114 &1308476104 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11437776, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1308476103} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} + m_Name: + m_EditorClassIdentifier: + fungusModule: 0 + activeLanguage: en + stringTables: [] + registerTypes: + - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} + - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3} +--- !u!114 &1308476105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11483650, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1308476103} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} + m_Name: + m_EditorClassIdentifier: + remoteDebugger: 0 +--- !u!114 &1308476106 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11414792, guid: e0c2b90c058ff43f4a56a266d4fa721b, + m_PrefabParentObject: {fileID: 11499092, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1265440900} + m_GameObject: {fileID: 1308476103} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} m_Name: m_EditorClassIdentifier: + allEnvironments: 0 + luaEnvironment: {fileID: 1308476105} tableName: registerTypes: 1 boundTypes: @@ -1841,18 +1809,60 @@ MonoBehaviour: - key: menudialog obj: {fileID: 1851713324} component: {fileID: 1851713325} ---- !u!4 &1265440902 +--- !u!114 &1308476107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11417560, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1308476103} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} + m_Name: + m_EditorClassIdentifier: + luaEnvironment: {fileID: 1308476105} + luaFile: {fileID: 0} + luaScript: "-- Lua functions are the equivalent of Blocks \n-- in a Fungus flowchart.\n\nsetsaydialog(saydialog)\nsetmenudialog(menudialog)\n\nfunction + start()\n say \"Welcome!\"\n\n sayoptions.waitforinput = false\n sayoptions.fadewhendone + = false\n\n say \"Select an option\"\n\n sayoptions.waitforinput = true\n + \ sayoptions.fadewhendone = true\n\n menu(\"Option A\", optiona)\n menu(\"Option + B\", optionb)\nend\n\nfunction optiona()\n say(\"You chose option a\")\nend\n\nfunction + optionb()\n say(\"You chose option b\")\nend\n\nstart()" + runAsCoroutine: 1 +--- !u!114 &1308476108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11415008, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1308476103} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} + m_Name: + m_EditorClassIdentifier: + executeAfterTime: 1 + repeatExecuteTime: 1 + repeatEveryTime: 1 + executeAfterFrames: 1 + repeatExecuteFrame: 1 + repeatEveryFrame: 1 + hasFailed: 0 + executeMethods: 2 + executeMethodName: OnExecute +--- !u!4 &1308476109 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 403334, guid: e0c2b90c058ff43f4a56a266d4fa721b, type: 2} + m_PrefabParentObject: {fileID: 466848, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1265440900} + m_GameObject: {fileID: 1308476103} 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: 0} - m_RootOrder: 4 + m_RootOrder: 3 --- !u!1 &1531220777 GameObject: m_ObjectHideFlags: 0 @@ -2799,7 +2809,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 --- !u!1 &1851713324 GameObject: m_ObjectHideFlags: 0 From d26a3ea08c8fda14d4d3ceb6af79ed3dfdb85cde Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Mon, 9 May 2016 08:21:04 +0100 Subject: [PATCH 12/20] Added InforText to Fungus utilities menu --- .../Flowchart/Editor/FlowchartMenuItems.cs | 6 +++ .../Flowchart/Resources/InfoText.prefab | 53 +++++++++++++++++++ .../Flowchart/Resources/InfoText.prefab.meta | 8 +++ .../FungusLua/Resources/Lua/fungus.txt | 1 - 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 Assets/Fungus/Flowchart/Resources/InfoText.prefab create mode 100644 Assets/Fungus/Flowchart/Resources/InfoText.prefab.meta diff --git a/Assets/Fungus/Flowchart/Editor/FlowchartMenuItems.cs b/Assets/Fungus/Flowchart/Editor/FlowchartMenuItems.cs index b2fb9452..1417bd59 100644 --- a/Assets/Fungus/Flowchart/Editor/FlowchartMenuItems.cs +++ b/Assets/Fungus/Flowchart/Editor/FlowchartMenuItems.cs @@ -50,6 +50,12 @@ namespace Fungus AssetDatabase.ExportPackage(folders, path, ExportPackageOptions.Recurse); } + [MenuItem("Tools/Fungus/Utilities/Info Text")] + static void SpawnInfoText() + { + SpawnPrefab("InfoText"); + } + public static GameObject SpawnPrefab(string prefabName) { GameObject prefab = Resources.Load(prefabName); diff --git a/Assets/Fungus/Flowchart/Resources/InfoText.prefab b/Assets/Fungus/Flowchart/Resources/InfoText.prefab new file mode 100644 index 00000000..0fd9a8f8 --- /dev/null +++ b/Assets/Fungus/Flowchart/Resources/InfoText.prefab @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &105822 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 438292} + - 114: {fileID: 11442554} + m_Layer: 0 + m_Name: InfoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &438292 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 105822} + 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: 0} + m_RootOrder: 0 +--- !u!114 &11442554 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 105822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} + m_Name: + m_EditorClassIdentifier: + info: Information text +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 105822} + m_IsPrefabParent: 1 diff --git a/Assets/Fungus/Flowchart/Resources/InfoText.prefab.meta b/Assets/Fungus/Flowchart/Resources/InfoText.prefab.meta new file mode 100644 index 00000000..232408c7 --- /dev/null +++ b/Assets/Fungus/Flowchart/Resources/InfoText.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d6f174e740b5040c68466fb971c4cec2 +timeCreated: 1462775608 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt b/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt index 036fcda4..00838920 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt +++ b/Assets/Fungus/Thirdparty/FungusLua/Resources/Lua/fungus.txt @@ -259,7 +259,6 @@ end -- varname: The name of the Variable to get. function M.getvar(flowchart, varname) assert(flowchart, "flowchart must not be nil") - assert(blockname, "varname must not be nil") return flowchart.GetVariable(varname) end From 8ebad6ef6ae5b2c878bee8b8dafd73823b690a85 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Mon, 9 May 2016 08:21:17 +0100 Subject: [PATCH 13/20] Added more examples --- .../FungusLua/Bindings/SpawnPrefab.unity | 398 +++++++++++ .../FungusLua/Bindings/SpawnPrefab.unity.meta | 8 + .../FungusLua/Bindings/TestSprite.prefab | 104 +++ .../FungusLua/Bindings/TestSprite.prefab.meta | 8 + .../FungusExamples/FungusLua/Flowchart.meta | 9 + .../FungusLua/Flowchart/Variables.unity | 668 ++++++++++++++++++ .../FungusLua/Flowchart/Variables.unity.meta | 8 + Assets/FungusExamples/FungusLua/Trigger.meta | 9 + .../FungusLua/{ => Trigger}/Trigger.unity | 101 +-- .../{ => Trigger}/Trigger.unity.meta | 0 10 files changed, 1265 insertions(+), 48 deletions(-) create mode 100644 Assets/FungusExamples/FungusLua/Bindings/SpawnPrefab.unity create mode 100644 Assets/FungusExamples/FungusLua/Bindings/SpawnPrefab.unity.meta create mode 100644 Assets/FungusExamples/FungusLua/Bindings/TestSprite.prefab create mode 100644 Assets/FungusExamples/FungusLua/Bindings/TestSprite.prefab.meta create mode 100644 Assets/FungusExamples/FungusLua/Flowchart.meta create mode 100644 Assets/FungusExamples/FungusLua/Flowchart/Variables.unity create mode 100644 Assets/FungusExamples/FungusLua/Flowchart/Variables.unity.meta create mode 100644 Assets/FungusExamples/FungusLua/Trigger.meta rename Assets/FungusExamples/FungusLua/{ => Trigger}/Trigger.unity (96%) rename Assets/FungusExamples/FungusLua/{ => Trigger}/Trigger.unity.meta (100%) diff --git a/Assets/FungusExamples/FungusLua/Bindings/SpawnPrefab.unity b/Assets/FungusExamples/FungusLua/Bindings/SpawnPrefab.unity new file mode 100644 index 00000000..386d5e7a --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Bindings/SpawnPrefab.unity @@ -0,0 +1,398 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_GIWorkflowMode: 1 + m_LightmapsMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 3 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_ReflectionCompression: 2 + m_LightingDataAsset: {fileID: 0} + m_RuntimeCPUUsage: 25 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: 0.16666667 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &520292961 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 520292966} + - 20: {fileID: 520292965} + - 92: {fileID: 520292964} + - 124: {fileID: 520292963} + - 81: {fileID: 520292962} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &520292962 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 520292961} + m_Enabled: 1 +--- !u!124 &520292963 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 520292961} + m_Enabled: 1 +--- !u!92 &520292964 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 520292961} + m_Enabled: 1 +--- !u!20 &520292965 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 520292961} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!4 &520292966 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 520292961} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!1 &866988388 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 179118, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 866988394} + - 114: {fileID: 866988393} + - 114: {fileID: 866988392} + - 114: {fileID: 866988391} + - 114: {fileID: 866988390} + - 114: {fileID: 866988389} + m_Layer: 0 + m_Name: Lua + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &866988389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11437776, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 866988388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} + m_Name: + m_EditorClassIdentifier: + fungusModule: 0 + activeLanguage: en + stringTables: [] + registerTypes: + - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} + - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3} +--- !u!114 &866988390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11483650, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 866988388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} + m_Name: + m_EditorClassIdentifier: + remoteDebugger: 0 +--- !u!114 &866988391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11499092, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 866988388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} + m_Name: + m_EditorClassIdentifier: + allEnvironments: 0 + luaEnvironment: {fileID: 866988390} + tableName: + registerTypes: 1 + boundTypes: + - UnityEngine.GameObject, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.PrimitiveType, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Component, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Type, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - UnityEngine.SendMessageOptions, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.SceneManagement.Scene, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + boundObjects: + - key: testsprite + obj: {fileID: 120068, guid: 78100db42249d407787823d1e5719214, type: 2} + component: {fileID: 0} +--- !u!114 &866988392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11417560, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 866988388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} + m_Name: + m_EditorClassIdentifier: + luaEnvironment: {fileID: 866988390} + luaFile: {fileID: 0} + luaScript: luautils.Instantiate(testsprite) + runAsCoroutine: 1 +--- !u!114 &866988393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11415008, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 866988388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} + m_Name: + m_EditorClassIdentifier: + executeAfterTime: 1 + repeatExecuteTime: 1 + repeatEveryTime: 0.5 + executeAfterFrames: 1 + repeatExecuteFrame: 1 + repeatEveryFrame: 1 + hasFailed: 0 + executeMethods: 1 + executeMethodName: OnExecute +--- !u!4 &866988394 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 466848, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 866988388} + 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: 0} + m_RootOrder: 2 +--- !u!1 &1842064384 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1842064386} + - 114: {fileID: 1842064385} + m_Layer: 0 + m_Name: InfoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1842064385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1842064384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} + m_Name: + m_EditorClassIdentifier: + info: 'This example shows how to instantiate a prefab from Lua. + + + In the LuaBindings component of the Lua object, a binding has been added to a + prefab asset with the key ''testsprite'' + + + The Execute Handler has been set to execute every 0.5 seconds, and we use the + luautils.Instantiate() method to instantiate the prefab gameobject. + + + There''s also a luautils.Spawn() method if you want to spawn a prefab just from + the asset name, see the docs for details.' +--- !u!4 &1842064386 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1842064384} + 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: 0} + m_RootOrder: 3 +--- !u!1 &1943384371 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1943384373} + - 114: {fileID: 1943384372} + m_Layer: 0 + m_Name: _FungusState + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1943384372 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1943384371} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedFlowchart: {fileID: 0} +--- !u!4 &1943384373 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1943384371} + 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: 0} + m_RootOrder: 1 diff --git a/Assets/FungusExamples/FungusLua/Bindings/SpawnPrefab.unity.meta b/Assets/FungusExamples/FungusLua/Bindings/SpawnPrefab.unity.meta new file mode 100644 index 00000000..4c5eaa81 --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Bindings/SpawnPrefab.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b7832786954140ba9f55ba65fcd9d94 +timeCreated: 1462774373 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/FungusLua/Bindings/TestSprite.prefab b/Assets/FungusExamples/FungusLua/Bindings/TestSprite.prefab new file mode 100644 index 00000000..026168f3 --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Bindings/TestSprite.prefab @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &120068 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 428828} + - 212: {fileID: 21207198} + - 50: {fileID: 5063608} + - 61: {fileID: 6194652} + m_Layer: 0 + m_Name: TestSprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &428828 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 120068} + 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: 0} + m_RootOrder: 0 +--- !u!50 &5063608 +Rigidbody2D: + serializedVersion: 2 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 120068} + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &6194652 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 120068} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Size: {x: 3, y: 3} +--- !u!212 &21207198 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 120068} + 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: 0 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 120068} + m_IsPrefabParent: 1 diff --git a/Assets/FungusExamples/FungusLua/Bindings/TestSprite.prefab.meta b/Assets/FungusExamples/FungusLua/Bindings/TestSprite.prefab.meta new file mode 100644 index 00000000..00099f15 --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Bindings/TestSprite.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 78100db42249d407787823d1e5719214 +timeCreated: 1462774531 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/FungusLua/Flowchart.meta b/Assets/FungusExamples/FungusLua/Flowchart.meta new file mode 100644 index 00000000..0d0ab5c0 --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Flowchart.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 33cf9f75cbecd4438a2464596aa02247 +folderAsset: yes +timeCreated: 1462775148 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/FungusLua/Flowchart/Variables.unity b/Assets/FungusExamples/FungusLua/Flowchart/Variables.unity new file mode 100644 index 00000000..a2e8f6d3 --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Flowchart/Variables.unity @@ -0,0 +1,668 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_GIWorkflowMode: 1 + m_LightmapsMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 3 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_ReflectionCompression: 2 + m_LightingDataAsset: {fileID: 0} + m_RuntimeCPUUsage: 25 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: 0.16666667 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &364295471 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 179118, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 364295477} + - 114: {fileID: 364295476} + - 114: {fileID: 364295475} + - 114: {fileID: 364295474} + - 114: {fileID: 364295473} + - 114: {fileID: 364295472} + m_Layer: 0 + m_Name: Lua + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &364295472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11437776, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 364295471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} + m_Name: + m_EditorClassIdentifier: + fungusModule: 0 + activeLanguage: en + stringTables: [] + registerTypes: + - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} + - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3} +--- !u!114 &364295473 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11483650, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 364295471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} + m_Name: + m_EditorClassIdentifier: + remoteDebugger: 0 +--- !u!114 &364295474 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11499092, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 364295471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} + m_Name: + m_EditorClassIdentifier: + allEnvironments: 0 + luaEnvironment: {fileID: 364295473} + tableName: + registerTypes: 1 + boundTypes: + - UnityEngine.GameObject, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.PrimitiveType, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Component, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Type, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - UnityEngine.SendMessageOptions, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.SceneManagement.Scene, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Vector2, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - Fungus.Variable, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.Command, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.CommandInfoAttribute, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + boundObjects: + - key: flowchart + obj: {fileID: 2088062867} + component: {fileID: 2088062874} +--- !u!114 &364295475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11417560, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 364295471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} + m_Name: + m_EditorClassIdentifier: + luaEnvironment: {fileID: 364295473} + luaFile: {fileID: 0} + luaScript: "local changename = getvar(flowchart, \"ChangeName\")\nlocal myname = + getvar(flowchart, \"MyName\")\n\nif (changename.value) then\n myname.value + = \"Darth John\"\nend\n" + runAsCoroutine: 1 +--- !u!114 &364295476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11415008, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 364295471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} + m_Name: + m_EditorClassIdentifier: + executeAfterTime: 1 + repeatExecuteTime: 1 + repeatEveryTime: 1 + executeAfterFrames: 1 + repeatExecuteFrame: 1 + repeatEveryFrame: 1 + hasFailed: 0 + executeMethods: 2 + executeMethodName: OnExecute +--- !u!4 &364295477 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 466848, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 364295471} + 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: 0} + m_RootOrder: 2 +--- !u!1 &700669203 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 700669208} + - 20: {fileID: 700669207} + - 92: {fileID: 700669206} + - 124: {fileID: 700669205} + - 81: {fileID: 700669204} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &700669204 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_Enabled: 1 +--- !u!124 &700669205 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_Enabled: 1 +--- !u!92 &700669206 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_Enabled: 1 +--- !u!20 &700669207 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!4 &700669208 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!1 &712898800 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 712898802} + - 114: {fileID: 712898801} + m_Layer: 0 + m_Name: _FungusState + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &712898801 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 712898800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedFlowchart: {fileID: 2088062874} +--- !u!4 &712898802 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 712898800} + 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: 0} + m_RootOrder: 1 +--- !u!1 &941829309 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 941829313} + - 114: {fileID: 941829312} + - 114: {fileID: 941829311} + - 114: {fileID: 941829310} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &941829310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941829309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ForceModuleActive: 0 +--- !u!114 &941829311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941829309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &941829312 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941829309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &941829313 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941829309} + 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: 0} + m_RootOrder: 4 +--- !u!1 &1703486016 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 105822, guid: d6f174e740b5040c68466fb971c4cec2, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1703486018} + - 114: {fileID: 1703486017} + m_Layer: 0 + m_Name: InfoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1703486017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11442554, guid: d6f174e740b5040c68466fb971c4cec2, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1703486016} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} + m_Name: + m_EditorClassIdentifier: + info: 'This example shows how to access the variables in a Flowchart from Lua. + + + The Flowchart object has 2 variables added to it. The Lua object has a binding + to the Flowchart. + + + The Lua script uses the getvar() function to get a reference to the 2 FLowchart + variables, and then uses the .value property accessor to access the values of + the variables. + + + Try setting the ChangeName variable in the Flowchart to false, to see how it affects + the Lua script.' +--- !u!4 &1703486018 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 438292, guid: d6f174e740b5040c68466fb971c4cec2, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1703486016} + 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: 0} + m_RootOrder: 5 +--- !u!1 &2088062867 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 2088062875} + - 114: {fileID: 2088062874} + - 114: {fileID: 2088062873} + - 114: {fileID: 2088062872} + - 114: {fileID: 2088062871} + - 114: {fileID: 2088062870} + - 114: {fileID: 2088062869} + - 114: {fileID: 2088062868} + m_Layer: 0 + m_Name: Flowchart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2088062868 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + errorMessage: + indentLevel: 0 + storyText: Name is {$MyName} + description: + character: {fileID: 0} + portrait: {fileID: 0} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + setSayDialog: {fileID: 0} +--- !u!114 &2088062869 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3315ad2ebb85443909a1203d56d9344e, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + errorMessage: + indentLevel: 0 + _duration: + floatRef: {fileID: 0} + floatVal: 1 + durationOLD: 0 +--- !u!114 &2088062870 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d02d9822eec54c98afe95bb497211b3, type: 3} + m_Name: + m_EditorClassIdentifier: + scope: 1 + key: ChangeName + value: 1 +--- !u!114 &2088062871 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4580f28dd8581476b810b38eea2f1316, type: 3} + m_Name: + m_EditorClassIdentifier: + scope: 1 + key: MyName + value: John +--- !u!114 &2088062872 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 2088062873} +--- !u!114 &2088062873 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 67 + y: 70 + width: 120 + height: 40 + itemId: 0 + blockName: Start + description: + eventHandler: {fileID: 2088062872} + commandList: + - {fileID: 2088062869} + - {fileID: 2088062868} +--- !u!114 &2088062874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 400 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -343 + y: -340 + width: 1114 + height: 859 + selectedBlock: {fileID: 2088062873} + selectedCommands: + - {fileID: 2088062868} + variables: + - {fileID: 2088062870} + - {fileID: 2088062871} + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + showLineNumbers: 0 + hideCommands: [] +--- !u!4 &2088062875 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + 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: 0} + m_RootOrder: 3 diff --git a/Assets/FungusExamples/FungusLua/Flowchart/Variables.unity.meta b/Assets/FungusExamples/FungusLua/Flowchart/Variables.unity.meta new file mode 100644 index 00000000..b6d69b53 --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Flowchart/Variables.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3878571bd7de84feb892061f72d83965 +timeCreated: 1462775164 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/FungusLua/Trigger.meta b/Assets/FungusExamples/FungusLua/Trigger.meta new file mode 100644 index 00000000..e124548f --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Trigger.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 0d16233e345464bbf9ac190ec03b5f75 +folderAsset: yes +timeCreated: 1462556807 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/FungusLua/Trigger.unity b/Assets/FungusExamples/FungusLua/Trigger/Trigger.unity similarity index 96% rename from Assets/FungusExamples/FungusLua/Trigger.unity rename to Assets/FungusExamples/FungusLua/Trigger/Trigger.unity index 8336a287..f9268f00 100644 --- a/Assets/FungusExamples/FungusLua/Trigger.unity +++ b/Assets/FungusExamples/FungusLua/Trigger/Trigger.unity @@ -221,7 +221,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 --- !u!54 &141306355 Rigidbody: m_ObjectHideFlags: 0 @@ -237,6 +237,50 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1 &229439457 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 229439459} + - 114: {fileID: 229439458} + m_Layer: 0 + m_Name: InfoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &229439458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 229439457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} + m_Name: + m_EditorClassIdentifier: + info: "This example shows how to execute a Lua script form a trigger event.\n\nThe + CubeTrigger object has ExecuteHandler and LuaScript components attached. The ExecuteHandler + has been set to execute the LuaScript component when a trigger enter event happens. + \n\nThe LuaBindings object looks after registering the Flowchart and SayDialog + objects so we can access them from Lua." +--- !u!4 &229439459 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 229439457} + 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: 0} + m_RootOrder: 9 --- !u!1 &517355049 GameObject: m_ObjectHideFlags: 1 @@ -276,7 +320,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 --- !u!1 &775333277 GameObject: m_ObjectHideFlags: 0 @@ -305,6 +349,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} m_Name: m_EditorClassIdentifier: + allEnvironments: 1 + luaEnvironment: {fileID: 0} tableName: registerTypes: 1 boundTypes: @@ -357,7 +403,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 --- !u!1 &913136538 GameObject: m_ObjectHideFlags: 0 @@ -474,7 +520,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 --- !u!1 &974098819 GameObject: m_ObjectHideFlags: 0 @@ -1208,7 +1254,7 @@ Transform: m_LocalScale: {x: 1.1810303, y: 1.1810303, z: 1.1810303} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 --- !u!114 &1437227280 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1248,48 +1294,7 @@ MonoBehaviour: repeatEveryFrame: 1 hasFailed: 0 executeMethods: 8192 ---- !u!1001 &1575311449 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} - m_IsPrefabParent: 0 + executeMethodName: OnExecute --- !u!1 &1882312847 GameObject: m_ObjectHideFlags: 0 @@ -1363,7 +1368,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 --- !u!1 &1918243061 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/FungusExamples/FungusLua/Trigger.unity.meta b/Assets/FungusExamples/FungusLua/Trigger/Trigger.unity.meta similarity index 100% rename from Assets/FungusExamples/FungusLua/Trigger.unity.meta rename to Assets/FungusExamples/FungusLua/Trigger/Trigger.unity.meta From 77c5c5f616564266f88898e4a55c3beddbc2a8cf Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Mon, 9 May 2016 08:24:39 +0100 Subject: [PATCH 14/20] Moved info text object tp FungusLua --- Assets/Fungus/Flowchart/Editor/FlowchartMenuItems.cs | 6 ------ .../FungusLua/Resources/Prefabs}/InfoText.prefab | 0 .../FungusLua/Resources/Prefabs}/InfoText.prefab.meta | 0 .../Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs | 9 +++++++++ 4 files changed, 9 insertions(+), 6 deletions(-) rename Assets/Fungus/{Flowchart/Resources => Thirdparty/FungusLua/Resources/Prefabs}/InfoText.prefab (100%) rename Assets/Fungus/{Flowchart/Resources => Thirdparty/FungusLua/Resources/Prefabs}/InfoText.prefab.meta (100%) diff --git a/Assets/Fungus/Flowchart/Editor/FlowchartMenuItems.cs b/Assets/Fungus/Flowchart/Editor/FlowchartMenuItems.cs index 1417bd59..327a6416 100644 --- a/Assets/Fungus/Flowchart/Editor/FlowchartMenuItems.cs +++ b/Assets/Fungus/Flowchart/Editor/FlowchartMenuItems.cs @@ -49,12 +49,6 @@ namespace Fungus AssetDatabase.ExportPackage(folders, path, ExportPackageOptions.Recurse); } - - [MenuItem("Tools/Fungus/Utilities/Info Text")] - static void SpawnInfoText() - { - SpawnPrefab("InfoText"); - } public static GameObject SpawnPrefab(string prefabName) { diff --git a/Assets/Fungus/Flowchart/Resources/InfoText.prefab b/Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/InfoText.prefab similarity index 100% rename from Assets/Fungus/Flowchart/Resources/InfoText.prefab rename to Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/InfoText.prefab diff --git a/Assets/Fungus/Flowchart/Resources/InfoText.prefab.meta b/Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/InfoText.prefab.meta similarity index 100% rename from Assets/Fungus/Flowchart/Resources/InfoText.prefab.meta rename to Assets/Fungus/Thirdparty/FungusLua/Resources/Prefabs/InfoText.prefab.meta diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs index 2ed9a8d9..b07ef8e8 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs @@ -111,6 +111,15 @@ namespace Fungus var asset = ScriptableObject.CreateInstance(); ProjectWindowUtil.CreateAsset(asset, typeof(T).Name + ".asset"); } + + /// + /// Create an info text object which displays help info in the top left of the sceen. + /// + [MenuItem("Tools/Fungus/Utilities/Info Text")] + static void SpawnInfoText() + { + SpawnPrefab("InfoText", false); + } } } From 6ce9eaa14e35006be752eed8a255bdb92eb68a25 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Mon, 9 May 2016 08:30:57 +0100 Subject: [PATCH 15/20] Improved Lua error message description --- Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaScript.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaScript.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaScript.cs index 2caca124..15b8350a 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaScript.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaScript.cs @@ -138,7 +138,7 @@ namespace Fungus } else { - luaEnvironment.RunLuaFunction(luaFunction, luaScript, runAsCoroutine); + luaEnvironment.RunLuaFunction(luaFunction, GetLuaString(), runAsCoroutine); } } } From bad3275fe43e0322f259b9ae6dad409155043f2d Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Mon, 9 May 2016 08:41:09 +0100 Subject: [PATCH 16/20] Fixed path to info text prefab --- Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs index b07ef8e8..efbc6d66 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs @@ -118,7 +118,7 @@ namespace Fungus [MenuItem("Tools/Fungus/Utilities/Info Text")] static void SpawnInfoText() { - SpawnPrefab("InfoText", false); + SpawnPrefab("Prefabs/InfoText", false); } } From 8e13371d2ddd964715f6d69b816744f90b43285c Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Mon, 9 May 2016 17:52:36 +0100 Subject: [PATCH 17/20] Fixed typo --- Assets/FungusExamples/FungusLua/Flowchart/Variables.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/FungusExamples/FungusLua/Flowchart/Variables.unity b/Assets/FungusExamples/FungusLua/Flowchart/Variables.unity index a2e8f6d3..a1959da8 100644 --- a/Assets/FungusExamples/FungusLua/Flowchart/Variables.unity +++ b/Assets/FungusExamples/FungusLua/Flowchart/Variables.unity @@ -465,7 +465,7 @@ MonoBehaviour: to the Flowchart. - The Lua script uses the getvar() function to get a reference to the 2 FLowchart + The Lua script uses the getvar() function to get a reference to the 2 Flowchart variables, and then uses the .value property accessor to access the values of the variables. From 0cdd16d4f14914dba33480615d854ac9efbda843 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Mon, 9 May 2016 18:04:50 +0100 Subject: [PATCH 18/20] Blocks example --- .../FungusLua/Flowchart/Blocks.unity | 657 ++++++++++++++++++ .../FungusLua/Flowchart/Blocks.unity.meta | 8 + 2 files changed, 665 insertions(+) create mode 100644 Assets/FungusExamples/FungusLua/Flowchart/Blocks.unity create mode 100644 Assets/FungusExamples/FungusLua/Flowchart/Blocks.unity.meta diff --git a/Assets/FungusExamples/FungusLua/Flowchart/Blocks.unity b/Assets/FungusExamples/FungusLua/Flowchart/Blocks.unity new file mode 100644 index 00000000..3d05b11e --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Flowchart/Blocks.unity @@ -0,0 +1,657 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_GIWorkflowMode: 1 + m_LightmapsMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 3 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_ReflectionCompression: 2 + m_LightingDataAsset: {fileID: 0} + m_RuntimeCPUUsage: 25 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: 0.16666667 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &364295471 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 179118, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 364295477} + - 114: {fileID: 364295476} + - 114: {fileID: 364295475} + - 114: {fileID: 364295474} + - 114: {fileID: 364295473} + - 114: {fileID: 364295472} + m_Layer: 0 + m_Name: Lua + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &364295472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11437776, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 364295471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} + m_Name: + m_EditorClassIdentifier: + fungusModule: 0 + activeLanguage: en + stringTables: [] + registerTypes: + - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} + - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3} +--- !u!114 &364295473 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11483650, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 364295471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} + m_Name: + m_EditorClassIdentifier: + remoteDebugger: 0 +--- !u!114 &364295474 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11499092, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 364295471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} + m_Name: + m_EditorClassIdentifier: + allEnvironments: 0 + luaEnvironment: {fileID: 364295473} + tableName: + registerTypes: 1 + boundTypes: + - UnityEngine.GameObject, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.PrimitiveType, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Component, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Type, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - UnityEngine.SendMessageOptions, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.SceneManagement.Scene, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Vector2, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - Fungus.Variable, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.Command, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.CommandInfoAttribute, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + boundObjects: + - key: flowchart + obj: {fileID: 2088062867} + component: {fileID: 2088062874} +--- !u!114 &364295475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11417560, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 364295471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 446caeace65234baaacd52095d24f101, type: 3} + m_Name: + m_EditorClassIdentifier: + luaEnvironment: {fileID: 364295473} + luaFile: {fileID: 0} + luaScript: '-- Run Block A and wait until it finishes + + runblock(flowchart, "BlockA") + + + -- Rub Block B and don''t wait + + runblock(flowchart, "BlockB", true) + + + -- This prints to the console while BlockB is still running + + print("Lua script finished") + +' + runAsCoroutine: 1 +--- !u!114 &364295476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11415008, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 364295471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ee79785811ba49399c1b56d7309e3df, type: 3} + m_Name: + m_EditorClassIdentifier: + executeAfterTime: 1 + repeatExecuteTime: 1 + repeatEveryTime: 1 + executeAfterFrames: 1 + repeatExecuteFrame: 1 + repeatEveryFrame: 1 + hasFailed: 0 + executeMethods: 2 + executeMethodName: OnExecute +--- !u!4 &364295477 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 466848, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 364295471} + 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: 0} + m_RootOrder: 2 +--- !u!1 &700669203 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 700669208} + - 20: {fileID: 700669207} + - 92: {fileID: 700669206} + - 124: {fileID: 700669205} + - 81: {fileID: 700669204} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &700669204 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_Enabled: 1 +--- !u!124 &700669205 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_Enabled: 1 +--- !u!92 &700669206 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_Enabled: 1 +--- !u!20 &700669207 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!4 &700669208 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!1 &712898800 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 712898802} + - 114: {fileID: 712898801} + m_Layer: 0 + m_Name: _FungusState + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &712898801 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 712898800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedFlowchart: {fileID: 2088062874} +--- !u!4 &712898802 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 712898800} + 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: 0} + m_RootOrder: 1 +--- !u!1 &941829309 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 941829313} + - 114: {fileID: 941829312} + - 114: {fileID: 941829311} + - 114: {fileID: 941829310} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &941829310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941829309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ForceModuleActive: 0 +--- !u!114 &941829311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941829309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &941829312 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941829309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &941829313 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941829309} + 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: 0} + m_RootOrder: 4 +--- !u!1 &1703486016 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 105822, guid: d6f174e740b5040c68466fb971c4cec2, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1703486018} + - 114: {fileID: 1703486017} + m_Layer: 0 + m_Name: InfoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1703486017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11442554, guid: d6f174e740b5040c68466fb971c4cec2, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1703486016} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} + m_Name: + m_EditorClassIdentifier: + info: 'This example shows how run Blocks in a Flowchart from Lua. + + + The Lua object has a binding to the Flowchart. The Lua script uses the runblock() + function to start BlockA and BlockB running. + +' +--- !u!4 &1703486018 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 438292, guid: d6f174e740b5040c68466fb971c4cec2, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1703486016} + 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: 0} + m_RootOrder: 5 +--- !u!1 &2088062867 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 2088062875} + - 114: {fileID: 2088062874} + - 114: {fileID: 2088062873} + - 114: {fileID: 2088062877} + - 114: {fileID: 2088062876} + - 114: {fileID: 2088062868} + m_Layer: 0 + m_Name: Flowchart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2088062868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 5 + errorMessage: + indentLevel: 0 + storyText: Executing Block B + description: + character: {fileID: 0} + portrait: {fileID: 0} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + setSayDialog: {fileID: 0} +--- !u!114 &2088062873 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 147 + y: 105 + width: 120 + height: 40 + itemId: 0 + blockName: BlockB + description: + eventHandler: {fileID: 0} + commandList: + - {fileID: 2088062868} +--- !u!114 &2088062874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 400 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -350 + y: -361 + width: 1121 + height: 906 + selectedBlock: {fileID: 2088062873} + selectedCommands: [] + variables: [] + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + showLineNumbers: 0 + hideCommands: [] +--- !u!4 &2088062875 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + 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: 0} + m_RootOrder: 3 +--- !u!114 &2088062876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 4 + errorMessage: + indentLevel: 0 + storyText: Executing Block A + description: + character: {fileID: 0} + portrait: {fileID: 0} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + setSayDialog: {fileID: 0} +--- !u!114 &2088062877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 141 + y: 40 + width: 120 + height: 40 + itemId: 3 + blockName: BlockA + description: + eventHandler: {fileID: 0} + commandList: + - {fileID: 2088062876} diff --git a/Assets/FungusExamples/FungusLua/Flowchart/Blocks.unity.meta b/Assets/FungusExamples/FungusLua/Flowchart/Blocks.unity.meta new file mode 100644 index 00000000..ff894c2d --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Flowchart/Blocks.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0db93d8e5ca44ebf9286329393f03a8 +timeCreated: 1462812880 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: From fc440099b4af708bdbbe075959bbf656ff9a7508 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Mon, 9 May 2016 18:20:22 +0100 Subject: [PATCH 19/20] Added ExecuteLua example --- .../FungusLua/Flowchart/ExecuteLua.unity | 713 ++++++++++++++++++ .../FungusLua/Flowchart/ExecuteLua.unity.meta | 8 + 2 files changed, 721 insertions(+) create mode 100644 Assets/FungusExamples/FungusLua/Flowchart/ExecuteLua.unity create mode 100644 Assets/FungusExamples/FungusLua/Flowchart/ExecuteLua.unity.meta diff --git a/Assets/FungusExamples/FungusLua/Flowchart/ExecuteLua.unity b/Assets/FungusExamples/FungusLua/Flowchart/ExecuteLua.unity new file mode 100644 index 00000000..01728ab1 --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Flowchart/ExecuteLua.unity @@ -0,0 +1,713 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_GIWorkflowMode: 1 + m_LightmapsMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 3 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_ReflectionCompression: 2 + m_LightingDataAsset: {fileID: 0} + m_RuntimeCPUUsage: 25 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: 0.16666667 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &59568984 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 178698, guid: e0c2b90c058ff43f4a56a266d4fa721b, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 59568986} + - 114: {fileID: 59568985} + m_Layer: 0 + m_Name: LuaBindings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &59568985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11414792, guid: e0c2b90c058ff43f4a56a266d4fa721b, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 59568984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} + m_Name: + m_EditorClassIdentifier: + allEnvironments: 1 + luaEnvironment: {fileID: 0} + tableName: + registerTypes: 1 + boundTypes: + - UnityEngine.GameObject, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.PrimitiveType, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Component, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Type, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - UnityEngine.SendMessageOptions, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.SceneManagement.Scene, UnityEngine, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Vector2, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - Fungus.Variable, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.Command, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - Fungus.CommandInfoAttribute, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + boundObjects: + - key: flowchart + obj: {fileID: 2088062867} + component: {fileID: 2088062874} +--- !u!4 &59568986 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 403334, guid: e0c2b90c058ff43f4a56a266d4fa721b, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 59568984} + 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: 0} + m_RootOrder: 1 +--- !u!1 &700669203 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 700669208} + - 20: {fileID: 700669207} + - 92: {fileID: 700669206} + - 124: {fileID: 700669205} + - 81: {fileID: 700669204} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &700669204 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_Enabled: 1 +--- !u!124 &700669205 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_Enabled: 1 +--- !u!92 &700669206 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_Enabled: 1 +--- !u!20 &700669207 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!4 &700669208 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 700669203} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!1 &712898800 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 712898802} + - 114: {fileID: 712898801} + m_Layer: 0 + m_Name: _FungusState + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &712898801 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 712898800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedFlowchart: {fileID: 2088062874} +--- !u!4 &712898802 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 712898800} + 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: 0} + m_RootOrder: 2 +--- !u!1 &941829309 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 941829313} + - 114: {fileID: 941829312} + - 114: {fileID: 941829311} + - 114: {fileID: 941829310} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &941829310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941829309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ForceModuleActive: 0 +--- !u!114 &941829311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941829309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &941829312 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941829309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &941829313 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941829309} + 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: 0} + m_RootOrder: 4 +--- !u!1 &1703486016 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 105822, guid: d6f174e740b5040c68466fb971c4cec2, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1703486018} + - 114: {fileID: 1703486017} + m_Layer: 0 + m_Name: InfoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1703486017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11442554, guid: d6f174e740b5040c68466fb971c4cec2, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1703486016} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} + m_Name: + m_EditorClassIdentifier: + info: 'This example shows how you can use Lua to perform complex calculations involving + multiple variables and maths functions. + + + This example doesn''t require all the components provided in the standard Lua + object, so we''ve just added a LuaBindings object (Tools > Fungus > Create > LuaBindings) + to manage the binding for the Flowchart. + + + The Flowchart has 3 variables, including a Boolean Result variable which stores + the result of the comparison. + + + The Start Block in the Flowchart uses an ExecuteLua command to run the Lua script + which evaluates the required expression and stores the result in the Result boolean + variable. + + + An If command then changes the response to the player based on the value stored + in Result.' +--- !u!4 &1703486018 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 438292, guid: d6f174e740b5040c68466fb971c4cec2, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1703486016} + 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: 0} + m_RootOrder: 5 +--- !u!1 &2088062867 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 2088062875} + - 114: {fileID: 2088062874} + - 114: {fileID: 2088062873} + - 114: {fileID: 2088062872} + - 114: {fileID: 2088062870} + - 114: {fileID: 2088062869} + - 114: {fileID: 2088062868} + - 114: {fileID: 2088062871} + - 114: {fileID: 2088062880} + - 114: {fileID: 2088062879} + - 114: {fileID: 2088062878} + - 114: {fileID: 2088062877} + - 114: {fileID: 2088062876} + m_Layer: 0 + m_Name: Flowchart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2088062868 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 71f455683d4ba4405b8dbba457159620, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + errorMessage: + indentLevel: 0 + luaEnvironment: {fileID: 0} + luaFile: {fileID: 0} + luaScript: "-- Check if player has a rock and score > 20 \n\n-- Get references to + the Flowchart variables\nlocal hasrock = getvar(flowchart, \"HasRock\")\nlocal + score = getvar(flowchart, \"Score\")\n\n-- Evaluate a complex condition, and return + it\n-- Remember to use .value to access the actual value\n\nreturn hasrock.value + == true and score.value > 10" + runAsCoroutine: 1 + waitUntilFinished: 1 + returnVariable: {fileID: 2088062869} +--- !u!114 &2088062869 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d02d9822eec54c98afe95bb497211b3, type: 3} + m_Name: + m_EditorClassIdentifier: + scope: 0 + key: Result + value: 0 +--- !u!114 &2088062870 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d02d9822eec54c98afe95bb497211b3, type: 3} + m_Name: + m_EditorClassIdentifier: + scope: 1 + key: HasRock + value: 1 +--- !u!114 &2088062871 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: afb91b566ceda411bad1e9d3c3243ecc, type: 3} + m_Name: + m_EditorClassIdentifier: + scope: 0 + key: Score + value: 20 +--- !u!114 &2088062872 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 2088062873} +--- !u!114 &2088062873 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 67 + y: 70 + width: 120 + height: 40 + itemId: 0 + blockName: Start + description: + eventHandler: {fileID: 2088062872} + commandList: + - {fileID: 2088062868} + - {fileID: 2088062880} + - {fileID: 2088062878} + - {fileID: 2088062877} + - {fileID: 2088062876} + - {fileID: 2088062879} +--- !u!114 &2088062874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 400 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -343 + y: -340 + width: 1114 + height: 859 + selectedBlock: {fileID: 2088062873} + selectedCommands: [] + variables: + - {fileID: 2088062870} + - {fileID: 2088062871} + - {fileID: 2088062869} + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + showLineNumbers: 0 + hideCommands: [] +--- !u!4 &2088062875 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + 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: 0} + m_RootOrder: 3 +--- !u!114 &2088062876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 6 + errorMessage: + indentLevel: 1 + storyText: I'm not angry, I'm just dissappointed. + description: + character: {fileID: 0} + portrait: {fileID: 0} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + setSayDialog: {fileID: 0} +--- !u!114 &2088062877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fa968f01a7f9496bb50e13dfe16760d, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 5 + errorMessage: + indentLevel: 0 +--- !u!114 &2088062878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 4 + errorMessage: + indentLevel: 1 + storyText: 'Level Up! + +' + description: + character: {fileID: 0} + portrait: {fileID: 0} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + stopVoiceover: 1 + setSayDialog: {fileID: 0} +--- !u!114 &2088062879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cb9773f2ca04e2bbf7a68ccfc23267, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 3 + errorMessage: + indentLevel: 0 +--- !u!114 &2088062880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2088062867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70c5622b8a80845c980954170295f292, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + errorMessage: + indentLevel: 0 + compareOperator: 0 + variable: {fileID: 2088062869} + booleanData: + booleanRef: {fileID: 0} + booleanVal: 1 + integerData: + integerRef: {fileID: 0} + integerVal: 0 + floatData: + floatRef: {fileID: 0} + floatVal: 0 + stringData: + stringRef: {fileID: 0} + stringVal: diff --git a/Assets/FungusExamples/FungusLua/Flowchart/ExecuteLua.unity.meta b/Assets/FungusExamples/FungusLua/Flowchart/ExecuteLua.unity.meta new file mode 100644 index 00000000..b543171a --- /dev/null +++ b/Assets/FungusExamples/FungusLua/Flowchart/ExecuteLua.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01ba5446fffc24f34995fb9313c4f454 +timeCreated: 1462813523 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: From 6c0c75cefa7d158060b3b05960f0492ae230b17b Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Mon, 9 May 2016 18:25:28 +0100 Subject: [PATCH 20/20] Updated Trigger example --- .../FungusLua/Trigger/Trigger.unity | 1086 +---------------- 1 file changed, 18 insertions(+), 1068 deletions(-) diff --git a/Assets/FungusExamples/FungusLua/Trigger/Trigger.unity b/Assets/FungusExamples/FungusLua/Trigger/Trigger.unity index f9268f00..5d3d9d39 100644 --- a/Assets/FungusExamples/FungusLua/Trigger/Trigger.unity +++ b/Assets/FungusExamples/FungusLua/Trigger/Trigger.unity @@ -145,7 +145,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 --- !u!1 &141306350 GameObject: m_ObjectHideFlags: 0 @@ -221,7 +221,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 --- !u!54 &141306355 Rigidbody: m_ObjectHideFlags: 0 @@ -264,11 +264,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8c0cbb63e218a4414a796a60ffe37dd3, type: 3} m_Name: m_EditorClassIdentifier: - info: "This example shows how to execute a Lua script form a trigger event.\n\nThe - CubeTrigger object has ExecuteHandler and LuaScript components attached. The ExecuteHandler - has been set to execute the LuaScript component when a trigger enter event happens. - \n\nThe LuaBindings object looks after registering the Flowchart and SayDialog - objects so we can access them from Lua." + info: 'This example shows how to execute a Lua script from a Unity trigger event. + + + The CubeTrigger object has ExecuteHandler and LuaScript components attached. The + ExecuteHandler has been set to execute the LuaScript component when a trigger + enter event happens. If you want to execute a LuaScript component from C# script, + simply call its OnExecute() method. + + + You can find the ExecuteHandler and LuaScript components in Fungus/ThirdParty/FungusLua/Scripts' --- !u!4 &229439459 Transform: m_ObjectHideFlags: 0 @@ -280,7 +285,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 6 --- !u!1 &517355049 GameObject: m_ObjectHideFlags: 1 @@ -308,7 +313,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 913136539} + selectedFlowchart: {fileID: 0} --- !u!4 &517355051 Transform: m_ObjectHideFlags: 1 @@ -320,864 +325,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 ---- !u!1 &775333277 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 178698, guid: e0c2b90c058ff43f4a56a266d4fa721b, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 775333279} - - 114: {fileID: 775333278} - m_Layer: 0 - m_Name: LuaBindings - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &775333278 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11414792, guid: e0c2b90c058ff43f4a56a266d4fa721b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 775333277} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} - m_Name: - m_EditorClassIdentifier: - allEnvironments: 1 - luaEnvironment: {fileID: 0} - tableName: - registerTypes: 1 - boundTypes: - - UnityEngine.GameObject, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.PrimitiveType, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.Component, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Type, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - UnityEngine.SendMessageOptions, UnityEngine, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null - - UnityEngine.SceneManagement.Scene, UnityEngine, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null - - UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.Vector2, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fungus.Variable, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Fungus.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Fungus.Command, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Fungus.CommandInfoAttribute, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null - - UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Fungus.SayDialog, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.AudioClip, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Fungus.Character, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.Sprite, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.Color, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.UI.Button, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.Canvas, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.UI.Text, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.UI.Image, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - boundObjects: - - key: flowchart - obj: {fileID: 913136538} - component: {fileID: 913136539} - - key: saydialog - obj: {fileID: 974098819} - component: {fileID: 974098824} ---- !u!4 &775333279 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 403334, guid: e0c2b90c058ff43f4a56a266d4fa721b, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 775333277} - 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: 0} - m_RootOrder: 3 ---- !u!1 &913136538 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 913136543} - - 114: {fileID: 913136539} - - 114: {fileID: 913136541} - - 114: {fileID: 913136540} - m_Layer: 0 - m_Name: Flowchart - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &913136539 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 913136538} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 1 - scrollPos: {x: 0, y: 0} - variablesScrollPos: {x: 0, y: 0} - variablesExpanded: 1 - blockViewHeight: 400 - zoom: 1 - scrollViewRect: - serializedVersion: 2 - x: -343 - y: -340 - width: 1114 - height: 859 - selectedBlock: {fileID: 913136541} - selectedCommands: [] - variables: [] - description: 'This example shows how to execute a Block in a Flowchart via a - - Lua script executed by a trigger.' - stepPause: 0 - colorCommands: 1 - hideComponents: 1 - saveSelection: 1 - localizationId: - showLineNumbers: 0 - hideCommands: [] ---- !u!114 &913136540 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 913136538} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 1 - errorMessage: - indentLevel: 0 - storyText: Block is executing - description: - character: {fileID: 0} - portrait: {fileID: 0} - voiceOverClip: {fileID: 0} - showAlways: 1 - showCount: 1 - extendPrevious: 0 - fadeWhenDone: 1 - waitForClick: 1 - stopVoiceover: 1 - setSayDialog: {fileID: 0} ---- !u!114 &913136541 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 913136538} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} - m_Name: - m_EditorClassIdentifier: - nodeRect: - serializedVersion: 2 - x: 67 - y: 69 - width: 120 - height: 40 - itemId: 0 - blockName: Start - description: - eventHandler: {fileID: 0} - commandList: - - {fileID: 913136540} ---- !u!4 &913136543 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 913136538} - 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: 0} - m_RootOrder: 6 ---- !u!1 &974098819 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 974098829} - - 223: {fileID: 974098828} - - 114: {fileID: 974098827} - - 225: {fileID: 974098826} - - 114: {fileID: 974098825} - - 114: {fileID: 974098824} - - 114: {fileID: 974098823} - - 114: {fileID: 974098822} - - 114: {fileID: 974098821} - - 82: {fileID: 974098820} - m_Layer: 5 - m_Name: SayDialog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &974098820 -AudioSource: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 8294266, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 974098819} - 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 - Spatialize: 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 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 0 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 0 ---- !u!114 &974098821 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11481894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 974098819} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 43b85556abd314f3f870c18c013fdcef, type: 3} - m_Name: - m_EditorClassIdentifier: - clickMode: 1 - keyPressMode: 2 - shiftKeyEnabled: 1 - nextClickDelay: 0 - keyList: 0900000020000000 - ignoreMenuClicks: 1 ---- !u!114 &974098822 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11404316, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 974098819} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c4782cf42f2644447b9631f6e522160b, type: 3} - m_Name: - m_EditorClassIdentifier: - volume: 1 - loop: 1 - targetAudioSource: {fileID: 0} - audioMode: 0 - beepSounds: - - {fileID: 8300000, guid: 774486030b696474e8b3cf7f178123da, type: 3} - - {fileID: 8300000, guid: f637c5ce9d10e45c7855ed89bfc6b97e, type: 3} - - {fileID: 8300000, guid: c53b7c20372e444c6bd7f2ac0729bbe2, type: 3} - soundEffect: {fileID: 0} - inputSound: {fileID: 8300000, guid: 14a396b1562834718b2d52b9c4639264, type: 3} ---- !u!114 &974098823 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11487070, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 974098819} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a676940fce6344af1a70043b089a6c14, type: 3} - m_Name: - m_EditorClassIdentifier: - targetTextObject: {fileID: 1248777639} - punchObject: {fileID: 1918243061} - writingSpeed: 60 - punctuationPause: 0.25 - hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} - writeWholeWords: 0 - forceRichText: 1 - instantComplete: 1 ---- !u!114 &974098824 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 974098819} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3a0bbe22c246e4c78ad8e9816cbae9d5, type: 3} - m_Name: - m_EditorClassIdentifier: - fadeDuration: 0.25 - continueButton: {fileID: 992052331} - dialogCanvas: {fileID: 974098828} - nameText: {fileID: 2103744777} - storyText: {fileID: 1248777642} - characterImage: {fileID: 1073217513} - fitTextWithImage: 1 ---- !u!114 &974098825 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11486804, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 974098819} - 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 &974098826 -CanvasGroup: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22588896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 974098819} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &974098827 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488906, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 974098819} - 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 &974098828 -Canvas: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22388894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 974098819} - 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_SortingBucketNormalizedSize: 0 - m_SortingLayerID: 0 - m_SortingOrder: 1 - m_TargetDisplay: 0 ---- !u!224 &974098829 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 974098819} - 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: 1918243066} - m_Father: {fileID: 0} - m_RootOrder: 1 - 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!1 &992052329 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 180152, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 992052330} - - 222: {fileID: 992052333} - - 114: {fileID: 992052332} - - 114: {fileID: 992052331} - m_Layer: 5 - m_Name: Continue - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &992052330 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22433354, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 992052329} - 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: 1281831295} - m_Father: {fileID: 1248777640} - m_RootOrder: 1 - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -38.900024, y: 38.074993} - m_SizeDelta: {x: 77.900024, y: 77} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &992052331 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11419088, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 992052329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 992052332} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 974098821} - m_MethodName: SetButtonClickedFlag - 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.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &992052332 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11493918, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 992052329} - 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_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 226248ac6f184e448af731df91b91958, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &992052333 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22268826, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 992052329} ---- !u!1 &1073217510 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1073217511} - - 222: {fileID: 1073217514} - - 114: {fileID: 1073217513} - - 114: {fileID: 1073217512} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1073217511 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1073217510} - 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: 1918243066} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1386, y: 263.13} - m_SizeDelta: {x: 357, y: 435} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1073217512 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11439142, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1073217510} - 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 &1073217513 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1073217510} - 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_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - 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 &1073217514 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22248914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1073217510} ---- !u!1 &1248777639 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1248777640} - - 222: {fileID: 1248777643} - - 114: {fileID: 1248777642} - - 114: {fileID: 1248777641} - m_Layer: 5 - m_Name: StoryText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1248777640 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1248777639} - 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: 2103744776} - - {fileID: 992052330} - m_Father: {fileID: 1918243066} - m_RootOrder: 1 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 799, y: 145.63} - m_SizeDelta: {x: 1531, y: 200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1248777641 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11439138, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1248777639} - 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 &1248777642 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1248777639} - 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_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 79197ecfbc3a4294a89ce589dac02cf2, type: 3} - m_FontSize: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 50 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Story text ---- !u!222 &1248777643 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22288894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1248777639} ---- !u!1 &1281831294 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 155030, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1281831295} - - 222: {fileID: 1281831297} - - 114: {fileID: 1281831296} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1281831295 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22443574, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1281831294} - 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: 992052330} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1281831296 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11431470, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1281831294} - 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: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: ---- !u!222 &1281831297 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22257884, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1281831294} + m_RootOrder: 4 --- !u!1 &1437227275 GameObject: m_ObjectHideFlags: 0 @@ -1254,7 +402,7 @@ Transform: m_LocalScale: {x: 1.1810303, y: 1.1810303, z: 1.1810303} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 3 --- !u!114 &1437227280 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1268,12 +416,7 @@ MonoBehaviour: m_EditorClassIdentifier: luaEnvironment: {fileID: 0} luaFile: {fileID: 0} - luaScript: 'runblock(flowchart, "Start") - - - setsaydialog(saydialog) - - say("Block is finished");' + luaScript: say("Entered Trigger"); runAsCoroutine: 1 --- !u!114 &1437227281 MonoBehaviour: @@ -1368,124 +511,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 ---- !u!1 &1918243061 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1918243066} - - 222: {fileID: 1918243065} - - 114: {fileID: 1918243064} - - 225: {fileID: 1918243063} - - 114: {fileID: 1918243062} - m_Layer: 5 - m_Name: Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1918243062 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11478524, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1918243061} - 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: 974098821} - 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 &1918243063 -CanvasGroup: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22583964, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1918243061} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &1918243064 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488904, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1918243061} - 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_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - 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 &1918243065 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22288900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1918243061} ---- !u!224 &1918243066 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1918243061} - 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: 1073217511} - - {fileID: 1248777640} - m_Father: {fileID: 974098829} - m_RootOrder: 0 - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -805, y: 0} - m_SizeDelta: {x: 1605, y: 335} - m_Pivot: {x: 0, y: 0} + m_RootOrder: 5 --- !u!1 &2071052756 GameObject: m_ObjectHideFlags: 0 @@ -1572,79 +598,3 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!1 &2103744775 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 2103744776} - - 222: {fileID: 2103744778} - - 114: {fileID: 2103744777} - m_Layer: 5 - m_Name: NameText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2103744776 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2103744775} - 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: 1248777640} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 588.75, y: 235.37001} - m_SizeDelta: {x: 1178.5, y: 71} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2103744777 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2103744775} - 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: 0.25882354, g: 0.25490198, b: 0.2627451, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} - m_FontSize: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 50 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Character Name ---- !u!222 &2103744778 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22288898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2103744775}