Download as
Browse Code »

Commit cfebcbf89957e7b02cc41631ea5aca54987a3042

Authored by Ícaro Magalhães
1 parent 470f9c9f
Exists in master and in 6 other branches Export, ExportVideo, IosBuild, development, dict, region

Solve bugs

Showing 5 changed files with 297 additions and 24 deletions   Show diff stats
Assets/Avatar/Avatar.blend.meta
  Diff comments   View file @cfebcbf
1 1 fileFormatVersion: 2
2 2 guid: 714c639770278b249bb7d0850bac50fc
3   -timeCreated: 1454610523
  3 +timeCreated: 1468514756
4 4 licenseType: Pro
5 5 ModelImporter:
6 6 serializedVersion: 19
... ...
Assets/Scenes/Main.unity
  Diff comments   View file @cfebcbf
... ... @@ -113,6 +113,7 @@ RectTransform:
113 113 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
114 114 m_LocalPosition: {x: 0, y: 0, z: 0}
115 115 m_LocalScale: {x: 1, y: 1, z: 1}
  116 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
116 117 m_Children: []
117 118 m_Father: {fileID: 1357627304}
118 119 m_RootOrder: 0
... ... @@ -236,6 +237,7 @@ RectTransform:
236 237 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
237 238 m_LocalPosition: {x: 0, y: 0, z: 0}
238 239 m_LocalScale: {x: 0.6, y: 0.6, z: 1}
  240 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
239 241 m_Children: []
240 242 m_Father: {fileID: 1265796708}
241 243 m_RootOrder: 2
... ... @@ -306,6 +308,7 @@ RectTransform:
306 308 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
307 309 m_LocalPosition: {x: 0, y: 0, z: 0}
308 310 m_LocalScale: {x: 1, y: 1, z: 1}
  311 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
309 312 m_Children: []
310 313 m_Father: {fileID: 1164416486}
311 314 m_RootOrder: 2
... ... @@ -382,6 +385,7 @@ RectTransform:
382 385 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
383 386 m_LocalPosition: {x: 0, y: 0, z: 0}
384 387 m_LocalScale: {x: 1, y: 1, z: 1}
  388 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
385 389 m_Children: []
386 390 m_Father: {fileID: 1266698452}
387 391 m_RootOrder: 0
... ... @@ -458,6 +462,7 @@ RectTransform:
458 462 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
459 463 m_LocalPosition: {x: 0, y: 0, z: 0}
460 464 m_LocalScale: {x: 1, y: 1, z: 1}
  465 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
461 466 m_Children: []
462 467 m_Father: {fileID: 1164416486}
463 468 m_RootOrder: 3
... ... @@ -600,6 +605,7 @@ RectTransform:
600 605 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
601 606 m_LocalPosition: {x: 0, y: 0, z: 0}
602 607 m_LocalScale: {x: 1, y: 1, z: 1}
  608 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
603 609 m_Children: []
604 610 m_Father: {fileID: 228512394}
605 611 m_RootOrder: 1
... ... @@ -737,6 +743,7 @@ RectTransform:
737 743 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
738 744 m_LocalPosition: {x: 0, y: 0, z: 0}
739 745 m_LocalScale: {x: 1, y: 1, z: 1}
  746 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
740 747 m_Children: []
741 748 m_Father: {fileID: 1010778543}
742 749 m_RootOrder: 1
... ... @@ -805,6 +812,7 @@ RectTransform:
805 812 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
806 813 m_LocalPosition: {x: 0, y: 0, z: 0}
807 814 m_LocalScale: {x: 1, y: 1, z: 1}
  815 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
808 816 m_Children: []
809 817 m_Father: {fileID: 1585560343}
810 818 m_RootOrder: 1
... ... @@ -876,6 +884,7 @@ RectTransform:
876 884 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
877 885 m_LocalPosition: {x: 0, y: 0, z: 0}
878 886 m_LocalScale: {x: 1, y: 1, z: 1}
  887 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
879 888 m_Children:
880 889 - {fileID: 389535983}
881 890 - {fileID: 191800646}
... ... @@ -971,6 +980,7 @@ RectTransform:
971 980 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
972 981 m_LocalPosition: {x: 0, y: 0, z: 0}
973 982 m_LocalScale: {x: 1, y: 1, z: 1}
  983 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
974 984 m_Children:
975 985 - {fileID: 1476138800}
976 986 - {fileID: 1173561061}
... ... @@ -1056,6 +1066,7 @@ RectTransform:
1056 1066 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1057 1067 m_LocalPosition: {x: 0, y: 0, z: 0}
1058 1068 m_LocalScale: {x: 1, y: 1, z: 1}
  1069 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1059 1070 m_Children:
1060 1071 - {fileID: 702185295}
1061 1072 m_Father: {fileID: 954173493}
... ... @@ -1125,6 +1136,7 @@ RectTransform:
1125 1136 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1126 1137 m_LocalPosition: {x: 0, y: 0, z: 0}
1127 1138 m_LocalScale: {x: 1, y: 1, z: 1}
  1139 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1128 1140 m_Children:
1129 1141 - {fileID: 1731945571}
1130 1142 - {fileID: 957593656}
... ... @@ -1170,6 +1182,7 @@ RectTransform:
1170 1182 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1171 1183 m_LocalPosition: {x: 0, y: 0, z: 0}
1172 1184 m_LocalScale: {x: 1, y: 1, z: 1}
  1185 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1173 1186 m_Children:
1174 1187 - {fileID: 600160455}
1175 1188 m_Father: {fileID: 1585560343}
... ... @@ -1207,6 +1220,7 @@ RectTransform:
1207 1220 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1208 1221 m_LocalPosition: {x: 0, y: 0, z: 0}
1209 1222 m_LocalScale: {x: 1, y: 1, z: 1}
  1223 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1210 1224 m_Children: []
1211 1225 m_Father: {fileID: 951727302}
1212 1226 m_RootOrder: 1
... ... @@ -1331,6 +1345,7 @@ RectTransform:
1331 1345 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1332 1346 m_LocalPosition: {x: 0, y: 0, z: 0}
1333 1347 m_LocalScale: {x: 1, y: 1, z: 1}
  1348 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1334 1349 m_Children: []
1335 1350 m_Father: {fileID: 813876602}
1336 1351 m_RootOrder: 0
... ... @@ -1554,6 +1569,7 @@ RectTransform:
1554 1569 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1555 1570 m_LocalPosition: {x: 0, y: 0, z: 0}
1556 1571 m_LocalScale: {x: 1, y: 1, z: 1}
  1572 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1557 1573 m_Children:
1558 1574 - {fileID: 814612177}
1559 1575 - {fileID: 1798565573}
... ... @@ -1613,6 +1629,7 @@ RectTransform:
1613 1629 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1614 1630 m_LocalPosition: {x: 0, y: 0, z: 0}
1615 1631 m_LocalScale: {x: 1, y: 1, z: 1}
  1632 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1616 1633 m_Children: []
1617 1634 m_Father: {fileID: 1357627304}
1618 1635 m_RootOrder: 2
... ... @@ -1738,6 +1755,7 @@ RectTransform:
1738 1755 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1739 1756 m_LocalPosition: {x: 0, y: 0, z: 0}
1740 1757 m_LocalScale: {x: 1, y: 1, z: 1}
  1758 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1741 1759 m_Children: []
1742 1760 m_Father: {fileID: 702185295}
1743 1761 m_RootOrder: 1
... ... @@ -1890,6 +1908,7 @@ RectTransform:
1890 1908 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1891 1909 m_LocalPosition: {x: 0, y: 0, z: 0}
1892 1910 m_LocalScale: {x: 1, y: 1, z: 1}
  1911 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1893 1912 m_Children: []
