Browse Source

Fixes for Unity 4.6 beta RC 2

You will need to update Unity to RC 2 to avail of these UI fixes.
master
chrisgregan 10 years ago
parent
commit
c3e17c9ca7
  1. 48
      Assets/Examples/JumpingPrax/JumpingPrax.unity
  2. 76
      Assets/Examples/TheFacility/Prefabs/CYOAChooseDialog.prefab
  3. 22
      Assets/Examples/TheFacility/Prefabs/CYOASayDialog.prefab
  4. 402
      Assets/Examples/TheFacility/TheFacility.unity
  5. 517
      Assets/Examples/TheHunter/TheHunter.unity
  6. 2
      Assets/Examples/iTween/iTween.unity
  7. 28
      Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab
  8. 18
      Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab
  9. 20
      Assets/Fungus/Dialog/Prefabs/SayDialog.prefab

48
Assets/Examples/JumpingPrax/JumpingPrax.unity

@ -169,6 +169,7 @@ Canvas:
m_PixelPerfect: 0 m_PixelPerfect: 0
m_ReceivesEvents: 1 m_ReceivesEvents: 1
m_OverrideSorting: 0 m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 0 m_SortingOrder: 0
--- !u!114 &10082985 --- !u!114 &10082985
@ -180,12 +181,19 @@ MonoBehaviour:
m_GameObject: {fileID: 10082982} m_GameObject: {fileID: 10082982}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Resolution: {x: 1024, y: 768} m_UiScaleMode: 1
m_CanvasScaleMode: 0 m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1024, y: 768}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0 m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!114 &10082986 --- !u!114 &10082986
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -363,7 +371,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 35344133} m_GameObject: {fileID: 35344133}
m_HideIfInvisible: 0
--- !u!1 &54732628 --- !u!1 &54732628
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -428,7 +435,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 54732628} m_GameObject: {fileID: 54732628}
m_HideIfInvisible: 0
--- !u!1 &67146554 --- !u!1 &67146554
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -548,7 +554,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 89485189} m_GameObject: {fileID: 89485189}
m_HideIfInvisible: 0
--- !u!1 &102763370 --- !u!1 &102763370
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -684,6 +689,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0} m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1 m_sendNavigationEvents: 1
m_DragThreshold: 5
--- !u!4 &171864911 --- !u!4 &171864911
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -788,7 +794,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 211668427} m_GameObject: {fileID: 211668427}
m_HideIfInvisible: 0
--- !u!1 &323796711 --- !u!1 &323796711
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1065,7 +1070,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 492670789} m_GameObject: {fileID: 492670789}
m_HideIfInvisible: 0
--- !u!1001 &544268548 --- !u!1001 &544268548
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1360,7 +1364,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 689227472} m_GameObject: {fileID: 689227472}
m_HideIfInvisible: 0
--- !u!1 &730247361 --- !u!1 &730247361
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1480,7 +1483,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1467280113} m_PrefabInternal: {fileID: 1467280113}
m_GameObject: {fileID: 904137534} m_GameObject: {fileID: 904137534}
m_HideIfInvisible: 0
--- !u!1 &927527735 --- !u!1 &927527735
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1751,7 +1753,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1467280113} m_PrefabInternal: {fileID: 1467280113}
m_GameObject: {fileID: 982770892} m_GameObject: {fileID: 982770892}
m_HideIfInvisible: 0
--- !u!1 &1042837580 --- !u!1 &1042837580
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1804,6 +1805,7 @@ Canvas:
m_PixelPerfect: 0 m_PixelPerfect: 0
m_ReceivesEvents: 1 m_ReceivesEvents: 1
m_OverrideSorting: 0 m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 0 m_SortingOrder: 0
--- !u!114 &1042837583 --- !u!114 &1042837583
@ -1815,12 +1817,19 @@ MonoBehaviour:
m_GameObject: {fileID: 1042837580} m_GameObject: {fileID: 1042837580}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Resolution: {x: 1024, y: 768} m_UiScaleMode: 1
m_CanvasScaleMode: 0 m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1024, y: 768}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0 m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!114 &1042837584 --- !u!114 &1042837584
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2103,7 +2112,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1467280113} m_PrefabInternal: {fileID: 1467280113}
m_GameObject: {fileID: 1245657369} m_GameObject: {fileID: 1245657369}
m_HideIfInvisible: 0
--- !u!114 &1245657373 --- !u!114 &1245657373
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2274,7 +2282,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 1251849278} m_GameObject: {fileID: 1251849278}
m_HideIfInvisible: 0
--- !u!1 &1261834498 --- !u!1 &1261834498
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2514,7 +2521,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 1436669959} m_GameObject: {fileID: 1436669959}
m_HideIfInvisible: 0
--- !u!1 &1463702819 --- !u!1 &1463702819
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2584,7 +2590,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 1463702819} m_GameObject: {fileID: 1463702819}
m_HideIfInvisible: 0
--- !u!1001 &1467280113 --- !u!1001 &1467280113
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2770,7 +2775,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1467280113} m_PrefabInternal: {fileID: 1467280113}
m_GameObject: {fileID: 1599807777} m_GameObject: {fileID: 1599807777}
m_HideIfInvisible: 0
--- !u!1 &1679475631 --- !u!1 &1679475631
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2899,7 +2903,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 1679475631} m_GameObject: {fileID: 1679475631}
m_HideIfInvisible: 0
--- !u!1 &1773019752 --- !u!1 &1773019752
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3028,7 +3031,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 1773019752} m_GameObject: {fileID: 1773019752}
m_HideIfInvisible: 0
--- !u!1 &1844806517 --- !u!1 &1844806517
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3188,7 +3190,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 1873765285} m_GameObject: {fileID: 1873765285}
m_HideIfInvisible: 0
--- !u!1 &1898957975 --- !u!1 &1898957975
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3317,7 +3318,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 1898957975} m_GameObject: {fileID: 1898957975}
m_HideIfInvisible: 0
--- !u!1 &1947290626 --- !u!1 &1947290626
GameObject: GameObject:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@ -3828,7 +3828,6 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1467280113} m_PrefabInternal: {fileID: 1467280113}
m_GameObject: {fileID: 2062365599} m_GameObject: {fileID: 2062365599}
m_HideIfInvisible: 0
--- !u!224 &2062365602 --- !u!224 &2062365602
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3982,4 +3981,3 @@ CanvasRenderer:
type: 2} type: 2}
m_PrefabInternal: {fileID: 1215079671} m_PrefabInternal: {fileID: 1215079671}
m_GameObject: {fileID: 2135751344} m_GameObject: {fileID: 2135751344}
m_HideIfInvisible: 0

