From b9032f4118f3f2268c5991cfb25ac655e15b129e Mon Sep 17 00:00:00 2001 From: Mateus Pires Date: Thu, 14 Jul 2016 14:44:50 -0300 Subject: [PATCH] icaro:: Finaliza tratamento de timeout e erros de conexão com tradutor --- Assets/Scenes/Main.unity | 303 +++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Assets/Scripts/PlayerManager.cs | 74 ++++++++++++++++++++++++++++++++++++++++---------------------------------- ProjectSettings/ProjectSettings.asset | 7 +------ ProjectSettings/ProjectVersion.txt | 2 +- 4 files changed, 91 insertions(+), 295 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 708d555..9aa60b8 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -113,7 +113,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1357627304} m_RootOrder: 0 @@ -237,7 +236,6 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1265796708} m_RootOrder: 2 @@ -308,7 +306,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1164416486} m_RootOrder: 2 @@ -385,7 +382,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1266698452} m_RootOrder: 0 @@ -462,7 +458,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1164416486} m_RootOrder: 3 @@ -605,7 +600,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 228512394} m_RootOrder: 1 @@ -743,7 +737,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1010778543} m_RootOrder: 1 @@ -812,7 +805,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1585560343} m_RootOrder: 1 @@ -884,7 +876,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 389535983} - {fileID: 191800646} @@ -980,7 +971,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1476138800} - {fileID: 1173561061} @@ -1066,7 +1056,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 702185295} m_Father: {fileID: 954173493} @@ -1136,7 +1125,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1731945571} - {fileID: 957593656} @@ -1182,7 +1170,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 600160455} m_Father: {fileID: 1585560343} @@ -1220,7 +1207,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 951727302} m_RootOrder: 1 @@ -1345,7 +1331,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 813876602} m_RootOrder: 0 @@ -1569,7 +1554,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 814612177} - {fileID: 1798565573} @@ -1629,7 +1613,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1357627304} m_RootOrder: 2 @@ -1755,7 +1738,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 702185295} m_RootOrder: 1 @@ -1908,7 +1890,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1315164544} m_RootOrder: 0 @@ -1993,7 +1974,6 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9, y: 0.9, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1024302432} m_RootOrder: 0 @@ -2129,7 +2109,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1357627304} m_RootOrder: 1 @@ -2254,7 +2233,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1431596489} m_Father: {fileID: 1436939327} @@ -2346,24 +2324,10 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 519244755} ---- !u!1 &535548070 +--- !u!1 &535548070 stripped GameObject: - m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100002, guid: 714c639770278b249bb7d0850bac50fc, type: 3} m_PrefabInternal: {fileID: 878475181} - serializedVersion: 4 - m_Component: - - 4: {fileID: 535548074} - - 111: {fileID: 535548071} - - 65: {fileID: 535548073} - - 114: {fileID: 535548072} - m_Layer: 0 - m_Name: Missing Prefab (Dummy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 --- !u!111 &535548071 Animation: m_ObjectHideFlags: 0 @@ -2372,53 +2336,53 @@ Animation: m_GameObject: {fileID: 535548070} m_Enabled: 1 serializedVersion: 3 - m_Animation: {fileID: 7400000, guid: 01d19198a4ba7744c947b54415b09638, type: 2} + m_Animation: {fileID: 7400000, guid: 51db1b84405e8df46945a2444bc2f5ca, type: 2} m_Animations: - - {fileID: 7400000, guid: c6e86de033f80104c9da2a84d18db220, type: 2} - - {fileID: 7400000, guid: ae38c53191ef36540a44cf79d5b508c7, type: 2} - - {fileID: 7400000, guid: 4082bb61a66d7fd459c60779fcf62ed2, type: 2} - - {fileID: 7400000, guid: b7c7a691b61597b4c93cf0fc4ba41e0d, type: 2} - - {fileID: 7400000, guid: efae9bc1d0c46ae41bafcd1eeac748f4, type: 2} - - {fileID: 7400000, guid: 8ed3bb42ac03ee041b7e605880586e61, type: 2} - - {fileID: 7400000, guid: ef487fc2824592b489c565d9f080904d, type: 2} - - {fileID: 7400000, guid: 5e812be261f5e3e4eb00316d3140e6ce, type: 2} - - {fileID: 7400000, guid: dc31cd5394369154d86c871411a58880, type: 2} - - {fileID: 7400000, guid: c2962583b282d2c4cba2042e8150f1af, type: 2} - - {fileID: 7400000, guid: 4c23fb839f5ed9842b6cd4c982f25c89, type: 2} - - {fileID: 7400000, guid: 927fd4f3952728c43a601b549109b45e, type: 2} - - {fileID: 7400000, guid: 6929c415176bb3248b254e3090ed5706, type: 2} - - {fileID: 7400000, guid: 0d8aed85ef356084b92a7c6f1378d511, type: 2} - - {fileID: 7400000, guid: a8166195fe3ec194b9362c9f549889e4, type: 2} - - {fileID: 7400000, guid: 337ddd951f945c246afff29be40766d4, type: 2} - - {fileID: 7400000, guid: f5812a168972d3b4696fd808b0d9f484, type: 2} - - {fileID: 7400000, guid: 409b1c465227bb140bd7e47bfbb28405, type: 2} - - {fileID: 7400000, guid: b81f4856f3a25e642bdf04d8cd3a4a45, type: 2} - - {fileID: 7400000, guid: 6c741a371cd427f4d84bf261750c9eb3, type: 2} - - {fileID: 7400000, guid: 352e895785329464fac2bb481f74d708, type: 2} - - {fileID: 7400000, guid: 62a671a71314cc843bfe2a5e5beb34d3, type: 2} - - {fileID: 7400000, guid: 6451e1786a3332442a939e0aa7cdf17a, type: 2} - - {fileID: 7400000, guid: 01d19198a4ba7744c947b54415b09638, type: 2} - - {fileID: 7400000, guid: e9925929e5188a5438af37bda5001871, type: 2} - - {fileID: 7400000, guid: 56f7d3f9fcc86974997bd6165d49da04, type: 2} - - {fileID: 7400000, guid: 5f4c6d4a5b98174438274768c58fdd94, type: 2} - - {fileID: 7400000, guid: a6d9e52b7cc787149988c649a0767531, type: 2} - - {fileID: 7400000, guid: 6dc60a9b7dec9314d927ed53ccf18585, type: 2} - - {fileID: 7400000, guid: 004d23eb4df3b6645861c8f14d6018fe, type: 2} - - {fileID: 7400000, guid: bef70c4c7e9041248a79b99707daa0fa, type: 2} - - {fileID: 7400000, guid: f0b5c68c67b7b9b4bbb562413715e8ef, type: 2} - - {fileID: 7400000, guid: de200fddf5c2a3a4db2a687366907299, type: 2} - - {fileID: 7400000, guid: 888a885e0b40c0243bc94c6c7c0e1dad, type: 2} - - {fileID: 7400000, guid: 95f07d9e464341a4e9375f0a6bd3c2ba, type: 2} - - {fileID: 7400000, guid: 5f485eee5989b6d46b37455de0049d87, type: 2} - - {fileID: 7400000, guid: 8db1c41fb8f72ea48bf19d9a859566a1, type: 2} - - {fileID: 7400000, guid: 6c68367f1a7e5dc40b44a31859baa543, type: 2} - - {fileID: 7400000, guid: 982f5eafc504a844b829cadbc69b7769, type: 2} - - {fileID: 7400000, guid: ac3c3fefc562f4e40aa9b816dbe45265, type: 2} - - {fileID: 7400000, guid: 8c1b645d40e4bc743a43af28ed6fdcff, type: 2} - - {fileID: 7400000, guid: 99e6ef2ed7d674543b49aac15d270ba9, type: 2} - - {fileID: 7400000, guid: 62cd54330055ab74d83a3a1ff15294ad, type: 2} - - {fileID: 7400000, guid: 84154a2622239cd4c91f811d671bb326, type: 2} - - {fileID: 7400000, guid: c1d2ea357fdd8c447b3e43b86b512c57, type: 2} + - {fileID: 7400000, guid: 815604012efc9a749a0f6ce23370945b, type: 2} + - {fileID: 7400000, guid: 909aa371266394f4ba7d293a01eaf06d, type: 2} + - {fileID: 7400000, guid: db7d27d1975560b41926077b900162b2, type: 2} + - {fileID: 7400000, guid: f25f075210a14cc429cea16706e7e593, type: 2} + - {fileID: 7400000, guid: c93c8d73f523b2a4b8b2c153f9117c57, type: 2} + - {fileID: 7400000, guid: 51db1b84405e8df46945a2444bc2f5ca, type: 2} + - {fileID: 7400000, guid: 694e9835c00a4264f98a06b4a7c03e7e, type: 2} + - {fileID: 7400000, guid: ed58a7550e488424bbf636153c9ba873, type: 2} + - {fileID: 7400000, guid: 453795a5a58dd3e499c6f39ee800a651, type: 2} + - {fileID: 7400000, guid: 1e3921c5606a9f14fab885646f3024b4, type: 2} + - {fileID: 7400000, guid: d7c82c265ba37004fa224beb16b6eb6a, type: 2} + - {fileID: 7400000, guid: 33d88aa6127ef4544b1464efb1a4b8b4, type: 2} + - {fileID: 7400000, guid: bac84647ceba43c449facd3739af9532, type: 2} + - {fileID: 7400000, guid: bb47b057b99c58744a1f4c6426e54bf0, type: 2} + - {fileID: 7400000, guid: 519d6257975db7242adfcc77eda840ce, type: 2} + - {fileID: 7400000, guid: 39aef458d59efdc4eabe7bf8fe84aa3d, type: 2} + - {fileID: 7400000, guid: d69acb984db4ec240811f153c3681e77, type: 2} + - {fileID: 7400000, guid: ff6f47a8b8a373249973461d314804c3, type: 2} + - {fileID: 7400000, guid: c59e54a9316310d4986932585b259cfa, type: 2} + - {fileID: 7400000, guid: 95b8dd0a735a8da4eb4317afd7b1360e, type: 2} + - {fileID: 7400000, guid: 7d0e3d3a88ed1474fb2715ff40dd2d3f, type: 2} + - {fileID: 7400000, guid: 84d7a3bab2c1f454ea34f3bfc0c88e20, type: 2} + - {fileID: 7400000, guid: da800fbac3523964ab14795c2d42078f, type: 2} + - {fileID: 7400000, guid: 39d12ceaff558884fbb687f8cf4b72cd, type: 2} + - {fileID: 7400000, guid: d73e0bfa4521def48b7fe69e30a97060, type: 2} + - {fileID: 7400000, guid: 58b1302b52b594947ae8f789a949c9c1, type: 2} + - {fileID: 7400000, guid: 15108c4b33ff3a44ba20c42e6ec5ade5, type: 2} + - {fileID: 7400000, guid: 2332735bc385f3b4aba797b26dc7515c, type: 2} + - {fileID: 7400000, guid: e5de295b0d539b94188fa1cc463ac351, type: 2} + - {fileID: 7400000, guid: 79851aeb181d51841b407feec3b40ab1, type: 2} + - {fileID: 7400000, guid: 4854da5cea686064cb1f86a1f02fc84c, type: 2} + - {fileID: 7400000, guid: 91de266c975472840a84e4e5ca8f426d, type: 2} + - {fileID: 7400000, guid: 946297ac02c155f4bb656f25b8dc4167, type: 2} + - {fileID: 7400000, guid: 3c90722d008ebdd46a9c786d9c6ef666, type: 2} + - {fileID: 7400000, guid: 4135a09db8e2f254e9ee229c9e49a6f6, type: 2} + - {fileID: 7400000, guid: b42189bd74abd034dbd4b4326e3d2da2, type: 2} + - {fileID: 7400000, guid: 2dfa71ed53334ab4f80f5fe29765d273, type: 2} + - {fileID: 7400000, guid: 179c974ec8dee0b43a087e7b88147a0d, type: 2} + - {fileID: 7400000, guid: 171564cea512d41439a87ed1a0f78b25, type: 2} + - {fileID: 7400000, guid: ca6d65de3ae2e4e418a53a80eb8b6bc2, type: 2} + - {fileID: 7400000, guid: d2b4405ffb25d3f448440bb652f442bd, type: 2} + - {fileID: 7400000, guid: 2eec476f24a99b44c8c47d356dbe0a46, type: 2} + - {fileID: 7400000, guid: 6fa1f48f9df657b4ab514a872880bd51, type: 2} + - {fileID: 7400000, guid: d8cf82af413d0774b850f67555bcae35, type: 2} + - {fileID: 7400000, guid: 6c036cdff369fb241a283d124626e635, type: 2} m_WrapMode: 0 m_PlayAutomatically: 1 m_AnimatePhysics: 0 @@ -2446,19 +2410,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 6.828157, y: 7.3689804, z: 1} m_Center: {x: -0.04474616, y: 3.5875206, z: -0.00000001458015} ---- !u!4 &535548074 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 878475181} - m_GameObject: {fileID: 535548070} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: [] - m_Father: {fileID: 1751933694} - m_RootOrder: 0 --- !u!1 &568312204 GameObject: m_ObjectHideFlags: 0 @@ -2488,7 +2439,6 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: -0.55919284, w: -0.8290376} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1952387009} m_RootOrder: 0 @@ -2627,7 +2577,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 702185295} m_RootOrder: 5 @@ -2751,7 +2700,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 342633403} m_RootOrder: 0 @@ -2820,7 +2768,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1157915785} m_Father: {fileID: 1874017187} @@ -2871,7 +2818,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1357627304} m_RootOrder: 3 @@ -2996,7 +2942,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1874017187} m_RootOrder: 3 @@ -3120,7 +3065,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 930426943} - {fileID: 440527254} @@ -3198,7 +3142,6 @@ 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 366095108} m_Father: {fileID: 861767965} @@ -3283,7 +3226,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 995712444} - {fileID: 268582951} @@ -3357,7 +3299,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 2044204295} m_RootOrder: 1 @@ -3441,7 +3382,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1277329011} m_Father: {fileID: 268582951} @@ -3478,7 +3418,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1237199446} m_Father: {fileID: 1763761724} @@ -3600,7 +3539,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -177.5, y: -385.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1414104007} m_RootOrder: 11 @@ -3677,7 +3615,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1164416486} m_Father: {fileID: 1414104007} @@ -3745,7 +3682,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 813876602} m_Father: {fileID: 1414104007} @@ -3796,7 +3732,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1585560343} m_RootOrder: 0 @@ -3999,7 +3934,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 702185295} m_RootOrder: 0 @@ -4141,7 +4075,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1874017187} m_RootOrder: 2 @@ -4266,7 +4199,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1920630439} - {fileID: 363895484} @@ -4352,7 +4284,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 263667178} m_Father: {fileID: 1414104007} @@ -4410,7 +4341,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 268582951} m_RootOrder: 1 @@ -4483,7 +4413,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 814612177} m_RootOrder: 0 @@ -4619,7 +4548,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1416567425} - {fileID: 197321766} @@ -4662,7 +4590,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 702185295} m_RootOrder: 3 @@ -4786,7 +4713,6 @@ 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 490251390} - {fileID: 2023188709} @@ -4861,7 +4787,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1357627304} m_RootOrder: 4 @@ -4987,7 +4912,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1935189154} m_RootOrder: 1 @@ -5138,7 +5062,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1024302432} m_RootOrder: 2 @@ -5273,7 +5196,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 2102396406} m_Father: {fileID: 613136921} @@ -5395,7 +5317,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1537204753} - {fileID: 1823767295} @@ -5456,7 +5377,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1516956731} - {fileID: 1201374061} @@ -5496,7 +5416,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1935189154} m_RootOrder: 5 @@ -5644,7 +5563,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1265796708} m_RootOrder: 0 @@ -5721,7 +5639,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1173561061} m_RootOrder: 1 @@ -5853,7 +5770,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1010778543} - {fileID: 1623802273} @@ -5891,7 +5807,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 841640089} m_RootOrder: 0 @@ -5976,7 +5891,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1952387009} m_Father: {fileID: 1414104007} @@ -6078,7 +5992,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1183073263} - {fileID: 1979341001} @@ -6168,7 +6081,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 152065639} m_Father: {fileID: 1164416486} @@ -6319,7 +6231,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 832064355} m_RootOrder: 0 @@ -6389,7 +6300,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 486636722} m_Father: {fileID: 1585560343} @@ -6433,7 +6343,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1431596489} m_RootOrder: 0 @@ -6503,7 +6412,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1623802273} m_RootOrder: 1 @@ -6571,7 +6479,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 45157146} - {fileID: 510126319} @@ -6647,7 +6554,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1935189154} m_RootOrder: 0 @@ -6786,7 +6692,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 2044204295} m_RootOrder: 0 @@ -6873,7 +6778,6 @@ RectTransform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1265043070} - {fileID: 1533000892} @@ -6950,7 +6854,6 @@ Canvas: m_ReceivesEvents: 1 m_OverrideSorting: 0 m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -6980,7 +6883,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1010778543} m_RootOrder: 0 @@ -7047,7 +6949,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1329557729} m_Father: {fileID: 519244756} @@ -7086,7 +6987,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1995982559} - {fileID: 519244756} @@ -7172,7 +7072,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1486957250} m_RootOrder: 0 @@ -7242,7 +7141,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1010778543} m_RootOrder: 2 @@ -7313,7 +7211,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 702185295} m_RootOrder: 4 @@ -7467,7 +7364,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 263018772} m_RootOrder: 0 @@ -7604,7 +7500,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1438965115} m_Father: {fileID: 268582951} @@ -7640,7 +7535,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1010778543} m_RootOrder: 4 @@ -7710,7 +7604,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1952387009} m_RootOrder: 1 @@ -7802,7 +7695,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1173561061} m_RootOrder: 0 @@ -7894,7 +7786,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1697118936} m_Father: {fileID: 1414104007} @@ -7932,7 +7823,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1164416486} m_RootOrder: 0 @@ -8016,7 +7906,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 874328298} - {fileID: 212041960} @@ -8090,35 +7979,10 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &1614563994 +--- !u!1 &1614563994 stripped GameObject: - m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100152, guid: 714c639770278b249bb7d0850bac50fc, type: 3} m_PrefabInternal: {fileID: 878475181} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1614563995} - - 114: {fileID: 1614563997} - m_Layer: 0 - m_Name: Missing Prefab (Dummy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1614563995 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 878475181} - m_GameObject: {fileID: 1614563994} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: [] - m_Father: {fileID: 1751933694} - m_RootOrder: 1 --- !u!114 &1614563997 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8167,7 +8031,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1010778543} m_RootOrder: 3 @@ -8233,7 +8096,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1922820117} - {fileID: 1330400155} @@ -8274,7 +8136,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 263018772} m_RootOrder: 2 @@ -8372,7 +8233,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1533000892} m_RootOrder: 0 @@ -8454,7 +8314,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1585560343} m_RootOrder: 4 @@ -8541,7 +8400,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 268582951} m_RootOrder: 0 @@ -8600,36 +8458,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1731945570} ---- !u!1 &1751933693 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 878475181} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1751933694} - m_Layer: 0 - m_Name: Missing Prefab - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1751933694 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 878475181} - m_GameObject: {fileID: 1751933693} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 535548074} - - {fileID: 1614563995} - m_Father: {fileID: 0} - m_RootOrder: 2 --- !u!1 &1763761723 GameObject: m_ObjectHideFlags: 0 @@ -8655,7 +8483,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 841640089} m_Father: {fileID: 1874017187} @@ -8703,7 +8530,6 @@ Transform: m_LocalRotation: {x: 0.059653778, y: 0.000080406884, z: 0.000984144, w: 0.99821866} m_LocalPosition: {x: -0, y: 3.9, z: -17.11} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 2123885087} m_Father: {fileID: 0} @@ -8803,7 +8629,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1357627304} m_Father: {fileID: 389535983} @@ -8874,7 +8699,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1164416486} m_RootOrder: 1 @@ -8942,7 +8766,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 613136921} - {fileID: 1763761724} @@ -8981,7 +8804,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1623802273} m_RootOrder: 2 @@ -9050,7 +8872,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 951727302} m_RootOrder: 0 @@ -9136,10 +8957,9 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 140.75763, y: 291.22995, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 --- !u!1 &1922820116 GameObject: m_ObjectHideFlags: 0 @@ -9166,7 +8986,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1623802273} m_RootOrder: 0 @@ -9236,7 +9055,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1585560343} m_Father: {fileID: 2119336824} @@ -9375,7 +9193,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1382683269} - {fileID: 1053934345} @@ -9460,7 +9277,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 568312205} - {fileID: 1496206517} @@ -9497,7 +9313,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1436939327} m_Father: {fileID: 951727302} @@ -9548,7 +9363,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1265796708} m_RootOrder: 1 @@ -9608,7 +9422,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1436939327} m_RootOrder: 0 @@ -9644,7 +9457,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1935189154} m_RootOrder: 3 @@ -9713,7 +9525,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 2105857205} m_Father: {fileID: 1935189154} @@ -9750,7 +9561,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 228512394} m_RootOrder: 2 @@ -9829,7 +9639,6 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.95, y: 0.95, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1024302432} m_RootOrder: 1 @@ -9963,7 +9772,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1623802273} m_RootOrder: 3 @@ -10032,7 +9840,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1412335970} - {fileID: 815279418} @@ -10156,7 +9963,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 268582951} m_RootOrder: 4 @@ -10241,7 +10047,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1623802273} m_RootOrder: 4 @@ -10310,7 +10115,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1935189154} m_RootOrder: 2 @@ -10382,7 +10186,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 814612177} m_RootOrder: 2 @@ -10505,7 +10308,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 2105857205} m_RootOrder: 0 @@ -10600,7 +10402,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 702185295} m_RootOrder: 2 @@ -10724,7 +10525,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1157915785} m_RootOrder: 0 @@ -10812,7 +10612,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 2071733049} m_Father: {fileID: 2002966284} @@ -10908,7 +10707,6 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -10939,7 +10737,6 @@ 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1923959837} m_Father: {fileID: 1414104007} @@ -10995,7 +10792,6 @@ Transform: m_LocalRotation: {x: 0.00007914052, y: 0.080148704, z: 0.9967825, w: 0.0009842431} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1772891848} m_RootOrder: 0 @@ -11089,7 +10885,6 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 4fde5fe..f680d82 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -29,17 +29,21 @@ public class PlayerManager : GenericPlayerManager { public enum ERROR_STATUS_MESSAGE { INTERNET_CONNECTION_FAILURE, - TRANSLATOR_CONNECTION_FAILURE + TRANSLATOR_CONNECTION_FAILURE, + CONNECTION_TIMEOUT_FAILURE } public static string get_connection_status_message(ERROR_STATUS_MESSAGE msg) { switch(msg) { - case ERROR_STATUS_MESSAGE.INTERNET_CONNECTION_FAILURE: - return "Problema na conexão. Usaremos português sinalizado e datilologia."; case ERROR_STATUS_MESSAGE.TRANSLATOR_CONNECTION_FAILURE: + return "Problema na conexão. Usaremos português sinalizado e datilologia."; + case ERROR_STATUS_MESSAGE.INTERNET_CONNECTION_FAILURE: + return "Não há acesso à internet. Usaremos português sinalizado e datilologia."; + case ERROR_STATUS_MESSAGE.CONNECTION_TIMEOUT_FAILURE: return "Não há acesso à internet. Usaremos português sinalizado e datilologia."; + //return "A conexão está lenta. Usaremos português sinalizado e datilologia."; default: return "Ocorreu um erro. Estamos trabalhando para solucioná-lo!"; } @@ -155,8 +159,9 @@ public class PlayerManager : GenericPlayerManager { lock (this.LOCKER_TRANSLATE) { - //string return_status = null; bool return_status_success = true; + bool timeout = false; + float timeout_limit = 10f; Debug.Log("Requesting tranlator: " + gloss); @@ -169,28 +174,25 @@ public class PlayerManager : GenericPlayerManager { { yield return glossRequest.isDone; - //float timer = 0; - //float timeOut = 3f; + float timer = 0; - //while (!glossRequest.isDone) - //{ - // if (timer > timeOut) - // { - // Debug.Log("Timeout"); - // //return_status_success = false; - // break; - // } - // timer += Time.deltaTime; - // yield return null; - //} - - //if (!return_status_success) glossRequest.Dispose(); - - if (glossRequest.error == null) + while (!glossRequest.isDone) + { + if (timer > timeout_limit) + { + Debug.Log("Timeout"); + timeout = true; + break; + } + timer += Time.deltaTime; + yield return null; + } + + if (glossRequest.error == null || timeout) { yield return glossRequest; - - return_status_success = glossRequest.responseHeaders["STATUS"].Equals("HTTP/1.0 200 OK"); + + return_status_success = glossRequest.responseHeaders.Count > 0 && glossRequest.responseHeaders["STATUS"].Equals("HTTP/1.0 200 OK"); if (return_status_success && !String.IsNullOrEmpty(glossRequest.text)) { @@ -213,17 +215,21 @@ public class PlayerManager : GenericPlayerManager { this.screenManager.setLoadingSnippetState(false); - //if(return_status_success) - //{ - // this.screenManager.showConnectionErrorDialog( - // PlayerManager.ERROR_STATUS_MESSAGE.INTERNET_CONNECTION_FAILURE); - //} - //else - //{ - // this.screenManager.showConnectionErrorDialog( - // PlayerManager.ERROR_STATUS_MESSAGE.TRANSLATOR_CONNECTION_FAILURE); - //} - this.screenManager.showConnectionErrorDialog(); + if (return_status_success) + { + this.screenManager.showConnectionErrorDialog( + PlayerManager.ERROR_STATUS_MESSAGE.TRANSLATOR_CONNECTION_FAILURE); + } + else if(timeout) + { + this.screenManager.showConnectionErrorDialog( + PlayerManager.ERROR_STATUS_MESSAGE.CONNECTION_TIMEOUT_FAILURE); + } + else + { + this.screenManager.showConnectionErrorDialog( + PlayerManager.ERROR_STATUS_MESSAGE.INTERNET_CONNECTION_FAILURE); + } //base.randomAnimations.unlockFor("translate"); } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 06363ae..ba57a23 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -117,8 +117,6 @@ PlayerSettings: m_Bits: 238 iPhoneSdkVersion: 988 iPhoneTargetOSVersion: 22 - tvOSSdkVersion: 0 - tvOSTargetOSVersion: 900 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -161,7 +159,7 @@ PlayerSettings: AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: C:/Users/mateu/Desktop/keystore.keystore - AndroidKeyaliasName: + AndroidKeyaliasName: vlibras AndroidTVCompatibility: 0 AndroidIsGame: 0 androidEnableBanner: 0 @@ -198,7 +196,6 @@ PlayerSettings: wiiUSystemHeapSize: 128 wiiUTVStartupScreen: {fileID: 0} wiiUGamePadStartupScreen: {fileID: 0} - wiiUDrcBufferDisabled: 0 wiiUProfilerLibPath: actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 @@ -266,7 +263,6 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ - ps4UseDebugIl2cppLibs: 0 ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 @@ -332,7 +328,6 @@ PlayerSettings: psp2UseLibLocation: 0 psp2InfoBarOnStartup: 0 psp2InfoBarColor: 0 - psp2UseDebugIl2cppLibs: 0 psmSplashimage: {fileID: 0} spritePackerPolicy: scriptingDefineSymbols: {} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 558807b..df44595 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.3.5f1 +m_EditorVersion: 5.3.3f1 m_StandardAssetsVersion: 0 -- libgit2 0.21.2