From 6af52b34529690667c55450382f26ff0f4dc520a Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Tue, 11 Nov 2014 09:53:18 +0000 Subject: [PATCH] Fixed up node graphs for example scenes --- Assets/Examples/JumpingPrax/JumpingPrax.unity | 73 ++++++++--- Assets/Examples/TheFacility/TheFacility.unity | 123 ++++++++++++------ Assets/Examples/iTween/iTween.unity | 50 ++++++- .../FungusScript/Editor/FungusScriptWindow.cs | 5 + 4 files changed, 190 insertions(+), 61 deletions(-) diff --git a/Assets/Examples/JumpingPrax/JumpingPrax.unity b/Assets/Examples/JumpingPrax/JumpingPrax.unity index 8a6e643c..79c15e2b 100644 --- a/Assets/Examples/JumpingPrax/JumpingPrax.unity +++ b/Assets/Examples/JumpingPrax/JumpingPrax.unity @@ -232,7 +232,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} m_Name: m_EditorClassIdentifier: - scrollPos: {x: 659.026611, y: 230.028076} + scrollPos: {x: 698.026611, y: 312.028076} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 zoom: 1 scrollViewRect: serializedVersion: 2 @@ -240,9 +242,8 @@ MonoBehaviour: y: -608 width: 2140 height: 1416 - selectedSequence: {fileID: 1947290628} - selectedCommands: - - {fileID: 1947290640} + selectedSequence: {fileID: 1059081933} + selectedCommands: [] variables: - {fileID: 16019625} startSequence: {fileID: 1947290628} @@ -895,10 +896,10 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -630 - y: -139 - width: 240 - height: 134 + x: -314 + y: -98 + width: 120 + height: 30 sequenceName: StopJumping commandList: - {fileID: 418947481} @@ -1648,6 +1649,46 @@ Prefab: m_RootGameObject: {fileID: 102763370} m_IsPrefabParent: 0 m_IsExploded: 1 +--- !u!1 &975464276 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 975464278} + - 114: {fileID: 975464277} + m_Layer: 0 + m_Name: _FungusState + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &975464277 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 975464276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedFungusScript: {fileID: 16019623} +--- !u!4 &975464278 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 975464276} + 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!1 &982770892 GameObject: m_ObjectHideFlags: 0 @@ -1905,10 +1946,10 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -49 - y: -145 - width: 240 - height: 74 + x: -152 + y: -152 + width: 120 + height: 30 sequenceName: BackToTheStart commandList: - {fileID: 1059081935} @@ -3340,10 +3381,10 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -343 - y: 27 - width: 240 - height: 334 + x: -314 + y: -201 + width: 120 + height: 30 sequenceName: Start commandList: - {fileID: 1947290641} diff --git a/Assets/Examples/TheFacility/TheFacility.unity b/Assets/Examples/TheFacility/TheFacility.unity index 3178436e..ee9042b9 100644 --- a/Assets/Examples/TheFacility/TheFacility.unity +++ b/Assets/Examples/TheFacility/TheFacility.unity @@ -157,10 +157,10 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 1470.05457 - y: -118.735016 - width: 240 - height: 514 + x: 1115.35596 + y: 17.5333862 + width: 120 + height: 30 sequenceName: TryVoice commandList: - {fileID: 57262726} @@ -1325,6 +1325,46 @@ RectTransform: m_AnchoredPosition: {x: 266.5, y: -82.6052704} m_SizeDelta: {x: 533, y: 33.0421066} m_Pivot: {x: .5, y: .5} +--- !u!1 &552372303 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 552372305} + - 114: {fileID: 552372304} + m_Layer: 0 + m_Name: _FungusState + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &552372304 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 552372303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedFungusScript: {fileID: 771014100} +--- !u!4 &552372305 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 552372303} + 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!1 &570845513 GameObject: m_ObjectHideFlags: 1 @@ -1370,10 +1410,10 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 804.489258 - y: -118.825607 - width: 240 - height: 354 + x: 734.351135 + y: 17.4427872 + width: 120 + height: 30 sequenceName: StandingThere commandList: - {fileID: 570845522} @@ -2016,10 +2056,10 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 272.156677 - y: 372.185455 - width: 240 - height: 254 + x: 737.76062 + y: 182.838104 + width: 120 + height: 30 sequenceName: OpenA147 commandList: - {fileID: 684444681} @@ -2497,17 +2537,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} m_Name: m_EditorClassIdentifier: - scrollPos: {x: -194.05423, y: 156.7798} - zoom: .968997777 + scrollPos: {x: -440.05423, y: 55.7798004} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + zoom: 1 scrollViewRect: serializedVersion: 2 x: -1118.14856 y: -610.734985 width: 3261.20312 height: 2227.35059 - selectedSequence: {fileID: 1797174374} - selectedCommands: - - {fileID: 1797174373} + selectedSequence: {fileID: 0} + selectedCommands: [] variables: - {fileID: 771014102} - {fileID: 771014103} @@ -2755,10 +2796,10 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 871.185425 - y: 383.865509 - width: 240 - height: 314 + x: 918.288086 + y: 99.3444824 + width: 120 + height: 30 sequenceName: DoorTalk commandList: - {fileID: 904348477} @@ -3199,10 +3240,10 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 597.577087 - y: 383.176605 - width: 240 - height: 254 + x: 737.837646 + y: 98.6635132 + width: 120 + height: 30 sequenceName: How commandList: - {fileID: 948050628} @@ -4577,10 +4618,10 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 1138.65356 - y: -118.559326 - width: 240 - height: 374 + x: 920.223206 + y: 17.7090759 + width: 120 + height: 30 sequenceName: InspectDeskFirst commandList: - {fileID: 1680954166} @@ -5224,10 +5265,10 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 501.703979 - y: -117.210686 - width: 240 - height: 234 + x: 557.814453 + y: 17.053772 + width: 120 + height: 30 sequenceName: Start commandList: - {fileID: 1797174373} @@ -5490,10 +5531,10 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 1173.2124 - y: 380.727905 - width: 240 - height: 274 + x: 1112.09448 + y: 99.2148132 + width: 120 + height: 30 sequenceName: LightsOnVoice commandList: - {fileID: 1824373605} @@ -5892,10 +5933,10 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 234.655121 - y: 207.536453 - width: 240 - height: 94 + x: 559.306458 + y: 100.366745 + width: 120 + height: 30 sequenceName: FREEDOM! commandList: - {fileID: 1925614673} diff --git a/Assets/Examples/iTween/iTween.unity b/Assets/Examples/iTween/iTween.unity index 6187bac2..2248560e 100644 --- a/Assets/Examples/iTween/iTween.unity +++ b/Assets/Examples/iTween/iTween.unity @@ -274,10 +274,10 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 60 - y: 60 - width: 240 - height: 454 + x: 162 + y: 214 + width: 120 + height: 30 sequenceName: Test iTween commandList: - {fileID: 868138995} @@ -313,6 +313,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scrollPos: {x: 163, y: -41} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 zoom: 1 scrollViewRect: serializedVersion: 2 @@ -963,3 +965,43 @@ SpriteRenderer: m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!1 &1971204863 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1971204865} + - 114: {fileID: 1971204864} + m_Layer: 0 + m_Name: _FungusState + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1971204864 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1971204863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedFungusScript: {fileID: 868138993} +--- !u!4 &1971204865 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1971204863} + 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 diff --git a/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs index c84ec9e8..ba80254f 100755 --- a/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs +++ b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs @@ -37,6 +37,11 @@ namespace Fungus followExecution = true; } + protected void OnInspectorUpdate() + { + Repaint(); + } + static public FungusScript GetFungusScript() { // Using a temp hidden object to track the active Fungus Script across