76
Assets/Examples/TheFacility/Prefabs/CYOAChooseDialog.prefab

@ -399,8 +399,8 @@ MonoBehaviour:
m_HighlightedTrigger: Highlighted m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled m_DisabledTrigger: Disabled
m_TargetGraphic: {fileID: 11400004}
m_Interactable: 1 m_Interactable: 1
m_TargetGraphic: {fileID: 11400004}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -417,7 +417,7 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: .588} m_Color: {r: 1, g: 1, b: 1, a: .588}
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1 m_Type: 1
@ -438,10 +438,10 @@ MonoBehaviour:
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1} m_Color: {r: 0, g: 0, b: 0, a: 1}
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3}
m_FontSize: 14 m_FontSize: 14
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
@ -464,10 +464,10 @@ MonoBehaviour:
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1} m_Color: {r: 0, g: 0, b: 0, a: 1}
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3}
m_FontSize: 14 m_FontSize: 14
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
@ -490,7 +490,7 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: .588} m_Color: {r: 1, g: 1, b: 1, a: .588}
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1 m_Type: 1
@ -534,8 +534,8 @@ MonoBehaviour:
m_HighlightedTrigger: Highlighted m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled m_DisabledTrigger: Disabled
m_TargetGraphic: {fileID: 11400010}
m_Interactable: 1 m_Interactable: 1
m_TargetGraphic: {fileID: 11400010}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -611,8 +611,8 @@ MonoBehaviour:
m_HighlightedTrigger: Highlighted m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled m_DisabledTrigger: Disabled
m_TargetGraphic: {fileID: 11400020}
m_Interactable: 1 m_Interactable: 1
m_TargetGraphic: {fileID: 11400020}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -629,7 +629,7 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: .588} m_Color: {r: 1, g: 1, b: 1, a: .588}
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1 m_Type: 1
@ -650,10 +650,10 @@ MonoBehaviour:
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1} m_Color: {r: 0, g: 0, b: 0, a: 1}
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3}
m_FontSize: 14 m_FontSize: 14
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
@ -680,10 +680,12 @@ MonoBehaviour:
writingSound: {fileID: 0} writingSound: {fileID: 0}
loopWritingSound: 1 loopWritingSound: 1
punctuationPause: .400000006 punctuationPause: .400000006
clickAnywhere: 1
dialogCanvas: {fileID: 22300000} dialogCanvas: {fileID: 22300000}
nameText: {fileID: 0} nameText: {fileID: 0}
storyText: {fileID: 11400048} storyText: {fileID: 11400048}
characterImage: {fileID: 0} characterImage: {fileID: 0}
characterTypingSound: {fileID: 0}
timeoutSlider: {fileID: 11400042} timeoutSlider: {fileID: 11400042}
optionButtons: optionButtons:
- {fileID: 11400036} - {fileID: 11400036}
@ -703,10 +705,10 @@ MonoBehaviour:
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1} m_Color: {r: 0, g: 0, b: 0, a: 1}
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3}
m_FontSize: 14 m_FontSize: 14
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
@ -770,8 +772,8 @@ MonoBehaviour:
m_HighlightedTrigger: Highlighted m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled m_DisabledTrigger: Disabled
m_TargetGraphic: {fileID: 11400032}
m_Interactable: 1 m_Interactable: 1
m_TargetGraphic: {fileID: 11400032}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -788,7 +790,7 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: .588} m_Color: {r: 1, g: 1, b: 1, a: .588}
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1 m_Type: 1
@ -809,7 +811,7 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0, g: 1, b: .0896551609, a: .588235319} m_Color: {r: 0, g: 1, b: .0896551609, a: .588235319}
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1 m_Type: 1
@ -853,8 +855,8 @@ MonoBehaviour:
m_HighlightedTrigger: Highlighted m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled m_DisabledTrigger: Disabled
m_TargetGraphic: {fileID: 11400038}
m_Interactable: 1 m_Interactable: 1
m_TargetGraphic: {fileID: 11400038}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -871,7 +873,7 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: .588} m_Color: {r: 1, g: 1, b: 1, a: .588}
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1 m_Type: 1
@ -933,8 +935,8 @@ MonoBehaviour:
m_HighlightedTrigger: Highlighted m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled m_DisabledTrigger: Disabled
m_TargetGraphic: {fileID: 11400044}
m_Interactable: 1 m_Interactable: 1
m_TargetGraphic: {fileID: 11400044}
m_FillRect: {fileID: 22400016} m_FillRect: {fileID: 22400016}
m_HandleRect: {fileID: 0} m_HandleRect: {fileID: 0}
m_Direction: 0 m_Direction: 0
@ -958,7 +960,7 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: .588} m_Color: {r: 1, g: 1, b: 1, a: .588}
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1 m_Type: 1
@ -993,10 +995,10 @@ MonoBehaviour:
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5114eb27d2894b12813790aa6c053e9, type: 3} m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3}
m_FontSize: 26 m_FontSize: 26
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
@ -1026,6 +1028,8 @@ MonoBehaviour:
m_Bottom: 0 m_Bottom: 0
m_ChildAlignment: 4 m_ChildAlignment: 4
m_Spacing: 0 m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
--- !u!114 &11400052 --- !u!114 &11400052
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@ -1034,11 +1038,19 @@ MonoBehaviour:
m_GameObject: {fileID: 100030} m_GameObject: {fileID: 100030}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Resolution: {x: 1024, y: 768} m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1024, y: 768}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0 m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!114 &11400054 --- !u!114 &11400054
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@ -1067,10 +1079,10 @@ MonoBehaviour:
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1} m_Color: {r: 0, g: 0, b: 0, a: 1}
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3}
m_FontSize: 14 m_FontSize: 14
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
@ -1116,8 +1128,8 @@ MonoBehaviour:
m_HighlightedTrigger: Highlighted m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled m_DisabledTrigger: Disabled
m_TargetGraphic: {fileID: 11400060}
m_Interactable: 1 m_Interactable: 1
m_TargetGraphic: {fileID: 11400060}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -1134,7 +1146,7 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: .588} m_Color: {r: 1, g: 1, b: 1, a: .588}
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1 m_Type: 1
@ -1173,10 +1185,10 @@ MonoBehaviour:
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1} m_Color: {r: 0, g: 0, b: 0, a: 1}
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3}
m_FontSize: 14 m_FontSize: 14
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
@ -1291,6 +1303,8 @@ Canvas:
m_PlaneDistance: 100 m_PlaneDistance: 100
m_PixelPerfect: 0 m_PixelPerfect: 0
m_ReceivesEvents: 1 m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 0 m_SortingOrder: 0
--- !u!224 &22400000 --- !u!224 &22400000