1894 1913 m_Father: {fileID: 1315164544}
1895 1914 m_RootOrder: 0
... ... @@ -1974,6 +1993,7 @@ RectTransform:
1974 1993 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1975 1994 m_LocalPosition: {x: 0, y: 0, z: 0}
1976 1995 m_LocalScale: {x: 0.9, y: 0.9, z: 1}
  1996 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1977 1997 m_Children: []
1978 1998 m_Father: {fileID: 1024302432}
1979 1999 m_RootOrder: 0
... ... @@ -2109,6 +2129,7 @@ RectTransform:
2109 2129 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2110 2130 m_LocalPosition: {x: 0, y: 0, z: 0}
2111 2131 m_LocalScale: {x: 1, y: 1, z: 1}
  2132 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2112 2133 m_Children: []
2113 2134 m_Father: {fileID: 1357627304}
2114 2135 m_RootOrder: 1
... ... @@ -2233,6 +2254,7 @@ RectTransform:
2233 2254 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2234 2255 m_LocalPosition: {x: 0, y: 0, z: 0}
2235 2256 m_LocalScale: {x: 1, y: 1, z: 1}
  2257 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2236 2258 m_Children:
2237 2259 - {fileID: 1431596489}
2238 2260 m_Father: {fileID: 1436939327}
... ... @@ -2324,10 +2346,24 @@ CanvasRenderer:
2324 2346 type: 2}
2325 2347 m_PrefabInternal: {fileID: 0}
2326 2348 m_GameObject: {fileID: 519244755}
2327   ---- !u!1 &535548070 stripped
  2349 +--- !u!1 &535548070
2328 2350 GameObject:
  2351 + m_ObjectHideFlags: 0
2329 2352 m_PrefabParentObject: {fileID: 100002, guid: 714c639770278b249bb7d0850bac50fc, type: 3}
2330 2353 m_PrefabInternal: {fileID: 878475181}
  2354 + serializedVersion: 4
  2355 + m_Component:
  2356 + - 4: {fileID: 535548074}
  2357 + - 111: {fileID: 535548071}
  2358 + - 65: {fileID: 535548073}
  2359 + - 114: {fileID: 535548072}
  2360 + m_Layer: 0
  2361 + m_Name: Missing Prefab (Dummy)
  2362 + m_TagString: Untagged
  2363 + m_Icon: {fileID: 0}
  2364 + m_NavMeshLayer: 0
  2365 + m_StaticEditorFlags: 0
  2366 + m_IsActive: 0
2331 2367 --- !u!111 &535548071
2332 2368 Animation:
2333 2369 m_ObjectHideFlags: 0
... ... @@ -2410,6 +2446,19 @@ BoxCollider:
2410 2446 serializedVersion: 2
2411 2447 m_Size: {x: 6.828157, y: 7.3689804, z: 1}
2412 2448 m_Center: {x: -0.04474616, y: 3.5875206, z: -0.00000001458015}
  2449 +--- !u!4 &535548074
  2450 +Transform:
  2451 + m_ObjectHideFlags: 0
  2452 + m_PrefabParentObject: {fileID: 0}
  2453 + m_PrefabInternal: {fileID: 878475181}
  2454 + m_GameObject: {fileID: 535548070}
  2455 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  2456 + m_LocalPosition: {x: 0, y: 0, z: 0}
  2457 + m_LocalScale: {x: 1, y: 1, z: 1}
  2458 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  2459 + m_Children: []
  2460 + m_Father: {fileID: 1751933694}
  2461 + m_RootOrder: 0
2413 2462 --- !u!1 &568312204
2414 2463 GameObject:
2415 2464 m_ObjectHideFlags: 0
... ... @@ -2439,6 +2488,7 @@ RectTransform:
2439 2488 m_LocalRotation: {x: 0, y: 0, z: -0.55919284, w: -0.8290376}
2440 2489 m_LocalPosition: {x: 0, y: 0, z: 0}
2441 2490 m_LocalScale: {x: 1, y: 1, z: 1}
  2491 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2442 2492 m_Children: []
2443 2493 m_Father: {fileID: 1952387009}
2444 2494 m_RootOrder: 0
... ... @@ -2577,6 +2627,7 @@ RectTransform:
2577 2627 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2578 2628 m_LocalPosition: {x: 0, y: 0, z: 0}
2579 2629 m_LocalScale: {x: 1, y: 1, z: 1}
  2630 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2580 2631 m_Children: []
2581 2632 m_Father: {fileID: 702185295}
2582 2633 m_RootOrder: 5
... ... @@ -2700,6 +2751,7 @@ RectTransform:
2700 2751 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2701 2752 m_LocalPosition: {x: 0, y: 0, z: 0}
2702 2753 m_LocalScale: {x: 1, y: 1, z: 1}
  2754 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2703 2755 m_Children: []
2704 2756 m_Father: {fileID: 342633403}
2705 2757 m_RootOrder: 0
... ... @@ -2768,6 +2820,7 @@ RectTransform:
2768 2820 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2769 2821 m_LocalPosition: {x: 0, y: 0, z: 0}
2770 2822 m_LocalScale: {x: 1, y: 1, z: 1}
  2823 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2771 2824 m_Children:
2772 2825 - {fileID: 1157915785}
2773 2826 m_Father: {fileID: 1874017187}
... ... @@ -2818,6 +2871,7 @@ RectTransform:
2818 2871 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2819 2872 m_LocalPosition: {x: 0, y: 0, z: 0}
2820 2873 m_LocalScale: {x: 1, y: 1, z: 1}
  2874 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2821 2875 m_Children: []
2822 2876 m_Father: {fileID: 1357627304}
2823 2877 m_RootOrder: 3
... ... @@ -2942,6 +2996,7 @@ RectTransform:
2942 2996 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2943 2997 m_LocalPosition: {x: 0, y: 0, z: 0}
2944 2998 m_LocalScale: {x: 1, y: 1, z: 1}
  2999 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2945 3000 m_Children: []
2946 3001 m_Father: {fileID: 1874017187}
2947 3002 m_RootOrder: 3
... ... @@ -3065,6 +3120,7 @@ RectTransform:
3065 3120 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3066 3121 m_LocalPosition: {x: 0, y: 0, z: 0}
3067 3122 m_LocalScale: {x: 1, y: 1, z: 1}
  3123 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3068 3124 m_Children:
3069 3125 - {fileID: 930426943}
3070 3126 - {fileID: 440527254}
... ... @@ -3142,6 +3198,7 @@ RectTransform:
3142 3198 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3143 3199 m_LocalPosition: {x: 0, y: 0, z: 0}
3144 3200 m_LocalScale: {x: 1, y: 1, z: 0}
  3201 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3145 3202 m_Children:
3146 3203 - {fileID: 366095108}
3147 3204 m_Father: {fileID: 861767965}
... ... @@ -3226,6 +3283,7 @@ RectTransform:
3226 3283 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3227 3284 m_LocalPosition: {x: 0, y: 0, z: 0}
3228 3285 m_LocalScale: {x: 1, y: 1, z: 1}
  3286 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3229 3287 m_Children:
3230 3288 - {fileID: 995712444}
3231 3289 - {fileID: 268582951}
... ... @@ -3299,6 +3357,7 @@ RectTransform:
3299 3357 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3300 3358 m_LocalPosition: {x: 0, y: 0, z: 0}
3301 3359 m_LocalScale: {x: 1, y: 1, z: 1}
  3360 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3302 3361 m_Children: []
3303 3362 m_Father: {fileID: 2044204295}
3304 3363 m_RootOrder: 1
... ... @@ -3382,6 +3441,7 @@ RectTransform:
3382 3441 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3383 3442 m_LocalPosition: {x: 0, y: 0, z: 0}
3384 3443 m_LocalScale: {x: 1, y: 1, z: 1}
  3444 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3385 3445 m_Children:
3386 3446 - {fileID: 1277329011}
3387 3447 m_Father: {fileID: 268582951}
... ... @@ -3418,6 +3478,7 @@ RectTransform:
3418 3478 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3419 3479 m_LocalPosition: {x: 0, y: 0, z: 0}
3420 3480 m_LocalScale: {x: 1, y: 1, z: 1}
  3481 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3421 3482 m_Children:
3422 3483 - {fileID: 1237199446}
3423 3484 m_Father: {fileID: 1763761724}
... ... @@ -3539,6 +3600,7 @@ Transform:
3539 3600 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3540 3601 m_LocalPosition: {x: -177.5, y: -385.5, z: 0}
3541 3602 m_LocalScale: {x: 1, y: 1, z: 1}
  3603 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3542 3604 m_Children: []
3543 3605 m_Father: {fileID: 1414104007}
3544 3606 m_RootOrder: 11
... ... @@ -3615,6 +3677,7 @@ RectTransform:
3615 3677 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3616 3678 m_LocalPosition: {x: 0, y: 0, z: 0}
3617 3679 m_LocalScale: {x: 1, y: 1, z: 1}
  3680 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3618 3681 m_Children:
3619 3682 - {fileID: 1164416486}
3620 3683 m_Father: {fileID: 1414104007}
... ... @@ -3682,6 +3745,7 @@ RectTransform:
3682 3745 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3683 3746 m_LocalPosition: {x: 0, y: 0, z: 0}
3684 3747 m_LocalScale: {x: 1, y: 1, z: 1}
  3748 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3685 3749 m_Children:
3686 3750 - {fileID: 813876602}
3687 3751 m_Father: {fileID: 1414104007}
... ... @@ -3732,6 +3796,7 @@ RectTransform:
3732 3796 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3733 3797 m_LocalPosition: {x: 0, y: 0, z: 0}
3734 3798 m_LocalScale: {x: 1, y: 1, z: 1}
  3799 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3735 3800 m_Children: []
3736 3801 m_Father: {fileID: 1585560343}
3737 3802 m_RootOrder: 0
... ... @@ -3934,6 +3999,7 @@ RectTransform:
3934 3999 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3935 4000 m_LocalPosition: {x: 0, y: 0, z: 0}
3936 4001 m_LocalScale: {x: 1, y: 1, z: 1}
  4002 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3937 4003 m_Children: []
3938 4004 m_Father: {fileID: 702185295}
3939 4005 m_RootOrder: 0
... ... @@ -4075,6 +4141,7 @@ RectTransform:
4075 4141 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4076 4142 m_LocalPosition: {x: 0, y: 0, z: 0}
4077 4143 m_LocalScale: {x: 1, y: 1, z: 1}
  4144 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4078 4145 m_Children: []
4079 4146 m_Father: {fileID: 1874017187}
4080 4147 m_RootOrder: 2
... ... @@ -4199,6 +4266,7 @@ RectTransform:
4199 4266 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4200 4267 m_LocalPosition: {x: 0, y: 0, z: 0}
4201 4268 m_LocalScale: {x: 1, y: 1, z: 1}
  4269 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4202 4270 m_Children:
4203 4271 - {fileID: 1920630439}
4204 4272 - {fileID: 363895484}
... ... @@ -4284,6 +4352,7 @@ RectTransform:
4284 4352 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4285 4353 m_LocalPosition: {x: 0, y: 0, z: 0}
4286 4354 m_LocalScale: {x: 1, y: 1, z: 1}
  4355 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4287 4356 m_Children:
4288 4357 - {fileID: 263667178}
4289 4358 m_Father: {fileID: 1414104007}
... ... @@ -4341,6 +4410,7 @@ RectTransform:
4341 4410 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4342 4411 m_LocalPosition: {x: 0, y: 0, z: 0}
4343 4412 m_LocalScale: {x: 1, y: 1, z: 1}
  4413 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4344 4414 m_Children: []
4345 4415 m_Father: {fileID: 268582951}
4346 4416 m_RootOrder: 1
... ... @@ -4413,6 +4483,7 @@ RectTransform:
4413 4483 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4414 4484 m_LocalPosition: {x: 0, y: 0, z: 0}
4415 4485 m_LocalScale: {x: 1, y: 1, z: 1}
  4486 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4416 4487 m_Children: []
4417 4488 m_Father: {fileID: 814612177}
4418 4489 m_RootOrder: 0
... ... @@ -4548,6 +4619,7 @@ RectTransform:
4548 4619 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4549 4620 m_LocalPosition: {x: 0, y: 0, z: 0}
4550 4621 m_LocalScale: {x: 1, y: 1, z: 1}
  4622 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4551 4623 m_Children:
4552 4624 - {fileID: 1416567425}
4553 4625 - {fileID: 197321766}
... ... @@ -4590,6 +4662,7 @@ RectTransform:
4590 4662 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4591 4663 m_LocalPosition: {x: 0, y: 0, z: 0}
4592 4664 m_LocalScale: {x: 1, y: 1, z: 1}
  4665 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4593 4666 m_Children: []
4594 4667 m_Father: {fileID: 702185295}
4595 4668 m_RootOrder: 3
... ... @@ -4713,6 +4786,7 @@ RectTransform:
4713 4786 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4714 4787 m_LocalPosition: {x: 0, y: 0, z: 0}
4715 4788 m_LocalScale: {x: 1, y: 1, z: 0}
  4789 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4716 4790 m_Children:
4717 4791 - {fileID: 490251390}
4718 4792 - {fileID: 2023188709}
... ... @@ -4787,6 +4861,7 @@ RectTransform:
4787 4861 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4788 4862 m_LocalPosition: {x: 0, y: 0, z: 0}
4789 4863 m_LocalScale: {x: 1, y: 1, z: 1}
  4864 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4790 4865 m_Children: []
4791 4866 m_Father: {fileID: 1357627304}
4792 4867 m_RootOrder: 4
... ... @@ -4912,6 +4987,7 @@ RectTransform:
4912 4987 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4913 4988 m_LocalPosition: {x: 0, y: 0, z: 0}
4914 4989 m_LocalScale: {x: 1, y: 1, z: 1}
  4990 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4915 4991 m_Children: []
4916 4992 m_Father: {fileID: 1935189154}
4917 4993 m_RootOrder: 1
... ... @@ -5062,6 +5138,7 @@ RectTransform:
5062 5138 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
5063 5139 m_LocalPosition: {x: 0, y: 0, z: 0}
5064 5140 m_LocalScale: {x: 1, y: 1, z: 1}
  5141 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5065 5142 m_Children: []
5066 5143 m_Father: {fileID: 1024302432}
5067 5144 m_RootOrder: 2
... ... @@ -5196,6 +5273,7 @@ RectTransform:
5196 5273 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
5197 5274 m_LocalPosition: {x: 0, y: 0, z: 0}
5198 5275 m_LocalScale: {x: 1, y: 1, z: 1}
  5276 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5199 5277 m_Children:
5200 5278 - {fileID: 2102396406}
5201 5279 m_Father: {fileID: 613136921}
... ... @@ -5317,6 +5395,7 @@ RectTransform:
5317 5395 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
5318 5396 m_LocalPosition: {x: 0, y: 0, z: 0}
5319 5397 m_LocalScale: {x: 1, y: 1, z: 1}
  5398 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5320 5399 m_Children:
5321 5400 - {fileID: 1537204753}
5322 5401 - {fileID: 1823767295}
... ... @@ -5377,6 +5456,7 @@ RectTransform:
5377 5456 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
5378 5457 m_LocalPosition: {x: 0, y: 0, z: 0}
5379 5458 m_LocalScale: {x: 1, y: 1, z: 1}
  5459 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5380 5460 m_Children:
5381 5461 - {fileID: 1516956731}
5382 5462 - {fileID: 1201374061}
... ... @@ -5416,6 +5496,7 @@ RectTransform:
5416 5496 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
5417 5497 m_LocalPosition: {x: 0, y: 0, z: 0}
5418 5498 m_LocalScale: {x: 1, y: 1, z: 1}
  5499 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5419 5500 m_Children: []
