From c44d7824a168cb952bad3d28acb1db8f7a581b5a Mon Sep 17 00:00:00 2001 From: Icaro Magalhaes Date: Tue, 15 Sep 2015 01:37:11 -0300 Subject: [PATCH] Implementa escolha de resolucao com novo design --- Assets/Prefabs/CanvasCore.prefab | 451 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------- Assets/Resources/GUI/IconeSub.png | Bin 1096 -> 0 bytes Assets/Resources/GUI/IconeSub.png.meta | 55 ------------------------------------------------------- Assets/Resources/GUI/OnSubtitle.png | Bin 24102 -> 0 bytes Assets/Resources/GUI/OnSubtitle.png.meta | 55 ------------------------------------------------------- Assets/Resources/GUI/_Barra.png | Bin 1764 -> 0 bytes Assets/Resources/GUI/_Barra.png.meta | 55 ------------------------------------------------------- Assets/Resources/GUI/__Pause.png | Bin 269 -> 0 bytes Assets/Resources/GUI/__Pause.png.meta | 55 ------------------------------------------------------- Assets/Resources/GUI/pause.png | Bin 0 -> 269 bytes Assets/Resources/GUI/pause.png.meta | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/reso/1024x768.png | Bin 0 -> 1018 bytes Assets/Resources/GUI/reso/1024x768.png.meta | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/reso/648x480.png | Bin 0 -> 954 bytes Assets/Resources/GUI/reso/648x480.png.meta | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/reso/800x600.png | Bin 0 -> 947 bytes Assets/Resources/GUI/reso/800x600.png.meta | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/reso/Off1024.png | Bin 16658 -> 0 bytes Assets/Resources/GUI/reso/Off1024.png.meta | 55 ------------------------------------------------------- Assets/Resources/GUI/reso/Off640.png | Bin 17011 -> 0 bytes Assets/Resources/GUI/reso/Off640.png.meta | 55 ------------------------------------------------------- Assets/Resources/GUI/reso/Off800.png | Bin 16772 -> 0 bytes Assets/Resources/GUI/reso/Off800.png.meta | 55 ------------------------------------------------------- Assets/Resources/GUI/reso/On1024.png | Bin 16687 -> 0 bytes Assets/Resources/GUI/reso/On1024.png.meta | 55 ------------------------------------------------------- Assets/Resources/GUI/reso/On640.png | Bin 17052 -> 0 bytes Assets/Resources/GUI/reso/On640.png.meta | 55 ------------------------------------------------------- Assets/Resources/GUI/reso/On800.png | Bin 16802 -> 0 bytes Assets/Resources/GUI/reso/On800.png.meta | 55 ------------------------------------------------------- Assets/Resources/GUI/reso/_menuconfig.png | Bin 15434 -> 0 bytes Assets/Resources/GUI/reso/_menuconfig.png.meta | 55 ------------------------------------------------------- Assets/Resources/GUI/reso/active.png | Bin 0 -> 424 bytes Assets/Resources/GUI/reso/active.png.meta | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/subtitles.png | Bin 0 -> 1096 bytes Assets/Resources/GUI/subtitles.png.meta | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Scenes/Scene.unity | 378 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ProjectSettings/ProjectSettings.asset | 5 ----- ProjectSettings/ProjectVersion.txt | 2 +- 38 files changed, 817 insertions(+), 954 deletions(-) delete mode 100644 Assets/Resources/GUI/IconeSub.png delete mode 100644 Assets/Resources/GUI/IconeSub.png.meta delete mode 100644 Assets/Resources/GUI/OnSubtitle.png delete mode 100644 Assets/Resources/GUI/OnSubtitle.png.meta delete mode 100644 Assets/Resources/GUI/_Barra.png delete mode 100644 Assets/Resources/GUI/_Barra.png.meta delete mode 100644 Assets/Resources/GUI/__Pause.png delete mode 100644 Assets/Resources/GUI/__Pause.png.meta create mode 100644 Assets/Resources/GUI/pause.png create mode 100644 Assets/Resources/GUI/pause.png.meta create mode 100644 Assets/Resources/GUI/reso/1024x768.png create mode 100644 Assets/Resources/GUI/reso/1024x768.png.meta create mode 100644 Assets/Resources/GUI/reso/648x480.png create mode 100644 Assets/Resources/GUI/reso/648x480.png.meta create mode 100644 Assets/Resources/GUI/reso/800x600.png create mode 100644 Assets/Resources/GUI/reso/800x600.png.meta delete mode 100644 Assets/Resources/GUI/reso/Off1024.png delete mode 100644 Assets/Resources/GUI/reso/Off1024.png.meta delete mode 100644 Assets/Resources/GUI/reso/Off640.png delete mode 100644 Assets/Resources/GUI/reso/Off640.png.meta delete mode 100644 Assets/Resources/GUI/reso/Off800.png delete mode 100644 Assets/Resources/GUI/reso/Off800.png.meta delete mode 100644 Assets/Resources/GUI/reso/On1024.png delete mode 100644 Assets/Resources/GUI/reso/On1024.png.meta delete mode 100644 Assets/Resources/GUI/reso/On640.png delete mode 100644 Assets/Resources/GUI/reso/On640.png.meta delete mode 100644 Assets/Resources/GUI/reso/On800.png delete mode 100644 Assets/Resources/GUI/reso/On800.png.meta delete mode 100644 Assets/Resources/GUI/reso/_menuconfig.png delete mode 100644 Assets/Resources/GUI/reso/_menuconfig.png.meta create mode 100644 Assets/Resources/GUI/reso/active.png create mode 100644 Assets/Resources/GUI/reso/active.png.meta create mode 100644 Assets/Resources/GUI/subtitles.png create mode 100644 Assets/Resources/GUI/subtitles.png.meta diff --git a/Assets/Prefabs/CanvasCore.prefab b/Assets/Prefabs/CanvasCore.prefab index 29ad2b7..1a2758c 100644 --- a/Assets/Prefabs/CanvasCore.prefab +++ b/Assets/Prefabs/CanvasCore.prefab @@ -1,5 +1,22 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &100066 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22404850} + - 222: {fileID: 22231860} + - 114: {fileID: 11400672} + m_Layer: 5 + m_Name: i_640x480 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &102362 GameObject: m_ObjectHideFlags: 1 @@ -33,7 +50,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!1 &103238 GameObject: m_ObjectHideFlags: 1 @@ -132,7 +149,7 @@ GameObject: - 222: {fileID: 22270438} - 114: {fileID: 11496706} m_Layer: 5 - m_Name: t_TamanhoDaTela + m_Name: t_tamanho_da_tela m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -216,7 +233,7 @@ GameObject: - 114: {fileID: 11423290} - 114: {fileID: 11414600} m_Layer: 5 - m_Name: b_update + m_Name: b_verificar_atualizacao m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -242,6 +259,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &113758 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22422378} + - 222: {fileID: 22286456} + - 114: {fileID: 11403672} + m_Layer: 5 + m_Name: i_1024x768 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &116530 GameObject: m_ObjectHideFlags: 1 @@ -269,6 +303,7 @@ GameObject: - 114: {fileID: 11487552} - 114: {fileID: 11403206} - 114: {fileID: 11431262} + - 114: {fileID: 11442424} m_Layer: 5 m_Name: Sub m_TagString: BUTTONS @@ -320,6 +355,7 @@ GameObject: - 114: {fileID: 11483556} - 114: {fileID: 11488766} - 114: {fileID: 11453832} + - 114: {fileID: 11415014} m_Layer: 5 m_Name: Settings m_TagString: BUTTONS @@ -337,7 +373,7 @@ GameObject: - 224: {fileID: 22474202} - 222: {fileID: 22295212} - 114: {fileID: 11446064} - - 114: {fileID: 11441928} + - 114: {fileID: 11467258} m_Layer: 5 m_Name: RESBOX m_TagString: RESBOX @@ -655,7 +691,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &167322 GameObject: m_ObjectHideFlags: 1 @@ -739,7 +775,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &177438 GameObject: m_ObjectHideFlags: 1 @@ -787,7 +823,7 @@ GameObject: - 114: {fileID: 11454790} - 114: {fileID: 11450564} m_Layer: 5 - m_Name: top + m_Name: b_640x480 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -805,7 +841,7 @@ GameObject: - 114: {fileID: 11438338} - 114: {fileID: 11449518} m_Layer: 5 - m_Name: bot + m_Name: b_1024x768 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -840,7 +876,7 @@ GameObject: - 114: {fileID: 11451834} - 114: {fileID: 11408606} m_Layer: 5 - m_Name: Info + m_Name: b_info m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -865,6 +901,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &191832 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22416570} + - 222: {fileID: 22283758} + - 114: {fileID: 11497192} + m_Layer: 5 + m_Name: i_800x600 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &193898 GameObject: m_ObjectHideFlags: 1 @@ -896,7 +949,7 @@ GameObject: - 114: {fileID: 11455316} - 114: {fileID: 11414824} m_Layer: 5 - m_Name: mid + m_Name: b_800x600 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -932,6 +985,26 @@ Transform: m_Children: [] m_Father: {fileID: 22403302} m_RootOrder: 2 +--- !u!114 &11400672 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100066} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Texture: {fileID: 2800000, guid: 1551e8a93dfea3b4ab30da9f65c4b8fc, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!114 &11402004 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1004,8 +1077,39 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 11442424} + m_MethodName: switchCollor + 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 &11403672 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 113758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Texture: {fileID: 2800000, guid: 1551e8a93dfea3b4ab30da9f65c4b8fc, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!114 &11405298 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1151,7 +1255,7 @@ MonoBehaviour: 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: .180392161, g: .200000018, b: .239215702, a: 1} + m_PressedColor: {r: .356862754, g: .78039223, b: .815686345, a: 1} m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} m_ColorMultiplier: 1 m_FadeDuration: .100000001 @@ -1181,7 +1285,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 - - m_Target: {fileID: 11441928} + - m_Target: {fileID: 0} m_MethodName: switchResbox m_Mode: 1 m_Arguments: @@ -1267,7 +1371,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 11441928} + - m_Target: {fileID: 0} m_MethodName: resChange m_Mode: 3 m_Arguments: @@ -1278,42 +1382,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 11454790} - m_MethodName: set_sprite - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 21300000, guid: c11e177d4ffb6004ab7c742627229705, - type: 3} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Sprite, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 11455316} - m_MethodName: set_sprite - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 21300000, guid: 6e0e7c06ed2243d409591b05c787ffd3, - type: 3} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Sprite, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 11438338} - m_MethodName: set_sprite - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 21300000, guid: 2d34a4809ebd08c469f6c440ca483a1f, - type: 3} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Sprite, 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 &11414834 @@ -1330,6 +1398,19 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: .5} m_EffectDistance: {x: .5, y: -.5} m_UseGraphicAlpha: 1 +--- !u!114 &11415014 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 120734} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7cc5766abb54eac43825973353dad745, type: 3} + m_Name: + m_EditorClassIdentifier: + thisButton: {fileID: 11488766} + enabled: 0 --- !u!114 &11415132 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1680,7 +1761,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Sprite: {fileID: 21300000, guid: 2d34a4809ebd08c469f6c440ca483a1f, type: 3} + m_Sprite: {fileID: 21300000, guid: c788952cf189a7f4184bddac60b45e7e, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1725,17 +1806,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: http://vlibrasplayer.lavid.ufpb.br/ ---- !u!114 &11441928 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 122814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0f8efe7b736c5c43932f164af521190, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &11442074 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1830,8 +1900,32 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 177042} + m_MethodName: SetActive + m_Mode: 6 + 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 &11442424 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 117460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7cc5766abb54eac43825973353dad745, type: 3} + m_Name: + m_EditorClassIdentifier: + thisButton: {fileID: 11403206} + enabled: 1 --- !u!114 &11445512 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2069,7 +2163,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 11441928} + - m_Target: {fileID: 0} m_MethodName: resChange m_Mode: 3 m_Arguments: @@ -2080,42 +2174,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 11454790} - m_MethodName: set_sprite - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 21300000, guid: c11e177d4ffb6004ab7c742627229705, - type: 3} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Sprite, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 11455316} - m_MethodName: set_sprite - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 21300000, guid: 3a8df4d9e63dbc145871fa09bed32d4b, - type: 3} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Sprite, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 11438338} - m_MethodName: set_sprite - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 21300000, guid: 544b244b010001544846fa4965364f02, - type: 3} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Sprite, 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 &11450256 @@ -2200,7 +2258,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 11441928} + - m_Target: {fileID: 0} m_MethodName: resChange m_Mode: 3 m_Arguments: @@ -2211,42 +2269,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 11454790} - m_MethodName: set_sprite - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 21300000, guid: ad3254b3ddabf9f49ba812db5de0f50a, - type: 3} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Sprite, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 11455316} - m_MethodName: set_sprite - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 21300000, guid: 3a8df4d9e63dbc145871fa09bed32d4b, - type: 3} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Sprite, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 11438338} - m_MethodName: set_sprite - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 21300000, guid: 2d34a4809ebd08c469f6c440ca483a1f, - type: 3} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Sprite, 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 &11450580 @@ -2525,7 +2547,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Sprite: {fileID: 21300000, guid: ad3254b3ddabf9f49ba812db5de0f50a, type: 3} + m_Sprite: {fileID: 21300000, guid: c5ac4b4b1a0d809479fa9f87bd72416b, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2546,7 +2568,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Sprite: {fileID: 21300000, guid: 3a8df4d9e63dbc145871fa09bed32d4b, type: 3} + m_Sprite: {fileID: 21300000, guid: e64bfab125ea2b243ba361f0023d66b9, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2751,6 +2773,17 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &11467258 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 122814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0f8efe7b736c5c43932f164af521190, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &11467578 MonoBehaviour: m_ObjectHideFlags: 1 @@ -3099,7 +3132,18 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 11441928} + - m_Target: {fileID: 11415014} + m_MethodName: switchCollor + 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_Target: {fileID: 11467258} m_MethodName: switchResbox m_Mode: 1 m_Arguments: @@ -3217,6 +3261,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 177042} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!114 &11491450 @@ -3310,6 +3365,26 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &11497192 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 191832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Texture: {fileID: 2800000, guid: 1551e8a93dfea3b4ab30da9f65c4b8fc, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!114 &11497262 MonoBehaviour: m_ObjectHideFlags: 1 @@ -3414,6 +3489,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 109188} +--- !u!222 &22231860 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100066} --- !u!222 &22232270 CanvasRenderer: m_ObjectHideFlags: 1 @@ -3558,12 +3639,24 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 165578} +--- !u!222 &22283758 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 191832} --- !u!222 &22284722 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 102362} +--- !u!222 &22286456 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 113758} --- !u!222 &22288072 CanvasRenderer: m_ObjectHideFlags: 1 @@ -3653,9 +3746,9 @@ RectTransform: - {fileID: 22474902} - {fileID: 22474202} - {fileID: 467572} - - {fileID: 22429890} - {fileID: 22407736} - {fileID: 22469258} + - {fileID: 22429890} m_Father: {fileID: 0} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} @@ -3663,6 +3756,23 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!224 &22404850 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100066} + 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: 22487684} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .5} + m_AnchorMax: {x: 0, y: .5} + m_AnchoredPosition: {x: 8, y: -.699999988} + m_SizeDelta: {x: 11, y: 10} + m_Pivot: {x: .5, y: .5} --- !u!224 &22407736 RectTransform: m_ObjectHideFlags: 1 @@ -3682,7 +3792,7 @@ RectTransform: - {fileID: 22426864} - {fileID: 22479914} m_Father: {fileID: 22403302} - m_RootOrder: 4 + m_RootOrder: 3 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -3760,6 +3870,23 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 150} m_SizeDelta: {x: 619, y: 52} m_Pivot: {x: .5, y: .5} +--- !u!224 &22416570 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 191832} + 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: 22448414} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .5} + m_AnchorMax: {x: 0, y: .5} + m_AnchoredPosition: {x: 8, y: -.699999988} + m_SizeDelta: {x: 11, y: 10} + m_Pivot: {x: .5, y: .5} --- !u!224 &22419714 RectTransform: m_ObjectHideFlags: 1 @@ -3795,6 +3922,23 @@ RectTransform: m_AnchoredPosition: {x: -26, y: 26.3999996} m_SizeDelta: {x: 136, y: 15} m_Pivot: {x: .5, y: .5} +--- !u!224 &22422378 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 113758} + 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: 22442176} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .5} + m_AnchorMax: {x: 0, y: .5} + m_AnchoredPosition: {x: 8, y: -.699999988} + m_SizeDelta: {x: 11, y: 10} + m_Pivot: {x: .5, y: .5} --- !u!224 &22422900 RectTransform: m_ObjectHideFlags: 1 @@ -3858,7 +4002,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 22403302} - m_RootOrder: 3 + m_RootOrder: 5 m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -5, y: -5} @@ -3949,13 +4093,14 @@ RectTransform: 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_Children: + - {fileID: 22422378} m_Father: {fileID: 22474202} m_RootOrder: 2 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 60.0999985, y: 33.9000015} - m_SizeDelta: {x: 77, y: 13} + m_AnchoredPosition: {x: 61.5, y: 30} + m_SizeDelta: {x: 86, y: 15} m_Pivot: {x: .5, y: .5} --- !u!224 &22444892 RectTransform: @@ -3983,13 +4128,14 @@ RectTransform: 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_Children: + - {fileID: 22416570} m_Father: {fileID: 22474202} m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 60.0999985, y: 63.9000015} - m_SizeDelta: {x: 77, y: 13} + m_AnchoredPosition: {x: 60, y: 60} + m_SizeDelta: {x: 83, y: 15} m_Pivot: {x: .5, y: .5} --- !u!224 &22448518 RectTransform: @@ -4267,7 +4413,7 @@ RectTransform: - {fileID: 22465524} - {fileID: 22437322} m_Father: {fileID: 22403302} - m_RootOrder: 5 + m_RootOrder: 4 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -4448,13 +4594,14 @@ RectTransform: 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_Children: + - {fileID: 22404850} m_Father: {fileID: 22474202} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 60.0999985, y: 90.9000015} - m_SizeDelta: {x: 77, y: 13} + m_AnchoredPosition: {x: 60, y: 90} + m_SizeDelta: {x: 83, y: 15} m_Pivot: {x: .5, y: .5} --- !u!224 &22491142 RectTransform: @@ -4487,7 +4634,7 @@ RectTransform: m_RootOrder: 3 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 111, y: 179.100006} + m_AnchoredPosition: {x: 111, y: 175} m_SizeDelta: {x: 188, y: 20} m_Pivot: {x: .5, y: .5} --- !u!224 &22496832 diff --git a/Assets/Resources/GUI/IconeSub.png b/Assets/Resources/GUI/IconeSub.png deleted file mode 100644 index 911b646..0000000 Binary files a/Assets/Resources/GUI/IconeSub.png and /dev/null differ diff --git a/Assets/Resources/GUI/IconeSub.png.meta b/Assets/Resources/GUI/IconeSub.png.meta deleted file mode 100644 index 0ea7e98..0000000 --- a/Assets/Resources/GUI/IconeSub.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 3d155d8724b57df49a86e5965d278e8b -timeCreated: 1442258153 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 2 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/GUI/OnSubtitle.png b/Assets/Resources/GUI/OnSubtitle.png deleted file mode 100644 index fa231d0..0000000 Binary files a/Assets/Resources/GUI/OnSubtitle.png and /dev/null differ diff --git a/Assets/Resources/GUI/OnSubtitle.png.meta b/Assets/Resources/GUI/OnSubtitle.png.meta deleted file mode 100644 index f8562a6..0000000 --- a/Assets/Resources/GUI/OnSubtitle.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 2b50f0069bfe4e6468bb0d76a963c35a -timeCreated: 1436213543 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 2 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/GUI/_Barra.png b/Assets/Resources/GUI/_Barra.png deleted file mode 100644 index cf6dacb..0000000 Binary files a/Assets/Resources/GUI/_Barra.png and /dev/null differ diff --git a/Assets/Resources/GUI/_Barra.png.meta b/Assets/Resources/GUI/_Barra.png.meta deleted file mode 100644 index 8e6fa64..0000000 --- a/Assets/Resources/GUI/_Barra.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: f142b78cafec0374e982867dab2f024a -timeCreated: 1434070776 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 2 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/GUI/__Pause.png b/Assets/Resources/GUI/__Pause.png deleted file mode 100644 index 62025bd..0000000 Binary files a/Assets/Resources/GUI/__Pause.png and /dev/null differ diff --git a/Assets/Resources/GUI/__Pause.png.meta b/Assets/Resources/GUI/__Pause.png.meta deleted file mode 100644 index 80c3a84..0000000 --- a/Assets/Resources/GUI/__Pause.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: a9f1ef1260bb59c45a4163d88527a173 -timeCreated: 1441914366 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 2 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/GUI/pause.png b/Assets/Resources/GUI/pause.png new file mode 100644 index 0000000..62025bd Binary files /dev/null and b/Assets/Resources/GUI/pause.png differ diff --git a/Assets/Resources/GUI/pause.png.meta b/Assets/Resources/GUI/pause.png.meta new file mode 100644 index 0000000..80c3a84 --- /dev/null +++ b/Assets/Resources/GUI/pause.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: a9f1ef1260bb59c45a4163d88527a173 +timeCreated: 1441914366 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: 2 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/reso/1024x768.png b/Assets/Resources/GUI/reso/1024x768.png new file mode 100644 index 0000000..38c8f57 Binary files /dev/null and b/Assets/Resources/GUI/reso/1024x768.png differ diff --git a/Assets/Resources/GUI/reso/1024x768.png.meta b/Assets/Resources/GUI/reso/1024x768.png.meta new file mode 100644 index 0000000..fcc604b --- /dev/null +++ b/Assets/Resources/GUI/reso/1024x768.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: c788952cf189a7f4184bddac60b45e7e +timeCreated: 1442290747 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: 2 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/reso/648x480.png b/Assets/Resources/GUI/reso/648x480.png new file mode 100644 index 0000000..88ba556 Binary files /dev/null and b/Assets/Resources/GUI/reso/648x480.png differ diff --git a/Assets/Resources/GUI/reso/648x480.png.meta b/Assets/Resources/GUI/reso/648x480.png.meta new file mode 100644 index 0000000..21e8d8a --- /dev/null +++ b/Assets/Resources/GUI/reso/648x480.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: c5ac4b4b1a0d809479fa9f87bd72416b +timeCreated: 1442290747 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: 2 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/reso/800x600.png b/Assets/Resources/GUI/reso/800x600.png new file mode 100644 index 0000000..d562bbc Binary files /dev/null and b/Assets/Resources/GUI/reso/800x600.png differ diff --git a/Assets/Resources/GUI/reso/800x600.png.meta b/Assets/Resources/GUI/reso/800x600.png.meta new file mode 100644 index 0000000..d52b230 --- /dev/null +++ b/Assets/Resources/GUI/reso/800x600.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: e64bfab125ea2b243ba361f0023d66b9 +timeCreated: 1442290747 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: 2 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/reso/Off1024.png b/Assets/Resources/GUI/reso/Off1024.png deleted file mode 100644 index 0c42e8f..0000000 Binary files a/Assets/Resources/GUI/reso/Off1024.png and /dev/null differ diff --git a/Assets/Resources/GUI/reso/Off1024.png.meta b/Assets/Resources/GUI/reso/Off1024.png.meta deleted file mode 100644 index 7ba0960..0000000 --- a/Assets/Resources/GUI/reso/Off1024.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 2d34a4809ebd08c469f6c440ca483a1f -timeCreated: 1436193351 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 2 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/GUI/reso/Off640.png b/Assets/Resources/GUI/reso/Off640.png deleted file mode 100644 index 79e5294..0000000 Binary files a/Assets/Resources/GUI/reso/Off640.png and /dev/null differ diff --git a/Assets/Resources/GUI/reso/Off640.png.meta b/Assets/Resources/GUI/reso/Off640.png.meta deleted file mode 100644 index 112a832..0000000 --- a/Assets/Resources/GUI/reso/Off640.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: c11e177d4ffb6004ab7c742627229705 -timeCreated: 1436193352 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 2 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/GUI/reso/Off800.png b/Assets/Resources/GUI/reso/Off800.png deleted file mode 100644 index 028fbd2..0000000 Binary files a/Assets/Resources/GUI/reso/Off800.png and /dev/null differ diff --git a/Assets/Resources/GUI/reso/Off800.png.meta b/Assets/Resources/GUI/reso/Off800.png.meta deleted file mode 100644 index 7ee3b0a..0000000 --- a/Assets/Resources/GUI/reso/Off800.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 3a8df4d9e63dbc145871fa09bed32d4b -timeCreated: 1436193352 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 2 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/GUI/reso/On1024.png b/Assets/Resources/GUI/reso/On1024.png deleted file mode 100644 index 504fc73..0000000 Binary files a/Assets/Resources/GUI/reso/On1024.png and /dev/null differ diff --git a/Assets/Resources/GUI/reso/On1024.png.meta b/Assets/Resources/GUI/reso/On1024.png.meta deleted file mode 100644 index 247e69a..0000000 --- a/Assets/Resources/GUI/reso/On1024.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 544b244b010001544846fa4965364f02 -timeCreated: 1436212608 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 2 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/GUI/reso/On640.png b/Assets/Resources/GUI/reso/On640.png deleted file mode 100644 index 3a960d6..0000000 Binary files a/Assets/Resources/GUI/reso/On640.png and /dev/null differ diff --git a/Assets/Resources/GUI/reso/On640.png.meta b/Assets/Resources/GUI/reso/On640.png.meta deleted file mode 100644 index 050afc2..0000000 --- a/Assets/Resources/GUI/reso/On640.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: ad3254b3ddabf9f49ba812db5de0f50a -timeCreated: 1436212608 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 2 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/GUI/reso/On800.png b/Assets/Resources/GUI/reso/On800.png deleted file mode 100644 index aa90681..0000000 Binary files a/Assets/Resources/GUI/reso/On800.png and /dev/null differ diff --git a/Assets/Resources/GUI/reso/On800.png.meta b/Assets/Resources/GUI/reso/On800.png.meta deleted file mode 100644 index 88a1e5c..0000000 --- a/Assets/Resources/GUI/reso/On800.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 6e0e7c06ed2243d409591b05c787ffd3 -timeCreated: 1436212608 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 2 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/GUI/reso/_menuconfig.png b/Assets/Resources/GUI/reso/_menuconfig.png deleted file mode 100644 index 03b02d3..0000000 Binary files a/Assets/Resources/GUI/reso/_menuconfig.png and /dev/null differ diff --git a/Assets/Resources/GUI/reso/_menuconfig.png.meta b/Assets/Resources/GUI/reso/_menuconfig.png.meta deleted file mode 100644 index 89b796b..0000000 --- a/Assets/Resources/GUI/reso/_menuconfig.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 0e81779474718034ea2a8077eee010c4 -timeCreated: 1435946164 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/GUI/reso/active.png b/Assets/Resources/GUI/reso/active.png new file mode 100644 index 0000000..0470355 Binary files /dev/null and b/Assets/Resources/GUI/reso/active.png differ diff --git a/Assets/Resources/GUI/reso/active.png.meta b/Assets/Resources/GUI/reso/active.png.meta new file mode 100644 index 0000000..3f62099 --- /dev/null +++ b/Assets/Resources/GUI/reso/active.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 1551e8a93dfea3b4ab30da9f65c4b8fc +timeCreated: 1442290839 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: 2 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/subtitles.png b/Assets/Resources/GUI/subtitles.png new file mode 100644 index 0000000..911b646 Binary files /dev/null and b/Assets/Resources/GUI/subtitles.png differ diff --git a/Assets/Resources/GUI/subtitles.png.meta b/Assets/Resources/GUI/subtitles.png.meta new file mode 100644 index 0000000..0ea7e98 --- /dev/null +++ b/Assets/Resources/GUI/subtitles.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 3d155d8724b57df49a86e5965d278e8b +timeCreated: 1442258153 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: 2 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Scene.unity b/Assets/Scenes/Scene.unity index 1958bd1..ac8d095 100644 --- a/Assets/Scenes/Scene.unity +++ b/Assets/Scenes/Scene.unity @@ -100,25 +100,17 @@ Prefab: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11491110, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 11442074, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 11488766, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 4 objectReference: {fileID: 0} - - target: {fileID: 11403206, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 4 objectReference: {fileID: 0} - - target: {fileID: 11414600, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 22403302, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_LocalPosition.x @@ -192,6 +184,26 @@ Prefab: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 11460436, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 138791195} + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 11414600, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 0} - target: {fileID: 11414600, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target value: @@ -200,196 +212,239 @@ Prefab: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 138791195} - - target: {fileID: 11460436, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 138791195} - target: {fileID: 11415218, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 138791195} - target: {fileID: 22412692, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_AnchorMax.x - value: .444444448 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22412692, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22452678, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_AnchorMin.x - value: .444444448 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22452678, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_AnchorMax.x - value: .444444448 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22452678, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 177042, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 102646, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11491110, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Mode + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode value: 6 objectReference: {fileID: 0} - - target: {fileID: 11491110, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_CallState + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 11491110, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Target + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 1033876454} - - target: {fileID: 11491110, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_MethodName + objectReference: {fileID: 1954855913} + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName value: SetActive objectReference: {fileID: 0} - - target: {fileID: 11491110, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_ObjectArgumentAssemblyTypeName + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 11491110, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_BoolArgument + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument value: 1 objectReference: {fileID: 0} - - target: {fileID: 11442074, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Mode + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode value: 6 objectReference: {fileID: 0} - - target: {fileID: 11442074, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_BoolArgument + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument value: 0 objectReference: {fileID: 0} - - target: {fileID: 11442074, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_CallState + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 11442074, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Target + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target value: - objectReference: {fileID: 1033876454} - - target: {fileID: 11442074, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_MethodName + objectReference: {fileID: 874907568} + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName value: SetActive objectReference: {fileID: 0} - - target: {fileID: 11442074, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_ObjectArgumentAssemblyTypeName + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 167114, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState + value: 2 objectReference: {fileID: 0} - - target: {fileID: 11441928, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: settingsButton + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target value: - objectReference: {fileID: 1415612310} - - target: {fileID: 11488766, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + objectReference: {fileID: 1651852724} + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 11450564, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 1 + value: 6 objectReference: {fileID: 0} - - target: {fileID: 11488766, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 11488766, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 600255962} - - target: {fileID: 11488766, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + objectReference: {fileID: 874907568} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 1954855913} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target + value: + objectReference: {fileID: 1651852724} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: switchResbox + value: SetActive objectReference: {fileID: 0} - - target: {fileID: 11488766, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 11403206, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument value: 1 objectReference: {fileID: 0} - - target: {fileID: 11403206, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 11414824, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 11403206, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 1954855913} + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 2070617373} - - target: {fileID: 11403206, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + objectReference: {fileID: 1651852724} + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target + value: + objectReference: {fileID: 874907568} + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: switchCollor + value: SetActive objectReference: {fileID: 0} - - target: {fileID: 11403206, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 11488766, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1415612313} - - target: {fileID: 11488766, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: switchCollor - objectReference: {fileID: 0} - - target: {fileID: 11414600, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_Colors.m_PressedColor.r - value: .356862754 - objectReference: {fileID: 0} - - target: {fileID: 11414600, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_Colors.m_PressedColor.g - value: .78039223 + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: SetActive objectReference: {fileID: 0} - - target: {fileID: 11414600, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_Colors.m_PressedColor.b - value: .815686345 + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 106742, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName + value: SetActive objectReference: {fileID: 0} - - target: {fileID: 11417248, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: target - value: - objectReference: {fileID: 1531535806} - - target: {fileID: 11414600, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Mode - value: 1 + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 11414600, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_BoolArgument + - target: {fileID: 11449518, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument value: 1 objectReference: {fileID: 0} - - target: {fileID: 11414600, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11414600, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Target - value: - objectReference: {fileID: 600255962} - - target: {fileID: 11414600, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_MethodName - value: switchResbox + - target: {fileID: 113758, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - - target: {fileID: 11414600, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine + - target: {fileID: 191832, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 122814, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 11441928, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} m_IsPrefabParent: 0 --- !u!1 &459467483 @@ -452,21 +507,6 @@ Light: m_ShadowRadius: 0 m_ShadowAngle: 0 m_AreaSize: {x: 1, y: 1} ---- !u!1 &600255960 stripped -GameObject: - m_PrefabParentObject: {fileID: 122814, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - m_PrefabInternal: {fileID: 444034374} ---- !u!114 &600255962 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 600255960} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0f8efe7b736c5c43932f164af521190, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &848001024 stripped GameObject: m_PrefabParentObject: {fileID: 126174, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} @@ -477,9 +517,9 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 444034374} m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} ---- !u!1 &1033876454 stripped +--- !u!1 &874907568 stripped GameObject: - m_PrefabParentObject: {fileID: 177042, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + m_PrefabParentObject: {fileID: 191832, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} m_PrefabInternal: {fileID: 444034374} --- !u!1 &1131564643 GameObject: @@ -538,40 +578,11 @@ Camera: m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 - m_TargetEye: 3 m_HDR: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: .0219999999 m_StereoMirrorMode: 0 ---- !u!1 &1415612307 stripped -GameObject: - m_PrefabParentObject: {fileID: 120734, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} - m_PrefabInternal: {fileID: 444034374} ---- !u!114 &1415612310 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11488766, guid: 12db97f21fb2a7d4cb537ec5395de1b9, - type: 2} - m_PrefabInternal: {fileID: 444034374} - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} ---- !u!114 &1415612313 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1415612307} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7cc5766abb54eac43825973353dad745, type: 3} - m_Name: - m_EditorClassIdentifier: - thisButton: {fileID: 1415612310} - enabled: 0 ---- !u!224 &1531535806 stripped -RectTransform: - m_PrefabParentObject: {fileID: 22491142, guid: 12db97f21fb2a7d4cb537ec5395de1b9, - type: 2} - m_PrefabInternal: {fileID: 444034374} --- !u!1001 &1610759364 Prefab: m_ObjectHideFlags: 0 @@ -691,6 +702,10 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 444034374} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} +--- !u!1 &1651852724 stripped +GameObject: + m_PrefabParentObject: {fileID: 113758, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + m_PrefabInternal: {fileID: 444034374} --- !u!1001 &1902280128 Prefab: m_ObjectHideFlags: 0 @@ -733,29 +748,10 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 00197fc9877daa14c963e5917de36124, type: 2} m_IsPrefabParent: 0 ---- !u!1 &2070617367 stripped +--- !u!1 &1954855913 stripped GameObject: - m_PrefabParentObject: {fileID: 117460, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} + m_PrefabParentObject: {fileID: 100066, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} m_PrefabInternal: {fileID: 444034374} ---- !u!114 &2070617369 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11403206, guid: 12db97f21fb2a7d4cb537ec5395de1b9, - type: 2} - m_PrefabInternal: {fileID: 444034374} - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} ---- !u!114 &2070617373 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2070617367} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7cc5766abb54eac43825973353dad745, type: 3} - m_Name: - m_EditorClassIdentifier: - thisButton: {fileID: 2070617369} - enabled: 1 --- !u!114 &2133039536 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11415218, guid: 12db97f21fb2a7d4cb537ec5395de1b9, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bd32bcd..5809bc0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -92,9 +92,6 @@ PlayerSettings: APKExpansionFiles: 0 preloadShaders: 0 StripUnusedMeshComponents: 0 - VertexChannelCompressionMask: - serializedVersion: 2 - m_Bits: 238 iPhoneSdkVersion: 988 iPhoneTargetOSVersion: 22 uIPrerenderedIcon: 0 @@ -215,8 +212,6 @@ PlayerSettings: ps4SaveDataImagePath: ps4BGMPath: ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4EnterButtonAssignment: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index c609863..8c353d8 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.1.3f1 +m_EditorVersion: 5.1.2f1 m_StandardAssetsVersion: 0 -- libgit2 0.21.2