22
Assets/Examples/TheFacility/Prefabs/CYOASayDialog.prefab

@ -93,7 +93,7 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 21300000, guid: b3426f0a4460547a69fc64b85700a13d, type: 3} m_Sprite: {fileID: 21300000, guid: b3426f0a4460547a69fc64b85700a13d, type: 3}
m_Type: 0 m_Type: 0
@ -128,10 +128,10 @@ MonoBehaviour:
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Mat: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5114eb27d2894b12813790aa6c053e9, type: 3} m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3}
m_FontSize: 26 m_FontSize: 26
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
@ -158,10 +158,12 @@ MonoBehaviour:
writingSound: {fileID: 0} writingSound: {fileID: 0}
loopWritingSound: 1 loopWritingSound: 1
punctuationPause: .400000006 punctuationPause: .400000006
clickAnywhere: 1
dialogCanvas: {fileID: 22300000} dialogCanvas: {fileID: 22300000}
nameText: {fileID: 0} nameText: {fileID: 0}
storyText: {fileID: 11400004} storyText: {fileID: 11400004}
characterImage: {fileID: 0} characterImage: {fileID: 0}
characterTypingSound: {fileID: 0}
continueImage: {fileID: 11400000} continueImage: {fileID: 11400000}
--- !u!114 &11400008 --- !u!114 &11400008
MonoBehaviour: MonoBehaviour:
@ -171,11 +173,19 @@ MonoBehaviour:
m_GameObject: {fileID: 100006} m_GameObject: {fileID: 100006}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Resolution: {x: 1024, y: 768} m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1024, y: 768}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0 m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!114 &11400010 --- !u!114 &11400010
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@ -218,6 +228,8 @@ Canvas:
m_PlaneDistance: 100 m_PlaneDistance: 100
m_PixelPerfect: 0 m_PixelPerfect: 0
m_ReceivesEvents: 1 m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 0 m_SortingOrder: 0
--- !u!224 &22400000 --- !u!224 &22400000

