From c3e17c9ca7f0451449411371f21dcef2d929f224 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Fri, 14 Nov 2014 15:05:46 +0000 Subject: [PATCH] Fixes for Unity 4.6 beta RC 2 You will need to update Unity to RC 2 to avail of these UI fixes. --- Assets/Examples/JumpingPrax/JumpingPrax.unity | 48 +- .../Prefabs/CYOAChooseDialog.prefab | 76 +-- .../TheFacility/Prefabs/CYOASayDialog.prefab | 22 +- Assets/Examples/TheFacility/TheFacility.unity | 402 ++++++-------- Assets/Examples/TheHunter/TheHunter.unity | 517 +++++++++--------- Assets/Examples/iTween/iTween.unity | 2 +- .../Fungus/Dialog/Prefabs/ChooseDialog.prefab | 28 +- .../Dialog/Prefabs/NarratorDialog.prefab | 18 +- Assets/Fungus/Dialog/Prefabs/SayDialog.prefab | 20 +- 9 files changed, 554 insertions(+), 579 deletions(-) diff --git a/Assets/Examples/JumpingPrax/JumpingPrax.unity b/Assets/Examples/JumpingPrax/JumpingPrax.unity index 86b84ae2..1540d0e5 100644 --- a/Assets/Examples/JumpingPrax/JumpingPrax.unity +++ b/Assets/Examples/JumpingPrax/JumpingPrax.unity @@ -169,6 +169,7 @@ Canvas: m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 --- !u!114 &10082985 @@ -180,12 +181,19 @@ MonoBehaviour: m_GameObject: {fileID: 10082982} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Resolution: {x: 1024, y: 768} - m_CanvasScaleMode: 0 + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1024, y: 768} + m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 --- !u!114 &10082986 MonoBehaviour: m_ObjectHideFlags: 0 @@ -363,7 +371,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 35344133} - m_HideIfInvisible: 0 --- !u!1 &54732628 GameObject: m_ObjectHideFlags: 0 @@ -428,7 +435,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 54732628} - m_HideIfInvisible: 0 --- !u!1 &67146554 GameObject: m_ObjectHideFlags: 0 @@ -548,7 +554,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 89485189} - m_HideIfInvisible: 0 --- !u!1 &102763370 GameObject: m_ObjectHideFlags: 0 @@ -684,6 +689,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 + m_DragThreshold: 5 --- !u!4 &171864911 Transform: m_ObjectHideFlags: 0 @@ -788,7 +794,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 211668427} - m_HideIfInvisible: 0 --- !u!1 &323796711 GameObject: m_ObjectHideFlags: 0 @@ -1065,7 +1070,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 492670789} - m_HideIfInvisible: 0 --- !u!1001 &544268548 Prefab: m_ObjectHideFlags: 0 @@ -1360,7 +1364,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 689227472} - m_HideIfInvisible: 0 --- !u!1 &730247361 GameObject: m_ObjectHideFlags: 0 @@ -1480,7 +1483,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1467280113} m_GameObject: {fileID: 904137534} - m_HideIfInvisible: 0 --- !u!1 &927527735 GameObject: m_ObjectHideFlags: 0 @@ -1751,7 +1753,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1467280113} m_GameObject: {fileID: 982770892} - m_HideIfInvisible: 0 --- !u!1 &1042837580 GameObject: m_ObjectHideFlags: 0 @@ -1804,6 +1805,7 @@ Canvas: m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 --- !u!114 &1042837583 @@ -1815,12 +1817,19 @@ MonoBehaviour: m_GameObject: {fileID: 1042837580} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Resolution: {x: 1024, y: 768} - m_CanvasScaleMode: 0 + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1024, y: 768} + m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 --- !u!114 &1042837584 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2103,7 +2112,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1467280113} m_GameObject: {fileID: 1245657369} - m_HideIfInvisible: 0 --- !u!114 &1245657373 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2274,7 +2282,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 1251849278} - m_HideIfInvisible: 0 --- !u!1 &1261834498 GameObject: m_ObjectHideFlags: 0 @@ -2514,7 +2521,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 1436669959} - m_HideIfInvisible: 0 --- !u!1 &1463702819 GameObject: m_ObjectHideFlags: 0 @@ -2584,7 +2590,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 1463702819} - m_HideIfInvisible: 0 --- !u!1001 &1467280113 Prefab: m_ObjectHideFlags: 0 @@ -2770,7 +2775,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1467280113} m_GameObject: {fileID: 1599807777} - m_HideIfInvisible: 0 --- !u!1 &1679475631 GameObject: m_ObjectHideFlags: 0 @@ -2899,7 +2903,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 1679475631} - m_HideIfInvisible: 0 --- !u!1 &1773019752 GameObject: m_ObjectHideFlags: 0 @@ -3028,7 +3031,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 1773019752} - m_HideIfInvisible: 0 --- !u!1 &1844806517 GameObject: m_ObjectHideFlags: 0 @@ -3188,7 +3190,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 1873765285} - m_HideIfInvisible: 0 --- !u!1 &1898957975 GameObject: m_ObjectHideFlags: 0 @@ -3317,7 +3318,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 1898957975} - m_HideIfInvisible: 0 --- !u!1 &1947290626 GameObject: m_ObjectHideFlags: 1 @@ -3828,7 +3828,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1467280113} m_GameObject: {fileID: 2062365599} - m_HideIfInvisible: 0 --- !u!224 &2062365602 RectTransform: m_ObjectHideFlags: 0 @@ -3982,4 +3981,3 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 1215079671} m_GameObject: {fileID: 2135751344} - m_HideIfInvisible: 0 diff --git a/Assets/Examples/TheFacility/Prefabs/CYOAChooseDialog.prefab b/Assets/Examples/TheFacility/Prefabs/CYOAChooseDialog.prefab index ab6f4fad..e4e2a09b 100644 --- a/Assets/Examples/TheFacility/Prefabs/CYOAChooseDialog.prefab +++ b/Assets/Examples/TheFacility/Prefabs/CYOAChooseDialog.prefab @@ -399,8 +399,8 @@ MonoBehaviour: m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed m_DisabledTrigger: Disabled - m_TargetGraphic: {fileID: 11400004} m_Interactable: 1 + m_TargetGraphic: {fileID: 11400004} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -417,7 +417,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: .588} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 @@ -438,10 +438,10 @@ MonoBehaviour: m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} m_FontData: - m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} + m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 1 @@ -464,10 +464,10 @@ MonoBehaviour: m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} m_FontData: - m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} + m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 1 @@ -490,7 +490,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: .588} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 @@ -534,8 +534,8 @@ MonoBehaviour: m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed m_DisabledTrigger: Disabled - m_TargetGraphic: {fileID: 11400010} m_Interactable: 1 + m_TargetGraphic: {fileID: 11400010} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -611,8 +611,8 @@ MonoBehaviour: m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed m_DisabledTrigger: Disabled - m_TargetGraphic: {fileID: 11400020} m_Interactable: 1 + m_TargetGraphic: {fileID: 11400020} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -629,7 +629,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: .588} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 @@ -650,10 +650,10 @@ MonoBehaviour: m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} m_FontData: - m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} + m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 1 @@ -680,10 +680,12 @@ MonoBehaviour: writingSound: {fileID: 0} loopWritingSound: 1 punctuationPause: .400000006 + clickAnywhere: 1 dialogCanvas: {fileID: 22300000} nameText: {fileID: 0} storyText: {fileID: 11400048} characterImage: {fileID: 0} + characterTypingSound: {fileID: 0} timeoutSlider: {fileID: 11400042} optionButtons: - {fileID: 11400036} @@ -703,10 +705,10 @@ MonoBehaviour: m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} m_FontData: - m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} + m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 1 @@ -770,8 +772,8 @@ MonoBehaviour: m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed m_DisabledTrigger: Disabled - m_TargetGraphic: {fileID: 11400032} m_Interactable: 1 + m_TargetGraphic: {fileID: 11400032} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -788,7 +790,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: .588} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 @@ -809,7 +811,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 0, g: 1, b: .0896551609, a: .588235319} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 @@ -853,8 +855,8 @@ MonoBehaviour: m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed m_DisabledTrigger: Disabled - m_TargetGraphic: {fileID: 11400038} m_Interactable: 1 + m_TargetGraphic: {fileID: 11400038} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -871,7 +873,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: .588} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 @@ -933,8 +935,8 @@ MonoBehaviour: m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed m_DisabledTrigger: Disabled - m_TargetGraphic: {fileID: 11400044} m_Interactable: 1 + m_TargetGraphic: {fileID: 11400044} m_FillRect: {fileID: 22400016} m_HandleRect: {fileID: 0} m_Direction: 0 @@ -958,7 +960,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: .588} m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 @@ -993,10 +995,10 @@ MonoBehaviour: m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FontData: - m_Font: {fileID: 12800000, guid: b5114eb27d2894b12813790aa6c053e9, type: 3} + m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} m_FontSize: 26 m_FontStyle: 0 m_BestFit: 1 @@ -1026,6 +1028,8 @@ MonoBehaviour: m_Bottom: 0 m_ChildAlignment: 4 m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 --- !u!114 &11400052 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1034,11 +1038,19 @@ MonoBehaviour: m_GameObject: {fileID: 100030} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: 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_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 --- !u!114 &11400054 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1067,10 +1079,10 @@ MonoBehaviour: m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} m_FontData: - m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} + m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 1 @@ -1116,8 +1128,8 @@ MonoBehaviour: m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed m_DisabledTrigger: Disabled - m_TargetGraphic: {fileID: 11400060} m_Interactable: 1 + m_TargetGraphic: {fileID: 11400060} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -1134,7 +1146,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: .588} m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 @@ -1173,10 +1185,10 @@ MonoBehaviour: m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} m_FontData: - m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} + m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 1 @@ -1291,6 +1303,8 @@ Canvas: m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 --- !u!224 &22400000 diff --git a/Assets/Examples/TheFacility/Prefabs/CYOASayDialog.prefab b/Assets/Examples/TheFacility/Prefabs/CYOASayDialog.prefab index e2808537..646fb43e 100644 --- a/Assets/Examples/TheFacility/Prefabs/CYOASayDialog.prefab +++ b/Assets/Examples/TheFacility/Prefabs/CYOASayDialog.prefab @@ -93,7 +93,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_Sprite: {fileID: 21300000, guid: b3426f0a4460547a69fc64b85700a13d, type: 3} m_Type: 0 @@ -128,10 +128,10 @@ MonoBehaviour: m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Mat: {fileID: 0} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FontData: - m_Font: {fileID: 12800000, guid: b5114eb27d2894b12813790aa6c053e9, type: 3} + m_Font: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, type: 3} m_FontSize: 26 m_FontStyle: 0 m_BestFit: 1 @@ -158,10 +158,12 @@ MonoBehaviour: writingSound: {fileID: 0} loopWritingSound: 1 punctuationPause: .400000006 + clickAnywhere: 1 dialogCanvas: {fileID: 22300000} nameText: {fileID: 0} storyText: {fileID: 11400004} characterImage: {fileID: 0} + characterTypingSound: {fileID: 0} continueImage: {fileID: 11400000} --- !u!114 &11400008 MonoBehaviour: @@ -171,11 +173,19 @@ MonoBehaviour: m_GameObject: {fileID: 100006} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: 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_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 --- !u!114 &11400010 MonoBehaviour: m_ObjectHideFlags: 1 @@ -218,6 +228,8 @@ Canvas: m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 --- !u!224 &22400000 diff --git a/Assets/Examples/TheFacility/TheFacility.unity b/Assets/Examples/TheFacility/TheFacility.unity index 150fd8a1..bfc41e54 100644 --- a/Assets/Examples/TheFacility/TheFacility.unity +++ b/Assets/Examples/TheFacility/TheFacility.unity @@ -776,7 +776,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100008, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 177024815} @@ -796,7 +796,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400008, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 177024814} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -815,7 +815,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400016, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 177024814} m_Enabled: 1 m_EditorHideFlags: 0 @@ -834,7 +834,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400018, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 177024814} m_Enabled: 1 m_EditorHideFlags: 0 @@ -876,7 +876,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400020, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 177024814} m_Enabled: 1 m_EditorHideFlags: 0 @@ -898,14 +898,13 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200008, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 177024814} - m_HideIfInvisible: 0 --- !u!1 &234853276 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100010, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 234853277} @@ -923,7 +922,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400010, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 234853276} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -941,7 +940,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400022, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 234853276} m_Enabled: 1 m_EditorHideFlags: 0 @@ -968,14 +967,13 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200010, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 234853276} - m_HideIfInvisible: 0 --- !u!1 &306771625 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100012, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 4: {fileID: 306771626} @@ -991,7 +989,7 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 400000, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 306771625} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1005,7 +1003,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400024, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 306771625} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1061,7 +1059,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100014, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 406472411} @@ -1079,7 +1077,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400012, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 406472410} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1097,7 +1095,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400026, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 406472410} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1124,9 +1122,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200012, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 406472410} - m_HideIfInvisible: 0 --- !u!1 &428153883 GameObject: m_ObjectHideFlags: 0 @@ -1201,7 +1198,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100016, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 527814928} @@ -1221,7 +1218,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400028, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 527814923} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1240,7 +1237,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400030, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 527814923} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1282,7 +1279,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400032, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 527814923} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1304,15 +1301,14 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200014, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 527814923} - m_HideIfInvisible: 0 --- !u!224 &527814928 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400014, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 527814923} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1826,7 +1822,7 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100018, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 576489124} @@ -1844,7 +1840,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400016, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 576489123} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1862,7 +1858,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400034, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 576489123} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1884,14 +1880,13 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200016, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 576489123} - m_HideIfInvisible: 0 --- !u!1 &576994357 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100000, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} serializedVersion: 4 m_Component: - 224: {fileID: 576994358} @@ -1909,7 +1904,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400000, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} m_GameObject: {fileID: 576994357} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1927,7 +1922,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400000, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} m_GameObject: {fileID: 576994357} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1949,9 +1944,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200000, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} m_GameObject: {fileID: 576994357} - m_HideIfInvisible: 0 --- !u!1 &639548732 GameObject: m_ObjectHideFlags: 1 @@ -2338,7 +2332,7 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100020, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 698212755} @@ -2358,7 +2352,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400018, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 698212754} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2377,7 +2371,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400036, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 698212754} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2419,7 +2413,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400038, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 698212754} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2441,7 +2435,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400040, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 698212754} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2460,9 +2454,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200018, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 698212754} - m_HideIfInvisible: 0 --- !u!1001 &768791691 Prefab: m_ObjectHideFlags: 0 @@ -2711,7 +2704,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100022, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 894624044} @@ -2727,7 +2720,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400020, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 894624043} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3489,7 +3482,7 @@ MonoBehaviour: sayDialog: {fileID: 0} voiceOverClip: {fileID: 0} showOnce: 1 ---- !u!1001 &977776766 +--- !u!1001 &961723956 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -3526,55 +3519,8 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 400000, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 22400016, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22400016, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100030, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 11400048, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, - type: 3} - - target: {fileID: 11400022, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, - type: 3} - - target: {fileID: 11400026, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, - type: 3} - - target: {fileID: 11400056, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, - type: 3} - - target: {fileID: 11400064, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, - type: 3} - - target: {fileID: 11400008, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, - type: 3} - - target: {fileID: 11400006, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, - type: 3} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} m_RootGameObject: {fileID: 306771625} @@ -3584,7 +3530,7 @@ Prefab: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100024, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 1002527486} @@ -3603,7 +3549,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400022, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1002527485} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3622,7 +3568,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400042, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1002527485} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3671,7 +3617,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400044, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1002527485} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3693,9 +3639,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200020, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1002527485} - m_HideIfInvisible: 0 --- !u!1 &1020378993 GameObject: m_ObjectHideFlags: 0 @@ -3784,7 +3729,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100002, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} serializedVersion: 4 m_Component: - 224: {fileID: 1065110602} @@ -3803,7 +3748,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400002, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} m_GameObject: {fileID: 1065110601} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3821,7 +3766,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400002, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} m_GameObject: {fileID: 1065110601} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3836,7 +3781,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400004, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} m_GameObject: {fileID: 1065110601} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3863,14 +3808,13 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200002, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} m_GameObject: {fileID: 1065110601} - m_HideIfInvisible: 0 --- !u!1 &1077748663 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100026, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 1077748664} @@ -3889,7 +3833,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400024, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1077748663} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3907,7 +3851,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400046, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1077748663} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3922,7 +3866,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400048, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1077748663} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3949,9 +3893,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200022, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1077748663} - m_HideIfInvisible: 0 --- !u!1 &1170700146 GameObject: m_ObjectHideFlags: 1 @@ -3979,6 +3922,50 @@ Transform: m_Children: [] m_Father: {fileID: 771014101} m_RootOrder: 9 +--- !u!1001 &1176325832 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 844878606} + m_Modifications: + - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: ab4b363f153c84318915d285f802490c, type: 2} + m_RootGameObject: {fileID: 1206280512} + m_IsPrefabParent: 0 + m_IsExploded: 1 --- !u!1 &1176957117 GameObject: m_ObjectHideFlags: 0 @@ -4033,7 +4020,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100004, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} serializedVersion: 4 m_Component: - 4: {fileID: 1206280513} @@ -4049,7 +4036,7 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} m_GameObject: {fileID: 1206280512} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4063,7 +4050,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400006, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} m_GameObject: {fileID: 1206280512} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4108,64 +4095,11 @@ Transform: m_Children: [] m_Father: {fileID: 771014101} m_RootOrder: 7 ---- !u!1001 &1275593113 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 844878606} - m_Modifications: - - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ab4b363f153c84318915d285f802490c, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 100006, guid: ab4b363f153c84318915d285f802490c, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11400004, guid: ab4b363f153c84318915d285f802490c, type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 43bce127d27b74a66a29b68d0de90ddb, - type: 3} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_RootGameObject: {fileID: 1206280512} - m_IsPrefabParent: 0 - m_IsExploded: 1 --- !u!1 &1375464609 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100028, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 1375464610} @@ -4182,7 +4116,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400026, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1375464609} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4206,7 +4140,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400050, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1375464609} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4253,7 +4187,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100006, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} serializedVersion: 4 m_Component: - 224: {fileID: 1446920682} @@ -4272,7 +4206,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400004, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} m_GameObject: {fileID: 1446920681} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4292,22 +4226,29 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400008, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} m_GameObject: {fileID: 1446920681} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Resolution: {x: 1024, y: 768} - m_CanvasScaleMode: 0 + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1024, y: 768} + m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 --- !u!114 &1446920684 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400010, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} m_GameObject: {fileID: 1446920681} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4325,7 +4266,7 @@ Canvas: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22300000, guid: ab4b363f153c84318915d285f802490c, type: 2} - m_PrefabInternal: {fileID: 1275593113} + m_PrefabInternal: {fileID: 1176325832} m_GameObject: {fileID: 1446920681} m_Enabled: 1 serializedVersion: 2 @@ -4335,13 +4276,14 @@ Canvas: m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 --- !u!1 &1486521695 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100000, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 1486521696} @@ -4361,7 +4303,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400000, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1486521695} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4380,7 +4322,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400002, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1486521695} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4422,7 +4364,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400004, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1486521695} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4444,7 +4386,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400000, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1486521695} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4463,9 +4405,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200000, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1486521695} - m_HideIfInvisible: 0 --- !u!1 &1499008162 GameObject: m_ObjectHideFlags: 1 @@ -5056,7 +4997,7 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100030, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 1686856204} @@ -5075,7 +5016,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400028, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1686856203} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5096,7 +5037,7 @@ Canvas: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22300000, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1686856203} m_Enabled: 1 serializedVersion: 2 @@ -5106,6 +5047,7 @@ Canvas: m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 --- !u!114 &1686856206 @@ -5113,22 +5055,29 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400052, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1686856203} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Resolution: {x: 1024, y: 768} - m_CanvasScaleMode: 0 + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1024, y: 768} + m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 --- !u!114 &1686856207 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400054, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1686856203} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5145,7 +5094,7 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100032, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 1754923517} @@ -5163,7 +5112,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400030, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1754923516} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5181,7 +5130,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400056, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1754923516} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5208,9 +5157,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200024, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1754923516} - m_HideIfInvisible: 0 --- !u!1 &1797174372 GameObject: m_ObjectHideFlags: 1 @@ -6025,7 +5973,7 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100006, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 1931134861} @@ -6045,7 +5993,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400006, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1931134860} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6064,7 +6012,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400012, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1931134860} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6106,7 +6054,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400010, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1931134860} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6128,7 +6076,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400014, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1931134860} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6147,14 +6095,13 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200006, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1931134860} - m_HideIfInvisible: 0 --- !u!1 &1952009529 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100004, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 1952009530} @@ -6172,7 +6119,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400004, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1952009529} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6190,7 +6137,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400008, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1952009529} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6217,9 +6164,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200004, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 1952009529} - m_HideIfInvisible: 0 --- !u!1 &2006087465 GameObject: m_ObjectHideFlags: 1 @@ -6251,7 +6197,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100002, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 2027003764} @@ -6269,7 +6215,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400002, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 2027003763} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6287,7 +6233,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400006, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 2027003763} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6314,14 +6260,13 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200002, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 2027003763} - m_HideIfInvisible: 0 --- !u!1 &2074993374 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100034, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 2074993375} @@ -6341,7 +6286,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400032, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 2074993374} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6360,7 +6305,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400058, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 2074993374} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6402,7 +6347,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400060, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 2074993374} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6424,7 +6369,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400062, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 2074993374} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6443,14 +6388,13 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200026, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 2074993374} - m_HideIfInvisible: 0 --- !u!1 &2083895222 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100036, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} serializedVersion: 4 m_Component: - 224: {fileID: 2083895223} @@ -6468,7 +6412,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400034, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 2083895222} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6486,7 +6430,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400064, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 2083895222} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6513,9 +6457,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200028, guid: f1eee15a132714adc82ac08c008b0cf0, type: 2} - m_PrefabInternal: {fileID: 977776766} + m_PrefabInternal: {fileID: 961723956} m_GameObject: {fileID: 2083895222} - m_HideIfInvisible: 0 --- !u!1 &2135004221 GameObject: m_ObjectHideFlags: 0 @@ -6576,6 +6519,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 + m_DragThreshold: 5 --- !u!4 &2135004225 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Examples/TheHunter/TheHunter.unity b/Assets/Examples/TheHunter/TheHunter.unity index 82bbd18c..051073b0 100644 --- a/Assets/Examples/TheHunter/TheHunter.unity +++ b/Assets/Examples/TheHunter/TheHunter.unity @@ -78,7 +78,7 @@ NavMeshSettings: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 7280707} @@ -97,7 +97,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 7280706} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -116,7 +116,7 @@ Canvas: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22300000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 7280706} m_Enabled: 1 serializedVersion: 2 @@ -126,6 +126,7 @@ Canvas: m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 --- !u!114 &7280709 @@ -133,7 +134,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 7280706} m_Enabled: 1 m_EditorHideFlags: 0 @@ -151,21 +152,28 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400002, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 7280706} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Resolution: {x: 1024, y: 768} - m_CanvasScaleMode: 0 + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1024, y: 768} + m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 --- !u!1 &78437090 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100000, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} serializedVersion: 4 m_Component: - 224: {fileID: 78437091} @@ -183,7 +191,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400000, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 78437090} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -201,7 +209,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400000, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 78437090} m_Enabled: 1 m_EditorHideFlags: 0 @@ -223,14 +231,13 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200000, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 78437090} - m_HideIfInvisible: 0 --- !u!1 &140463385 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100002, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} serializedVersion: 4 m_Component: - 224: {fileID: 140463386} @@ -249,7 +256,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400002, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 140463385} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -268,7 +275,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400002, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 140463385} m_Enabled: 1 m_EditorHideFlags: 0 @@ -286,7 +293,7 @@ Canvas: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22300000, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 140463385} m_Enabled: 1 serializedVersion: 2 @@ -296,6 +303,7 @@ Canvas: m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 --- !u!114 &140463389 @@ -303,21 +311,28 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400004, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 140463385} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Resolution: {x: 1024, y: 768} - m_CanvasScaleMode: 0 + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1024, y: 768} + m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 --- !u!1 &213951423 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100002, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 213951424} @@ -337,7 +352,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400002, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 213951423} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -356,7 +371,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400004, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 213951423} m_Enabled: 1 m_EditorHideFlags: 0 @@ -375,7 +390,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400006, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 213951423} m_Enabled: 1 m_EditorHideFlags: 0 @@ -417,7 +432,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400008, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 213951423} m_Enabled: 1 m_EditorHideFlags: 0 @@ -439,9 +454,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 213951423} - m_HideIfInvisible: 0 --- !u!1001 &216100353 Prefab: m_ObjectHideFlags: 0 @@ -600,7 +614,7 @@ Prefab: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100004, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 261898320} @@ -618,7 +632,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400004, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 261898319} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -636,7 +650,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400010, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 261898319} m_Enabled: 1 m_EditorHideFlags: 0 @@ -658,14 +672,13 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200002, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 261898319} - m_HideIfInvisible: 0 --- !u!1 &278128634 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100006, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 278128635} @@ -684,7 +697,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400006, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 278128634} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -702,7 +715,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400012, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 278128634} m_Enabled: 1 m_EditorHideFlags: 0 @@ -729,7 +742,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400014, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 278128634} m_Enabled: 1 m_EditorHideFlags: 0 @@ -744,9 +757,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200004, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 278128634} - m_HideIfInvisible: 0 --- !u!1 &307931410 GameObject: m_ObjectHideFlags: 0 @@ -999,6 +1011,50 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 +--- !u!1001 &332292456 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 666782604} + m_Modifications: + - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} + m_RootGameObject: {fileID: 1185554285} + m_IsPrefabParent: 0 + m_IsExploded: 1 --- !u!1 &332860037 GameObject: m_ObjectHideFlags: 1 @@ -1170,7 +1226,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100008, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 373915797} @@ -1188,7 +1244,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400008, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 373915796} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1211,7 +1267,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400016, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 373915796} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1233,9 +1289,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200006, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 373915796} - m_HideIfInvisible: 0 --- !u!1001 &447139369 Prefab: m_ObjectHideFlags: 0 @@ -1343,7 +1398,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100010, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 477376609} @@ -1361,7 +1416,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400010, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 477376608} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1379,7 +1434,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400018, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 477376608} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1406,9 +1461,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200008, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 477376608} - m_HideIfInvisible: 0 --- !u!1 &488519164 GameObject: m_ObjectHideFlags: 0 @@ -1508,7 +1562,7 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100012, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 524591088} @@ -1527,7 +1581,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400012, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 524591087} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1545,7 +1599,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400020, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 524591087} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1560,7 +1614,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400022, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 524591087} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1587,9 +1641,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200010, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 524591087} - m_HideIfInvisible: 0 --- !u!1 &541676550 GameObject: m_ObjectHideFlags: 1 @@ -1906,7 +1959,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} serializedVersion: 4 m_Component: - 224: {fileID: 655392666} @@ -1925,7 +1978,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 655392665} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1944,22 +1997,29 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 655392665} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Resolution: {x: 1024, y: 768} - m_CanvasScaleMode: 0 + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1024, y: 768} + m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 --- !u!114 &655392668 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400002, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 655392665} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1977,7 +2037,7 @@ Canvas: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22300000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 655392665} m_Enabled: 1 serializedVersion: 2 @@ -1987,6 +2047,7 @@ Canvas: m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 --- !u!1 &666782603 @@ -2111,7 +2172,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100016, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 790624069} @@ -2131,7 +2192,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400016, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 790624068} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2150,7 +2211,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400026, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 790624068} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2192,7 +2253,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400028, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 790624068} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2214,7 +2275,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400030, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 790624068} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2233,9 +2294,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200012, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 790624068} - m_HideIfInvisible: 0 --- !u!1 &842161034 GameObject: m_ObjectHideFlags: 0 @@ -2335,7 +2395,7 @@ Prefab: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100018, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 844530006} @@ -2354,7 +2414,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400018, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 844530005} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2373,7 +2433,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400032, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 844530005} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2422,7 +2482,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400034, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 844530005} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2444,14 +2504,13 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200014, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 844530005} - m_HideIfInvisible: 0 --- !u!1 &855798636 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100014, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 855798637} @@ -2468,7 +2527,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400014, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 855798636} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2490,7 +2549,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400024, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 855798636} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2573,7 +2632,7 @@ Prefab: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100020, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 882646453} @@ -2591,7 +2650,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400020, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 882646452} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2609,7 +2668,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400036, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 882646452} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2636,9 +2695,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200016, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 882646452} - m_HideIfInvisible: 0 --- !u!1 &891057085 GameObject: m_ObjectHideFlags: 1 @@ -3183,7 +3241,7 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100022, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 4: {fileID: 1016272667} @@ -3199,7 +3257,7 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1016272666} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3213,7 +3271,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400038, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1016272666} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3240,7 +3298,7 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100004, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} serializedVersion: 4 m_Component: - 4: {fileID: 1070206233} @@ -3256,7 +3314,7 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 400000, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1070206232} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3270,7 +3328,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400006, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1070206232} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3292,7 +3350,7 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100024, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 1083260643} @@ -3308,7 +3366,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400022, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1083260642} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3382,6 +3440,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 + m_DragThreshold: 5 --- !u!4 &1126583575 Transform: m_ObjectHideFlags: 0 @@ -3398,7 +3457,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100002, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} serializedVersion: 4 m_Component: - 4: {fileID: 1185554286} @@ -3414,7 +3473,7 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1185554285} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3428,7 +3487,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400004, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1185554285} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3859,11 +3918,55 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 +--- !u!1001 &1262863302 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 666782604} + m_Modifications: + - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} + m_RootGameObject: {fileID: 1016272666} + m_IsPrefabParent: 0 + m_IsExploded: 1 --- !u!1 &1269446786 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100004, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} serializedVersion: 4 m_Component: - 224: {fileID: 1269446787} @@ -3883,7 +3986,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400002, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1269446786} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3903,7 +4006,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400006, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1269446786} m_Enabled: 0 m_EditorHideFlags: 0 @@ -3925,15 +4028,14 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1269446786} - m_HideIfInvisible: 0 --- !u!114 &1269446790 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400014, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1269446786} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3964,56 +4066,12 @@ CanvasGroup: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22500000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1269446786} m_Alpha: 1 m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!1001 &1306188651 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 666782604} - m_Modifications: - - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_RootGameObject: {fileID: 1185554285} - m_IsPrefabParent: 0 - m_IsExploded: 1 --- !u!115 &1348154262 MonoScript: m_ObjectHideFlags: 0 @@ -4034,7 +4092,7 @@ MonoScript: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100028, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 1352298691} @@ -4054,7 +4112,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400026, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1352298690} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4073,7 +4131,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400042, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1352298690} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4115,7 +4173,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400044, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1352298690} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4137,7 +4195,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400046, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1352298690} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4156,9 +4214,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200018, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1352298690} - m_HideIfInvisible: 0 --- !u!115 &1354654048 MonoScript: m_ObjectHideFlags: 0 @@ -4179,7 +4236,7 @@ MonoScript: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100006, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} serializedVersion: 4 m_Component: - 224: {fileID: 1391076437} @@ -4199,7 +4256,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400004, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1391076436} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4221,7 +4278,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400008, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1391076436} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4243,15 +4300,14 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200002, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1391076436} - m_HideIfInvisible: 0 --- !u!114 &1391076440 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400020, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1391076436} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4282,7 +4338,7 @@ CanvasGroup: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22500000, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1391076436} m_Alpha: 1 m_Interactable: 1 @@ -4292,7 +4348,7 @@ CanvasGroup: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100030, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 1440444952} @@ -4310,7 +4366,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400028, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1440444951} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4328,7 +4384,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400048, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1440444951} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4355,14 +4411,13 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200020, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1440444951} - m_HideIfInvisible: 0 --- !u!1 &1461018195 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100008, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} serializedVersion: 4 m_Component: - 224: {fileID: 1461018196} @@ -4381,7 +4436,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400006, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1461018195} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4399,7 +4454,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400010, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1461018195} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4414,7 +4469,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400012, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1461018195} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4441,9 +4496,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200004, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1461018195} - m_HideIfInvisible: 0 --- !u!1 &1507034363 GameObject: m_ObjectHideFlags: 1 @@ -4601,7 +4655,7 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100006, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} serializedVersion: 4 m_Component: - 224: {fileID: 1509015467} @@ -4620,7 +4674,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400004, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1509015466} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4638,7 +4692,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400008, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1509015466} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4665,7 +4719,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400010, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1509015466} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4680,14 +4734,13 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200002, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1509015466} - m_HideIfInvisible: 0 --- !u!1 &1544552306 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100032, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 1544552307} @@ -4707,7 +4760,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400030, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1544552306} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4726,7 +4779,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400050, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1544552306} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4745,7 +4798,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400052, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1544552306} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4787,7 +4840,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400054, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1544552306} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4809,9 +4862,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200022, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 1544552306} - m_HideIfInvisible: 0 --- !u!1 &1594072534 GameObject: m_ObjectHideFlags: 0 @@ -4913,7 +4965,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100008, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} serializedVersion: 4 m_Component: - 224: {fileID: 1650608144} @@ -4931,7 +4983,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400006, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1650608143} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4949,7 +5001,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400012, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1650608143} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4971,14 +5023,13 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200004, guid: ffe6272c05a0840d1b4b07028163f170, type: 2} - m_PrefabInternal: {fileID: 1306188651} + m_PrefabInternal: {fileID: 332292456} m_GameObject: {fileID: 1650608143} - m_HideIfInvisible: 0 --- !u!1 &1662794596 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100010, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} serializedVersion: 4 m_Component: - 224: {fileID: 1662794597} @@ -4997,7 +5048,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400008, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1662794596} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5015,7 +5066,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400014, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1662794596} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5042,7 +5093,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400016, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1662794596} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5057,9 +5108,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200006, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1662794596} - m_HideIfInvisible: 0 --- !u!1 &1712414753 GameObject: m_ObjectHideFlags: 0 @@ -5105,50 +5155,6 @@ MonoBehaviour: profileSprite: {fileID: 21300000, guid: 05ccd53483a554ca9b31f685fa76154a, type: 3} soundEffect: {fileID: 8300000, guid: 124184555ec434aa68814be3bd116c26, type: 3} notes: ---- !u!1001 &1725106525 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 666782604} - m_Modifications: - - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_RootGameObject: {fileID: 1016272666} - m_IsPrefabParent: 0 - m_IsExploded: 1 --- !u!1 &1726080686 GameObject: m_ObjectHideFlags: 0 @@ -5436,7 +5442,7 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100012, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} serializedVersion: 4 m_Component: - 224: {fileID: 1787345561} @@ -5454,7 +5460,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400018, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1787345558} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5476,15 +5482,14 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200008, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1787345558} - m_HideIfInvisible: 0 --- !u!224 &1787345561 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400010, guid: 00974f07e5b9248d48d344335b83f4bd, type: 2} - m_PrefabInternal: {fileID: 1962321647} + m_PrefabInternal: {fileID: 1906080536} m_GameObject: {fileID: 1787345558} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5936,7 +5941,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} m_Name: m_EditorClassIdentifier: - scrollPos: {x: 204.192505, y: 518.002808} + scrollPos: {x: 257.192505, y: 556.002808} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 0 zoom: 1 @@ -5946,7 +5951,7 @@ MonoBehaviour: y: -904.006714 width: 1939.01758 height: 1993.50671 - selectedSequence: {fileID: 1507034365} + selectedSequence: {fileID: 0} selectedCommands: [] variables: - {fileID: 1831099569} @@ -6123,7 +6128,7 @@ Prefab: m_RootGameObject: {fileID: 700450243} m_IsPrefabParent: 0 m_IsExploded: 1 ---- !u!1001 &1962321647 +--- !u!1001 &1906080536 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -6204,7 +6209,7 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100034, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 2058027210} @@ -6222,7 +6227,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400032, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 2058027209} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6240,7 +6245,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400056, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 2058027209} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6262,9 +6267,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200024, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 2058027209} - m_HideIfInvisible: 0 --- !u!1 &2069641429 GameObject: m_ObjectHideFlags: 0 @@ -6312,7 +6316,7 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100036, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} serializedVersion: 4 m_Component: - 224: {fileID: 2094006159} @@ -6330,7 +6334,7 @@ RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22400034, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 2094006158} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6348,7 +6352,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400058, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 2094006158} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6375,9 +6379,8 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22200026, guid: 6b7fc59bc2eb0416e91931c4248923ae, type: 2} - m_PrefabInternal: {fileID: 1725106525} + m_PrefabInternal: {fileID: 1262863302} m_GameObject: {fileID: 2094006158} - m_HideIfInvisible: 0 --- !u!1 &2111357052 GameObject: m_ObjectHideFlags: 1 diff --git a/Assets/Examples/iTween/iTween.unity b/Assets/Examples/iTween/iTween.unity index 3ffd11f9..31cf754c 100644 --- a/Assets/Examples/iTween/iTween.unity +++ b/Assets/Examples/iTween/iTween.unity @@ -1182,7 +1182,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFungusScript: {fileID: 470391090} + selectedFungusScript: {fileID: 868138993} --- !u!4 &1971204865 Transform: m_ObjectHideFlags: 1 diff --git a/Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab b/Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab index a1fde513..44558b1c 100644 --- a/Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab +++ b/Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab @@ -352,12 +352,19 @@ MonoBehaviour: m_GameObject: {fileID: 100000} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Resolution: {x: 1024, y: 768} - m_CanvasScaleMode: 0 + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1024, y: 768} + m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 --- !u!114 &11400004 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1050,98 +1057,84 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100002} - m_HideIfInvisible: 0 --- !u!222 &22200002 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100004} - m_HideIfInvisible: 0 --- !u!222 &22200004 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100006} - m_HideIfInvisible: 0 --- !u!222 &22200006 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100008} - m_HideIfInvisible: 0 --- !u!222 &22200008 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100010} - m_HideIfInvisible: 0 --- !u!222 &22200010 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100012} - m_HideIfInvisible: 0 --- !u!222 &22200012 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100016} - m_HideIfInvisible: 0 --- !u!222 &22200014 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100018} - m_HideIfInvisible: 0 --- !u!222 &22200016 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100020} - m_HideIfInvisible: 0 --- !u!222 &22200018 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100028} - m_HideIfInvisible: 0 --- !u!222 &22200020 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100030} - m_HideIfInvisible: 0 --- !u!222 &22200022 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100032} - m_HideIfInvisible: 0 --- !u!222 &22200024 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100034} - m_HideIfInvisible: 0 --- !u!222 &22200026 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100036} - m_HideIfInvisible: 0 --- !u!223 &22300000 Canvas: m_ObjectHideFlags: 1 @@ -1156,6 +1149,7 @@ Canvas: m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 --- !u!224 &22400000 diff --git a/Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab b/Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab index 6f3b3ea6..191dde9e 100644 --- a/Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab +++ b/Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab @@ -109,12 +109,19 @@ MonoBehaviour: m_GameObject: {fileID: 100000} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Resolution: {x: 1024, y: 768} - m_CanvasScaleMode: 0 + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1024, y: 768} + m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 --- !u!114 &11400002 MonoBehaviour: m_ObjectHideFlags: 1 @@ -152,6 +159,7 @@ MonoBehaviour: nameText: {fileID: 0} storyText: {fileID: 11400008} characterImage: {fileID: 0} + characterTypingSound: {fileID: 0} continueImage: {fileID: 11400012} --- !u!114 &11400006 MonoBehaviour: @@ -271,21 +279,18 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100004} - m_HideIfInvisible: 0 --- !u!222 &22200002 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100006} - m_HideIfInvisible: 0 --- !u!222 &22200004 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100008} - m_HideIfInvisible: 0 --- !u!223 &22300000 Canvas: m_ObjectHideFlags: 1 @@ -300,6 +305,7 @@ Canvas: m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 --- !u!224 &22400000 diff --git a/Assets/Fungus/Dialog/Prefabs/SayDialog.prefab b/Assets/Fungus/Dialog/Prefabs/SayDialog.prefab index b80b05e4..410634a5 100644 --- a/Assets/Fungus/Dialog/Prefabs/SayDialog.prefab +++ b/Assets/Fungus/Dialog/Prefabs/SayDialog.prefab @@ -182,12 +182,19 @@ MonoBehaviour: m_GameObject: {fileID: 100002} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -990768443, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Resolution: {x: 1024, y: 768} - m_CanvasScaleMode: 0 + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1024, y: 768} + m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 --- !u!114 &11400006 MonoBehaviour: m_ObjectHideFlags: 1 @@ -208,6 +215,7 @@ MonoBehaviour: nameText: {fileID: 11400012} storyText: {fileID: 11400014} characterImage: {fileID: 11400018} + characterTypingSound: {fileID: 0} continueImage: {fileID: 11400000} --- !u!114 &11400008 MonoBehaviour: @@ -367,35 +375,30 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100000} - m_HideIfInvisible: 0 --- !u!222 &22200002 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100006} - m_HideIfInvisible: 0 --- !u!222 &22200004 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100008} - m_HideIfInvisible: 0 --- !u!222 &22200006 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100010} - m_HideIfInvisible: 0 --- !u!222 &22200008 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100012} - m_HideIfInvisible: 0 --- !u!223 &22300000 Canvas: m_ObjectHideFlags: 1 @@ -410,6 +413,7 @@ Canvas: m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 --- !u!224 &22400000