diff --git a/Assets/Plugins/Android/AndroidPlugin.jar b/Assets/Plugins/Android/AndroidPlugin.jar index e9cff82..713b750 100644 Binary files a/Assets/Plugins/Android/AndroidPlugin.jar and b/Assets/Plugins/Android/AndroidPlugin.jar differ diff --git a/Assets/Plugins/Android/AndroidPlugin.jar.meta b/Assets/Plugins/Android/AndroidPlugin.jar.meta index ab5e03d..82256e4 100644 --- a/Assets/Plugins/Android/AndroidPlugin.jar.meta +++ b/Assets/Plugins/Android/AndroidPlugin.jar.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: adceddb083d40cc4aaefba7e91837e28 -timeCreated: 1443633684 +timeCreated: 1443646150 licenseType: Free PluginImporter: serializedVersion: 1 diff --git a/Assets/Plugins/Android/res.meta b/Assets/Plugins/Android/res.meta new file mode 100644 index 0000000..3ad0241 --- /dev/null +++ b/Assets/Plugins/Android/res.meta @@ -0,0 +1,17 @@ +fileFormatVersion: 2 +guid: f7bdbc30c69e5324dbf58ab70b70cfac +folderAsset: yes +timeCreated: 1443822734 +licenseType: Free +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Any: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/res/drawable.meta b/Assets/Plugins/Android/res/drawable.meta new file mode 100644 index 0000000..a20e09c --- /dev/null +++ b/Assets/Plugins/Android/res/drawable.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e073df4ade8a8544ea79c93fd5165124 +folderAsset: yes +timeCreated: 1443818710 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index a878395..3dd5611 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -2358,7 +2358,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} - {fileID: 0} - collider: {fileID: 0} + _collider: {fileID: 0} text_entry: {fileID: 1800578777} i_bar: {fileID: 317863996} player_manager: {fileID: 578311381} @@ -7838,7 +7838,6 @@ GameObject: - 224: {fileID: 1381092951} - 222: {fileID: 1381092954} - 114: {fileID: 1381092953} - - 114: {fileID: 1381092952} m_Layer: 5 m_Name: b_text m_TagString: Untagged @@ -7864,70 +7863,6 @@ RectTransform: m_AnchoredPosition: {x: -300, y: -15.5} m_SizeDelta: {x: 106, y: 106} m_Pivot: {x: .5, y: .5} ---- !u!114 &1381092952 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11407270, guid: 6506218ed7927bf45b508ebbec0c1222, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1381092950} - 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_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .572549045, g: .752941251, b: .811764777, 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: 0 - m_TargetGraphic: {fileID: 1381092953} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1800578777} - 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_Target: {fileID: 1740734478} - m_MethodName: - 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 &1381092953 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ChangeState.cs b/Assets/Scripts/ChangeState.cs new file mode 100644 index 0000000..19e59b3 --- /dev/null +++ b/Assets/Scripts/ChangeState.cs @@ -0,0 +1,5 @@ +interface ChangeState { + + bool getChangeState(); + +} diff --git a/Assets/Scripts/ChangeState.cs.meta b/Assets/Scripts/ChangeState.cs.meta new file mode 100644 index 0000000..b54f69e --- /dev/null +++ b/Assets/Scripts/ChangeState.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 6d83e5bebf7655944adc5d9a7bc02fde +timeCreated: 1443550977 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ColorChangeState.cs b/Assets/Scripts/ColorChangeState.cs deleted file mode 100644 index 0511c83..0000000 --- a/Assets/Scripts/ColorChangeState.cs +++ /dev/null @@ -1,5 +0,0 @@ -interface ColorChangeState { - - bool getColorChangeState(); - -} diff --git a/Assets/Scripts/ColorChangeState.cs.meta b/Assets/Scripts/ColorChangeState.cs.meta deleted file mode 100644 index b54f69e..0000000 --- a/Assets/Scripts/ColorChangeState.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 6d83e5bebf7655944adc5d9a7bc02fde -timeCreated: 1443550977 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ScreenReferences.cs b/Assets/Scripts/ScreenReferences.cs index f1f2bea..75ef44c 100644 --- a/Assets/Scripts/ScreenReferences.cs +++ b/Assets/Scripts/ScreenReferences.cs @@ -34,7 +34,7 @@ public class ScreenReferences : MonoBehaviour { public Button[] home_screen_bar_buttons; - public BoxCollider collider; + public BoxCollider _collider; // screens public GameObject text_entry; @@ -67,12 +67,12 @@ public class ScreenReferences : MonoBehaviour { { //home_screen_bar_buttons = new Button[4]; HOME_SCREEN = true; - collider = GameObject.FindGameObjectWithTag("avatar").GetComponent(); + _collider = GameObject.FindGameObjectWithTag("avatar").GetComponent(); } void BackToHomeScreen() { - collider.enabled = true; + _collider.enabled = true; // if connection pop up not true if(!player_manager.canvas_connection_error.isActiveAndEnabled){ diff --git a/Assets/Scripts/SwitchActiveStatus.cs b/Assets/Scripts/SwitchActiveStatus.cs index a304479..31c7560 100644 --- a/Assets/Scripts/SwitchActiveStatus.cs +++ b/Assets/Scripts/SwitchActiveStatus.cs @@ -1,20 +1,18 @@ using UnityEngine; using System; -public class SwitchActiveStatus : MonoBehaviour, ColorChangeState { +public class SwitchActiveStatus : MonoBehaviour, ChangeState { public bool show = true; - //Mostra ou esconde o GameObject associado ao script + // Mostra ou esconde o GameObject associado ao script public void SwitchStatus() { - show = !show; gameObject.SetActive(show); - } - public bool getColorChangeState() + public bool getChangeState() { return show; } diff --git a/Assets/Scripts/SwitchButtonCollor.cs b/Assets/Scripts/SwitchButtonCollor.cs deleted file mode 100644 index a85cad0..0000000 --- a/Assets/Scripts/SwitchButtonCollor.cs +++ /dev/null @@ -1,60 +0,0 @@ -using UnityEngine; -using System.Collections; -using UnityEngine.UI; - -public class SwitchButtonCollor : MonoBehaviour { - - public Button thisButton; - public GameObject reference; - private Graphic thisButtonGraphic; - - public bool isEnabled; - private static Color enabledColor = new Color(0.31F, 0.75F, 0.913F, 1F); - private static Color disabledColor = new Color(1F, 1F, 1F, 1F); - - - void Start () - { - if (thisButton == null) - thisButton = (Button) gameObject.GetComponent