diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta new file mode 100644 index 0000000..506ee6e --- /dev/null +++ b/Assets/Plugins.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 2f76639d276d256418c4d22174caf2aa +folderAsset: yes +timeCreated: 1443633364 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android.meta b/Assets/Plugins/Android.meta new file mode 100644 index 0000000..9861c99 --- /dev/null +++ b/Assets/Plugins/Android.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: c09545e387c50874db2086d6b06b2a1c +folderAsset: yes +timeCreated: 1442947850 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml new file mode 100644 index 0000000..c80f70b --- /dev/null +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/Plugins/Android/AndroidManifest.xml.meta b/Assets/Plugins/Android/AndroidManifest.xml.meta new file mode 100644 index 0000000..8d86a5d --- /dev/null +++ b/Assets/Plugins/Android/AndroidManifest.xml.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a462ece95f547e47a1b71267f63d924 +timeCreated: 1442947850 +licenseType: Free +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/AndroidPlugin.jar b/Assets/Plugins/Android/AndroidPlugin.jar new file mode 100644 index 0000000..e9cff82 Binary files /dev/null and b/Assets/Plugins/Android/AndroidPlugin.jar differ diff --git a/Assets/Plugins/Android/AndroidPlugin.jar.meta b/Assets/Plugins/Android/AndroidPlugin.jar.meta new file mode 100644 index 0000000..ab5e03d --- /dev/null +++ b/Assets/Plugins/Android/AndroidPlugin.jar.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: adceddb083d40cc4aaefba7e91837e28 +timeCreated: 1443633684 +licenseType: Free +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: ARMv7 + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/Connection_Failed.png b/Assets/Resources/GUI/Connection_Failed.png new file mode 100644 index 0000000..69eb1b4 Binary files /dev/null and b/Assets/Resources/GUI/Connection_Failed.png differ diff --git a/Assets/Resources/GUI/Connection_Failed.png.meta b/Assets/Resources/GUI/Connection_Failed.png.meta new file mode 100644 index 0000000..fc8b86a --- /dev/null +++ b/Assets/Resources/GUI/Connection_Failed.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 50d21420fd916e048b11cacad3dda079 +timeCreated: 1443640673 +licenseType: Free +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: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + 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/Main.unity b/Assets/Scenes/Main.unity index 8ecf1cc..45e6868 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -435,6 +435,72 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 46909741} +--- !u!1 &55870182 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 55870183} + - 222: {fileID: 55870185} + - 114: {fileID: 55870184} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &55870183 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 55870182} + 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: 1525104851} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &55870184 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 55870182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: OK +--- !u!222 &55870185 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 55870182} --- !u!1 &58433888 GameObject: m_ObjectHideFlags: 0 @@ -625,6 +691,109 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 93856253} +--- !u!1 &117472615 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 117472616} + - 223: {fileID: 117472619} + - 114: {fileID: 117472618} + - 114: {fileID: 117472617} + - 114: {fileID: 117472620} + m_Layer: 5 + m_Name: connection_error + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &117472616 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 117472615} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1665948603} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &117472617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 117472615} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &117472618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 117472615} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &117472619 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 117472615} + m_Enabled: 1 + serializedVersion: 2 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!114 &117472620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 117472615} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09acbdec1f642334e86af23b51b56662, type: 3} + m_Name: + m_EditorClassIdentifier: + box: {fileID: 1665948604} --- !u!1 &136047198 GameObject: m_ObjectHideFlags: 0 @@ -2020,6 +2189,55 @@ MonoBehaviour: thisButton: {fileID: 460346710} reference: {fileID: 1066268158} isEnabled: 1 +--- !u!1 &478527308 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 478527310} + - 114: {fileID: 478527309} + m_Layer: 0 + m_Name: BackButtons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &478527309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 478527308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 11f8b85837bcf7c4da290b756e6580da, type: 3} + m_Name: + m_EditorClassIdentifier: + infos: {fileID: 1740734478} + t_1: {fileID: 1032180210} + t_2: {fileID: 323095193} + t_3: {fileID: 1570800641} + t_4: {fileID: 1559431851} + t_5: {fileID: 984201654} + collider: {fileID: 0} + text_entry: {fileID: 1800578777} + i_bar: {fileID: 317863996} + player_manager: {fileID: 578311381} +--- !u!4 &478527310 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 478527308} + 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: 0} + m_RootOrder: 0 --- !u!1 &496020597 GameObject: m_ObjectHideFlags: 0 @@ -2316,6 +2534,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 478527309} + m_MethodName: setHomeScreen + 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 &522470816 @@ -2526,7 +2755,7 @@ Prefab: m_Modifications: - target: {fileID: 11171278, guid: 00197fc9877daa14c963e5917de36124, type: 2} propertyPath: m_Animations.Array.size - value: 40 + value: 41 objectReference: {fileID: 0} - target: {fileID: 491010, guid: 00197fc9877daa14c963e5917de36124, type: 2} propertyPath: m_LocalPosition.x @@ -2558,7 +2787,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 491010, guid: 00197fc9877daa14c963e5917de36124, type: 2} propertyPath: m_RootOrder - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 13795696, guid: 00197fc9877daa14c963e5917de36124, type: 2} propertyPath: m_Materials.Array.data[0] @@ -2747,7 +2976,11 @@ Prefab: - target: {fileID: 11171278, guid: 00197fc9877daa14c963e5917de36124, type: 2} propertyPath: m_Animation value: - objectReference: {fileID: 7400000, guid: e9d2ab4f57bf67b4e9b1d6e702c350ec, type: 2} + objectReference: {fileID: 7400000, guid: d5e155ea263a8204ba16b7567efb8d98, type: 2} + - target: {fileID: 11171278, guid: 00197fc9877daa14c963e5917de36124, type: 2} + propertyPath: m_Animations.Array.data[40] + value: + objectReference: {fileID: 7400000, guid: d5e155ea263a8204ba16b7567efb8d98, type: 2} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 00197fc9877daa14c963e5917de36124, type: 2} m_IsPrefabParent: 0 @@ -3703,6 +3936,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 478527309} + m_MethodName: setHomeScreen + 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 &721763002 @@ -4138,7 +4382,7 @@ RectTransform: - {fileID: 1800578778} - {fileID: 1927199758} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 3 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -8008,6 +8252,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 478527309} + m_MethodName: setHomeScreen + 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 &1491086500 @@ -8148,6 +8403,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 478527309} + m_MethodName: setHomeScreen + 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 &1495062327 @@ -8406,6 +8672,110 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1514219280} +--- !u!1 &1525104850 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1525104851} + - 222: {fileID: 1525104854} + - 114: {fileID: 1525104853} + - 114: {fileID: 1525104852} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1525104851 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1525104850} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 55870183} + m_Father: {fileID: 1665948603} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: 0} + m_AnchorMax: {x: .5, y: 0} + m_AnchoredPosition: {x: 0, y: 93.75} + m_SizeDelta: {x: 360, y: 125} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1525104852 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1525104850} + 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: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1525104853} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1525104853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1525104850} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1525104854 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1525104850} --- !u!1 &1531717202 GameObject: m_ObjectHideFlags: 0 @@ -9037,6 +9407,28 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 578311381} + m_MethodName: SetAvatarCollider + 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: 478527309} + m_MethodName: setHomeScreen + 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 &1577109303 @@ -9213,6 +9605,68 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1621592085} +--- !u!1 &1665948602 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1665948603} + - 222: {fileID: 1665948605} + - 114: {fileID: 1665948604} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1665948603 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1665948602} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1525104851} + m_Father: {fileID: 117472616} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1400, y: 420} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1665948604 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1665948602} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 21300000, guid: 50d21420fd916e048b11cacad3dda079, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1665948605 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1665948602} --- !u!1 &1669460799 GameObject: m_ObjectHideFlags: 0 @@ -9322,6 +9776,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 478527309} + m_MethodName: setHomeScreen + 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 &1669460802 @@ -9409,7 +9874,7 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_NormalColor: {r: .254901975, g: .741176486, b: .862745166, a: 1} m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} @@ -9462,6 +9927,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 478527309} + m_MethodName: setHomeScreen + 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 &1708734847 @@ -9846,7 +10322,7 @@ Transform: m_Children: - {fileID: 2123885087} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 4 --- !u!20 &1772891849 Camera: m_ObjectHideFlags: 0 @@ -10005,6 +10481,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 478527309} + m_MethodName: setHomeScreen + 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 &1778899874 @@ -10615,7 +11102,18 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1814140556} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 578311381} + m_MethodName: callVoiceRecognizer + 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 &1814140556 @@ -11183,7 +11681,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 5 --- !u!1001 &1924401076 Prefab: m_ObjectHideFlags: 0 @@ -11221,7 +11719,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 484614, guid: da45329542b035e4da18f1132cc3d700, type: 2} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 11435512, guid: da45329542b035e4da18f1132cc3d700, type: 2} propertyPath: SUBTITLES @@ -11734,6 +12232,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 478527309} + m_MethodName: setHomeScreen + 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 &2084437506 diff --git a/Assets/Scripts/GenericPlayerManager.cs b/Assets/Scripts/GenericPlayerManager.cs index 7f2823f..4e76d1e 100644 --- a/Assets/Scripts/GenericPlayerManager.cs +++ b/Assets/Scripts/GenericPlayerManager.cs @@ -84,6 +84,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { protected bool playing = false; protected bool paused = false; + protected VoiceRecognition voiceRecognizer; public virtual void Start() { @@ -91,6 +92,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { COMPONENT_ANIMATION = AVATAR.GetComponent();//referencia para o componente animador do avatar AVATAR_COLLIDER = GameObject.FindGameObjectWithTag("avatar").GetComponent(); Application.ExternalCall("onLoadPlayer");//var onLoadPlayer = function(){} + voiceRecognizer = new VoiceRecognition(); } public void SetAvatarCollider(bool isActive) diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 269c181..21f6b25 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -22,6 +22,7 @@ public class PlayerManager : GenericPlayerManager { //private const string BASE_URL = "http://150.165.205.9/anims/AssetBundles/0_DefaultBundles/"; public InputField INFIELD; private int version = 1; + private bool thereIsConnection; public void catchGlosa(String glosa) { @@ -86,29 +87,6 @@ public class PlayerManager : GenericPlayerManager { } } - protected string getGlosaFromServer(string str) - { - string strToServer = ""; - - foreach (char c in str) - if (c.Equals(' ')) - strToServer += "%20"; - else - strToServer += c; - - Debug.Log("str to server -> " + strToServer); - - string urlWithText = SERVER_URL + strToServer; - - WWW www = new WWW(urlWithText); - StartCoroutine(waitForRequest(www)); - - // while(!www.isDone) Thread.Sleep(250); - - Debug.Log("returned from server -> " + www.text); - return www.text; - } - protected IEnumerator waitForRequest(WWW www) { yield return www.isDone; @@ -119,4 +97,49 @@ public class PlayerManager : GenericPlayerManager { else Debug.Log("WWW Error: "+ www.error); } + + // Called from microphone icon at main interface + public void callVoiceRecognizer() + { + /* + //base.voiceRecognizer.callConnectionError(); + CheckConnection(); + //StartCoroutine(CheckConnection()); + Debug.Log("passou"); + if(thereIsConnection) + { + //base.glosa = base.voiceRecognizer.callRecognition(); + base.glosa = base.voiceRecognizer.callRecognition(); + if(!base.glosa.Equals("")) + { + StartCoroutine(translate ()); + } + } + else + { + + Debug.Log("NO NET"); + //ShowErrorMessage(); + //base.voiceRecognizer.callConnectionError(); + //base.voiceRecognizer.callConnectionError(); + } + //base.voiceRecognizer.callConnectionError();*/ + } + + void CheckConnection() + { + thereIsConnection = false; + WWW www = new WWW("https://www.google.com.br"); + waitForRequest(www); + + if(www.bytesDownloaded > 0){ + thereIsConnection = true; + Debug.Log("connection ok"); + } + else{ + Debug.Log("no connection"); + thereIsConnection = false; + + } + } } diff --git a/Assets/Scripts/ScreenReferences.cs b/Assets/Scripts/ScreenReferences.cs new file mode 100644 index 0000000..585bfe5 --- /dev/null +++ b/Assets/Scripts/ScreenReferences.cs @@ -0,0 +1,99 @@ +/********************** +********LAVID********** +***VLibras Project***** +*------------------------------------------------------------------------ +*Description: +* +* Controls screens transactions (back button) +* +*------------------------------------------------------------------------ +**Author: Claudiomar Araujo +*claudiomar.araujo@lavid.ufpb.br +*/ +using UnityEngine; +using System.Collections; +using System.Threading; + +public class ScreenReferences : MonoBehaviour { + + // tutorials + public GameObject infos; + public GameObject t_1; + public GameObject t_2; + public GameObject t_3; + public GameObject t_4; + public GameObject t_5; + + public BoxCollider collider; + public GameObject text_entry; + public GameObject i_bar; + public PlayerManager player_manager; + private static bool HOME_SCREEN; + + void Update() + { + if (Input.GetKey(KeyCode.Escape)) + { + if(HOME_SCREEN) + { + Application.Quit(); + } + else + { + BackToHomeScreen(); + } + Thread.Sleep(500); + } + } + + void Start() + { + HOME_SCREEN = true; + collider = GameObject.FindGameObjectWithTag("avatar").GetComponent(); + } + + void BackToHomeScreen() + { + collider.enabled = true; + HOME_SCREEN = true; + + if(infos.activeSelf) + { + infos.SetActive(false); + } + if(t_1.activeSelf) + { + t_1.SetActive(false); + } + if(t_2.activeSelf) + { + t_2.SetActive(false); + } + if(t_3.activeSelf) + { + t_3.SetActive(false); + } + if(t_4.activeSelf) + { + t_4.SetActive(false); + } + if(t_5.activeSelf) + { + t_5.SetActive(false); + } + if(!i_bar.activeSelf) + { + i_bar.SetActive(true); + } + if(text_entry.activeSelf) + { + text_entry.SetActive(false); + } + + } + + public void setHomeScreen(bool value) + { + HOME_SCREEN = value; + } +} diff --git a/Assets/Scripts/ScreenReferences.cs.meta b/Assets/Scripts/ScreenReferences.cs.meta new file mode 100644 index 0000000..11edc84 --- /dev/null +++ b/Assets/Scripts/ScreenReferences.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 11f8b85837bcf7c4da290b756e6580da +timeCreated: 1443632970 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UIManagers/UIManagerConnectionError.cs b/Assets/Scripts/UIManagers/UIManagerConnectionError.cs new file mode 100644 index 0000000..3de8087 --- /dev/null +++ b/Assets/Scripts/UIManagers/UIManagerConnectionError.cs @@ -0,0 +1,13 @@ +using UnityEngine; +using UnityEngine.UI; + +public class UIManagerConnectionError : UIManager { + + public Image box; + + protected override void rebuild(float scale) + { + box.transform.localScale = new Vector3(scale, scale, 1); + } + +} diff --git a/Assets/Scripts/UIManagers/UIManagerConnectionError.cs.meta b/Assets/Scripts/UIManagers/UIManagerConnectionError.cs.meta new file mode 100644 index 0000000..61b1c35 --- /dev/null +++ b/Assets/Scripts/UIManagers/UIManagerConnectionError.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 09acbdec1f642334e86af23b51b56662 +timeCreated: 1443641228 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/VoiceRecognition.cs b/Assets/Scripts/VoiceRecognition.cs new file mode 100644 index 0000000..c0e1b4a --- /dev/null +++ b/Assets/Scripts/VoiceRecognition.cs @@ -0,0 +1,63 @@ +/********************** +********LAVID********** +***VLibras Project***** +*------------------------------------------------------------------------ +*Description: +* +*This class needs an android plugin to call Google Speech API +*Before recognition, it verifies if there is internect connection. +*If there is no connection, the application doesn't run and shows an error message. +* +*--------------------------------------------------------------------------- +*Plugin directory: +* - Assets/Plugins/Android +*References: +* - http://docs.unity3d.com/ScriptReference/AndroidJavaClass.html +* - https://msdn.microsoft.com/pt-br/library/system.net.webclient(v=vs.110).aspx +* +*------------------------------------------------------------------------ +*Author: Claudiomar Araujo +*claudiomar.araujo@lavid.ufpb.br +***********************/ + +using UnityEngine; +using System.Collections; +using UnityEngine.UI; +using System; + +public class VoiceRecognition{ + + AndroidJavaClass unity; + AndroidJavaObject currentActivity; + + string voiceText = ""; + + + // Constructor + public VoiceRecognition() + { + #if !UNITY_EDITOR + unity = new AndroidJavaClass ("com.unity3d.player.UnityPlayer"); + currentActivity = unity.Get ("currentActivity"); + #endif + } + + // Calls Google Speech from plugin method and returns recognized text + public string callRecognition() + { +#if !UNITY_EDITOR + voiceText = currentActivity.Call ("callGoogleSpeech"); +#endif + + return voiceText; + } + + public void callConnectionError() + { + Debug.Log("frsef"); + currentActivity.Call ("displayConnectionError"); + //currentActivity.Call ("callGoogleSpeech", "error"); + //currentActivity.Call ("callGoogleSpeech", "error"); + Debug.Log("frsef"); + } +} diff --git a/Assets/Scripts/VoiceRecognition.cs.meta b/Assets/Scripts/VoiceRecognition.cs.meta new file mode 100644 index 0000000..c43d2a1 --- /dev/null +++ b/Assets/Scripts/VoiceRecognition.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 7b20eaea5baef4a4b9723c9da4e2db3f +timeCreated: 1443632970 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 8c353d8..78b2941 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.1.2f1 +m_EditorVersion: 5.1.1f1 m_StandardAssetsVersion: 0 -- libgit2 0.21.2