Browse Source

Fixed up node graphs for example scenes

master
chrisgregan 10 years ago
parent
commit
6af52b3452
  1. 73
      Assets/Examples/JumpingPrax/JumpingPrax.unity
  2. 123
      Assets/Examples/TheFacility/TheFacility.unity
  3. 50
      Assets/Examples/iTween/iTween.unity
  4. 5
      Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs

73
Assets/Examples/JumpingPrax/JumpingPrax.unity

@ -232,7 +232,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: 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 zoom: 1
scrollViewRect: scrollViewRect:
serializedVersion: 2 serializedVersion: 2
@ -240,9 +242,8 @@ MonoBehaviour:
y: -608 y: -608
width: 2140 width: 2140
height: 1416 height: 1416
selectedSequence: {fileID: 1947290628} selectedSequence: {fileID: 1059081933}
selectedCommands: selectedCommands: []
- {fileID: 1947290640}
variables: variables:
- {fileID: 16019625} - {fileID: 16019625}
startSequence: {fileID: 1947290628} startSequence: {fileID: 1947290628}
@ -895,10 +896,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nodeRect: nodeRect:
serializedVersion: 2 serializedVersion: 2
x: -630 x: -314
y: -139 y: -98
width: 240 width: 120
height: 134 height: 30
sequenceName: StopJumping sequenceName: StopJumping
commandList: commandList:
- {fileID: 418947481} - {fileID: 418947481}
@ -1648,6 +1649,46 @@ Prefab:
m_RootGameObject: {fileID: 102763370} m_RootGameObject: {fileID: 102763370}
m_IsPrefabParent: 0 m_IsPrefabParent: 0
m_IsExploded: 1 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 --- !u!1 &982770892
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1905,10 +1946,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nodeRect: nodeRect:
serializedVersion: 2 serializedVersion: 2
x: -49 x: -152
y: -145 y: -152
width: 240 width: 120
height: 74 height: 30
sequenceName: BackToTheStart sequenceName: BackToTheStart
commandList: commandList:
- {fileID: 1059081935} - {fileID: 1059081935}
@ -3340,10 +3381,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nodeRect: nodeRect:
serializedVersion: 2 serializedVersion: 2
x: -343 x: -314
y: 27 y: -201
width: 240 width: 120
height: 334 height: 30
sequenceName: Start sequenceName: Start
commandList: commandList:
- {fileID: 1947290641} - {fileID: 1947290641}

123
Assets/Examples/TheFacility/TheFacility.unity

