Commit 847efc4872d02a73f45369252708981b455776ec
1 parent
85f88069
Exists in
master
and in
6 other branches
...
Showing
6 changed files
with
451 additions
and
31 deletions
Show diff stats
Assets/Plugins/Android/AndroidManifest.xml
| ... | ... | @@ -5,6 +5,8 @@ |
| 5 | 5 | android:versionCode="1" |
| 6 | 6 | android:versionName="1.0"> |
| 7 | 7 | <uses-sdk android:minSdkVersion="14" /> |
| 8 | + <uses-permission android:name="android.permission.INTERNET" /> | |
| 9 | + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> | |
| 8 | 10 | <application |
| 9 | 11 | android:icon="@drawable/app_icon" |
| 10 | 12 | android:label="@string/app_name" | ... | ... |
Assets/Scenes/Main.unity
| ... | ... | @@ -3672,6 +3672,108 @@ CanvasRenderer: |
| 3672 | 3672 | type: 2} |
| 3673 | 3673 | m_PrefabInternal: {fileID: 0} |
| 3674 | 3674 | m_GameObject: {fileID: 582478958} |
| 3675 | +--- !u!1 &597012080 | |
| 3676 | +GameObject: | |
| 3677 | + m_ObjectHideFlags: 0 | |
| 3678 | + m_PrefabParentObject: {fileID: 0} | |
| 3679 | + m_PrefabInternal: {fileID: 0} | |
| 3680 | + serializedVersion: 4 | |
| 3681 | + m_Component: | |
| 3682 | + - 224: {fileID: 597012081} | |
| 3683 | + - 114: {fileID: 597012084} | |
| 3684 | + - 222: {fileID: 597012083} | |
| 3685 | + - 114: {fileID: 597012082} | |
| 3686 | + m_Layer: 5 | |
| 3687 | + m_Name: logger | |
| 3688 | + m_TagString: Untagged | |
| 3689 | + m_Icon: {fileID: 0} | |
| 3690 | + m_NavMeshLayer: 0 | |
| 3691 | + m_StaticEditorFlags: 0 | |
| 3692 | + m_IsActive: 0 | |
| 3693 | +--- !u!224 &597012081 | |
| 3694 | +RectTransform: | |
| 3695 | + m_ObjectHideFlags: 0 | |
| 3696 | + m_PrefabParentObject: {fileID: 0} | |
| 3697 | + m_PrefabInternal: {fileID: 0} | |
| 3698 | + m_GameObject: {fileID: 597012080} | |
| 3699 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | |
| 3700 | + m_LocalPosition: {x: 0, y: 0, z: 0} | |
| 3701 | + m_LocalScale: {x: 1, y: 1, z: 1} | |
| 3702 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | |
| 3703 | + m_Children: | |
| 3704 | + - {fileID: 1742480560} | |
| 3705 | + - {fileID: 1741583075} | |
| 3706 | + m_Father: {fileID: 1414104007} | |
| 3707 | + m_RootOrder: 0 | |
| 3708 | + m_AnchorMin: {x: 0, y: 0.2} | |
| 3709 | + m_AnchorMax: {x: 1, y: 0.9} | |
| 3710 | + m_AnchoredPosition: {x: 0, y: 0} | |
| 3711 | + m_SizeDelta: {x: 0, y: 0} | |
| 3712 | + m_Pivot: {x: 0.5, y: 0.5} | |
| 3713 | +--- !u!114 &597012082 | |
| 3714 | +MonoBehaviour: | |
| 3715 | + m_ObjectHideFlags: 0 | |
| 3716 | + m_PrefabParentObject: {fileID: 0} | |
| 3717 | + m_PrefabInternal: {fileID: 0} | |
| 3718 | + m_GameObject: {fileID: 597012080} | |
| 3719 | + m_Enabled: 1 | |
| 3720 | + m_EditorHideFlags: 0 | |
| 3721 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | |
| 3722 | + m_Name: | |
| 3723 | + m_EditorClassIdentifier: | |
| 3724 | + m_Material: {fileID: 0} | |
| 3725 | + m_Color: {r: 1, g: 1, b: 1, a: 0.392} | |
| 3726 | + m_RaycastTarget: 1 | |
| 3727 | + m_OnCullStateChanged: | |
| 3728 | + m_PersistentCalls: | |
| 3729 | + m_Calls: [] | |
| 3730 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | |
| 3731 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | |
| 3732 | + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} | |
| 3733 | + m_Type: 1 | |
| 3734 | + m_PreserveAspect: 0 | |
| 3735 | + m_FillCenter: 1 | |
| 3736 | + m_FillMethod: 4 | |
| 3737 | + m_FillAmount: 1 | |
| 3738 | + m_FillClockwise: 1 | |
| 3739 | + m_FillOrigin: 0 | |
| 3740 | +--- !u!222 &597012083 | |
| 3741 | +CanvasRenderer: | |
| 3742 | + m_ObjectHideFlags: 0 | |
| 3743 | + m_PrefabParentObject: {fileID: 0} | |
| 3744 | + m_PrefabInternal: {fileID: 0} | |
| 3745 | + m_GameObject: {fileID: 597012080} | |
| 3746 | +--- !u!114 &597012084 | |
| 3747 | +MonoBehaviour: | |
| 3748 | + m_ObjectHideFlags: 0 | |
| 3749 | + m_PrefabParentObject: {fileID: 0} | |
| 3750 | + m_PrefabInternal: {fileID: 0} | |
| 3751 | + m_GameObject: {fileID: 597012080} | |
| 3752 | + m_Enabled: 1 | |
| 3753 | + m_EditorHideFlags: 0 | |
| 3754 | + m_Script: {fileID: 1367256648, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | |
| 3755 | + m_Name: | |
| 3756 | + m_EditorClassIdentifier: | |
| 3757 | + m_Content: {fileID: 970584909} | |
| 3758 | + m_Horizontal: 0 | |
| 3759 | + m_Vertical: 1 | |
| 3760 | + m_MovementType: 1 | |
| 3761 | + m_Elasticity: 0.1 | |
| 3762 | + m_Inertia: 1 | |
| 3763 | + m_DecelerationRate: 0.135 | |
| 3764 | + m_ScrollSensitivity: 1 | |
| 3765 | + m_Viewport: {fileID: 1742480560} | |
| 3766 | + m_HorizontalScrollbar: {fileID: 0} | |
| 3767 | + m_VerticalScrollbar: {fileID: 1741583076} | |
| 3768 | + m_HorizontalScrollbarVisibility: 1 | |
| 3769 | + m_VerticalScrollbarVisibility: 2 | |
| 3770 | + m_HorizontalScrollbarSpacing: -3 | |
| 3771 | + m_VerticalScrollbarSpacing: -3 | |
| 3772 | + m_OnValueChanged: | |
| 3773 | + m_PersistentCalls: | |
| 3774 | + m_Calls: [] | |
| 3775 | + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, | |
| 3776 | + Culture=neutral, PublicKeyToken=null | |
| 3675 | 3777 | --- !u!1 &600160454 |
| 3676 | 3778 | GameObject: |
| 3677 | 3779 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -5750,31 +5852,32 @@ GameObject: |
| 5750 | 5852 | - 114: {fileID: 970584913} |
| 5751 | 5853 | - 114: {fileID: 970584911} |
| 5752 | 5854 | - 114: {fileID: 970584910} |
| 5855 | + - 114: {fileID: 970584912} | |
| 5753 | 5856 | m_Layer: 5 |
| 5754 | - m_Name: logger | |
| 5857 | + m_Name: Content | |
| 5755 | 5858 | m_TagString: Untagged |
| 5756 | 5859 | m_Icon: {fileID: 0} |
| 5757 | 5860 | m_NavMeshLayer: 0 |
| 5758 | 5861 | m_StaticEditorFlags: 0 |
| 5759 | - m_IsActive: 0 | |
| 5862 | + m_IsActive: 1 | |
| 5760 | 5863 | --- !u!224 &970584909 |
| 5761 | 5864 | RectTransform: |
| 5762 | 5865 | m_ObjectHideFlags: 0 |
| 5763 | 5866 | m_PrefabParentObject: {fileID: 0} |
| 5764 | 5867 | m_PrefabInternal: {fileID: 0} |
| 5765 | 5868 | m_GameObject: {fileID: 970584908} |
| 5766 | - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | |
| 5869 | + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | |
| 5767 | 5870 | m_LocalPosition: {x: 0, y: 0, z: 0} |
| 5768 | 5871 | m_LocalScale: {x: 1, y: 1, z: 1} |
| 5769 | 5872 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
| 5770 | 5873 | m_Children: [] |
| 5771 | - m_Father: {fileID: 1414104007} | |
| 5874 | + m_Father: {fileID: 1742480560} | |
| 5772 | 5875 | m_RootOrder: 0 |
| 5773 | 5876 | m_AnchorMin: {x: 0, y: 0} |
| 5774 | - m_AnchorMax: {x: 1, y: 0.9} | |
| 5775 | - m_AnchoredPosition: {x: 0, y: 0} | |
| 5776 | - m_SizeDelta: {x: -40, y: 0} | |
| 5777 | - m_Pivot: {x: 0.5, y: 0.5} | |
| 5877 | + m_AnchorMax: {x: 1, y: 0} | |
| 5878 | + m_AnchoredPosition: {x: 0, y: 896} | |
| 5879 | + m_SizeDelta: {x: 0, y: 3000} | |
| 5880 | + m_Pivot: {x: 0.5, y: 1} | |
| 5778 | 5881 | --- !u!114 &970584910 |
| 5779 | 5882 | MonoBehaviour: |
| 5780 | 5883 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -5800,7 +5903,20 @@ MonoBehaviour: |
| 5800 | 5903 | m_Script: {fileID: 11500000, guid: 2f9320693b408af41867b25eefd59d32, type: 3} |
| 5801 | 5904 | m_Name: |
| 5802 | 5905 | m_EditorClassIdentifier: |
| 5803 | - maximumLines: 20 | |
| 5906 | + maximumLines: 40 | |
| 5907 | +--- !u!114 &970584912 | |
| 5908 | +MonoBehaviour: | |
| 5909 | + m_ObjectHideFlags: 0 | |
| 5910 | + m_PrefabParentObject: {fileID: 0} | |
| 5911 | + m_PrefabInternal: {fileID: 0} | |
| 5912 | + m_GameObject: {fileID: 970584908} | |
| 5913 | + m_Enabled: 1 | |
| 5914 | + m_EditorHideFlags: 0 | |
| 5915 | + m_Script: {fileID: 1741964061, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | |
| 5916 | + m_Name: | |
| 5917 | + m_EditorClassIdentifier: | |
| 5918 | + m_HorizontalFit: 0 | |
| 5919 | + m_VerticalFit: 0 | |
| 5804 | 5920 | --- !u!114 &970584913 |
| 5805 | 5921 | MonoBehaviour: |
| 5806 | 5922 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -6572,7 +6688,7 @@ MonoBehaviour: |
| 6572 | 6688 | m_HorizontalOverflow: 0 |
| 6573 | 6689 | m_VerticalOverflow: 0 |
| 6574 | 6690 | m_LineSpacing: 1 |
| 6575 | - m_Text: Version 3.0.40 | |
| 6691 | + m_Text: Version 3.0.43 | |
| 6576 | 6692 | --- !u!222 &1071047506 |
| 6577 | 6693 | CanvasRenderer: |
| 6578 | 6694 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -6825,6 +6941,74 @@ MonoBehaviour: |
| 6825 | 6941 | m_Calls: [] |
| 6826 | 6942 | m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, |
| 6827 | 6943 | Culture=neutral, PublicKeyToken=null |
| 6944 | +--- !u!1 &1124983616 | |
| 6945 | +GameObject: | |
| 6946 | + m_ObjectHideFlags: 0 | |
| 6947 | + m_PrefabParentObject: {fileID: 0} | |
| 6948 | + m_PrefabInternal: {fileID: 0} | |
| 6949 | + serializedVersion: 4 | |
| 6950 | + m_Component: | |
| 6951 | + - 224: {fileID: 1124983617} | |
| 6952 | + - 222: {fileID: 1124983619} | |
| 6953 | + - 114: {fileID: 1124983618} | |
| 6954 | + m_Layer: 5 | |
| 6955 | + m_Name: Handle | |
| 6956 | + m_TagString: Untagged | |
| 6957 | + m_Icon: {fileID: 0} | |
| 6958 | + m_NavMeshLayer: 0 | |
| 6959 | + m_StaticEditorFlags: 0 | |
| 6960 | + m_IsActive: 1 | |
| 6961 | +--- !u!224 &1124983617 | |
| 6962 | +RectTransform: | |
| 6963 | + m_ObjectHideFlags: 0 | |
| 6964 | + m_PrefabParentObject: {fileID: 0} | |
| 6965 | + m_PrefabInternal: {fileID: 0} | |
| 6966 | + m_GameObject: {fileID: 1124983616} | |
| 6967 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | |
| 6968 | + m_LocalPosition: {x: 0, y: 0, z: 0} | |
| 6969 | + m_LocalScale: {x: 1, y: 1, z: 1} | |
| 6970 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | |
| 6971 | + m_Children: [] | |
| 6972 | + m_Father: {fileID: 1729393456} | |
| 6973 | + m_RootOrder: 0 | |
| 6974 | + m_AnchorMin: {x: 0, y: 0.74399996} | |
| 6975 | + m_AnchorMax: {x: 1, y: 1} | |
| 6976 | + m_AnchoredPosition: {x: 0, y: 0} | |
| 6977 | + m_SizeDelta: {x: 20, y: 20} | |
| 6978 | + m_Pivot: {x: 0.5, y: 0.5} | |
| 6979 | +--- !u!114 &1124983618 | |
| 6980 | +MonoBehaviour: | |
| 6981 | + m_ObjectHideFlags: 0 | |
| 6982 | + m_PrefabParentObject: {fileID: 0} | |
| 6983 | + m_PrefabInternal: {fileID: 0} | |
| 6984 | + m_GameObject: {fileID: 1124983616} | |
| 6985 | + m_Enabled: 1 | |
| 6986 | + m_EditorHideFlags: 0 | |
| 6987 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | |
| 6988 | + m_Name: | |
| 6989 | + m_EditorClassIdentifier: | |
| 6990 | + m_Material: {fileID: 0} | |
| 6991 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | |
| 6992 | + m_RaycastTarget: 1 | |
| 6993 | + m_OnCullStateChanged: | |
| 6994 | + m_PersistentCalls: | |
| 6995 | + m_Calls: [] | |
| 6996 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | |
| 6997 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | |
| 6998 | + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} | |
| 6999 | + m_Type: 1 | |
| 7000 | + m_PreserveAspect: 0 | |
| 7001 | + m_FillCenter: 1 | |
| 7002 | + m_FillMethod: 4 | |
| 7003 | + m_FillAmount: 1 | |
| 7004 | + m_FillClockwise: 1 | |
| 7005 | + m_FillOrigin: 0 | |
| 7006 | +--- !u!222 &1124983619 | |
| 7007 | +CanvasRenderer: | |
| 7008 | + m_ObjectHideFlags: 0 | |
| 7009 | + m_PrefabParentObject: {fileID: 0} | |
| 7010 | + m_PrefabInternal: {fileID: 0} | |
| 7011 | + m_GameObject: {fileID: 1124983616} | |
| 6828 | 7012 | --- !u!1 &1152273569 |
| 6829 | 7013 | GameObject: |
| 6830 | 7014 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -7581,7 +7765,7 @@ MonoBehaviour: |
| 7581 | 7765 | m_InputType: 0 |
| 7582 | 7766 | m_AsteriskChar: 42 |
| 7583 | 7767 | m_KeyboardType: 0 |
| 7584 | - m_LineType: 1 | |
| 7768 | + m_LineType: 2 | |
| 7585 | 7769 | m_HideMobileInput: 0 |
| 7586 | 7770 | m_CharacterValidation: 0 |
| 7587 | 7771 | m_CharacterLimit: 0 |
| ... | ... | @@ -8880,7 +9064,7 @@ RectTransform: |
| 8880 | 9064 | m_LocalScale: {x: 0, y: 0, z: 0} |
| 8881 | 9065 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
| 8882 | 9066 | m_Children: |
| 8883 | - - {fileID: 970584909} | |
| 9067 | + - {fileID: 597012081} | |
| 8884 | 9068 | - {fileID: 1613520792} |
| 8885 | 9069 | - {fileID: 1620867682} |
| 8886 | 9070 | - {fileID: 2119336824} |
| ... | ... | @@ -11035,6 +11219,40 @@ CanvasRenderer: |
| 11035 | 11219 | type: 2} |
| 11036 | 11220 | m_PrefabInternal: {fileID: 0} |
| 11037 | 11221 | m_GameObject: {fileID: 1717529861} |
| 11222 | +--- !u!1 &1729393455 | |
| 11223 | +GameObject: | |
| 11224 | + m_ObjectHideFlags: 0 | |
| 11225 | + m_PrefabParentObject: {fileID: 0} | |
| 11226 | + m_PrefabInternal: {fileID: 0} | |
| 11227 | + serializedVersion: 4 | |
| 11228 | + m_Component: | |
| 11229 | + - 224: {fileID: 1729393456} | |
| 11230 | + m_Layer: 5 | |
| 11231 | + m_Name: Sliding Area | |
| 11232 | + m_TagString: Untagged | |
| 11233 | + m_Icon: {fileID: 0} | |
| 11234 | + m_NavMeshLayer: 0 | |
| 11235 | + m_StaticEditorFlags: 0 | |
| 11236 | + m_IsActive: 1 | |
| 11237 | +--- !u!224 &1729393456 | |
| 11238 | +RectTransform: | |
| 11239 | + m_ObjectHideFlags: 0 | |
| 11240 | + m_PrefabParentObject: {fileID: 0} | |
| 11241 | + m_PrefabInternal: {fileID: 0} | |
| 11242 | + m_GameObject: {fileID: 1729393455} | |
| 11243 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | |
| 11244 | + m_LocalPosition: {x: 0, y: 0, z: 0} | |
| 11245 | + m_LocalScale: {x: 1, y: 1, z: 1} | |
| 11246 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | |
| 11247 | + m_Children: | |
| 11248 | + - {fileID: 1124983617} | |
| 11249 | + m_Father: {fileID: 1741583075} | |
| 11250 | + m_RootOrder: 0 | |
| 11251 | + m_AnchorMin: {x: 0, y: 0} | |
| 11252 | + m_AnchorMax: {x: 1, y: 1} | |
| 11253 | + m_AnchoredPosition: {x: 0, y: 0} | |
| 11254 | + m_SizeDelta: {x: -20, y: -20} | |
| 11255 | + m_Pivot: {x: 0.5, y: 0.5} | |
| 11038 | 11256 | --- !u!1 &1731945570 |
| 11039 | 11257 | GameObject: |
| 11040 | 11258 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -11122,6 +11340,204 @@ CanvasRenderer: |
| 11122 | 11340 | type: 2} |
| 11123 | 11341 | m_PrefabInternal: {fileID: 0} |
| 11124 | 11342 | m_GameObject: {fileID: 1731945570} |
| 11343 | +--- !u!1 &1741583074 | |
| 11344 | +GameObject: | |
| 11345 | + m_ObjectHideFlags: 0 | |
| 11346 | + m_PrefabParentObject: {fileID: 0} | |
| 11347 | + m_PrefabInternal: {fileID: 0} | |
| 11348 | + serializedVersion: 4 | |
| 11349 | + m_Component: | |
| 11350 | + - 224: {fileID: 1741583075} | |
| 11351 | + - 222: {fileID: 1741583078} | |
| 11352 | + - 114: {fileID: 1741583077} | |
| 11353 | + - 114: {fileID: 1741583076} | |
| 11354 | + m_Layer: 5 | |
| 11355 | + m_Name: Scrollbar Vertical | |
| 11356 | + m_TagString: Untagged | |
| 11357 | + m_Icon: {fileID: 0} | |
| 11358 | + m_NavMeshLayer: 0 | |
| 11359 | + m_StaticEditorFlags: 0 | |
| 11360 | + m_IsActive: 1 | |
| 11361 | +--- !u!224 &1741583075 | |
| 11362 | +RectTransform: | |
| 11363 | + m_ObjectHideFlags: 0 | |
| 11364 | + m_PrefabParentObject: {fileID: 0} | |
| 11365 | + m_PrefabInternal: {fileID: 0} | |
| 11366 | + m_GameObject: {fileID: 1741583074} | |
| 11367 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | |
| 11368 | + m_LocalPosition: {x: 0, y: 0, z: 0} | |
| 11369 | + m_LocalScale: {x: 1, y: 1, z: 1} | |
| 11370 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | |
| 11371 | + m_Children: | |
| 11372 | + - {fileID: 1729393456} | |
| 11373 | + m_Father: {fileID: 597012081} | |
| 11374 | + m_RootOrder: 1 | |
| 11375 | + m_AnchorMin: {x: 1, y: 0} | |
| 11376 | + m_AnchorMax: {x: 1, y: 1} | |
| 11377 | + m_AnchoredPosition: {x: 0, y: 0} | |
| 11378 | + m_SizeDelta: {x: 30, y: 0} | |
| 11379 | + m_Pivot: {x: 1, y: 1} | |
| 11380 | +--- !u!114 &1741583076 | |
| 11381 | +MonoBehaviour: | |
| 11382 | + m_ObjectHideFlags: 0 | |
| 11383 | + m_PrefabParentObject: {fileID: 0} | |
| 11384 | + m_PrefabInternal: {fileID: 0} | |
| 11385 | + m_GameObject: {fileID: 1741583074} | |
| 11386 | + m_Enabled: 1 | |
| 11387 | + m_EditorHideFlags: 0 | |
| 11388 | + m_Script: {fileID: -2061169968, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | |
| 11389 | + m_Name: | |
| 11390 | + m_EditorClassIdentifier: | |
| 11391 | + m_Navigation: | |
| 11392 | + m_Mode: 3 | |
| 11393 | + m_SelectOnUp: {fileID: 0} | |
| 11394 | + m_SelectOnDown: {fileID: 0} | |
| 11395 | + m_SelectOnLeft: {fileID: 0} | |
| 11396 | + m_SelectOnRight: {fileID: 0} | |
| 11397 | + m_Transition: 1 | |
| 11398 | + m_Colors: | |
| 11399 | + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} | |
| 11400 | + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} | |
| 11401 | + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} | |
| 11402 | + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} | |
| 11403 | + m_ColorMultiplier: 1 | |
| 11404 | + m_FadeDuration: 0.1 | |
| 11405 | + m_SpriteState: | |
| 11406 | + m_HighlightedSprite: {fileID: 0} | |
| 11407 | + m_PressedSprite: {fileID: 0} | |
| 11408 | + m_DisabledSprite: {fileID: 0} | |
| 11409 | + m_AnimationTriggers: | |
| 11410 | + m_NormalTrigger: Normal | |
| 11411 | + m_HighlightedTrigger: Highlighted | |
| 11412 | + m_PressedTrigger: Pressed | |
| 11413 | + m_DisabledTrigger: Disabled | |
| 11414 | + m_Interactable: 1 | |
| 11415 | + m_TargetGraphic: {fileID: 1124983618} | |
| 11416 | + m_HandleRect: {fileID: 1124983617} | |
| 11417 | + m_Direction: 2 | |
| 11418 | + m_Value: 1 | |
| 11419 | + m_Size: 0.256 | |
| 11420 | + m_NumberOfSteps: 0 | |
| 11421 | + m_OnValueChanged: | |
| 11422 | + m_PersistentCalls: | |
| 11423 | + m_Calls: [] | |
| 11424 | + m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, | |
| 11425 | + Culture=neutral, PublicKeyToken=null | |
| 11426 | +--- !u!114 &1741583077 | |
| 11427 | +MonoBehaviour: | |
| 11428 | + m_ObjectHideFlags: 0 | |
| 11429 | + m_PrefabParentObject: {fileID: 0} | |
| 11430 | + m_PrefabInternal: {fileID: 0} | |
| 11431 | + m_GameObject: {fileID: 1741583074} | |
| 11432 | + m_Enabled: 1 | |
| 11433 | + m_EditorHideFlags: 0 | |
| 11434 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | |
| 11435 | + m_Name: | |
| 11436 | + m_EditorClassIdentifier: | |
| 11437 | + m_Material: {fileID: 0} | |
| 11438 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | |
| 11439 | + m_RaycastTarget: 1 | |
| 11440 | + m_OnCullStateChanged: | |
| 11441 | + m_PersistentCalls: | |
| 11442 | + m_Calls: [] | |
| 11443 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | |
| 11444 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | |
| 11445 | + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} | |
| 11446 | + m_Type: 1 | |
| 11447 | + m_PreserveAspect: 0 | |
| 11448 | + m_FillCenter: 1 | |
| 11449 | + m_FillMethod: 4 | |
| 11450 | + m_FillAmount: 1 | |
| 11451 | + m_FillClockwise: 1 | |
| 11452 | + m_FillOrigin: 0 | |
| 11453 | +--- !u!222 &1741583078 | |
| 11454 | +CanvasRenderer: | |
| 11455 | + m_ObjectHideFlags: 0 | |
| 11456 | + m_PrefabParentObject: {fileID: 0} | |
| 11457 | + m_PrefabInternal: {fileID: 0} | |
| 11458 | + m_GameObject: {fileID: 1741583074} | |
| 11459 | +--- !u!1 &1742480559 | |
| 11460 | +GameObject: | |
| 11461 | + m_ObjectHideFlags: 0 | |
| 11462 | + m_PrefabParentObject: {fileID: 0} | |
| 11463 | + m_PrefabInternal: {fileID: 0} | |
| 11464 | + serializedVersion: 4 | |
| 11465 | + m_Component: | |
| 11466 | + - 224: {fileID: 1742480560} | |
| 11467 | + - 114: {fileID: 1742480563} | |
| 11468 | + - 222: {fileID: 1742480562} | |
| 11469 | + - 114: {fileID: 1742480561} | |
| 11470 | + m_Layer: 5 | |
| 11471 | + m_Name: Viewport | |
| 11472 | + m_TagString: Untagged | |
| 11473 | + m_Icon: {fileID: 0} | |
| 11474 | + m_NavMeshLayer: 0 | |
| 11475 | + m_StaticEditorFlags: 0 | |
| 11476 | + m_IsActive: 1 | |
| 11477 | +--- !u!224 &1742480560 | |
| 11478 | +RectTransform: | |
| 11479 | + m_ObjectHideFlags: 0 | |
| 11480 | + m_PrefabParentObject: {fileID: 0} | |
| 11481 | + m_PrefabInternal: {fileID: 0} | |
| 11482 | + m_GameObject: {fileID: 1742480559} | |
| 11483 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | |
| 11484 | + m_LocalPosition: {x: 0, y: 0, z: 0} | |
| 11485 | + m_LocalScale: {x: 1, y: 1, z: 1} | |
| 11486 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | |
| 11487 | + m_Children: | |
| 11488 | + - {fileID: 970584909} | |
| 11489 | + m_Father: {fileID: 597012081} | |
| 11490 | + m_RootOrder: 0 | |
| 11491 | + m_AnchorMin: {x: 0, y: 0} | |
| 11492 | + m_AnchorMax: {x: 1, y: 1} | |
| 11493 | + m_AnchoredPosition: {x: 0, y: 0} | |
| 11494 | + m_SizeDelta: {x: -27, y: 0} | |
| 11495 | + m_Pivot: {x: 0, y: 1} | |
| 11496 | +--- !u!114 &1742480561 | |
| 11497 | +MonoBehaviour: | |
| 11498 | + m_ObjectHideFlags: 0 | |
| 11499 | + m_PrefabParentObject: {fileID: 0} | |
| 11500 | + m_PrefabInternal: {fileID: 0} | |
| 11501 | + m_GameObject: {fileID: 1742480559} | |
| 11502 | + m_Enabled: 1 | |
| 11503 | + m_EditorHideFlags: 0 | |
| 11504 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | |
| 11505 | + m_Name: | |
| 11506 | + m_EditorClassIdentifier: | |
| 11507 | + m_Material: {fileID: 0} | |
| 11508 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | |
| 11509 | + m_RaycastTarget: 1 | |
| 11510 | + m_OnCullStateChanged: | |
| 11511 | + m_PersistentCalls: | |
| 11512 | + m_Calls: [] | |
| 11513 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | |
| 11514 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | |
| 11515 | + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} | |
| 11516 | + m_Type: 1 | |
| 11517 | + m_PreserveAspect: 0 | |
| 11518 | + m_FillCenter: 1 | |
| 11519 | + m_FillMethod: 4 | |
| 11520 | + m_FillAmount: 1 | |
| 11521 | + m_FillClockwise: 1 | |
| 11522 | + m_FillOrigin: 0 | |
| 11523 | +--- !u!222 &1742480562 | |
| 11524 | +CanvasRenderer: | |
| 11525 | + m_ObjectHideFlags: 0 | |
| 11526 | + m_PrefabParentObject: {fileID: 0} | |
| 11527 | + m_PrefabInternal: {fileID: 0} | |
| 11528 | + m_GameObject: {fileID: 1742480559} | |
| 11529 | +--- !u!114 &1742480563 | |
| 11530 | +MonoBehaviour: | |
| 11531 | + m_ObjectHideFlags: 0 | |
| 11532 | + m_PrefabParentObject: {fileID: 0} | |
| 11533 | + m_PrefabInternal: {fileID: 0} | |
| 11534 | + m_GameObject: {fileID: 1742480559} | |
| 11535 | + m_Enabled: 1 | |
| 11536 | + m_EditorHideFlags: 0 | |
| 11537 | + m_Script: {fileID: -1200242548, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | |
| 11538 | + m_Name: | |
| 11539 | + m_EditorClassIdentifier: | |
| 11540 | + m_ShowMaskGraphic: 0 | |
| 11125 | 11541 | --- !u!1 &1763219241 |
| 11126 | 11542 | GameObject: |
| 11127 | 11543 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -13829,7 +14245,7 @@ GameObject: |
| 13829 | 14245 | m_Icon: {fileID: 0} |
| 13830 | 14246 | m_NavMeshLayer: 0 |
| 13831 | 14247 | m_StaticEditorFlags: 0 |
| 13832 | - m_IsActive: 1 | |
| 14248 | + m_IsActive: 0 | |
| 13833 | 14249 | --- !u!224 &2099411279 |
| 13834 | 14250 | RectTransform: |
| 13835 | 14251 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -13844,10 +14260,10 @@ RectTransform: |
| 13844 | 14260 | m_Children: [] |
| 13845 | 14261 | m_Father: {fileID: 702185295} |
| 13846 | 14262 | m_RootOrder: 2 |
| 13847 | - m_AnchorMin: {x: 0, y: 0} | |
| 13848 | - m_AnchorMax: {x: 0, y: 0} | |
| 13849 | - m_AnchoredPosition: {x: 0, y: 0} | |
| 13850 | - m_SizeDelta: {x: 0, y: 0} | |
| 14263 | + m_AnchorMin: {x: 0, y: 1} | |
| 14264 | + m_AnchorMax: {x: 0, y: 1} | |
| 14265 | + m_AnchoredPosition: {x: 260.71997, y: -76.62858} | |
| 14266 | + m_SizeDelta: {x: 106, y: 106} | |
| 13851 | 14267 | m_Pivot: {x: 0.5, y: 0.5} |
| 13852 | 14268 | --- !u!114 &2099411280 |
| 13853 | 14269 | MonoBehaviour: | ... | ... |
Assets/Scripts/Player Manager/GenericPlayerManager.cs
| ... | ... | @@ -599,7 +599,11 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
| 599 | 599 | } |
| 600 | 600 | } |
| 601 | 601 | |
| 602 | - if (playingStarted) yield return new WaitForEndOfFrame(); | |
| 602 | + if (playingStarted) | |
| 603 | + yield return new WaitForEndOfFrame(); | |
| 604 | + | |
| 605 | + while (this.animQueue.Count > 6) | |
| 606 | + yield return new WaitForEndOfFrame(); | |
| 603 | 607 | } |
| 604 | 608 | |
| 605 | 609 | while (toPlayQueue.Count > 0) |
| ... | ... | @@ -637,11 +641,11 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
| 637 | 641 | |
| 638 | 642 | // Gets first animation |
| 639 | 643 | AnimationReference reference = this.animQueue.Peek(); |
| 640 | - PlayerLogger.Log("GPM", "AW", "Got " + reference.name + "."); | |
| 644 | + // PlayerLogger.Log("GPM", "AW", "Got " + reference.name + "."); | |
| 641 | 645 | |
| 642 | 646 | if (COMPONENT_ANIMATION.IsPlaying(reference.name)) |
| 643 | 647 | { |
| 644 | - PlayerLogger.Log("GPM", "AW", "And its playing!"); | |
| 648 | + // PlayerLogger.Log("GPM", "AW", "And its playing!"); | |
| 645 | 649 | |
| 646 | 650 | this.animationPlaying = this.animQueue.Dequeue(); |
| 647 | 651 | this.subtitles.setText(reference.subtitle); |
| ... | ... | @@ -649,8 +653,6 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
| 649 | 653 | // Watches transition between current and next animation |
| 650 | 654 | while (true) |
| 651 | 655 | { |
| 652 | - PlayerLogger.Log("GPM", "AW", "Wating for it to end."); | |
| 653 | - | |
| 654 | 656 | yield return new WaitForEndOfFrame(); |
| 655 | 657 | |
| 656 | 658 | // Gets next animation |
| ... | ... | @@ -658,7 +660,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
| 658 | 660 | |
| 659 | 661 | if (next != null && COMPONENT_ANIMATION.IsPlaying(next.name)) |
| 660 | 662 | { |
| 661 | - PlayerLogger.Log("GPM", "AW", "It has a next."); | |
| 663 | + // PlayerLogger.Log("GPM", "AW", "Next: " + next.name + "."); | |
| 662 | 664 | |
| 663 | 665 | // Waits next animation starts |
| 664 | 666 | while (!COMPONENT_ANIMATION.IsPlaying(next.name)) | ... | ... |
Assets/Scripts/PlayerManager.cs
| ... | ... | @@ -14,9 +14,9 @@ public class PlayerManager : GenericPlayerManager { |
| 14 | 14 | private const string BASE_URL = "http://dicionario.vlibras.gov.br/ANDROID/"; |
| 15 | 15 | #endif |
| 16 | 16 | |
| 17 | - //private const string SERVER_URL = "http://vlibras.lavid.ufpb.br/glosa?texto=";//old | |
| 18 | - private const string SERVER_URL = "http://traducao.vlibras.gov.br/translate?text="; | |
| 19 | - private const int VERSION = 1; | |
| 17 | + //private const string SERVER_URL = "http://vlibras.lavid.ufpb.br/glosa?texto=";//old | |
| 18 | + private const string SERVER_URL = "http://traducao.vlibras.gov.br/translate?text="; | |
| 19 | + private const int VERSION = 1; | |
| 20 | 20 | |
| 21 | 21 | public enum ERROR_STATUS_MESSAGE |
| 22 | 22 | { |
| ... | ... | @@ -87,6 +87,7 @@ public class PlayerManager : GenericPlayerManager { |
| 87 | 87 | public void playTranslate() |
| 88 | 88 | { |
| 89 | 89 | stopTranslation(); |
| 90 | + base.stopAll(); | |
| 90 | 91 | |
| 91 | 92 | string text = translateScreenText.text; |
| 92 | 93 | translateScreenText.text = ""; |
| ... | ... | @@ -208,14 +209,14 @@ public class PlayerManager : GenericPlayerManager { |
| 208 | 209 | { |
| 209 | 210 | PlayerLogger.Log("PM", "WFR", "Stating time check."); |
| 210 | 211 | |
| 211 | - const float timeoutLimit = 10f; | |
| 212 | + const float timeoutLimit = 20f; | |
| 212 | 213 | float timer = 0; |
| 213 | 214 | |
| 214 | 215 | while ( ! www.isDone) |
| 215 | 216 | { |
| 216 | 217 | if (timer > timeoutLimit) |
| 217 | 218 | { |
| 218 | - PlayerLogger.Log("PM", "WFR", "Timeout."); | |
| 219 | + PlayerLogger.Log("PM", "WFR", "Timeout (" + timer + ")."); | |
| 219 | 220 | yield break; |
| 220 | 221 | } |
| 221 | 222 | |
| ... | ... | @@ -228,7 +229,7 @@ public class PlayerManager : GenericPlayerManager { |
| 228 | 229 | #endif |
| 229 | 230 | } |
| 230 | 231 | |
| 231 | - PlayerLogger.Log("PM", "WFR", "Done."); | |
| 232 | + PlayerLogger.Log("PM", "WFR", "Done (" + timer + ")."); | |
| 232 | 233 | } |
| 233 | 234 | |
| 234 | 235 | private IEnumerator translate(string gloss) | ... | ... |
Assets/Scripts/UI/RotateGameObject.cs
ProjectSettings/ProjectSettings.asset