402
Assets/Examples/TheFacility/TheFacility.unity

File diff suppressed because it is too large Load Diff

517
Assets/Examples/TheHunter/TheHunter.unity

File diff suppressed because it is too large Load Diff

2
Assets/Examples/iTween/iTween.unity

@ -1182,7 +1182,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
selectedFungusScript: {fileID: 470391090} selectedFungusScript: {fileID: 868138993}
--- !u!4 &1971204865 --- !u!4 &1971204865
Transform: Transform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

28
Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab

@ -352,12 +352,19 @@ MonoBehaviour:
m_GameObject: {fileID: 100000} m_GameObject: {fileID: 100000}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Resolution: {x: 1024, y: 768} m_UiScaleMode: 1
m_CanvasScaleMode: 0 m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1024, y: 768}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0 m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!114 &11400004 --- !u!114 &11400004
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@ -1050,98 +1057,84 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002} m_GameObject: {fileID: 100002}
m_HideIfInvisible: 0
--- !u!222 &22200002 --- !u!222 &22200002
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100004} m_GameObject: {fileID: 100004}
m_HideIfInvisible: 0
--- !u!222 &22200004 --- !u!222 &22200004
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006} m_GameObject: {fileID: 100006}
m_HideIfInvisible: 0
--- !u!222 &22200006 --- !u!222 &22200006
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100008} m_GameObject: {fileID: 100008}
m_HideIfInvisible: 0
--- !u!222 &22200008 --- !u!222 &22200008
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100010} m_GameObject: {fileID: 100010}
m_HideIfInvisible: 0
--- !u!222 &22200010 --- !u!222 &22200010
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100012} m_GameObject: {fileID: 100012}
m_HideIfInvisible: 0
--- !u!222 &22200012 --- !u!222 &22200012
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100016} m_GameObject: {fileID: 100016}
m_HideIfInvisible: 0
--- !u!222 &22200014 --- !u!222 &22200014
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100018} m_GameObject: {fileID: 100018}
m_HideIfInvisible: 0
--- !u!222 &22200016 --- !u!222 &22200016
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100020} m_GameObject: {fileID: 100020}
m_HideIfInvisible: 0
--- !u!222 &22200018 --- !u!222 &22200018
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100028} m_GameObject: {fileID: 100028}
m_HideIfInvisible: 0
--- !u!222 &22200020 --- !u!222 &22200020
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100030} m_GameObject: {fileID: 100030}
m_HideIfInvisible: 0
--- !u!222 &22200022 --- !u!222 &22200022
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100032} m_GameObject: {fileID: 100032}
m_HideIfInvisible: 0
--- !u!222 &22200024 --- !u!222 &22200024
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100034} m_GameObject: {fileID: 100034}
m_HideIfInvisible: 0
--- !u!222 &22200026 --- !u!222 &22200026
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100036} m_GameObject: {fileID: 100036}
m_HideIfInvisible: 0
--- !u!223 &22300000 --- !u!223 &22300000
Canvas: Canvas:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@ -1156,6 +1149,7 @@ Canvas:
m_PixelPerfect: 0 m_PixelPerfect: 0
m_ReceivesEvents: 1 m_ReceivesEvents: 1
m_OverrideSorting: 0 m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 0 m_SortingOrder: 0
--- !u!224 &22400000 --- !u!224 &22400000