5420 5501 m_Father: {fileID: 1935189154}
5421 5502 m_RootOrder: 5
... ... @@ -5563,6 +5644,7 @@ RectTransform:
5563 5644 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
5564 5645 m_LocalPosition: {x: 0, y: 0, z: 0}
5565 5646 m_LocalScale: {x: 1, y: 1, z: 1}
  5647 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5566 5648 m_Children: []
5567 5649 m_Father: {fileID: 1265796708}
5568 5650 m_RootOrder: 0
... ... @@ -5639,6 +5721,7 @@ RectTransform:
5639 5721 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
5640 5722 m_LocalPosition: {x: 0, y: 0, z: 0}
5641 5723 m_LocalScale: {x: 1, y: 1, z: 1}
  5724 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5642 5725 m_Children: []
5643 5726 m_Father: {fileID: 1173561061}
5644 5727 m_RootOrder: 1
... ... @@ -5770,6 +5853,7 @@ RectTransform:
5770 5853 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
5771 5854 m_LocalPosition: {x: 0, y: 0, z: 0}
5772 5855 m_LocalScale: {x: 1, y: 1, z: 1}
  5856 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5773 5857 m_Children:
5774 5858 - {fileID: 1010778543}
5775 5859 - {fileID: 1623802273}
... ... @@ -5807,6 +5891,7 @@ RectTransform:
5807 5891 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
5808 5892 m_LocalPosition: {x: 0, y: 0, z: 0}
5809 5893 m_LocalScale: {x: 1, y: 1, z: 1}
  5894 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5810 5895 m_Children: []
5811 5896 m_Father: {fileID: 841640089}
5812 5897 m_RootOrder: 0
... ... @@ -5891,6 +5976,7 @@ RectTransform:
5891 5976 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
5892 5977 m_LocalPosition: {x: 0, y: 0, z: 0}
5893 5978 m_LocalScale: {x: 1, y: 1, z: 1}
  5979 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5894 5980 m_Children:
5895 5981 - {fileID: 1952387009}
5896 5982 m_Father: {fileID: 1414104007}
... ... @@ -5992,6 +6078,7 @@ RectTransform:
5992 6078 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
5993 6079 m_LocalPosition: {x: 0, y: 0, z: 0}
5994 6080 m_LocalScale: {x: 1, y: 1, z: 1}
  6081 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5995 6082 m_Children:
5996 6083 - {fileID: 1183073263}
5997 6084 - {fileID: 1979341001}
... ... @@ -6081,6 +6168,7 @@ RectTransform:
6081 6168 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6082 6169 m_LocalPosition: {x: 0, y: 0, z: 0}
6083 6170 m_LocalScale: {x: 1, y: 1, z: 1}
  6171 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6084 6172 m_Children:
6085 6173 - {fileID: 152065639}
6086 6174 m_Father: {fileID: 1164416486}
... ... @@ -6231,6 +6319,7 @@ RectTransform:
6231 6319 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6232 6320 m_LocalPosition: {x: 0, y: 0, z: 0}
6233 6321 m_LocalScale: {x: 1, y: 1, z: 1}
  6322 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6234 6323 m_Children: []
6235 6324 m_Father: {fileID: 832064355}
6236 6325 m_RootOrder: 0
... ... @@ -6300,6 +6389,7 @@ RectTransform:
6300 6389 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6301 6390 m_LocalPosition: {x: 0, y: 0, z: 0}
6302 6391 m_LocalScale: {x: 1, y: 1, z: 1}
  6392 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6303 6393 m_Children:
6304 6394 - {fileID: 486636722}
6305 6395 m_Father: {fileID: 1585560343}
... ... @@ -6343,6 +6433,7 @@ RectTransform:
6343 6433 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6344 6434 m_LocalPosition: {x: 0, y: 0, z: 0}
6345 6435 m_LocalScale: {x: 1, y: 1, z: 1}
  6436 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6346 6437 m_Children: []
6347 6438 m_Father: {fileID: 1431596489}
6348 6439 m_RootOrder: 0
... ... @@ -6412,6 +6503,7 @@ RectTransform:
6412 6503 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6413 6504 m_LocalPosition: {x: 0, y: 0, z: 0}
6414 6505 m_LocalScale: {x: 1, y: 1, z: 1}
  6506 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6415 6507 m_Children: []
6416 6508 m_Father: {fileID: 1623802273}
6417 6509 m_RootOrder: 1
... ... @@ -6479,6 +6571,7 @@ RectTransform:
6479 6571 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6480 6572 m_LocalPosition: {x: 0, y: 0, z: 0}
6481 6573 m_LocalScale: {x: 1, y: 1, z: 1}
  6574 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6482 6575 m_Children:
6483 6576 - {fileID: 45157146}
6484 6577 - {fileID: 510126319}
... ... @@ -6554,6 +6647,7 @@ RectTransform:
6554 6647 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6555 6648 m_LocalPosition: {x: 0, y: 0, z: 0}
6556 6649 m_LocalScale: {x: 1, y: 1, z: 1}
  6650 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6557 6651 m_Children: []
6558 6652 m_Father: {fileID: 1935189154}
6559 6653 m_RootOrder: 0
... ... @@ -6692,6 +6786,7 @@ RectTransform:
6692 6786 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6693 6787 m_LocalPosition: {x: 0, y: 0, z: 0}
6694 6788 m_LocalScale: {x: 1, y: 1, z: 1}
  6789 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6695 6790 m_Children: []
6696 6791 m_Father: {fileID: 2044204295}
6697 6792 m_RootOrder: 0
... ... @@ -6778,6 +6873,7 @@ RectTransform:
6778 6873 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6779 6874 m_LocalPosition: {x: 0, y: 0, z: 0}
6780 6875 m_LocalScale: {x: 0, y: 0, z: 0}
  6876 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6781 6877 m_Children:
6782 6878 - {fileID: 1265043070}
6783 6879 - {fileID: 1533000892}
... ... @@ -6854,6 +6950,7 @@ Canvas:
6854 6950 m_ReceivesEvents: 1
6855 6951 m_OverrideSorting: 0
6856 6952 m_OverridePixelPerfect: 0
  6953 + m_SortingBucketNormalizedSize: 0
6857 6954 m_SortingLayerID: 0
6858 6955 m_SortingOrder: 0
6859 6956 m_TargetDisplay: 0
... ... @@ -6883,6 +6980,7 @@ RectTransform:
6883 6980 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6884 6981 m_LocalPosition: {x: 0, y: 0, z: 0}
6885 6982 m_LocalScale: {x: 1, y: 1, z: 1}
  6983 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6886 6984 m_Children: []
6887 6985 m_Father: {fileID: 1010778543}
6888 6986 m_RootOrder: 0
... ... @@ -6949,6 +7047,7 @@ RectTransform:
6949 7047 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6950 7048 m_LocalPosition: {x: 0, y: 0, z: 0}
6951 7049 m_LocalScale: {x: 1, y: 1, z: 1}
  7050 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6952 7051 m_Children:
6953 7052 - {fileID: 1329557729}
6954 7053 m_Father: {fileID: 519244756}
... ... @@ -6987,6 +7086,7 @@ RectTransform:
6987 7086 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6988 7087 m_LocalPosition: {x: 0, y: 0, z: 0}
6989 7088 m_LocalScale: {x: 1, y: 1, z: 1}
  7089 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6990 7090 m_Children:
6991 7091 - {fileID: 1995982559}
6992 7092 - {fileID: 519244756}
... ... @@ -7072,6 +7172,7 @@ RectTransform:
7072 7172 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7073 7173 m_LocalPosition: {x: 0, y: 0, z: 0}
7074 7174 m_LocalScale: {x: 1, y: 1, z: 1}
  7175 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7075 7176 m_Children: []