@ -157,10 +157,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nodeRect: nodeRect:
serializedVersion: 2 serializedVersion: 2
x: 1470.05457 x: 1115.35596
y: -118.735016 y: 17.5333862
width: 240 width: 120
height: 514 height: 30
sequenceName: TryVoice sequenceName: TryVoice
commandList: commandList:
- {fileID: 57262726} - {fileID: 57262726}
@ -1325,6 +1325,46 @@ RectTransform:
m_AnchoredPosition: {x: 266.5, y: -82.6052704} m_AnchoredPosition: {x: 266.5, y: -82.6052704}
m_SizeDelta: {x: 533, y: 33.0421066} m_SizeDelta: {x: 533, y: 33.0421066}
m_Pivot: {x: .5, y: .5} 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 --- !u!1 &570845513
GameObject: GameObject:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@ -1370,10 +1410,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nodeRect: nodeRect:
serializedVersion: 2 serializedVersion: 2
x: 804.489258 x: 734.351135
y: -118.825607 y: 17.4427872
width: 240 width: 120
height: 354 height: 30
sequenceName: StandingThere sequenceName: StandingThere
commandList: commandList:
- {fileID: 570845522} - {fileID: 570845522}
@ -2016,10 +2056,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nodeRect: nodeRect:
serializedVersion: 2 serializedVersion: 2
x: 272.156677 x: 737.76062
y: 372.185455 y: 182.838104
width: 240 width: 120
height: 254 height: 30
sequenceName: OpenA147 sequenceName: OpenA147
commandList: commandList:
- {fileID: 684444681} - {fileID: 684444681}
@ -2497,17 +2537,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrollPos: {x: -194.05423, y: 156.7798} scrollPos: {x: -440.05423, y: 55.7798004}
zoom: .968997777 variablesScrollPos: {x: 0, y: 0}
variablesExpanded: 1
zoom: 1
scrollViewRect: scrollViewRect:
serializedVersion: 2 serializedVersion: 2
x: -1118.14856 x: -1118.14856
y: -610.734985 y: -610.734985
width: 3261.20312 width: 3261.20312
height: 2227.35059 height: 2227.35059
selectedSequence: {fileID: 1797174374} selectedSequence: {fileID: 0}
selectedCommands: selectedCommands: []
- {fileID: 1797174373}
variables: variables:
- {fileID: 771014102} - {fileID: 771014102}
- {fileID: 771014103} - {fileID: 771014103}
@ -2755,10 +2796,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nodeRect: nodeRect:
serializedVersion: 2 serializedVersion: 2
x: 871.185425 x: 918.288086
y: 383.865509 y: 99.3444824
width: 240 width: 120
height: 314 height: 30
sequenceName: DoorTalk sequenceName: DoorTalk
commandList: commandList:
- {fileID: 904348477} - {fileID: 904348477}
@ -3199,10 +3240,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nodeRect: nodeRect:
serializedVersion: 2 serializedVersion: 2
x: 597.577087 x: 737.837646
y: 383.176605 y: 98.6635132
width: 240 width: 120
height: 254 height: 30
sequenceName: How sequenceName: How
commandList: commandList:
- {fileID: 948050628} - {fileID: 948050628}
@ -4577,10 +4618,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nodeRect: nodeRect:
serializedVersion: 2 serializedVersion: 2
x: 1138.65356 x: 920.223206
y: -118.559326 y: 17.7090759
width: 240 width: 120
height: 374 height: 30
sequenceName: InspectDeskFirst sequenceName: InspectDeskFirst
commandList: commandList:
- {fileID: 1680954166} - {fileID: 1680954166}
@ -5224,10 +5265,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nodeRect: nodeRect:
serializedVersion: 2 serializedVersion: 2
x: 501.703979 x: 557.814453
y: -117.210686 y: 17.053772
width: 240 width: 120
height: 234 height: 30
sequenceName: Start sequenceName: Start
commandList: commandList:
- {fileID: 1797174373} - {fileID: 1797174373}
@ -5490,10 +5531,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nodeRect: nodeRect:
serializedVersion: 2 serializedVersion: 2
x: 1173.2124 x: 1112.09448
y: 380.727905 y: 99.2148132
width: 240 width: 120
height: 274 height: 30
sequenceName: LightsOnVoice sequenceName: LightsOnVoice
commandList: commandList:
- {fileID: 1824373605} - {fileID: 1824373605}
@ -5892,10 +5933,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nodeRect: nodeRect:
serializedVersion: 2 serializedVersion: 2
x: 234.655121 x: 559.306458
y: 207.536453 y: 100.366745
width: 240 width: 120
height: 94 height: 30
sequenceName: FREEDOM! sequenceName: FREEDOM!
commandList: commandList:
- {fileID: 1925614673} - {fileID: 1925614673}

50
Assets/Examples/iTween/iTween.unity

@ -274,10 +274,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
nodeRect: nodeRect:
serializedVersion: 2 serializedVersion: 2
x: 60 x: 162
y: 60 y: 214
width: 240 width: 120
height: 454 height: 30
sequenceName: Test iTween sequenceName: Test iTween
commandList: commandList:
- {fileID: 868138995} - {fileID: 868138995}
@ -313,6 +313,8 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrollPos: {x: 163, y: -41} scrollPos: {x: 163, y: -41}
variablesScrollPos: {x: 0, y: 0}
variablesExpanded: 1
zoom: 1 zoom: 1
scrollViewRect: scrollViewRect:
serializedVersion: 2 serializedVersion: 2
@ -963,3 +965,43 @@ SpriteRenderer:
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} 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

5
Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs

@ -37,6 +37,11 @@ namespace Fungus
followExecution = true; followExecution = true;
} }
protected void OnInspectorUpdate()
{
Repaint();
}
static public FungusScript GetFungusScript() static public FungusScript GetFungusScript()
{ {
// Using a temp hidden object to track the active Fungus Script across // Using a temp hidden object to track the active Fungus Script across

Loading…
Cancel
Save