18
Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab

@ -109,12 +109,19 @@ MonoBehaviour:
m_GameObject: {fileID: 100000} m_GameObject: {fileID: 100000}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Resolution: {x: 1024, y: 768} m_UiScaleMode: 1
m_CanvasScaleMode: 0 m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1024, y: 768}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0 m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!114 &11400002 --- !u!114 &11400002
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@ -152,6 +159,7 @@ MonoBehaviour:
nameText: {fileID: 0} nameText: {fileID: 0}
storyText: {fileID: 11400008} storyText: {fileID: 11400008}
characterImage: {fileID: 0} characterImage: {fileID: 0}
characterTypingSound: {fileID: 0}
continueImage: {fileID: 11400012} continueImage: {fileID: 11400012}
--- !u!114 &11400006 --- !u!114 &11400006
MonoBehaviour: MonoBehaviour:
@ -271,21 +279,18 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100004} m_GameObject: {fileID: 100004}
m_HideIfInvisible: 0
--- !u!222 &22200002 --- !u!222 &22200002
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006} m_GameObject: {fileID: 100006}
m_HideIfInvisible: 0
--- !u!222 &22200004 --- !u!222 &22200004
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100008} m_GameObject: {fileID: 100008}
m_HideIfInvisible: 0
--- !u!223 &22300000 --- !u!223 &22300000
Canvas: Canvas:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@ -300,6 +305,7 @@ Canvas:
m_PixelPerfect: 0 m_PixelPerfect: 0
m_ReceivesEvents: 1 m_ReceivesEvents: 1
m_OverrideSorting: 0 m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 0 m_SortingOrder: 0
--- !u!224 &22400000 --- !u!224 &22400000

20
Assets/Fungus/Dialog/Prefabs/SayDialog.prefab

@ -182,12 +182,19 @@ MonoBehaviour:
m_GameObject: {fileID: 100002} m_GameObject: {fileID: 100002}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Resolution: {x: 1024, y: 768} m_UiScaleMode: 1
m_CanvasScaleMode: 0 m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1024, y: 768}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0 m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!114 &11400006 --- !u!114 &11400006
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@ -208,6 +215,7 @@ MonoBehaviour:
nameText: {fileID: 11400012} nameText: {fileID: 11400012}
storyText: {fileID: 11400014} storyText: {fileID: 11400014}
characterImage: {fileID: 11400018} characterImage: {fileID: 11400018}
characterTypingSound: {fileID: 0}
continueImage: {fileID: 11400000} continueImage: {fileID: 11400000}
--- !u!114 &11400008 --- !u!114 &11400008
MonoBehaviour: MonoBehaviour:
@ -367,35 +375,30 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000} m_GameObject: {fileID: 100000}
m_HideIfInvisible: 0
--- !u!222 &22200002 --- !u!222 &22200002
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006} m_GameObject: {fileID: 100006}
m_HideIfInvisible: 0
--- !u!222 &22200004 --- !u!222 &22200004
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100008} m_GameObject: {fileID: 100008}
m_HideIfInvisible: 0
--- !u!222 &22200006 --- !u!222 &22200006
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100010} m_GameObject: {fileID: 100010}
m_HideIfInvisible: 0
--- !u!222 &22200008 --- !u!222 &22200008
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100012} m_GameObject: {fileID: 100012}
m_HideIfInvisible: 0
--- !u!223 &22300000 --- !u!223 &22300000
Canvas: Canvas:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@ -410,6 +413,7 @@ Canvas:
m_PixelPerfect: 0 m_PixelPerfect: 0
m_ReceivesEvents: 1 m_ReceivesEvents: 1
m_OverrideSorting: 0 m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 0 m_SortingOrder: 0
--- !u!224 &22400000 --- !u!224 &22400000

Loading…
Cancel
Save