7076 7177 m_Father: {fileID: 1486957250}
7077 7178 m_RootOrder: 0
... ... @@ -7141,6 +7242,7 @@ RectTransform:
7141 7242 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7142 7243 m_LocalPosition: {x: 0, y: 0, z: 0}
7143 7244 m_LocalScale: {x: 1, y: 1, z: 1}
  7245 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7144 7246 m_Children: []
7145 7247 m_Father: {fileID: 1010778543}
7146 7248 m_RootOrder: 2
... ... @@ -7211,6 +7313,7 @@ RectTransform:
7211 7313 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7212 7314 m_LocalPosition: {x: 0, y: 0, z: 0}
7213 7315 m_LocalScale: {x: 1, y: 1, z: 1}
  7316 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7214 7317 m_Children: []
7215 7318 m_Father: {fileID: 702185295}
7216 7319 m_RootOrder: 4
... ... @@ -7364,6 +7467,7 @@ RectTransform:
7364 7467 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7365 7468 m_LocalPosition: {x: 0, y: 0, z: 0}
7366 7469 m_LocalScale: {x: 1, y: 1, z: 1}
  7470 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7367 7471 m_Children: []
7368 7472 m_Father: {fileID: 263018772}
7369 7473 m_RootOrder: 0
... ... @@ -7500,6 +7604,7 @@ RectTransform:
7500 7604 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7501 7605 m_LocalPosition: {x: 0, y: 0, z: 0}
7502 7606 m_LocalScale: {x: 1, y: 1, z: 1}
  7607 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7503 7608 m_Children:
7504 7609 - {fileID: 1438965115}
7505 7610 m_Father: {fileID: 268582951}
... ... @@ -7535,6 +7640,7 @@ RectTransform:
7535 7640 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7536 7641 m_LocalPosition: {x: 0, y: 0, z: 0}
7537 7642 m_LocalScale: {x: 1, y: 1, z: 1}
  7643 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7538 7644 m_Children: []
7539 7645 m_Father: {fileID: 1010778543}
7540 7646 m_RootOrder: 4
... ... @@ -7604,6 +7710,7 @@ RectTransform:
7604 7710 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7605 7711 m_LocalPosition: {x: 0, y: 0, z: 0}
7606 7712 m_LocalScale: {x: 1, y: 1, z: 1}
  7713 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7607 7714 m_Children: []
7608 7715 m_Father: {fileID: 1952387009}
7609 7716 m_RootOrder: 1
... ... @@ -7695,6 +7802,7 @@ RectTransform:
7695 7802 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7696 7803 m_LocalPosition: {x: 0, y: 0, z: 0}
7697 7804 m_LocalScale: {x: 1, y: 1, z: 1}
  7805 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7698 7806 m_Children: []
7699 7807 m_Father: {fileID: 1173561061}
7700 7808 m_RootOrder: 0
... ... @@ -7786,6 +7894,7 @@ RectTransform:
7786 7894 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7787 7895 m_LocalPosition: {x: 0, y: 0, z: 0}
7788 7896 m_LocalScale: {x: 1, y: 1, z: 1}
  7897 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7789 7898 m_Children:
7790 7899 - {fileID: 1697118936}
7791 7900 m_Father: {fileID: 1414104007}
... ... @@ -7823,6 +7932,7 @@ RectTransform:
7823 7932 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7824 7933 m_LocalPosition: {x: 0, y: 0, z: 0}
7825 7934 m_LocalScale: {x: 1, y: 1, z: 1}
  7935 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7826 7936 m_Children: []
7827 7937 m_Father: {fileID: 1164416486}
7828 7938 m_RootOrder: 0
... ... @@ -7906,6 +8016,7 @@ RectTransform:
7906 8016 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7907 8017 m_LocalPosition: {x: 0, y: 0, z: 0}
7908 8018 m_LocalScale: {x: 1, y: 1, z: 1}
  8019 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7909 8020 m_Children:
7910 8021 - {fileID: 874328298}
7911 8022 - {fileID: 212041960}
... ... @@ -7979,10 +8090,35 @@ MonoBehaviour:
7979 8090 m_CallState: 2
7980 8091 m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0,
7981 8092 Culture=neutral, PublicKeyToken=null
7982   ---- !u!1 &1614563994 stripped
  8093 +--- !u!1 &1614563994
7983 8094 GameObject:
  8095 + m_ObjectHideFlags: 0
7984 8096 m_PrefabParentObject: {fileID: 100152, guid: 714c639770278b249bb7d0850bac50fc, type: 3}
7985 8097 m_PrefabInternal: {fileID: 878475181}
  8098 + serializedVersion: 4
  8099 + m_Component:
  8100 + - 4: {fileID: 1614563995}
  8101 + - 114: {fileID: 1614563997}
  8102 + m_Layer: 0
  8103 + m_Name: Missing Prefab (Dummy)
  8104 + m_TagString: Untagged
  8105 + m_Icon: {fileID: 0}
  8106 + m_NavMeshLayer: 0
  8107 + m_StaticEditorFlags: 0
  8108 + m_IsActive: 0
  8109 +--- !u!4 &1614563995
  8110 +Transform:
  8111 + m_ObjectHideFlags: 0
  8112 + m_PrefabParentObject: {fileID: 0}
  8113 + m_PrefabInternal: {fileID: 878475181}
  8114 + m_GameObject: {fileID: 1614563994}
  8115 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  8116 + m_LocalPosition: {x: 0, y: 0, z: 0}
  8117 + m_LocalScale: {x: 1, y: 1, z: 1}
  8118 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  8119 + m_Children: []
  8120 + m_Father: {fileID: 1751933694}
  8121 + m_RootOrder: 1
7986 8122 --- !u!114 &1614563997
7987 8123 MonoBehaviour:
7988 8124 m_ObjectHideFlags: 0
... ... @@ -8031,6 +8167,7 @@ RectTransform:
8031 8167 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8032 8168 m_LocalPosition: {x: 0, y: 0, z: 0}
8033 8169 m_LocalScale: {x: 1, y: 1, z: 1}
  8170 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8034 8171 m_Children: []
8035 8172 m_Father: {fileID: 1010778543}
8036 8173 m_RootOrder: 3
... ... @@ -8096,6 +8233,7 @@ RectTransform:
8096 8233 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8097 8234 m_LocalPosition: {x: 0, y: 0, z: 0}
8098 8235 m_LocalScale: {x: 1, y: 1, z: 1}
  8236 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8099 8237 m_Children:
8100 8238 - {fileID: 1922820117}
8101 8239 - {fileID: 1330400155}
... ... @@ -8136,6 +8274,7 @@ RectTransform:
8136 8274 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8137 8275 m_LocalPosition: {x: 0, y: 0, z: 0}
8138 8276 m_LocalScale: {x: 1, y: 1, z: 1}
  8277 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8139 8278 m_Children: []
8140 8279 m_Father: {fileID: 263018772}
8141 8280 m_RootOrder: 2
... ... @@ -8233,6 +8372,7 @@ RectTransform:
8233 8372 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8234 8373 m_LocalPosition: {x: 0, y: 0, z: 0}
8235 8374 m_LocalScale: {x: 1, y: 1, z: 1}
  8375 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8236 8376 m_Children: []
8237 8377 m_Father: {fileID: 1533000892}
8238 8378 m_RootOrder: 0
... ... @@ -8314,6 +8454,7 @@ RectTransform:
8314 8454 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8315 8455 m_LocalPosition: {x: 0, y: 0, z: 0}
8316 8456 m_LocalScale: {x: 1, y: 1, z: 1}
  8457 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8317 8458 m_Children: []
