From: cybutek Date: Sun, 27 Mar 2016 21:45:11 +0000 Subject: Updated change log. X-Git-Url: http://git.toad.homelinux.net/projects/VesselSimulator.git/commitdiff/26330ff --- Updated change log. --- --- a/Assets/Prefabs/FlightMenu.prefab +++ b/Assets/Prefabs/FlightMenu.prefab @@ -27,8 +27,8 @@ - 224: {fileID: 22468796} - 222: {fileID: 22254028} - 114: {fileID: 11494262} - - 114: {fileID: 11417302} - - 114: {fileID: 11415068} + - 114: {fileID: 11482720} + - 114: {fileID: 11400468} m_Layer: 5 m_Name: ToggleControlBar m_TagString: Untagged @@ -45,7 +45,6 @@ m_Component: - 224: {fileID: 22475412} - 222: {fileID: 22223226} - - 114: {fileID: 11409704} - 114: {fileID: 11424646} m_Layer: 5 m_Name: Content @@ -66,6 +65,7 @@ - 114: {fileID: 11404586} - 114: {fileID: 11461688} - 114: {fileID: 11420706} + - 114: {fileID: 11482140} m_Layer: 5 m_Name: NewCustomSection m_TagString: Untagged @@ -86,6 +86,8 @@ - 114: {fileID: 11485532} - 225: {fileID: 22567868} - 114: {fileID: 11415294} + - 114: {fileID: 11447982} + - 114: {fileID: 11478508} m_Layer: 5 m_Name: FlightMenu m_TagString: Untagged @@ -171,6 +173,7 @@ - 222: {fileID: 22267572} - 114: {fileID: 11463504} - 114: {fileID: 11453198} + - 114: {fileID: 11400370} m_Layer: 5 m_Name: Titlebar m_TagString: Untagged @@ -239,8 +242,8 @@ - 224: {fileID: 22469574} - 222: {fileID: 22281674} - 114: {fileID: 11498756} - - 114: {fileID: 11451984} - - 114: {fileID: 11485338} + - 114: {fileID: 11483870} + - 114: {fileID: 11489252} m_Layer: 5 m_Name: ToggleShowEngineer m_TagString: Untagged @@ -248,6 +251,74 @@ m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &11400370 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 156848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 323546239, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ElementType: 1 +--- !u!114 &11400468 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 114528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 11494262} + toggleTransition: 0 + graphic: {fileID: 11459182} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 11415294} + m_MethodName: SetControlBarVisible + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 0 --- !u!114 &11403342 MonoBehaviour: m_ObjectHideFlags: 1 @@ -260,7 +331,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -292,7 +363,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .800000072, g: 1, b: 0, a: .501960814} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -307,42 +378,32 @@ m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &11409704 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 116014} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: .313725501, g: .313725501, b: .313725501, a: .70588237} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &11415068 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 114528} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 2109663825, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} +--- !u!114 &11415294 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 126098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 571159103, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowEngineerToggle: {fileID: 11489252} + m_ControlBarToggle: {fileID: 11400468} + m_MenuSectionPrefab: {fileID: 130812, guid: 2147dc5ac8aa16a4ca2003dfcd024533, type: 2} + m_SectionsTransform: {fileID: 22435482} + m_FastFadeDuration: .200000003 + m_SlowFadeDuration: .200000003 +--- !u!114 &11420706 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 122098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -351,98 +412,7 @@ m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .467545569, g: 1, b: .448529422, a: 1} - m_PressedColor: {r: .800000072, g: 1, b: 0, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} - m_ColorMultiplier: 1 - m_FadeDuration: .100000001 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 11494262} - toggleTransition: 1 - graphic: {fileID: 11459182} - m_Group: {fileID: 0} - onValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 11415294} - m_MethodName: SetControlBarVisible - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null - m_IsOn: 0 ---- !u!114 &11415294 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 126098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 571159103, guid: a3a55138b08428847a08c7b48fe72efe, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowEngineerToggle: {fileID: 11485338} - m_ControlBarToggle: {fileID: 11415068} - m_MenuSectionPrefab: {fileID: 130812, guid: 1755c05344f574d4787a372d34a4e3fb, type: 2} - m_SectionsTransform: {fileID: 22435482} - m_FastFadeDuration: .100000001 - m_SlowFadeDuration: .300000012 ---- !u!114 &11417302 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 114528} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: 15 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 ---- !u!114 &11420706 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 122098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: .467545569, g: 1, b: .448529422, a: 1} @@ -507,7 +477,7 @@ m_Top: 4 m_Bottom: 4 m_ChildAlignment: 0 - m_Spacing: 4 + m_Spacing: 2 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 --- !u!114 &11439582 @@ -557,27 +527,36 @@ m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 15 + m_PreferredHeight: 18 m_FlexibleWidth: -1 m_FlexibleHeight: -1 ---- !u!114 &11451984 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 194088} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: 15 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 +--- !u!114 &11447982 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 126098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &11453198 MonoBehaviour: m_ObjectHideFlags: 1 @@ -608,7 +587,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .800000072, g: 1, b: 0, a: .784313738} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -638,7 +617,7 @@ m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 15 + m_PreferredHeight: 18 m_FlexibleWidth: -1 m_FlexibleHeight: -1 --- !u!114 &11462752 @@ -655,10 +634,10 @@ m_Padding: m_Left: 0 m_Right: 0 - m_Top: 4 - m_Bottom: 4 + m_Top: 1 + m_Bottom: 1 m_ChildAlignment: 0 - m_Spacing: 4 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 --- !u!114 &11463504 @@ -673,7 +652,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .183823526, g: .183823526, b: .183823526, a: .90196079} + m_Color: {r: .600000024, g: .600000024, b: .600000024, a: .784313738} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -700,7 +679,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -732,7 +711,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -764,7 +743,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .800000072, g: 1, b: 0, a: .784313738} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -779,6 +758,54 @@ m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &11478508 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 126098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 323546239, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ElementType: 1 +--- !u!114 &11482140 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 122098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 323546239, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ElementType: 3 +--- !u!114 &11482720 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 114528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 323546239, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ElementType: 4 +--- !u!114 &11483870 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 194088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 323546239, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ElementType: 4 --- !u!114 &11483978 MonoBehaviour: m_ObjectHideFlags: 1 @@ -792,7 +819,27 @@ m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!114 &11485338 +--- !u!114 &11485532 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 126098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 +--- !u!114 &11489252 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -809,11 +856,11 @@ m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .467545569, g: 1, b: .448529422, a: 1} - m_PressedColor: {r: .800000072, g: 1, b: 0, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} m_ColorMultiplier: 1 m_FadeDuration: .100000001 @@ -828,7 +875,7 @@ m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 11498756} - toggleTransition: 1 + toggleTransition: 0 graphic: {fileID: 11475868} m_Group: {fileID: 0} onValueChanged: @@ -848,26 +895,6 @@ m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_IsOn: 0 ---- !u!114 &11485532 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 126098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 --- !u!114 &11494262 MonoBehaviour: m_ObjectHideFlags: 1 @@ -880,7 +907,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .800000072, g: 1, b: 0, a: .501960814} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -907,7 +934,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .800000072, g: 1, b: 0, a: .501960814} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: --- a/Assets/Prefabs/FlightMenuSection.prefab +++ b/Assets/Prefabs/FlightMenuSection.prefab @@ -10,8 +10,8 @@ - 224: {fileID: 22409126} - 222: {fileID: 22266612} - 114: {fileID: 11461446} - - 114: {fileID: 11496274} - 114: {fileID: 11436568} + - 114: {fileID: 11403482} m_Layer: 5 m_Name: ToggleDisplay m_TagString: Untagged @@ -46,8 +46,8 @@ - 224: {fileID: 22444842} - 222: {fileID: 22269896} - 114: {fileID: 11449350} - - 114: {fileID: 11489918} - 114: {fileID: 11421724} + - 114: {fileID: 11411294} m_Layer: 5 m_Name: ToggleEdit m_TagString: Untagged @@ -123,6 +123,18 @@ m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &11403482 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 121376} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 323546239, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ElementType: 4 --- !u!114 &11408784 MonoBehaviour: m_ObjectHideFlags: 1 @@ -135,7 +147,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -155,6 +167,18 @@ m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: DISPLAY +--- !u!114 &11411294 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 130136} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 323546239, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ElementType: 4 --- !u!114 &11418436 MonoBehaviour: m_ObjectHideFlags: 1 @@ -167,7 +191,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .800000072, g: 1, b: 0, a: .784313738} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -199,7 +223,7 @@ m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: .467545569, g: 1, b: .448529422, a: 1} @@ -218,7 +242,7 @@ m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 11449350} - toggleTransition: 1 + toggleTransition: 0 graphic: {fileID: 11484356} m_Group: {fileID: 0} onValueChanged: @@ -253,7 +277,7 @@ m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 15 + m_PreferredHeight: 18 m_FlexibleWidth: -1 m_FlexibleHeight: -1 --- !u!114 &11436568 @@ -273,7 +297,7 @@ m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: .467545569, g: 1, b: .448529422, a: 1} @@ -292,7 +316,7 @@ m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 11461446} - toggleTransition: 1 + toggleTransition: 0 graphic: {fileID: 11418436} m_Group: {fileID: 0} onValueChanged: @@ -324,7 +348,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .800000072, g: 1, b: 0, a: .501960814} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -351,7 +375,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .800000072, g: 1, b: 0, a: .501960814} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -378,7 +402,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -410,7 +434,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .800000072, g: 1, b: 0, a: .784313738} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -425,24 +449,6 @@ m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &11489918 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 130136} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: 20 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 --- !u!114 &11494744 MonoBehaviour: m_ObjectHideFlags: 1 @@ -451,30 +457,12 @@ m_GameObject: {fileID: 130812} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -1842827791, guid: a3a55138b08428847a08c7b48fe72efe, type: 3} + m_Script: {fileID: -1842827791, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} m_Name: m_EditorClassIdentifier: m_DisplayToggle: {fileID: 11436568} m_DisplayText: {fileID: 11408784} m_EditToggle: {fileID: 11421724} ---- !u!114 &11496274 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 121376} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: 20 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 --- !u!222 &22219086 CanvasRenderer: m_ObjectHideFlags: 1 @@ -687,6 +675,42 @@ propertyPath: m_Colors.m_PressedColor.b value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DisplayToggle + value: + objectReference: {fileID: 11436568} + - target: {fileID: 0} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ElementType + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_PreferredHeight + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: toggleTransition + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 130812} --- /dev/null +++ b/Assets/Prefabs/Setting.prefab @@ -1,1 +1,274 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &120186 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22457826} + - 222: {fileID: 22284884} + - 114: {fileID: 11446448} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &139342 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22475724} + - 114: {fileID: 11457692} + - 114: {fileID: 11461286} + m_Layer: 5 + m_Name: Setting + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &152604 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22432972} + - 114: {fileID: 11476120} + m_Layer: 5 + m_Name: Buttons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &11446448 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 120186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 12 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Setting Label +--- !u!114 &11457692 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 139342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 400 + m_PreferredHeight: 20 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 +--- !u!114 &11461286 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 139342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 644905346, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Label: {fileID: 11446448} + m_ButtonsTransform: {fileID: 22432972} + m_SettingButtonPrefab: {fileID: 168214, guid: 345debd9876196a4e95d8718febe5301, + type: 2} + m_SettingTogglePrefab: {fileID: 153220, guid: b0b78ee2755669241a6e82c70b5988cf, + type: 2} +--- !u!114 &11476120 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 152604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 5 + m_Spacing: 2 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 +--- !u!222 &22284884 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 120186} +--- !u!224 &22432972 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 152604} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22475724} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 1, y: .5} +--- !u!224 &22457826 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 120186} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22475724} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: .5, y: 1} + m_AnchoredPosition: {x: 2.5, y: 0} + m_SizeDelta: {x: -5, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22475724 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 139342} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22457826} + - {fileID: 22432972} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 0} + propertyPath: m_ButtonsTransform + value: + objectReference: {fileID: 22432972} + - target: {fileID: 0} + propertyPath: m_Label + value: + objectReference: {fileID: 11446448} + - target: {fileID: 0} + propertyPath: m_SettingButtonPrefab + value: + objectReference: {fileID: 168214, guid: 345debd9876196a4e95d8718febe5301, type: 2} + - target: {fileID: 0} + propertyPath: m_SettingTogglePrefab + value: + objectReference: {fileID: 153220, guid: b0b78ee2755669241a6e82c70b5988cf, type: 2} + - target: {fileID: 0} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Text + value: Setting Label + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_PreferredWidth + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SizeDelta.x + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMax.x + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Spacing + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchoredPosition.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ChildForceExpandWidth + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ChildAlignment + value: 5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 139342} + m_IsPrefabParent: 1 --- /dev/null +++ b/Assets/Prefabs/SettingButton.prefab @@ -1,1 +1,260 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &168214 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22424224} + - 222: {fileID: 22268938} + - 114: {fileID: 11467924} + - 114: {fileID: 11423954} + - 114: {fileID: 11425436} + - 114: {fileID: 11431978} + m_Layer: 5 + m_Name: SettingButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &190018 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22434708} + - 222: {fileID: 22253606} + - 114: {fileID: 11411402} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &11411402 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 190018} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 12 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Button +--- !u!114 &11423954 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 168214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 11467924} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &11425436 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 168214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 323546239, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ElementType: 3 +--- !u!114 &11431978 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 168214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 +--- !u!114 &11467924 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 168214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &22253606 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 190018} +--- !u!222 &22268938 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 168214} +--- !u!224 &22424224 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 168214} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22434708} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22434708 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 190018} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22424224} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 0} + propertyPath: m_FontData.m_FontSize + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_FontData.m_RichText + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_FontData.m_FontStyle + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_FlexibleWidth + value: -1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 168214} + m_IsPrefabParent: 1 --- /dev/null +++ b/Assets/Prefabs/SettingToggle.prefab @@ -1,1 +1,344 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &112456 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22471524} + - 222: {fileID: 22262292} + - 114: {fileID: 11411192} + m_Layer: 5 + m_Name: Selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &153220 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22458510} + - 222: {fileID: 22234250} + - 114: {fileID: 11474744} + - 114: {fileID: 11492986} + - 114: {fileID: 11473012} + - 114: {fileID: 11469566} + m_Layer: 5 + m_Name: SettingToggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &159822 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22412684} + - 222: {fileID: 22267242} + - 114: {fileID: 11484368} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &11411192 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 112456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11469566 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 +--- !u!114 &11473012 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 11474744} + toggleTransition: 0 + graphic: {fileID: 11411192} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 0 +--- !u!114 &11474744 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11484368 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 159822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 12 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Button +--- !u!114 &11492986 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 323546239, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ElementType: 4 +--- !u!222 &22234250 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153220} +--- !u!222 &22262292 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 112456} +--- !u!222 &22267242 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 159822} +--- !u!224 &22412684 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 159822} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22458510} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22458510 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153220} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22471524} + - {fileID: 22412684} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22471524 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 112456} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22458510} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 0} + propertyPath: m_ElementType + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_FontData.m_FontSize + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_FontData.m_RichText + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_FontData.m_FontStyle + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: toggleTransition + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_FlexibleWidth + value: -1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 153220} + m_IsPrefabParent: 1 --- /dev/null +++ b/Assets/Prefabs/Window.prefab @@ -1,1 +1,731 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &115950 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22465080} + - 222: {fileID: 22224666} + - 114: {fileID: 11463020} + - 114: {fileID: 11473370} + - 114: {fileID: 11452824} + m_Layer: 5 + m_Name: Titlebar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &147848 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22498172} + - 222: {fileID: 22241544} + - 114: {fileID: 11472350} + - 114: {fileID: 11482324} + - 114: {fileID: 11478236} + m_Layer: 5 + m_Name: Close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &153670 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22461526} + - 222: {fileID: 22240064} + - 114: {fileID: 11470056} + - 114: {fileID: 11400662} + - 114: {fileID: 11453036} + - 225: {fileID: 22579498} + - 114: {fileID: 11464560} + - 114: {fileID: 11409628} + m_Layer: 5 + m_Name: Window + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &158314 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22418124} + - 222: {fileID: 22254660} + - 114: {fileID: 11457960} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &173368 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22447524} + - 114: {fileID: 11403752} + - 114: {fileID: 11450476} + m_Layer: 5 + m_Name: Padding + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &182900 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22456320} + - 114: {fileID: 11481312} + - 114: {fileID: 11443188} + - 222: {fileID: 22252016} + - 114: {fileID: 11454192} + - 114: {fileID: 11486264} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &194536 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22474276} + - 222: {fileID: 22295052} + - 114: {fileID: 11464580} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &11400662 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 604723565, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Title: {fileID: 11464580} + m_Content: {fileID: 22456320} +--- !u!114 &11403752 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 173368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 5 + m_Right: 5 + m_Top: 5 + m_Bottom: 5 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 +--- !u!114 &11409628 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &11443188 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 182900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &11450476 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 173368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &11452824 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 115950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 20 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 +--- !u!114 &11453036 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 323546239, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ElementType: 1 +--- !u!114 &11454192 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 182900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11457960 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 158314} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 12 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: X +--- !u!114 &11463020 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 115950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .600000024, g: .600000024, b: .600000024, a: .784313738} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11464560 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 +--- !u!114 &11464580 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 194536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .800000072, g: 1, b: 0, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 12 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!114 &11470056 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11472350 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 147848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11473370 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 115950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 323546239, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ElementType: 1 +--- !u!114 &11478236 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 147848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 323546239, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ElementType: 3 +--- !u!114 &11481312 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 182900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 5 + m_Right: 5 + m_Top: 5 + m_Bottom: 5 + m_ChildAlignment: 0 + m_Spacing: 2 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 +--- !u!114 &11482324 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 147848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 11472350} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 11400662} + m_MethodName: Close + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &11486264 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 182900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 323546239, guid: 4ffb1bf511e31af45bdeaa3d272d49d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ElementType: 2 +--- !u!222 &22224666 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 115950} +--- !u!222 &22240064 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153670} +--- !u!222 &22241544 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 147848} +--- !u!222 &22252016 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 182900} +--- !u!222 &22254660 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 158314} +--- !u!222 &22295052 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 194536} +--- !u!224 &22418124 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 158314} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22498172} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22447524 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 173368} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22456320} + m_Father: {fileID: 22461526} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22456320 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 182900} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22447524} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22461526 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153670} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22465080} + - {fileID: 22447524} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22465080 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 115950} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22474276} + - {fileID: 22498172} + m_Father: {fileID: 22461526} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: 1} +--- !u!224 &22474276 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 194536} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 22465080} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 2.5, y: 0} + m_SizeDelta: {x: -5, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22498172 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 147848} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22418124} + m_Father: {fileID: 22465080} + m_RootOrder: 1 + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -2, y: 0} + m_SizeDelta: {x: 16, y: -4} + m_Pivot: {x: 1, y: .5} +--- !u!225 &22579498 +CanvasGroup: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153670} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 0} + propertyPath: m_Padding.m_Left + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Padding.m_Right + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Spacing + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 153670} + m_IsPrefabParent: 1 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -85,6 +85,11 @@ cellSize: .166666672 manualCellSize: 0 m_NavMeshData: {fileID: 0} +--- !u!224 &26094926 stripped +RectTransform: + m_PrefabParentObject: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, + type: 2} + m_PrefabInternal: {fileID: 1928878396} --- !u!1 &476101859 GameObject: m_ObjectHideFlags: 0 @@ -138,7 +143,7 @@ m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 0115c816d260a0947976c8ea804febbc, type: 3} + m_Sprite: {fileID: 21300000, guid: 4105bbb9c3877934f99f89c091ba0b8b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -152,269 +157,6 @@ m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 476101859} ---- !u!1001 &719682886 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1866791882} - m_Modifications: - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_SizeDelta.x - value: 250 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_SizeDelta.y - value: 74 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMin.x - value: .5 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMin.y - value: .5 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMax.x - value: .5 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMax.y - value: .5 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Pivot.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22435482, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22435482, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22435482, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchoredPosition.x - value: 125 - objectReference: {fileID: 0} - - target: {fileID: 22435482, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchoredPosition.y - value: -27 - objectReference: {fileID: 0} - - target: {fileID: 22435482, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_SizeDelta.x - value: 242 - objectReference: {fileID: 0} - - target: {fileID: 22435482, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_SizeDelta.y - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 22478174, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22478174, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22478174, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchoredPosition.x - value: 125 - objectReference: {fileID: 0} - - target: {fileID: 22478174, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchoredPosition.y - value: -11.5 - objectReference: {fileID: 0} - - target: {fileID: 22478174, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_SizeDelta.x - value: 242 - objectReference: {fileID: 0} - - target: {fileID: 22478174, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_SizeDelta.y - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 22401100, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22401100, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22401100, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchoredPosition.x - value: 125 - objectReference: {fileID: 0} - - target: {fileID: 22401100, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchoredPosition.y - value: -42.5 - objectReference: {fileID: 0} - - target: {fileID: 22401100, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_SizeDelta.x - value: 242 - objectReference: {fileID: 0} - - target: {fileID: 22401100, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_SizeDelta.y - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 22483410, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22483410, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22483410, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchoredPosition.x - value: 125 - objectReference: {fileID: 0} - - target: {fileID: 22483410, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_SizeDelta.x - value: 250 - objectReference: {fileID: 0} - - target: {fileID: 22483410, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_SizeDelta.y - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 22475412, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22475412, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22475412, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchoredPosition.x - value: 125 - objectReference: {fileID: 0} - - target: {fileID: 22475412, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_AnchoredPosition.y - value: -47 - objectReference: {fileID: 0} - - target: {fileID: 22475412, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_SizeDelta.x - value: 250 - objectReference: {fileID: 0} - - target: {fileID: 22475412, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_SizeDelta.y - value: 54 - objectReference: {fileID: 0} - - target: {fileID: 11415068, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SetControlBarVisible - objectReference: {fileID: 0} - - target: {fileID: 11485338, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SetDisplayStackVisible - objectReference: {fileID: 0} - - target: {fileID: 11485338, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Colors.m_HighlightedColor.r - value: .467545569 - objectReference: {fileID: 0} - - target: {fileID: 11485338, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Colors.m_HighlightedColor.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11485338, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Colors.m_HighlightedColor.b - value: .448529422 - objectReference: {fileID: 0} - - target: {fileID: 11485338, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Colors.m_PressedColor.r - value: .800000072 - objectReference: {fileID: 0} - - target: {fileID: 11485338, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Colors.m_PressedColor.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11485338, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Colors.m_PressedColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11485338, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Colors.m_PressedColor.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11415068, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Colors.m_HighlightedColor.r - value: .467545569 - objectReference: {fileID: 0} - - target: {fileID: 11415068, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Colors.m_HighlightedColor.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11415068, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Colors.m_HighlightedColor.b - value: .448529422 - objectReference: {fileID: 0} - - target: {fileID: 11415068, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Colors.m_PressedColor.r - value: .800000072 - objectReference: {fileID: 0} - - target: {fileID: 11415068, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Colors.m_PressedColor.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11415068, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - propertyPath: m_Colors.m_PressedColor.b - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: a41f85cb0b8964f43947e85b3e833c0f, type: 2} - m_IsPrefabParent: 0 ---- !u!224 &1026898450 stripped -RectTransform: - m_PrefabParentObject: {fileID: 22476196, guid: a41f85cb0b8964f43947e85b3e833c0f, - type: 2} - m_PrefabInternal: {fileID: 719682886} --- !u!1 &1398276586 GameObject: m_ObjectHideFlags: 0 @@ -573,7 +315,7 @@ m_Children: - {fileID: 2037475081} - {fileID: 476101860} - - {fileID: 1026898450} + - {fileID: 26094926} m_Father: {fileID: 0} m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} @@ -581,6 +323,132 @@ m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1001 &1928878396 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1866791882} + m_Modifications: + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_AnchorMin.x + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_AnchorMin.y + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_AnchorMax.x + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_AnchorMax.y + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_Pivot.x + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 22461526, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_Pivot.y + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 22456320, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22456320, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22456320, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_AnchoredPosition.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 22456320, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_AnchoredPosition.y + value: -25 + objectReference: {fileID: 0} + - target: {fileID: 22456320, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 22456320, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_SizeDelta.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 22465080, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22465080, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22465080, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_AnchoredPosition.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 22465080, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 22465080, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + propertyPath: m_SizeDelta.y + value: 20 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1146896f042c04546abd10ef08dc0354, type: 2} + m_IsPrefabParent: 0 --- !u!1 &2037475080 GameObject: m_ObjectHideFlags: 0 @@ -634,7 +502,7 @@ m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b0e2a09d07dbbcb40b0d4db43cd044f9, type: 3} + m_Sprite: {fileID: 21300000, guid: 696e4ea6d01cf324889c1a7fa0c2fb06, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 --- a/Assets/Scripts/Editor/BuildAssetBundles.cs +++ b/Assets/Scripts/Editor/BuildAssetBundles.cs @@ -21,7 +21,7 @@ public class BuildAssetBundles : MonoBehaviour { - [MenuItem("Assets/Build Asset Bundles")] + [MenuItem("Build/Asset Bundles")] public static void Build() { BuildPipeline.BuildAssetBundles(Application.dataPath + "/../Output/KerbalEngineer", BuildAssetBundleOptions.UncompressedAssetBundle); --- a/Documents/CHANGES.txt +++ b/Documents/CHANGES.txt @@ -1,9 +1,13 @@ +1.1.0.0, XX-XX-16 Added: Asset bundle loading and integration. + Added: Styling system so that Unity UI objects can use KSP stock styles. + Added: Unity UI window system. Changed: Thermal flux is now correctly indicated in kilowatts. Changed: Complete rewrite of code underpinning the stock toolbar icons. Changed: Flight Engineer toolbar menu recreated using Unity UI. Changed: Replaced occurances of IMGUI using RenderingManager to use OnGUI directly. Fixed: Toggling the 'Control Bar' now appropriately resizes the display stack. + Fixed: Part info tooltips in the editor remaining open when no part is selected. 1.0.19.4, 12-02-16 Fixed: Only 'STAGE_STACK_FLOW' and 'STAGE_STACK_FLOW_BALANCE' resources include surface mounted parts as fuel targets. --- a/KerbalEngineer.CSharp.Editor.csproj +++ b/KerbalEngineer.CSharp.Editor.csproj @@ -55,6 +55,9 @@ Library\UnityAssemblies\UnityEditor.dll + + Library\UnityAssemblies\UnityEngine.Advertisements.dll + Library\UnityAssemblies\UnityEditor.Advertisements.dll @@ -69,6 +72,9 @@ Library\UnityAssemblies\UnityEditor.Networking.dll + + + Library\UnityAssemblies\UnityEngine.Analytics.dll Library\UnityAssemblies\UnityEditor.Graphs.dll --- a/KerbalEngineer.Unity/CanvasGroupFader.cs +++ b/KerbalEngineer.Unity/CanvasGroupFader.cs @@ -100,7 +100,6 @@ yield return null; } - print(m_CanvasGroup.alpha); callback?.Invoke(); m_FadeCoroutine = null; --- a/KerbalEngineer.Unity/Flight/FlightMenu.cs +++ b/KerbalEngineer.Unity/Flight/FlightMenu.cs @@ -180,6 +180,9 @@ GameObject menuSectionObject = Instantiate(m_MenuSectionPrefab); if (menuSectionObject != null) { + // apply ksp theme to the created menu section object + m_FlightAppLauncher.ApplyTheme(menuSectionObject); + menuSectionObject.transform.SetParent(m_SectionsTransform, false); FlightMenuSection menuSection = menuSectionObject.GetComponent(); --- a/KerbalEngineer.Unity/Flight/IFlightAppLauncher.cs +++ b/KerbalEngineer.Unity/Flight/IFlightAppLauncher.cs @@ -29,6 +29,8 @@ bool IsOn { get; } + void ApplyTheme(GameObject gameObject); + void ClampToScreen(RectTransform rectTransform); Vector3 GetAnchor(); --- a/KerbalEngineer.Unity/KerbalEngineer.Unity.csproj +++ b/KerbalEngineer.Unity/KerbalEngineer.Unity.csproj @@ -37,6 +37,10 @@ + + + + --- /dev/null +++ b/KerbalEngineer.Unity/Setting.cs @@ -1,1 +1,147 @@ +namespace KerbalEngineer.Unity +{ + using System; + using UnityEngine; + using UnityEngine.Events; + using UnityEngine.UI; + public class Setting : MonoBehaviour + { + [SerializeField] + private Text m_Label = null; + + [SerializeField] + private Transform m_ButtonsTransform = null; + + [SerializeField] + private GameObject m_SettingButtonPrefab = null; + + [SerializeField] + private GameObject m_SettingTogglePrefab = null; + + private Action m_OnUpdate; + + public Button AddButton(string text, float width, UnityAction onClick) + { + Button button = null; + + if (m_SettingButtonPrefab != null) + { + GameObject buttonObject = Instantiate(m_SettingButtonPrefab); + if (buttonObject != null) + { + button = buttonObject.GetComponent