8318 8459 m_Father: {fileID: 1585560343}
8319 8460 m_RootOrder: 4
... ... @@ -8400,6 +8541,7 @@ RectTransform:
8400 8541 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8401 8542 m_LocalPosition: {x: 0, y: 0, z: 0}
8402 8543 m_LocalScale: {x: 1, y: 1, z: 1}
  8544 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8403 8545 m_Children: []
8404 8546 m_Father: {fileID: 268582951}
8405 8547 m_RootOrder: 0
... ... @@ -8458,6 +8600,36 @@ CanvasRenderer:
8458 8600 type: 2}
8459 8601 m_PrefabInternal: {fileID: 0}
8460 8602 m_GameObject: {fileID: 1731945570}
  8603 +--- !u!1 &1751933693
  8604 +GameObject:
  8605 + m_ObjectHideFlags: 0
  8606 + m_PrefabParentObject: {fileID: 0}
  8607 + m_PrefabInternal: {fileID: 878475181}
  8608 + serializedVersion: 4
  8609 + m_Component:
  8610 + - 4: {fileID: 1751933694}
  8611 + m_Layer: 0
  8612 + m_Name: Missing Prefab
  8613 + m_TagString: Untagged
  8614 + m_Icon: {fileID: 0}
  8615 + m_NavMeshLayer: 0
  8616 + m_StaticEditorFlags: 0
  8617 + m_IsActive: 1
  8618 +--- !u!4 &1751933694
  8619 +Transform:
  8620 + m_ObjectHideFlags: 0
  8621 + m_PrefabParentObject: {fileID: 0}
  8622 + m_PrefabInternal: {fileID: 878475181}
  8623 + m_GameObject: {fileID: 1751933693}
  8624 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  8625 + m_LocalPosition: {x: 0, y: 0, z: 0}
  8626 + m_LocalScale: {x: 1, y: 1, z: 1}
  8627 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  8628 + m_Children:
  8629 + - {fileID: 535548074}
  8630 + - {fileID: 1614563995}
  8631 + m_Father: {fileID: 0}
  8632 + m_RootOrder: 2
8461 8633 --- !u!1 &1763761723
8462 8634 GameObject:
8463 8635 m_ObjectHideFlags: 0
... ... @@ -8483,6 +8655,7 @@ RectTransform:
8483 8655 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8484 8656 m_LocalPosition: {x: 0, y: 0, z: 0}
8485 8657 m_LocalScale: {x: 1, y: 1, z: 1}
  8658 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8486 8659 m_Children:
8487 8660 - {fileID: 841640089}
8488 8661 m_Father: {fileID: 1874017187}
... ... @@ -8530,6 +8703,7 @@ Transform:
8530 8703 m_LocalRotation: {x: 0.059653778, y: 0.000080406884, z: 0.000984144, w: 0.99821866}
8531 8704 m_LocalPosition: {x: -0, y: 3.9, z: -17.11}
8532 8705 m_LocalScale: {x: 1, y: 1, z: 1}
  8706 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8533 8707 m_Children:
8534 8708 - {fileID: 2123885087}
8535 8709 m_Father: {fileID: 0}
... ... @@ -8629,6 +8803,7 @@ RectTransform:
8629 8803 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8630 8804 m_LocalPosition: {x: 0, y: 0, z: 0}
8631 8805 m_LocalScale: {x: 1, y: 1, z: 1}
  8806 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8632 8807 m_Children:
8633 8808 - {fileID: 1357627304}
8634 8809 m_Father: {fileID: 389535983}
... ... @@ -8699,6 +8874,7 @@ RectTransform:
8699 8874 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8700 8875 m_LocalPosition: {x: 0, y: 0, z: 0}
8701 8876 m_LocalScale: {x: 1, y: 1, z: 1}
  8877 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8702 8878 m_Children: []
8703 8879 m_Father: {fileID: 1164416486}
8704 8880 m_RootOrder: 1
... ... @@ -8766,6 +8942,7 @@ RectTransform:
8766 8942 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8767 8943 m_LocalPosition: {x: 0, y: 0, z: 0}
8768 8944 m_LocalScale: {x: 1, y: 1, z: 1}
  8945 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8769 8946 m_Children:
8770 8947 - {fileID: 613136921}
8771 8948 - {fileID: 1763761724}
... ... @@ -8804,6 +8981,7 @@ RectTransform:
8804 8981 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8805 8982 m_LocalPosition: {x: 0, y: 0, z: 0}
8806 8983 m_LocalScale: {x: 1, y: 1, z: 1}
  8984 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8807 8985 m_Children: []
8808 8986 m_Father: {fileID: 1623802273}
8809 8987 m_RootOrder: 2
... ... @@ -8872,6 +9050,7 @@ RectTransform:
8872 9050 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8873 9051 m_LocalPosition: {x: 0, y: 0, z: 0}
8874 9052 m_LocalScale: {x: 1, y: 1, z: 1}
  9053 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8875 9054 m_Children: []
8876 9055 m_Father: {fileID: 951727302}
8877 9056 m_RootOrder: 0
... ... @@ -8957,9 +9136,10 @@ Transform:
8957 9136 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8958 9137 m_LocalPosition: {x: 140.75763, y: 291.22995, z: 0}
8959 9138 m_LocalScale: {x: 1, y: 1, z: 1}
  9139 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8960 9140 m_Children: []
8961 9141 m_Father: {fileID: 0}
8962   - m_RootOrder: 2
  9142 + m_RootOrder: 1
8963 9143 --- !u!1 &1922820116
8964 9144 GameObject:
8965 9145 m_ObjectHideFlags: 0
... ... @@ -8986,6 +9166,7 @@ RectTransform:
8986 9166 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8987 9167 m_LocalPosition: {x: 0, y: 0, z: 0}
8988 9168 m_LocalScale: {x: 1, y: 1, z: 1}
  9169 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8989 9170 m_Children: []
8990 9171 m_Father: {fileID: 1623802273}
8991 9172 m_RootOrder: 0
... ... @@ -9055,6 +9236,7 @@ RectTransform:
9055 9236 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9056 9237 m_LocalPosition: {x: 0, y: 0, z: 0}
9057 9238 m_LocalScale: {x: 1, y: 1, z: 1}
  9239 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9058 9240 m_Children:
9059 9241 - {fileID: 1585560343}
9060 9242 m_Father: {fileID: 2119336824}
... ... @@ -9193,6 +9375,7 @@ RectTransform:
9193 9375 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9194 9376 m_LocalPosition: {x: 0, y: 0, z: 0}
9195 9377 m_LocalScale: {x: 1, y: 1, z: 1}
  9378 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9196 9379 m_Children:
9197 9380 - {fileID: 1382683269}
9198 9381 - {fileID: 1053934345}
... ... @@ -9277,6 +9460,7 @@ RectTransform:
9277 9460 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9278 9461 m_LocalPosition: {x: 0, y: 0, z: 0}
9279 9462 m_LocalScale: {x: 1, y: 1, z: 1}
  9463 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9280 9464 m_Children:
9281 9465 - {fileID: 568312205}
9282 9466 - {fileID: 1496206517}
... ... @@ -9313,6 +9497,7 @@ RectTransform:
9313 9497 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9314 9498 m_LocalPosition: {x: 0, y: 0, z: 0}
9315 9499 m_LocalScale: {x: 1, y: 1, z: 1}
  9500 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9316 9501 m_Children:
9317 9502 - {fileID: 1436939327}
9318 9503 m_Father: {fileID: 951727302}
... ... @@ -9363,6 +9548,7 @@ RectTransform:
9363 9548 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9364 9549 m_LocalPosition: {x: 0, y: 0, z: 0}
9365 9550 m_LocalScale: {x: 1, y: 1, z: 1}
  9551 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9366 9552 m_Children: []
9367 9553 m_Father: {fileID: 1265796708}
9368 9554 m_RootOrder: 1
... ... @@ -9422,6 +9608,7 @@ RectTransform:
9422 9608 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9423 9609 m_LocalPosition: {x: 0, y: 0, z: 0}
9424 9610 m_LocalScale: {x: 1, y: 1, z: 1}
  9611 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9425 9612 m_Children: []
9426 9613 m_Father: {fileID: 1436939327}
9427 9614 m_RootOrder: 0
... ... @@ -9457,6 +9644,7 @@ RectTransform:
9457 9644 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9458 9645 m_LocalPosition: {x: 0, y: 0, z: 0}
9459 9646 m_LocalScale: {x: 1, y: 1, z: 1}
  9647 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9460 9648 m_Children: []
9461 9649 m_Father: {fileID: 1935189154}
9462 9650 m_RootOrder: 3
... ... @@ -9525,6 +9713,7 @@ RectTransform:
9525 9713 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9526 9714 m_LocalPosition: {x: 0, y: 0, z: 0}
9527 9715 m_LocalScale: {x: 1, y: 1, z: 1}
  9716 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9528 9717 m_Children:
9529 9718 - {fileID: 2105857205}
9530 9719 m_Father: {fileID: 1935189154}
... ... @@ -9561,6 +9750,7 @@ RectTransform:
9561 9750 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9562 9751 m_LocalPosition: {x: 0, y: 0, z: 0}
9563 9752 m_LocalScale: {x: 1, y: 1, z: 1}
  9753 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9564 9754 m_Children: []
9565 9755 m_Father: {fileID: 228512394}
9566 9756 m_RootOrder: 2
... ... @@ -9639,6 +9829,7 @@ RectTransform:
9639 9829 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9640 9830 m_LocalPosition: {x: 0, y: 0, z: 0}
9641 9831 m_LocalScale: {x: 0.95, y: 0.95, z: 1}
  9832 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9642 9833 m_Children: []
9643 9834 m_Father: {fileID: 1024302432}
9644 9835 m_RootOrder: 1
... ... @@ -9772,6 +9963,7 @@ RectTransform:
9772 9963 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9773 9964 m_LocalPosition: {x: 0, y: 0, z: 0}
9774 9965 m_LocalScale: {x: 1, y: 1, z: 1}
  9966 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9775 9967 m_Children: []
9776 9968 m_Father: {fileID: 1623802273}
9777 9969 m_RootOrder: 3
... ... @@ -9840,6 +10032,7 @@ RectTransform:
9840 10032 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9841 10033 m_LocalPosition: {x: 0, y: 0, z: 0}
9842 10034 m_LocalScale: {x: 1, y: 1, z: 1}
  10035 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9843 10036 m_Children:
9844 10037 - {fileID: 1412335970}
9845 10038 - {fileID: 815279418}
... ... @@ -9963,6 +10156,7 @@ RectTransform:
9963 10156 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9964 10157 m_LocalPosition: {x: 0, y: 0, z: 0}
9965 10158 m_LocalScale: {x: 1, y: 1, z: 1}
  10159 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9966 10160 m_Children: []
9967 10161 m_Father: {fileID: 268582951}
9968 10162 m_RootOrder: 4
... ... @@ -10047,6 +10241,7 @@ RectTransform:
10047 10241 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
10048 10242 m_LocalPosition: {x: 0, y: 0, z: 0}
10049 10243 m_LocalScale: {x: 1, y: 1, z: 1}
  10244 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10050 10245 m_Children: []
10051 10246 m_Father: {fileID: 1623802273}
10052 10247 m_RootOrder: 4
... ... @@ -10115,6 +10310,7 @@ RectTransform:
10115 10310 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
10116 10311 m_LocalPosition: {x: 0, y: 0, z: 0}
10117 10312 m_LocalScale: {x: 1, y: 1, z: 1}
  10313 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10118 10314 m_Children: []
10119 10315 m_Father: {fileID: 1935189154}
10120 10316 m_RootOrder: 2
... ... @@ -10186,6 +10382,7 @@ RectTransform:
10186 10382 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
10187 10383 m_LocalPosition: {x: 0, y: 0, z: 0}
10188 10384 m_LocalScale: {x: 1, y: 1, z: 1}
  10385 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10189 10386 m_Children: []
10190 10387 m_Father: {fileID: 814612177}
10191 10388 m_RootOrder: 2
... ... @@ -10308,6 +10505,7 @@ RectTransform:
10308 10505 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
10309 10506 m_LocalPosition: {x: 0, y: 0, z: 0}
10310 10507 m_LocalScale: {x: 1, y: 1, z: 1}
  10508 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10311 10509 m_Children: []
10312 10510 m_Father: {fileID: 2105857205}
10313 10511 m_RootOrder: 0
... ... @@ -10402,6 +10600,7 @@ RectTransform:
10402 10600 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
10403 10601 m_LocalPosition: {x: 0, y: 0, z: 0}
10404 10602 m_LocalScale: {x: 1, y: 1, z: 1}
  10603 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10405 10604 m_Children: []
10406 10605 m_Father: {fileID: 702185295}
10407 10606 m_RootOrder: 2
... ... @@ -10525,6 +10724,7 @@ RectTransform:
10525 10724 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
10526 10725 m_LocalPosition: {x: 0, y: 0, z: 0}
10527 10726 m_LocalScale: {x: 1, y: 1, z: 1}
  10727 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10528 10728 m_Children: []
10529 10729 m_Father: {fileID: 1157915785}
10530 10730 m_RootOrder: 0
... ... @@ -10612,6 +10812,7 @@ RectTransform:
10612 10812 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
10613 10813 m_LocalPosition: {x: 0, y: 0, z: 0}
10614 10814 m_LocalScale: {x: 1, y: 1, z: 1}
  10815 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10615 10816 m_Children:
10616 10817 - {fileID: 2071733049}
10617 10818 m_Father: {fileID: 2002966284}
... ... @@ -10707,6 +10908,7 @@ Transform:
10707 10908 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
10708 10909 m_LocalPosition: {x: 0, y: 0, z: 0}
10709 10910 m_LocalScale: {x: 1, y: 1, z: 1}
  10911 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10710 10912 m_Children: []
10711 10913 m_Father: {fileID: 0}
10712 10914 m_RootOrder: 5
... ... @@ -10737,6 +10939,7 @@ RectTransform:
10737 10939 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
10738 10940 m_LocalPosition: {x: 0, y: 0, z: 0}
10739 10941 m_LocalScale: {x: 1, y: 1, z: 1}
  10942 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10740 10943 m_Children:
10741 10944 - {fileID: 1923959837}
10742 10945 m_Father: {fileID: 1414104007}
... ... @@ -10792,6 +10995,7 @@ Transform:
10792 10995 m_LocalRotation: {x: 0.00007914052, y: 0.080148704, z: 0.9967825, w: 0.0009842431}
10793 10996 m_LocalPosition: {x: 0, y: 0, z: 0}
10794 10997 m_LocalScale: {x: 1, y: 1, z: 1}
  10998 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10795 10999 m_Children: []
10796 11000 m_Father: {fileID: 1772891848}
10797 11001 m_RootOrder: 0
... ... @@ -10885,6 +11089,7 @@ Transform:
10885 11089 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
10886 11090 m_LocalPosition: {x: 0, y: 0, z: 0}
10887 11091 m_LocalScale: {x: 1, y: 1, z: 1}
  11092 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10888 11093 m_Children: []
10889 11094 m_Father: {fileID: 0}
10890 11095 m_RootOrder: 4
... ... @@ -10912,6 +11117,7 @@ MonoBehaviour:
10912 11117 infoButtonImage: {fileID: 2079280005}
10913 11118 loadingSnippet: {fileID: 1265043069}
10914 11119 connectionErrorDialog: {fileID: 848083142}
  11120 + connectionErrorText: {fileID: 163763091}
10915 11121 pauseMenu: {fileID: 1024302431}
10916 11122 repeatLayer: {fileID: 861767964}
10917 11123 textButton: {fileID: 930426942}
... ...
Assets/Scripts/PlayerManager.cs
  Diff comments   View file @cfebcbf
... ... @@ -15,18 +15,40 @@ using System.Threading;
15 15 public class PlayerManager : GenericPlayerManager {
16 16  
17 17 #if UNITY_IOS
18   - private const string BASE_URL = "http://150.165.205.9/anims/IOS/";
  18 + //private const string BASE_URL = "http://150.165.205.9/anims/IOS/";//old
  19 + private const string BASE_URL = "http://dicionario.vlibras.gov.br/IOS/";
19 20 #else
20   - private const string BASE_URL = "http://150.165.205.9/anims/ANDROID/";
  21 + //private const string BASE_URL = "http://150.165.205.9/anims/ANDROID/";//old
  22 + private const string BASE_URL = "http://dicionario.vlibras.gov.br/ANDROID/";
21 23 #endif
22 24  
23   - private const string SERVER_URL = "http://vlibras.lavid.ufpb.br/glosa?texto=";
24   -
25   - protected VoiceRecognition voiceRecognizer;
  25 + //private const string SERVER_URL = "http://vlibras.lavid.ufpb.br/glosa?texto=";//old
  26 + private const string SERVER_URL = "http://traducao.vlibras.gov.br/translate?text=";
  27 + private const int version = 1;
  28 +
  29 + public enum ERROR_STATUS_MESSAGE
  30 + {
  31 + INTERNET_CONNECTION_FAILURE,
  32 + TRANSLATOR_CONNECTION_FAILURE
  33 + }
  34 +
  35 + public static string get_connection_status_message(ERROR_STATUS_MESSAGE msg)
  36 + {
  37 + switch(msg)
  38 + {
  39 + case ERROR_STATUS_MESSAGE.INTERNET_CONNECTION_FAILURE:
  40 + return "Problema na conexão. Usaremos português sinalizado e datilologia.";
  41 + case ERROR_STATUS_MESSAGE.TRANSLATOR_CONNECTION_FAILURE:
  42 + return "Não há acesso à internet. Usaremos português sinalizado e datilologia.";
  43 + default:
  44 + return "Ocorreu um erro. Estamos trabalhando para solucioná-lo!";
  45 + }
  46 +
  47 + }
  48 +
  49 + protected VoiceRecognition voiceRecognizer;
26 50 public InputField translateScreenText;
27 51  
28   - private int version = 1;
29   -
30 52 private string[] randomAnimationNames = new string[] {
31 53 "[RELAXAR]",
32 54 "[BOCEJAR]",
... ... @@ -40,6 +62,7 @@ public class PlayerManager : GenericPlayerManager {
40 62  
41 63 public override void Start()
42 64 {
  65 +
43 66 base.setRandomAnimations(randomAnimationNames);
44 67 base.Start();
45 68  
... ... @@ -108,7 +131,8 @@ public class PlayerManager : GenericPlayerManager {
108 131 if (gloss.Equals(this.dictWord))
109 132 {
110 133 base.stopAll();
111   - this.screenManager.showConnectionErrorDialog();
  134 + this.screenManager.showConnectionErrorDialog(
  135 + PlayerManager.ERROR_STATUS_MESSAGE.INTERNET_CONNECTION_FAILURE);
112 136 }
113 137 }
114 138  
... ... @@ -130,27 +154,50 @@ public class PlayerManager : GenericPlayerManager {
130 154 {
131 155 lock (this.LOCKER_TRANSLATE)
132 156 {
133   - Debug.Log("Requesting tranlator: " + gloss);
  157 +
  158 + //string return_status = null;
  159 + bool return_status_success = true;
  160 +
  161 + Debug.Log("Requesting tranlator: " + gloss);
134 162  
135 163 base.randomAnimations.lockFor("translate");
136 164 this.screenManager.setLoadingSnippetState(true);
137 165  
138 166 WWW glossRequest = new WWW(SERVER_URL + WWW.EscapeURL(gloss));
139   -
  167 +
140 168 if (glossRequest != null)
141 169 {
142 170 yield return glossRequest.isDone;
143 171  
144   - if (glossRequest.error == null)
145   - {
  172 + //float timer = 0;
  173 + //float timeOut = 3f;
  174 +
  175 + //while (!glossRequest.isDone)
  176 + //{
  177 + // if (timer > timeOut)
  178 + // {
  179 + // Debug.Log("Timeout");
  180 + // //return_status_success = false;
  181 + // break;
  182 + // }
  183 + // timer += Time.deltaTime;
  184 + // yield return null;
  185 + //}
  186 +
  187 + //if (!return_status_success) glossRequest.Dispose();
  188 +
  189 + if (glossRequest.error == null)
  190 + {
146 191 yield return glossRequest;
  192 +
  193 + return_status_success = glossRequest.responseHeaders["STATUS"].Equals("HTTP/1.0 200 OK");
147 194  
148   - if ( ! String.IsNullOrEmpty(glossRequest.text))
  195 + if (return_status_success && !String.IsNullOrEmpty(glossRequest.text))
149 196 {
150 197 Debug.Log("Translator answer: " + glossRequest.text);
151 198  
152 199 base.gloss = glossRequest.text;
153   - base.playNow(glossRequest.text);
  200 + base.playNow(glossRequest.text);
154 201 this.screenManager.setLoadingSnippetState(false);
155 202 base.randomAnimations.unlockFor("translate");
156 203  
... ... @@ -165,9 +212,21 @@ public class PlayerManager : GenericPlayerManager {
165 212 base.gloss = gloss.ToUpper();
166 213  
167 214 this.screenManager.setLoadingSnippetState(false);
168   - this.screenManager.showConnectionErrorDialog();
169   - //base.randomAnimations.unlockFor("translate");
170   - }
  215 +
  216 + //if(return_status_success)
  217 + //{
  218 + // this.screenManager.showConnectionErrorDialog(
  219 + // PlayerManager.ERROR_STATUS_MESSAGE.INTERNET_CONNECTION_FAILURE);
  220 + //}
  221 + //else
  222 + //{
  223 + // this.screenManager.showConnectionErrorDialog(
  224 + // PlayerManager.ERROR_STATUS_MESSAGE.TRANSLATOR_CONNECTION_FAILURE);
  225 + //}
  226 + this.screenManager.showConnectionErrorDialog();
  227 +
  228 + //base.randomAnimations.unlockFor("translate");
  229 + }
171 230 }
172 231  
173 232 }
... ...
Assets/Scripts/UI/ScreenManager.cs
  Diff comments   View file @cfebcbf
... ... @@ -21,7 +21,8 @@ public class ScreenManager : MonoBehaviour {
21 21  
22 22 public GameObject loadingSnippet;
23 23 public GameObject connectionErrorDialog;
24   - public GameObject pauseMenu;
  24 + public Text connectionErrorText;
  25 + public GameObject pauseMenu;
25 26 public GameObject repeatLayer;
26 27  
27 28 public GameObject textButton;
... ... @@ -176,8 +177,15 @@ public class ScreenManager : MonoBehaviour {
176 177 this.pauseMenu.SetActive(false);
177 178 }
178 179  
179   - public void showConnectionErrorDialog() {
180   - this.connectionErrorDialog.SetActive(true);
  180 + public void showConnectionErrorDialog()
  181 + {
  182 + this.connectionErrorDialog.SetActive(true);
  183 + }
  184 +
  185 + public void showConnectionErrorDialog(PlayerManager.ERROR_STATUS_MESSAGE msg)//int error_code
  186 + {
  187 + this.connectionErrorDialog.SetActive(true);
  188 + this.connectionErrorText.text = PlayerManager.get_connection_status_message(msg);
181 189 }
182 190  
183 191 public void setAvatarColliderState(bool active) {
... ...
playerdroid-ios_2016-03-18_20-12.rar
View file @470f9c9
No preview for this file type