Download as
Browse Code »

Commit ea1d06ff2a6cb61486b549a83c24fee9fbf7370c

Authored by Mateus Lustosa
1 parent 9d63b8f5
Exists in master and in 7 other branches Export, ExportVideo, IosBuild, development, dict, region, ui

Org and repeat button nufinished

Showing 8 changed files with 803 additions and 105 deletions   Show diff stats
Assets/Resources/GUI/round_sprite.png 0 → 100644
View file @ea1d06f

313 Bytes
Assets/Resources/GUI/round_sprite.png.meta 0 → 100644
  Diff comments   View file @ea1d06f
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
  1 +fileFormatVersion: 2
  2 +guid: 9508c7fa52bc67f44bf75321e581396e
  3 +timeCreated: 1456433420
  4 +licenseType: Pro
  5 +TextureImporter:
  6 + fileIDToRecycleName: {}
  7 + serializedVersion: 2
  8 + mipmaps:
  9 + mipMapMode: 0
  10 + enableMipMap: 1
  11 + linearTexture: 0
  12 + correctGamma: 0
  13 + fadeOut: 0
  14 + borderMipMap: 0
  15 + mipMapFadeDistanceStart: 1
  16 + mipMapFadeDistanceEnd: 3
  17 + bumpmap:
  18 + convertToNormalMap: 0
  19 + externalNormalMap: 0
  20 + heightScale: .25
  21 + normalMapFilter: 0
  22 + isReadable: 0
  23 + grayScaleToAlpha: 0
  24 + generateCubemap: 0
  25 + cubemapConvolution: 0
  26 + cubemapConvolutionSteps: 8
  27 + cubemapConvolutionExponent: 1.5
  28 + seamlessCubemap: 0
  29 + textureFormat: -1
  30 + maxTextureSize: 2048
  31 + textureSettings:
  32 + filterMode: -1
  33 + aniso: -1
  34 + mipBias: -1
  35 + wrapMode: 1
  36 + nPOTScale: 0
  37 + lightmap: 0
  38 + rGBM: 0
  39 + compressionQuality: 50
  40 + allowsAlphaSplitting: 0
  41 + spriteMode: 1
  42 + spriteExtrude: 1
  43 + spriteMeshType: 1
  44 + alignment: 0
  45 + spritePivot: {x: .5, y: .5}
  46 + spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  47 + spritePixelsToUnits: 100
  48 + alphaIsTransparency: 1
  49 + textureType: 8
  50 + buildTargetSettings: []
  51 + spriteSheet:
  52 + sprites: []
  53 + spritePackingTag:
  54 + userData:
  55 + assetBundleName:
  56 + assetBundleVariant:
Assets/Scenes/Main.unity
  Diff comments   View file @ea1d06f
@@ -309,7 +309,7 @@ RectTransform: @@ -309,7 +309,7 @@ RectTransform:
309 m_Children: [] 309 m_Children: []
310 m_Father: {fileID: 1164416486} 310 m_Father: {fileID: 1164416486}
311 m_RootOrder: 2 311 m_RootOrder: 2
312 - m_AnchorMin: {x: 0, y: .860000014} 312 + m_AnchorMin: {x: 0, y: .800000012}
313 m_AnchorMax: {x: 1, y: .99000001} 313 m_AnchorMax: {x: 1, y: .99000001}
314 m_AnchoredPosition: {x: 0, y: 0} 314 m_AnchoredPosition: {x: 0, y: 0}
315 m_SizeDelta: {x: 0, y: 0} 315 m_SizeDelta: {x: 0, y: 0}
@@ -459,8 +459,8 @@ RectTransform: @@ -459,8 +459,8 @@ RectTransform:
459 m_Children: [] 459 m_Children: []
460 m_Father: {fileID: 1164416486} 460 m_Father: {fileID: 1164416486}
461 m_RootOrder: 3 461 m_RootOrder: 3
462 - m_AnchorMin: {x: .0399999991, y: .600000024}  
463 - m_AnchorMax: {x: .959999979, y: .839999974} 462 + m_AnchorMin: {x: .0399999991, y: .439999998}
  463 + m_AnchorMax: {x: .959999979, y: .74000001}
464 m_AnchoredPosition: {x: 0, y: 0} 464 m_AnchoredPosition: {x: 0, y: 0}
465 m_SizeDelta: {x: 0, y: 0} 465 m_SizeDelta: {x: 0, y: 0}
466 m_Pivot: {x: .5, y: .5} 466 m_Pivot: {x: .5, y: .5}
@@ -495,7 +495,7 @@ MonoBehaviour: @@ -495,7 +495,7 @@ MonoBehaviour:
495 m_RichText: 1 495 m_RichText: 1
496 m_HorizontalOverflow: 0 496 m_HorizontalOverflow: 0
497 m_VerticalOverflow: 0 497 m_VerticalOverflow: 0
498 - m_LineSpacing: 1 498 + m_LineSpacing: .879999995
499 m_Text: "Verifique sua conex\xE3o com a internet e tente novamente." 499 m_Text: "Verifique sua conex\xE3o com a internet e tente novamente."
500 --- !u!222 &163763092 500 --- !u!222 &163763092
501 CanvasRenderer: 501 CanvasRenderer:
@@ -874,7 +874,7 @@ RectTransform: @@ -874,7 +874,7 @@ RectTransform:
874 - {fileID: 191800646} 874 - {fileID: 191800646}
875 - {fileID: 2010584310} 875 - {fileID: 2010584310}
876 m_Father: {fileID: 1414104007} 876 m_Father: {fileID: 1414104007}
877 - m_RootOrder: 8 877 + m_RootOrder: 9
878 m_AnchorMin: {x: 0, y: 0} 878 m_AnchorMin: {x: 0, y: 0}
879 m_AnchorMax: {x: 1, y: 1} 879 m_AnchorMax: {x: 1, y: 1}
880 m_AnchoredPosition: {x: 0, y: 0} 880 m_AnchoredPosition: {x: 0, y: 0}
@@ -970,7 +970,7 @@ RectTransform: @@ -970,7 +970,7 @@ RectTransform:
970 - {fileID: 1632068377} 970 - {fileID: 1632068377}
971 - {fileID: 1874017187} 971 - {fileID: 1874017187}
972 m_Father: {fileID: 1414104007} 972 m_Father: {fileID: 1414104007}
973 - m_RootOrder: 4 973 + m_RootOrder: 5
974 m_AnchorMin: {x: 0, y: 0} 974 m_AnchorMin: {x: 0, y: 0}
975 m_AnchorMax: {x: 1, y: 1} 975 m_AnchorMax: {x: 1, y: 1}
976 m_AnchoredPosition: {x: 0, y: 0} 976 m_AnchoredPosition: {x: 0, y: 0}
@@ -1296,6 +1296,141 @@ CanvasRenderer: @@ -1296,6 +1296,141 @@ CanvasRenderer:
1296 type: 2} 1296 type: 2}
1297 m_PrefabInternal: {fileID: 0} 1297 m_PrefabInternal: {fileID: 0}
1298 m_GameObject: {fileID: 363895483} 1298 m_GameObject: {fileID: 363895483}
  1299 +--- !u!1 &366095107
  1300 +GameObject:
  1301 + m_ObjectHideFlags: 0
  1302 + m_PrefabParentObject: {fileID: 133590, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2}
  1303 + m_PrefabInternal: {fileID: 0}
  1304 + serializedVersion: 4
  1305 + m_Component:
  1306 + - 224: {fileID: 366095108}
  1307 + - 222: {fileID: 366095111}
  1308 + - 114: {fileID: 366095110}
  1309 + - 114: {fileID: 366095109}
  1310 + m_Layer: 5
  1311 + m_Name: b_repeat
  1312 + m_TagString: Untagged
  1313 + m_Icon: {fileID: 0}
  1314 + m_NavMeshLayer: 0
  1315 + m_StaticEditorFlags: 0
  1316 + m_IsActive: 1
  1317 +--- !u!224 &366095108
  1318 +RectTransform:
  1319 + m_ObjectHideFlags: 0
  1320 + m_PrefabParentObject: {fileID: 22474260, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  1321 + type: 2}
  1322 + m_PrefabInternal: {fileID: 0}
  1323 + m_GameObject: {fileID: 366095107}
  1324 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  1325 + m_LocalPosition: {x: 0, y: 0, z: 0}
  1326 + m_LocalScale: {x: .949999988, y: .949999988, z: 1}
  1327 + m_Children: []
  1328 + m_Father: {fileID: 813876602}
  1329 + m_RootOrder: 0
  1330 + m_AnchorMin: {x: .300000012, y: .159999996}
  1331 + m_AnchorMax: {x: .699999988, y: .839999974}
  1332 + m_AnchoredPosition: {x: 0, y: 0}
  1333 + m_SizeDelta: {x: 0, y: 0}
  1334 + m_Pivot: {x: .5, y: .5}
  1335 +--- !u!114 &366095109
  1336 +MonoBehaviour:
  1337 + m_ObjectHideFlags: 0
  1338 + m_PrefabParentObject: {fileID: 11431640, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  1339 + type: 2}
  1340 + m_PrefabInternal: {fileID: 0}
  1341 + m_GameObject: {fileID: 366095107}
  1342 + m_Enabled: 1
  1343 + m_EditorHideFlags: 0
  1344 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  1345 + m_Name:
  1346 + m_EditorClassIdentifier:
  1347 + m_Navigation:
  1348 + m_Mode: 3
  1349 + m_SelectOnUp: {fileID: 0}
  1350 + m_SelectOnDown: {fileID: 0}
  1351 + m_SelectOnLeft: {fileID: 0}
  1352 + m_SelectOnRight: {fileID: 0}
  1353 + m_Transition: 1
  1354 + m_Colors:
  1355 + m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
  1356 + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1}
  1357 + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1}
  1358 + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814}
  1359 + m_ColorMultiplier: 1
  1360 + m_FadeDuration: .100000001
  1361 + m_SpriteState:
  1362 + m_HighlightedSprite: {fileID: 0}
  1363 + m_PressedSprite: {fileID: 0}
  1364 + m_DisabledSprite: {fileID: 0}
  1365 + m_AnimationTriggers:
  1366 + m_NormalTrigger: Normal
  1367 + m_HighlightedTrigger: Highlighted
  1368 + m_PressedTrigger: Pressed
  1369 + m_DisabledTrigger: Disabled
  1370 + m_Interactable: 1
  1371 + m_TargetGraphic: {fileID: 366095110}
  1372 + m_OnClick:
  1373 + m_PersistentCalls:
  1374 + m_Calls:
  1375 + - m_Target: {fileID: 578311381}
  1376 + m_MethodName: repeat
  1377 + m_Mode: 1
  1378 + m_Arguments:
  1379 + m_ObjectArgument: {fileID: 0}
  1380 + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
  1381 + m_IntArgument: 0
  1382 + m_FloatArgument: 0
  1383 + m_StringArgument:
  1384 + m_BoolArgument: 0
  1385 + m_CallState: 2
  1386 + - m_Target: {fileID: 813876601}
  1387 + m_MethodName: SetActive
  1388 + m_Mode: 6
  1389 + m_Arguments:
  1390 + m_ObjectArgument: {fileID: 0}
  1391 + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
  1392 + m_IntArgument: 0
  1393 + m_FloatArgument: 0
  1394 + m_StringArgument:
  1395 + m_BoolArgument: 0
  1396 + m_CallState: 2
  1397 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
  1398 + Culture=neutral, PublicKeyToken=null
  1399 +--- !u!114 &366095110
  1400 +MonoBehaviour:
  1401 + m_ObjectHideFlags: 0
  1402 + m_PrefabParentObject: {fileID: 11451830, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  1403 + type: 2}
  1404 + m_PrefabInternal: {fileID: 0}
  1405 + m_GameObject: {fileID: 366095107}
  1406 + m_Enabled: 1
  1407 + m_EditorHideFlags: 0
  1408 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  1409 + m_Name:
  1410 + m_EditorClassIdentifier:
  1411 + m_Material: {fileID: 0}
  1412 + m_Color: {r: 1, g: 1, b: 1, a: 1}
  1413 + m_RaycastTarget: 1
  1414 + m_OnCullStateChanged:
  1415 + m_PersistentCalls:
  1416 + m_Calls: []
  1417 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  1418 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  1419 + m_Sprite: {fileID: 21300000, guid: 5324882cb6bf20141b5cff66b4764ffb, type: 3}
  1420 + m_Type: 0
  1421 + m_PreserveAspect: 1
  1422 + m_FillCenter: 1
  1423 + m_FillMethod: 4
  1424 + m_FillAmount: 1
  1425 + m_FillClockwise: 1
  1426 + m_FillOrigin: 0
  1427 +--- !u!222 &366095111
  1428 +CanvasRenderer:
  1429 + m_ObjectHideFlags: 0
  1430 + m_PrefabParentObject: {fileID: 22202710, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  1431 + type: 2}
  1432 + m_PrefabInternal: {fileID: 0}
  1433 + m_GameObject: {fileID: 366095107}
1299 --- !u!1 &388597102 1434 --- !u!1 &388597102
1300 GameObject: 1435 GameObject:
1301 m_ObjectHideFlags: 0 1436 m_ObjectHideFlags: 0
@@ -1867,7 +2002,7 @@ MonoBehaviour: @@ -1867,7 +2002,7 @@ MonoBehaviour:
1867 m_PersistentCalls: 2002 m_PersistentCalls:
1868 m_Calls: 2003 m_Calls:
1869 - m_Target: {fileID: 578311381} 2004 - m_Target: {fileID: 578311381}
1870 - m_MethodName: switchPauseState 2005 + m_MethodName: setPauseState
1871 m_Mode: 6 2006 m_Mode: 6
1872 m_Arguments: 2007 m_Arguments:
1873 m_ObjectArgument: {fileID: 0} 2008 m_ObjectArgument: {fileID: 0}
@@ -2283,10 +2418,10 @@ RectTransform: @@ -2283,10 +2418,10 @@ RectTransform:
2283 m_LocalPosition: {x: 0, y: 0, z: 0} 2418 m_LocalPosition: {x: 0, y: 0, z: 0}
2284 m_LocalScale: {x: 1, y: 1, z: 1} 2419 m_LocalScale: {x: 1, y: 1, z: 1}
2285 m_Children: [] 2420 m_Children: []
2286 - m_Father: {fileID: 1265043070} 2421 + m_Father: {fileID: 1952387009}
2287 m_RootOrder: 0 2422 m_RootOrder: 0
2288 - m_AnchorMin: {x: 0, y: .419999987}  
2289 - m_AnchorMax: {x: 1, y: .579999983} 2423 + m_AnchorMin: {x: 0, y: .400000006}
  2424 + m_AnchorMax: {x: 1, y: 1}
2290 m_AnchoredPosition: {x: 0, y: 0} 2425 m_AnchoredPosition: {x: 0, y: 0}
2291 m_SizeDelta: {x: 0, y: 0} 2426 m_SizeDelta: {x: 0, y: 0}
2292 m_Pivot: {x: .5, y: .5} 2427 m_Pivot: {x: .5, y: .5}
@@ -2352,6 +2487,78 @@ CanvasRenderer: @@ -2352,6 +2487,78 @@ CanvasRenderer:
2352 type: 2} 2487 type: 2}
2353 m_PrefabInternal: {fileID: 0} 2488 m_PrefabInternal: {fileID: 0}
2354 m_GameObject: {fileID: 568312204} 2489 m_GameObject: {fileID: 568312204}
  2490 +--- !u!1 &577197974
  2491 +GameObject:
  2492 + m_ObjectHideFlags: 0
  2493 + m_PrefabParentObject: {fileID: 0}
  2494 + m_PrefabInternal: {fileID: 0}
  2495 + serializedVersion: 4
  2496 + m_Component:
  2497 + - 224: {fileID: 577197975}
  2498 + - 222: {fileID: 577197977}
  2499 + - 114: {fileID: 577197976}
  2500 + m_Layer: 5
  2501 + m_Name: Text
  2502 + m_TagString: Untagged
  2503 + m_Icon: {fileID: 0}
  2504 + m_NavMeshLayer: 0
  2505 + m_StaticEditorFlags: 0
  2506 + m_IsActive: 1
  2507 +--- !u!224 &577197975
  2508 +RectTransform:
  2509 + m_ObjectHideFlags: 0
  2510 + m_PrefabParentObject: {fileID: 0}
  2511 + m_PrefabInternal: {fileID: 0}
  2512 + m_GameObject: {fileID: 577197974}
  2513 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  2514 + m_LocalPosition: {x: 0, y: 0, z: 0}
  2515 + m_LocalScale: {x: 1, y: 1, z: 1}
  2516 + m_Children: []
  2517 + m_Father: {fileID: 1584409086}
  2518 + m_RootOrder: 0
  2519 + m_AnchorMin: {x: 0, y: 0}
  2520 + m_AnchorMax: {x: 1, y: 1}
  2521 + m_AnchoredPosition: {x: 0, y: 0}
  2522 + m_SizeDelta: {x: 0, y: 0}
  2523 + m_Pivot: {x: .5, y: .5}
  2524 +--- !u!114 &577197976
  2525 +MonoBehaviour:
  2526 + m_ObjectHideFlags: 0
  2527 + m_PrefabParentObject: {fileID: 0}
  2528 + m_PrefabInternal: {fileID: 0}
  2529 + m_GameObject: {fileID: 577197974}
  2530 + m_Enabled: 1
  2531 + m_EditorHideFlags: 0
  2532 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  2533 + m_Name:
  2534 + m_EditorClassIdentifier:
  2535 + m_Material: {fileID: 0}
  2536 + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1}
  2537 + m_RaycastTarget: 1
  2538 + m_OnCullStateChanged:
  2539 + m_PersistentCalls:
  2540 + m_Calls: []
  2541 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  2542 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  2543 + m_FontData:
  2544 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
  2545 + m_FontSize: 14
  2546 + m_FontStyle: 0
  2547 + m_BestFit: 0
  2548 + m_MinSize: 10
  2549 + m_MaxSize: 40
  2550 + m_Alignment: 4
  2551 + m_RichText: 1
  2552 + m_HorizontalOverflow: 0
  2553 + m_VerticalOverflow: 0
  2554 + m_LineSpacing: 1
  2555 + m_Text: afasdasdasds
  2556 +--- !u!222 &577197977
  2557 +CanvasRenderer:
  2558 + m_ObjectHideFlags: 0
  2559 + m_PrefabParentObject: {fileID: 0}
  2560 + m_PrefabInternal: {fileID: 0}
  2561 + m_GameObject: {fileID: 577197974}
2355 --- !u!1 &578311380 stripped 2562 --- !u!1 &578311380 stripped
2356 GameObject: 2563 GameObject:
2357 m_PrefabParentObject: {fileID: 125100, guid: da45329542b035e4da18f1132cc3d700, type: 2} 2564 m_PrefabParentObject: {fileID: 125100, guid: da45329542b035e4da18f1132cc3d700, type: 2}
@@ -2520,6 +2727,91 @@ CanvasRenderer: @@ -2520,6 +2727,91 @@ CanvasRenderer:
2520 type: 2} 2727 type: 2}
2521 m_PrefabInternal: {fileID: 0} 2728 m_PrefabInternal: {fileID: 0}
2522 m_GameObject: {fileID: 582478958} 2729 m_GameObject: {fileID: 582478958}
  2730 +--- !u!1 &593910183
  2731 +GameObject:
  2732 + m_ObjectHideFlags: 0
  2733 + m_PrefabParentObject: {fileID: 127404, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2}
  2734 + m_PrefabInternal: {fileID: 0}
  2735 + serializedVersion: 4
  2736 + m_Component:
  2737 + - 224: {fileID: 593910184}
  2738 + - 222: {fileID: 593910187}
  2739 + - 114: {fileID: 593910186}
  2740 + - 114: {fileID: 593910185}
  2741 + m_Layer: 5
  2742 + m_Name: container (1)
  2743 + m_TagString: Untagged
  2744 + m_Icon: {fileID: 0}
  2745 + m_NavMeshLayer: 0
  2746 + m_StaticEditorFlags: 0
  2747 + m_IsActive: 0
  2748 +--- !u!224 &593910184
  2749 +RectTransform:
  2750 + m_ObjectHideFlags: 0
  2751 + m_PrefabParentObject: {fileID: 22468874, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  2752 + type: 2}
  2753 + m_PrefabInternal: {fileID: 0}
  2754 + m_GameObject: {fileID: 593910183}
  2755 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  2756 + m_LocalPosition: {x: 0, y: 0, z: 0}
  2757 + m_LocalScale: {x: 1, y: 1, z: 0}
  2758 + m_Children:
  2759 + - {fileID: 1584409086}
  2760 + m_Father: {fileID: 861767965}
  2761 + m_RootOrder: 1
  2762 + m_AnchorMin: {x: .839999974, y: 1}
  2763 + m_AnchorMax: {x: 1, y: 2}
  2764 + m_AnchoredPosition: {x: -5, y: 10}
  2765 + m_SizeDelta: {x: -10, y: -43.817131}
  2766 + m_Pivot: {x: .5, y: 0}
  2767 +--- !u!114 &593910185
  2768 +MonoBehaviour:
  2769 + m_ObjectHideFlags: 0
  2770 + m_PrefabParentObject: {fileID: 0}
  2771 + m_PrefabInternal: {fileID: 0}
  2772 + m_GameObject: {fileID: 593910183}
  2773 + m_Enabled: 1
  2774 + m_EditorHideFlags: 0
  2775 + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  2776 + m_Name:
  2777 + m_EditorClassIdentifier:
  2778 + m_AspectMode: 1
  2779 + m_AspectRatio: 1
  2780 +--- !u!114 &593910186
  2781 +MonoBehaviour:
  2782 + m_ObjectHideFlags: 0
  2783 + m_PrefabParentObject: {fileID: 11464616, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  2784 + type: 2}
  2785 + m_PrefabInternal: {fileID: 0}
  2786 + m_GameObject: {fileID: 593910183}
  2787 + m_Enabled: 0
  2788 + m_EditorHideFlags: 0
  2789 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  2790 + m_Name:
  2791 + m_EditorClassIdentifier:
  2792 + m_Material: {fileID: 0}
  2793 + m_Color: {r: 0, g: 0, b: 0, a: 1}
  2794 + m_RaycastTarget: 1
  2795 + m_OnCullStateChanged:
  2796 + m_PersistentCalls:
  2797 + m_Calls: []
  2798 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  2799 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  2800 + m_Sprite: {fileID: 0}
  2801 + m_Type: 0
  2802 + m_PreserveAspect: 0
  2803 + m_FillCenter: 1
  2804 + m_FillMethod: 4
  2805 + m_FillAmount: 1
  2806 + m_FillClockwise: 1
  2807 + m_FillOrigin: 0
  2808 +--- !u!222 &593910187
  2809 +CanvasRenderer:
  2810 + m_ObjectHideFlags: 0
  2811 + m_PrefabParentObject: {fileID: 22208740, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  2812 + type: 2}
  2813 + m_PrefabInternal: {fileID: 0}
  2814 + m_GameObject: {fileID: 593910183}
2523 --- !u!1 &600160454 2815 --- !u!1 &600160454
2524 GameObject: 2816 GameObject:
2525 m_ObjectHideFlags: 0 2817 m_ObjectHideFlags: 0
@@ -2894,24 +3186,109 @@ MonoBehaviour: @@ -2894,24 +3186,109 @@ MonoBehaviour:
2894 --- !u!114 &702185297 3186 --- !u!114 &702185297
2895 MonoBehaviour: 3187 MonoBehaviour:
2896 m_ObjectHideFlags: 0 3188 m_ObjectHideFlags: 0
2897 - m_PrefabParentObject: {fileID: 11476848, guid: 5ccb0ba277304a14b9bb8d4e34161675, 3189 + m_PrefabParentObject: {fileID: 11476848, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  3190 + type: 2}
  3191 + m_PrefabInternal: {fileID: 0}
  3192 + m_GameObject: {fileID: 702185294}
  3193 + m_Enabled: 1
  3194 + m_EditorHideFlags: 0
  3195 + m_Script: {fileID: -405508275, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  3196 + m_Name:
  3197 + m_EditorClassIdentifier:
  3198 + m_Padding:
  3199 + m_Left: 0
  3200 + m_Right: 0
  3201 + m_Top: 5
  3202 + m_Bottom: 5
  3203 + m_ChildAlignment: 4
  3204 + m_Spacing: 26
  3205 + m_ChildForceExpandWidth: 0
  3206 + m_ChildForceExpandHeight: 0
  3207 +--- !u!1 &813876601
  3208 +GameObject:
  3209 + m_ObjectHideFlags: 0
  3210 + m_PrefabParentObject: {fileID: 127404, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2}
  3211 + m_PrefabInternal: {fileID: 0}
  3212 + serializedVersion: 4
  3213 + m_Component:
  3214 + - 224: {fileID: 813876602}
  3215 + - 222: {fileID: 813876605}
  3216 + - 114: {fileID: 813876604}
  3217 + - 114: {fileID: 813876603}
  3218 + m_Layer: 5
  3219 + m_Name: container
  3220 + m_TagString: Untagged
  3221 + m_Icon: {fileID: 0}
  3222 + m_NavMeshLayer: 0
  3223 + m_StaticEditorFlags: 0
  3224 + m_IsActive: 1
  3225 +--- !u!224 &813876602
  3226 +RectTransform:
  3227 + m_ObjectHideFlags: 0
  3228 + m_PrefabParentObject: {fileID: 22468874, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  3229 + type: 2}
  3230 + m_PrefabInternal: {fileID: 0}
  3231 + m_GameObject: {fileID: 813876601}
  3232 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  3233 + m_LocalPosition: {x: 0, y: 0, z: 0}
  3234 + m_LocalScale: {x: 1, y: 1, z: 0}
  3235 + m_Children:
  3236 + - {fileID: 366095108}
  3237 + m_Father: {fileID: 861767965}
  3238 + m_RootOrder: 0
  3239 + m_AnchorMin: {x: .839999974, y: 1}
  3240 + m_AnchorMax: {x: 1, y: 2}
  3241 + m_AnchoredPosition: {x: -5, y: 10}
  3242 + m_SizeDelta: {x: -10, y: -43.817131}
  3243 + m_Pivot: {x: .5, y: 0}
  3244 +--- !u!114 &813876603
  3245 +MonoBehaviour:
  3246 + m_ObjectHideFlags: 0
  3247 + m_PrefabParentObject: {fileID: 0}
  3248 + m_PrefabInternal: {fileID: 0}
  3249 + m_GameObject: {fileID: 813876601}
  3250 + m_Enabled: 1
  3251 + m_EditorHideFlags: 0
  3252 + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  3253 + m_Name:
  3254 + m_EditorClassIdentifier:
  3255 + m_AspectMode: 1
  3256 + m_AspectRatio: 1
  3257 +--- !u!114 &813876604
  3258 +MonoBehaviour:
  3259 + m_ObjectHideFlags: 0
  3260 + m_PrefabParentObject: {fileID: 11464616, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  3261 + type: 2}
  3262 + m_PrefabInternal: {fileID: 0}
  3263 + m_GameObject: {fileID: 813876601}
  3264 + m_Enabled: 0
  3265 + m_EditorHideFlags: 0
  3266 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  3267 + m_Name:
  3268 + m_EditorClassIdentifier:
  3269 + m_Material: {fileID: 0}
  3270 + m_Color: {r: 0, g: 0, b: 0, a: 1}
  3271 + m_RaycastTarget: 1
  3272 + m_OnCullStateChanged:
  3273 + m_PersistentCalls:
  3274 + m_Calls: []
  3275 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  3276 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  3277 + m_Sprite: {fileID: 21300000, guid: 8cb2fa7829f176b4c9c1f9775977665f, type: 3}
  3278 + m_Type: 0
  3279 + m_PreserveAspect: 0
  3280 + m_FillCenter: 1
  3281 + m_FillMethod: 4
  3282 + m_FillAmount: 1
  3283 + m_FillClockwise: 1
  3284 + m_FillOrigin: 0
  3285 +--- !u!222 &813876605
  3286 +CanvasRenderer:
  3287 + m_ObjectHideFlags: 0
  3288 + m_PrefabParentObject: {fileID: 22208740, guid: 5ccb0ba277304a14b9bb8d4e34161675,
2898 type: 2} 3289 type: 2}
2899 m_PrefabInternal: {fileID: 0} 3290 m_PrefabInternal: {fileID: 0}
2900 - m_GameObject: {fileID: 702185294}  
2901 - m_Enabled: 1  
2902 - m_EditorHideFlags: 0  
2903 - m_Script: {fileID: -405508275, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}  
2904 - m_Name:  
2905 - m_EditorClassIdentifier:  
2906 - m_Padding:  
2907 - m_Left: 0  
2908 - m_Right: 0  
2909 - m_Top: 5  
2910 - m_Bottom: 5  
2911 - m_ChildAlignment: 4  
2912 - m_Spacing: 26  
2913 - m_ChildForceExpandWidth: 0  
2914 - m_ChildForceExpandHeight: 0 3291 + m_GameObject: {fileID: 813876601}
2915 --- !u!1 &814612176 3292 --- !u!1 &814612176
2916 GameObject: 3293 GameObject:
2917 m_ObjectHideFlags: 0 3294 m_ObjectHideFlags: 0
@@ -3187,7 +3564,7 @@ Transform: @@ -3187,7 +3564,7 @@ Transform:
3187 m_LocalScale: {x: 1, y: 1, z: 1} 3564 m_LocalScale: {x: 1, y: 1, z: 1}
3188 m_Children: [] 3565 m_Children: []
3189 m_Father: {fileID: 1414104007} 3566 m_Father: {fileID: 1414104007}
3190 - m_RootOrder: 10 3567 + m_RootOrder: 11
3191 --- !u!114 &842733391 3568 --- !u!114 &842733391
3192 MonoBehaviour: 3569 MonoBehaviour:
3193 m_ObjectHideFlags: 0 3570 m_ObjectHideFlags: 0
@@ -3235,6 +3612,122 @@ MonoBehaviour: @@ -3235,6 +3612,122 @@ MonoBehaviour:
3235 m_FirstSelected: {fileID: 0} 3612 m_FirstSelected: {fileID: 0}
3236 m_sendNavigationEvents: 1 3613 m_sendNavigationEvents: 1
3237 m_DragThreshold: 5 3614 m_DragThreshold: 5
  3615 +--- !u!1 &848083142
  3616 +GameObject:
  3617 + m_ObjectHideFlags: 0
  3618 + m_PrefabParentObject: {fileID: 0}
  3619 + m_PrefabInternal: {fileID: 0}
  3620 + serializedVersion: 4
  3621 + m_Component:
  3622 + - 224: {fileID: 848083143}
  3623 + - 222: {fileID: 848083145}
  3624 + - 114: {fileID: 848083144}
  3625 + m_Layer: 5
  3626 + m_Name: layer_conn_error
  3627 + m_TagString: Untagged
  3628 + m_Icon: {fileID: 0}
  3629 + m_NavMeshLayer: 0
  3630 + m_StaticEditorFlags: 0
  3631 + m_IsActive: 0
  3632 +--- !u!224 &848083143
  3633 +RectTransform:
  3634 + m_ObjectHideFlags: 0
  3635 + m_PrefabParentObject: {fileID: 0}
  3636 + m_PrefabInternal: {fileID: 0}
  3637 + m_GameObject: {fileID: 848083142}
  3638 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  3639 + m_LocalPosition: {x: 0, y: 0, z: 0}
  3640 + m_LocalScale: {x: 1, y: 1, z: 1}
  3641 + m_Children:
  3642 + - {fileID: 1164416486}
  3643 + m_Father: {fileID: 1414104007}
  3644 + m_RootOrder: 12
  3645 + m_AnchorMin: {x: 0, y: 0}
  3646 + m_AnchorMax: {x: 1, y: 1}
  3647 + m_AnchoredPosition: {x: 0, y: 0}
  3648 + m_SizeDelta: {x: 0, y: 0}
  3649 + m_Pivot: {x: .5, y: .5}
  3650 +--- !u!114 &848083144
  3651 +MonoBehaviour:
  3652 + m_ObjectHideFlags: 0
  3653 + m_PrefabParentObject: {fileID: 0}
  3654 + m_PrefabInternal: {fileID: 0}
  3655 + m_GameObject: {fileID: 848083142}
  3656 + m_Enabled: 1
  3657 + m_EditorHideFlags: 0
  3658 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  3659 + m_Name:
  3660 + m_EditorClassIdentifier:
  3661 + m_Material: {fileID: 0}
  3662 + m_Color: {r: 1, g: 1, b: 1, a: 0}
  3663 + m_RaycastTarget: 1
  3664 + m_OnCullStateChanged:
  3665 + m_PersistentCalls:
  3666 + m_Calls: []
  3667 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  3668 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  3669 + m_Sprite: {fileID: 0}
  3670 + m_Type: 0
  3671 + m_PreserveAspect: 0
  3672 + m_FillCenter: 1
  3673 + m_FillMethod: 4
  3674 + m_FillAmount: 1
  3675 + m_FillClockwise: 1
  3676 + m_FillOrigin: 0
  3677 +--- !u!222 &848083145
  3678 +CanvasRenderer:
  3679 + m_ObjectHideFlags: 0
  3680 + m_PrefabParentObject: {fileID: 0}
  3681 + m_PrefabInternal: {fileID: 0}
  3682 + m_GameObject: {fileID: 848083142}
  3683 +--- !u!1 &861767964
  3684 +GameObject:
  3685 + m_ObjectHideFlags: 0
  3686 + m_PrefabParentObject: {fileID: 0}
  3687 + m_PrefabInternal: {fileID: 0}
  3688 + serializedVersion: 4
  3689 + m_Component:
  3690 + - 224: {fileID: 861767965}
  3691 + - 114: {fileID: 861767966}
  3692 + m_Layer: 5
  3693 + m_Name: layer_repeat
  3694 + m_TagString: Untagged
  3695 + m_Icon: {fileID: 0}
  3696 + m_NavMeshLayer: 0
  3697 + m_StaticEditorFlags: 0
  3698 + m_IsActive: 0
  3699 +--- !u!224 &861767965
  3700 +RectTransform:
  3701 + m_ObjectHideFlags: 0
  3702 + m_PrefabParentObject: {fileID: 0}
  3703 + m_PrefabInternal: {fileID: 0}
  3704 + m_GameObject: {fileID: 861767964}
  3705 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  3706 + m_LocalPosition: {x: 0, y: 0, z: 0}
  3707 + m_LocalScale: {x: 1, y: 1, z: 1}
  3708 + m_Children:
  3709 + - {fileID: 813876602}
  3710 + - {fileID: 593910184}
  3711 + m_Father: {fileID: 1414104007}
  3712 + m_RootOrder: 4
  3713 + m_AnchorMin: {x: 0, y: 0}
  3714 + m_AnchorMax: {x: 1, y: 0}
  3715 + m_AnchoredPosition: {x: 0, y: 0}
  3716 + m_SizeDelta: {x: 0, y: 76.8571396}
  3717 + m_Pivot: {x: 1, y: 0}
  3718 +--- !u!114 &861767966
  3719 +MonoBehaviour:
  3720 + m_ObjectHideFlags: 0
  3721 + m_PrefabParentObject: {fileID: 0}
  3722 + m_PrefabInternal: {fileID: 0}
  3723 + m_GameObject: {fileID: 861767964}
  3724 + m_Enabled: 1
  3725 + m_EditorHideFlags: 0
  3726 + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  3727 + m_Name:
  3728 + m_EditorClassIdentifier:
  3729 + m_AspectMode: 1
  3730 + m_AspectRatio: 3.5
3238 --- !u!1 &874328297 3731 --- !u!1 &874328297
3239 GameObject: 3732 GameObject:
3240 m_ObjectHideFlags: 0 3733 m_ObjectHideFlags: 0
@@ -3736,7 +4229,7 @@ RectTransform: @@ -3736,7 +4229,7 @@ RectTransform:
3736 - {fileID: 1265796708} 4229 - {fileID: 1265796708}
3737 - {fileID: 1976368185} 4230 - {fileID: 1976368185}
3738 m_Father: {fileID: 1414104007} 4231 m_Father: {fileID: 1414104007}
3739 - m_RootOrder: 6 4232 + m_RootOrder: 7
3740 m_AnchorMin: {x: 0, y: 0} 4233 m_AnchorMin: {x: 0, y: 0}
3741 m_AnchorMax: {x: 1, y: 1} 4234 m_AnchorMax: {x: 1, y: 1}
3742 m_AnchoredPosition: {x: 0, y: 0} 4235 m_AnchoredPosition: {x: 0, y: 0}
@@ -3818,7 +4311,7 @@ RectTransform: @@ -3818,7 +4311,7 @@ RectTransform:
3818 m_Children: 4311 m_Children:
3819 - {fileID: 263667178} 4312 - {fileID: 263667178}
3820 m_Father: {fileID: 1414104007} 4313 m_Father: {fileID: 1414104007}
3821 - m_RootOrder: 7 4314 + m_RootOrder: 8
3822 m_AnchorMin: {x: 0, y: 0} 4315 m_AnchorMin: {x: 0, y: 0}
3823 m_AnchorMax: {x: 1, y: 0} 4316 m_AnchorMax: {x: 1, y: 0}
3824 m_AnchoredPosition: {x: 0, y: 0} 4317 m_AnchoredPosition: {x: 0, y: 0}
@@ -4228,7 +4721,7 @@ GameObject: @@ -4228,7 +4721,7 @@ GameObject:
4228 - 222: {fileID: 1024302434} 4721 - 222: {fileID: 1024302434}
4229 - 114: {fileID: 1024302433} 4722 - 114: {fileID: 1024302433}
4230 m_Layer: 5 4723 m_Layer: 5
4231 - m_Name: pause_menu 4724 + m_Name: layer_pause_menu
4232 m_TagString: Untagged 4725 m_TagString: Untagged
4233 m_Icon: {fileID: 0} 4726 m_Icon: {fileID: 0}
4234 m_NavMeshLayer: 0 4727 m_NavMeshLayer: 0
@@ -4711,12 +5204,12 @@ GameObject: @@ -4711,12 +5204,12 @@ GameObject:
4711 - 222: {fileID: 1164416488} 5204 - 222: {fileID: 1164416488}
4712 - 114: {fileID: 1164416487} 5205 - 114: {fileID: 1164416487}
4713 m_Layer: 5 5206 m_Layer: 5
4714 - m_Name: connection_error 5207 + m_Name: container
4715 m_TagString: conn_err 5208 m_TagString: conn_err
4716 m_Icon: {fileID: 0} 5209 m_Icon: {fileID: 0}
4717 m_NavMeshLayer: 0 5210 m_NavMeshLayer: 0
4718 m_StaticEditorFlags: 0 5211 m_StaticEditorFlags: 0
4719 - m_IsActive: 0 5212 + m_IsActive: 1
4720 --- !u!224 &1164416486 5213 --- !u!224 &1164416486
4721 RectTransform: 5214 RectTransform:
4722 m_ObjectHideFlags: 0 5215 m_ObjectHideFlags: 0
@@ -4733,9 +5226,9 @@ RectTransform: @@ -4733,9 +5226,9 @@ RectTransform:
4733 - {fileID: 142212435} 5226 - {fileID: 142212435}
4734 - {fileID: 163763090} 5227 - {fileID: 163763090}
4735 - {fileID: 1266698452} 5228 - {fileID: 1266698452}
4736 - m_Father: {fileID: 1414104007}  
4737 - m_RootOrder: 11  
4738 - m_AnchorMin: {x: .0299999993, y: .300000012} 5229 + m_Father: {fileID: 848083143}
  5230 + m_RootOrder: 0
  5231 + m_AnchorMin: {x: .0299999993, y: .419999987}
4739 m_AnchorMax: {x: .970000029, y: .699999988} 5232 m_AnchorMax: {x: .970000029, y: .699999988}
4740 m_AnchoredPosition: {x: 0, y: 0} 5233 m_AnchoredPosition: {x: 0, y: 0}
4741 m_SizeDelta: {x: 0, y: 0} 5234 m_SizeDelta: {x: 0, y: 0}
@@ -5181,7 +5674,7 @@ GameObject: @@ -5181,7 +5674,7 @@ GameObject:
5181 - 224: {fileID: 1265043070} 5674 - 224: {fileID: 1265043070}
5182 - 114: {fileID: 1265043071} 5675 - 114: {fileID: 1265043071}
5183 m_Layer: 5 5676 m_Layer: 5
5184 - m_Name: loading_snippet 5677 + m_Name: layer_loading_snippet
5185 m_TagString: Untagged 5678 m_TagString: Untagged
5186 m_Icon: {fileID: 0} 5679 m_Icon: {fileID: 0}
5187 m_NavMeshLayer: 0 5680 m_NavMeshLayer: 0
@@ -5198,12 +5691,11 @@ RectTransform: @@ -5198,12 +5691,11 @@ RectTransform:
5198 m_LocalPosition: {x: 0, y: 0, z: 0} 5691 m_LocalPosition: {x: 0, y: 0, z: 0}
5199 m_LocalScale: {x: 1, y: 1, z: 1} 5692 m_LocalScale: {x: 1, y: 1, z: 1}
5200 m_Children: 5693 m_Children:
5201 - - {fileID: 568312205}  
5202 - - {fileID: 1496206517} 5694 + - {fileID: 1952387009}
5203 m_Father: {fileID: 1414104007} 5695 m_Father: {fileID: 1414104007}
5204 m_RootOrder: 0 5696 m_RootOrder: 0
5205 - m_AnchorMin: {x: 0, y: .200000003}  
5206 - m_AnchorMax: {x: 1, y: .800000012} 5697 + m_AnchorMin: {x: 0, y: 0}
  5698 + m_AnchorMax: {x: 1, y: 1}
5207 m_AnchoredPosition: {x: 0, y: 0} 5699 m_AnchoredPosition: {x: 0, y: 0}
5208 m_SizeDelta: {x: 0, y: 0} 5700 m_SizeDelta: {x: 0, y: 0}
5209 m_Pivot: {x: .5, y: .5} 5701 m_Pivot: {x: .5, y: .5}
@@ -5392,8 +5884,8 @@ RectTransform: @@ -5392,8 +5884,8 @@ RectTransform:
5392 - {fileID: 152065639} 5884 - {fileID: 152065639}
5393 m_Father: {fileID: 1164416486} 5885 m_Father: {fileID: 1164416486}
5394 m_RootOrder: 4 5886 m_RootOrder: 4
5395 - m_AnchorMin: {x: .340000004, y: .340000004}  
5396 - m_AnchorMax: {x: .660000026, y: .540000021} 5887 + m_AnchorMin: {x: .340000004, y: .100000001}
  5888 + m_AnchorMax: {x: .660000026, y: .360000014}
5397 m_AnchoredPosition: {x: 0, y: 0} 5889 m_AnchoredPosition: {x: 0, y: 0}
5398 m_SizeDelta: {x: 0, y: 0} 5890 m_SizeDelta: {x: 0, y: 0}
5399 m_Pivot: {x: .5, y: .5} 5891 m_Pivot: {x: .5, y: .5}
@@ -6017,6 +6509,7 @@ RectTransform: @@ -6017,6 +6509,7 @@ RectTransform:
6017 - {fileID: 1533000892} 6509 - {fileID: 1533000892}
6018 - {fileID: 2119336824} 6510 - {fileID: 2119336824}
6019 - {fileID: 1024302432} 6511 - {fileID: 1024302432}
  6512 + - {fileID: 861767965}
6020 - {fileID: 263018772} 6513 - {fileID: 263018772}
6021 - {fileID: 1935189154} 6514 - {fileID: 1935189154}
6022 - {fileID: 951727302} 6515 - {fileID: 951727302}
@@ -6024,7 +6517,7 @@ RectTransform: @@ -6024,7 +6517,7 @@ RectTransform:
6024 - {fileID: 228512394} 6517 - {fileID: 228512394}
6025 - {fileID: 2044204295} 6518 - {fileID: 2044204295}
6026 - {fileID: 842733390} 6519 - {fileID: 842733390}
6027 - - {fileID: 1164416486} 6520 + - {fileID: 848083143}
6028 m_Father: {fileID: 0} 6521 m_Father: {fileID: 0}
6029 m_RootOrder: 0 6522 m_RootOrder: 0
6030 m_AnchorMin: {x: 0, y: 0} 6523 m_AnchorMin: {x: 0, y: 0}
@@ -6837,10 +7330,10 @@ RectTransform: @@ -6837,10 +7330,10 @@ RectTransform:
6837 m_LocalPosition: {x: 0, y: 0, z: 0} 7330 m_LocalPosition: {x: 0, y: 0, z: 0}
6838 m_LocalScale: {x: 1, y: 1, z: 1} 7331 m_LocalScale: {x: 1, y: 1, z: 1}
6839 m_Children: [] 7332 m_Children: []
6840 - m_Father: {fileID: 1265043070} 7333 + m_Father: {fileID: 1952387009}
6841 m_RootOrder: 1 7334 m_RootOrder: 1
6842 - m_AnchorMin: {x: 0, y: .330000013}  
6843 - m_AnchorMax: {x: 1, y: .419999987} 7335 + m_AnchorMin: {x: 0, y: .0399999991}
  7336 + m_AnchorMax: {x: 1, y: .360000014}
6844 m_AnchoredPosition: {x: 0, y: 0} 7337 m_AnchoredPosition: {x: 0, y: 0}
6845 m_SizeDelta: {x: 0, y: 0} 7338 m_SizeDelta: {x: 0, y: 0}
6846 m_Pivot: {x: .5, y: .5} 7339 m_Pivot: {x: .5, y: .5}
@@ -6980,7 +7473,7 @@ GameObject: @@ -6980,7 +7473,7 @@ GameObject:
6980 - 114: {fileID: 1533000891} 7473 - 114: {fileID: 1533000891}
6981 - 222: {fileID: 1533000890} 7474 - 222: {fileID: 1533000890}
6982 m_Layer: 5 7475 m_Layer: 5
6983 - m_Name: subtitle_container 7476 + m_Name: layer_subtitle
6984 m_TagString: Untagged 7477 m_TagString: Untagged
6985 m_Icon: {fileID: 0} 7478 m_Icon: {fileID: 0}
6986 m_NavMeshLayer: 0 7479 m_NavMeshLayer: 0
@@ -7057,7 +7550,7 @@ RectTransform: @@ -7057,7 +7550,7 @@ RectTransform:
7057 m_Children: [] 7550 m_Children: []
7058 m_Father: {fileID: 1164416486} 7551 m_Father: {fileID: 1164416486}
7059 m_RootOrder: 0 7552 m_RootOrder: 0
7060 - m_AnchorMin: {x: 0, y: .300000012} 7553 + m_AnchorMin: {x: 0, y: 0}
7061 m_AnchorMax: {x: 1, y: 1} 7554 m_AnchorMax: {x: 1, y: 1}
7062 m_AnchoredPosition: {x: 0, y: 0} 7555 m_AnchoredPosition: {x: 0, y: 0}
7063 m_SizeDelta: {x: 0, y: 0} 7556 m_SizeDelta: {x: 0, y: 0}
@@ -7111,6 +7604,116 @@ CanvasRenderer: @@ -7111,6 +7604,116 @@ CanvasRenderer:
7111 type: 2} 7604 type: 2}
7112 m_PrefabInternal: {fileID: 0} 7605 m_PrefabInternal: {fileID: 0}
7113 m_GameObject: {fileID: 1537204752} 7606 m_GameObject: {fileID: 1537204752}
  7607 +--- !u!1 &1584409085
  7608 +GameObject:
  7609 + m_ObjectHideFlags: 0
  7610 + m_PrefabParentObject: {fileID: 0}
  7611 + m_PrefabInternal: {fileID: 0}
  7612 + serializedVersion: 4
  7613 + m_Component:
  7614 + - 224: {fileID: 1584409086}
  7615 + - 222: {fileID: 1584409089}
  7616 + - 114: {fileID: 1584409088}
  7617 + - 114: {fileID: 1584409087}
  7618 + m_Layer: 5
  7619 + m_Name: Button
  7620 + m_TagString: Untagged
  7621 + m_Icon: {fileID: 0}
  7622 + m_NavMeshLayer: 0
  7623 + m_StaticEditorFlags: 0
  7624 + m_IsActive: 1
  7625 +--- !u!224 &1584409086
  7626 +RectTransform:
  7627 + m_ObjectHideFlags: 0
  7628 + m_PrefabParentObject: {fileID: 0}
  7629 + m_PrefabInternal: {fileID: 0}
  7630 + m_GameObject: {fileID: 1584409085}
  7631 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  7632 + m_LocalPosition: {x: 0, y: 0, z: 0}
  7633 + m_LocalScale: {x: 0, y: 0, z: 0}
  7634 + m_Children:
  7635 + - {fileID: 577197975}
  7636 + m_Father: {fileID: 593910184}
  7637 + m_RootOrder: 0
  7638 + m_AnchorMin: {x: 0, y: 0}
  7639 + m_AnchorMax: {x: 1, y: 1}
  7640 + m_AnchoredPosition: {x: 0, y: 0}
  7641 + m_SizeDelta: {x: 0, y: 0}
  7642 + m_Pivot: {x: .5, y: .5}
  7643 +--- !u!114 &1584409087
  7644 +MonoBehaviour:
  7645 + m_ObjectHideFlags: 0
  7646 + m_PrefabParentObject: {fileID: 0}
  7647 + m_PrefabInternal: {fileID: 0}
  7648 + m_GameObject: {fileID: 1584409085}
  7649 + m_Enabled: 1
  7650 + m_EditorHideFlags: 0
  7651 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  7652 + m_Name:
  7653 + m_EditorClassIdentifier:
  7654 + m_Navigation:
  7655 + m_Mode: 3
  7656 + m_SelectOnUp: {fileID: 0}
  7657 + m_SelectOnDown: {fileID: 0}
  7658 + m_SelectOnLeft: {fileID: 0}
  7659 + m_SelectOnRight: {fileID: 0}
  7660 + m_Transition: 1
  7661 + m_Colors:
  7662 + m_NormalColor: {r: 1, g: 0, b: 0, a: 1}
  7663 + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1}
  7664 + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1}
  7665 + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814}
  7666 + m_ColorMultiplier: 1
  7667 + m_FadeDuration: .100000001
  7668 + m_SpriteState:
  7669 + m_HighlightedSprite: {fileID: 0}
  7670 + m_PressedSprite: {fileID: 0}
  7671 + m_DisabledSprite: {fileID: 0}
  7672 + m_AnimationTriggers:
  7673 + m_NormalTrigger: Normal
  7674 + m_HighlightedTrigger: Highlighted
  7675 + m_PressedTrigger: Pressed
  7676 + m_DisabledTrigger: Disabled
  7677 + m_Interactable: 1
  7678 + m_TargetGraphic: {fileID: 1584409088}
  7679 + m_OnClick:
  7680 + m_PersistentCalls:
  7681 + m_Calls: []
  7682 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
  7683 + Culture=neutral, PublicKeyToken=null
  7684 +--- !u!114 &1584409088
  7685 +MonoBehaviour:
  7686 + m_ObjectHideFlags: 0
  7687 + m_PrefabParentObject: {fileID: 0}
  7688 + m_PrefabInternal: {fileID: 0}
  7689 + m_GameObject: {fileID: 1584409085}
  7690 + m_Enabled: 1
  7691 + m_EditorHideFlags: 0
  7692 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  7693 + m_Name:
  7694 + m_EditorClassIdentifier:
  7695 + m_Material: {fileID: 0}
  7696 + m_Color: {r: 1, g: 0, b: 0, a: 1}
  7697 + m_RaycastTarget: 1
  7698 + m_OnCullStateChanged:
  7699 + m_PersistentCalls:
  7700 + m_Calls: []
  7701 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  7702 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  7703 + m_Sprite: {fileID: 0}
  7704 + m_Type: 0
  7705 + m_PreserveAspect: 1
  7706 + m_FillCenter: 1
  7707 + m_FillMethod: 4
  7708 + m_FillAmount: 1
  7709 + m_FillClockwise: 1
  7710 + m_FillOrigin: 0
  7711 +--- !u!222 &1584409089
  7712 +CanvasRenderer:
  7713 + m_ObjectHideFlags: 0
  7714 + m_PrefabParentObject: {fileID: 0}
  7715 + m_PrefabInternal: {fileID: 0}
  7716 + m_GameObject: {fileID: 1584409085}
7114 --- !u!1 &1585560342 7717 --- !u!1 &1585560342
7115 GameObject: 7718 GameObject:
7116 m_ObjectHideFlags: 0 7719 m_ObjectHideFlags: 0
@@ -7923,8 +8526,8 @@ RectTransform: @@ -7923,8 +8526,8 @@ RectTransform:
7923 m_Children: [] 8526 m_Children: []
7924 m_Father: {fileID: 1164416486} 8527 m_Father: {fileID: 1164416486}
7925 m_RootOrder: 1 8528 m_RootOrder: 1
7926 - m_AnchorMin: {x: 0, y: .850000024}  
7927 - m_AnchorMax: {x: 1, y: .850000024} 8529 + m_AnchorMin: {x: 0, y: .779999971}
  8530 + m_AnchorMax: {x: 1, y: .779999971}
7928 m_AnchoredPosition: {x: 0, y: 0} 8531 m_AnchoredPosition: {x: 0, y: 0}
7929 m_SizeDelta: {x: 0, y: 1} 8532 m_SizeDelta: {x: 0, y: 1}
7930 m_Pivot: {x: .5, y: .5} 8533 m_Pivot: {x: .5, y: .5}
@@ -8419,7 +9022,7 @@ RectTransform: @@ -8419,7 +9022,7 @@ RectTransform:
8419 - {fileID: 2002966284} 9022 - {fileID: 2002966284}
8420 - {fileID: 1175405161} 9023 - {fileID: 1175405161}
8421 m_Father: {fileID: 1414104007} 9024 m_Father: {fileID: 1414104007}
8422 - m_RootOrder: 5 9025 + m_RootOrder: 6
8423 m_AnchorMin: {x: 0, y: 0} 9026 m_AnchorMin: {x: 0, y: 0}
8424 m_AnchorMax: {x: 1, y: 1} 9027 m_AnchorMax: {x: 1, y: 1}
8425 m_AnchoredPosition: {x: 0, y: 0} 9028 m_AnchoredPosition: {x: 0, y: 0}
@@ -8471,6 +9074,40 @@ CanvasRenderer: @@ -8471,6 +9074,40 @@ CanvasRenderer:
8471 type: 2} 9074 type: 2}
8472 m_PrefabInternal: {fileID: 0} 9075 m_PrefabInternal: {fileID: 0}
8473 m_GameObject: {fileID: 1935189153} 9076 m_GameObject: {fileID: 1935189153}
  9077 +--- !u!1 &1952387008
  9078 +GameObject:
  9079 + m_ObjectHideFlags: 0
  9080 + m_PrefabParentObject: {fileID: 0}
  9081 + m_PrefabInternal: {fileID: 0}
  9082 + serializedVersion: 4
  9083 + m_Component:
  9084 + - 224: {fileID: 1952387009}
  9085 + m_Layer: 5
  9086 + m_Name: container
  9087 + m_TagString: Untagged
  9088 + m_Icon: {fileID: 0}
  9089 + m_NavMeshLayer: 0
  9090 + m_StaticEditorFlags: 0
  9091 + m_IsActive: 1
  9092 +--- !u!224 &1952387009
  9093 +RectTransform:
  9094 + m_ObjectHideFlags: 0
  9095 + m_PrefabParentObject: {fileID: 0}
  9096 + m_PrefabInternal: {fileID: 0}
  9097 + m_GameObject: {fileID: 1952387008}
  9098 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  9099 + m_LocalPosition: {x: 0, y: 0, z: 0}
  9100 + m_LocalScale: {x: 1, y: 1, z: 1}
  9101 + m_Children:
  9102 + - {fileID: 568312205}
  9103 + - {fileID: 1496206517}
  9104 + m_Father: {fileID: 1265043070}
  9105 + m_RootOrder: 0
  9106 + m_AnchorMin: {x: 0, y: .419999987}
  9107 + m_AnchorMax: {x: 1, y: .579999983}
  9108 + m_AnchoredPosition: {x: 0, y: 0}
  9109 + m_SizeDelta: {x: 0, y: 0}
  9110 + m_Pivot: {x: .5, y: .5}
8474 --- !u!1 &1976368184 9111 --- !u!1 &1976368184
8475 GameObject: 9112 GameObject:
8476 m_ObjectHideFlags: 0 9113 m_ObjectHideFlags: 0
@@ -9027,7 +9664,7 @@ RectTransform: @@ -9027,7 +9664,7 @@ RectTransform:
9027 - {fileID: 815279418} 9664 - {fileID: 815279418}
9028 - {fileID: 1221700622} 9665 - {fileID: 1221700622}
9029 m_Father: {fileID: 1414104007} 9666 m_Father: {fileID: 1414104007}
9030 - m_RootOrder: 9 9667 + m_RootOrder: 10
9031 m_AnchorMin: {x: 0, y: 0} 9668 m_AnchorMin: {x: 0, y: 0}
9032 m_AnchorMax: {x: 1, y: 1} 9669 m_AnchorMax: {x: 1, y: 1}
9033 m_AnchoredPosition: {x: 0, y: 0} 9670 m_AnchoredPosition: {x: 0, y: 0}
@@ -9993,8 +10630,9 @@ MonoBehaviour: @@ -9993,8 +10630,9 @@ MonoBehaviour:
9993 dictButtonImage: {fileID: 1649730299} 10630 dictButtonImage: {fileID: 1649730299}
9994 infoButtonImage: {fileID: 2079280005} 10631 infoButtonImage: {fileID: 2079280005}
9995 loadingSnippet: {fileID: 1265043069} 10632 loadingSnippet: {fileID: 1265043069}
9996 - connectionErrorDialog: {fileID: 1164416485} 10633 + connectionErrorDialog: {fileID: 848083142}
9997 pauseMenu: {fileID: 1024302431} 10634 pauseMenu: {fileID: 1024302431}
  10635 + avatarCollider: {fileID: 535548073}
9998 --- !u!4 &2131993093 10636 --- !u!4 &2131993093
9999 Transform: 10637 Transform:
10000 m_ObjectHideFlags: 0 10638 m_ObjectHideFlags: 0
Assets/Scripts/Animation List/SampleItem.cs
  Diff comments   View file @ea1d06f
@@ -11,10 +11,6 @@ public class SampleItem : MonoBehaviour { @@ -11,10 +11,6 @@ public class SampleItem : MonoBehaviour {
11 { 11 {
12 PlayerManager playerManager = GameObject.FindGameObjectWithTag("PlayerManager").GetComponent<PlayerManager>(); 12 PlayerManager playerManager = GameObject.FindGameObjectWithTag("PlayerManager").GetComponent<PlayerManager>();
13 playerManager.playDict(title.text); 13 playerManager.playDict(title.text);
14 -  
15 - ScreenManager screenManager = GameObject.FindGameObjectWithTag("ScreenManager").GetComponent<ScreenManager>();  
16 - screenManager.hideScreen();  
17 - screenManager.setPauseMenuState(false);  
18 } 14 }
19 15
20 } 16 }
Assets/Scripts/Player Manager/GenericPlayerManager.cs
  Diff comments   View file @ea1d06f
@@ -22,7 +22,6 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -22,7 +22,6 @@ public abstract class GenericPlayerManager : MonoBehaviour {
22 private GameObject AVATAR; 22 private GameObject AVATAR;
23 // Referencia para o componente animador do avatar 23 // Referencia para o componente animador do avatar
24 private Animation COMPONENT_ANIMATION; 24 private Animation COMPONENT_ANIMATION;
25 - private BoxCollider AVATAR_COLLIDER;  
26 public Text SUBTITLES; 25 public Text SUBTITLES;
27 26
28 // Guarda os nomes das palavras já carregadas 27 // Guarda os nomes das palavras já carregadas
@@ -64,7 +63,6 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -64,7 +63,6 @@ public abstract class GenericPlayerManager : MonoBehaviour {
64 63
65 AVATAR = GameObject.FindGameObjectWithTag("avatar"); 64 AVATAR = GameObject.FindGameObjectWithTag("avatar");
66 COMPONENT_ANIMATION = AVATAR.GetComponent<Animation>(); 65 COMPONENT_ANIMATION = AVATAR.GetComponent<Animation>();
67 - AVATAR_COLLIDER = GameObject.FindGameObjectWithTag("avatar").GetComponent<BoxCollider>();  
68 66
69 // Sinais ignorados na legenda 67 // Sinais ignorados na legenda
70 string[] flags = new string[] { 68 string[] flags = new string[] {
@@ -96,10 +94,6 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -96,10 +94,6 @@ public abstract class GenericPlayerManager : MonoBehaviour {
96 this.randomAnimations.setAnimations(intervalAnimations); 94 this.randomAnimations.setAnimations(intervalAnimations);
97 } 95 }
98 96
99 - public void SetAvatarCollider(bool isActive) {  
100 - AVATAR_COLLIDER.enabled = isActive;  
101 - }  
102 -  
103 // Define a velocidade das animacões com base no slider da GUI 97 // Define a velocidade das animacões com base no slider da GUI
104 public void setSlider(float sliderPosition) 98 public void setSlider(float sliderPosition)
105 { 99 {
Assets/Scripts/PlayerManager.cs
  Diff comments   View file @ea1d06f
@@ -73,22 +73,21 @@ public class PlayerManager : GenericPlayerManager { @@ -73,22 +73,21 @@ public class PlayerManager : GenericPlayerManager {
73 forcePlayInCache(); 73 forcePlayInCache();
74 } 74 }
75 75
76 - public void playAfterError() {  
77 - forcePlayInCache();  
78 - }  
79 -  
80 public void playDict(string word) 76 public void playDict(string word)
81 { 77 {
82 base.glosa = word; 78 base.glosa = word;
83 base.play(true, true, true); 79 base.play(true, true, true);
84 - }  
85 80
86 - //private bool cancelTranslation() 81 + this.screenManager.hideScreen();
  82 + this.screenManager.setPauseMenuState(false);
  83 + }
87 84
88 public void playTranslate() 85 public void playTranslate()
89 { 86 {
90 stopTranslation(); 87 stopTranslation();
91 StartCoroutine("translate", translateScreenText.text); 88 StartCoroutine("translate", translateScreenText.text);
  89 +
  90 + this.screenManager.setPauseMenuState(false);
92 } 91 }
93 92
94 public void stopTranslation() 93 public void stopTranslation()
@@ -153,42 +152,47 @@ public class PlayerManager : GenericPlayerManager { @@ -153,42 +152,47 @@ public class PlayerManager : GenericPlayerManager {
153 this.screenManager.switchScreen("translate"); 152 this.screenManager.switchScreen("translate");
154 } 153 }
155 154
  155 + private System.Object translateLocker = new System.Object();
  156 +
156 private IEnumerator translate(string glosa) 157 private IEnumerator translate(string glosa)
157 { 158 {
158 - base.randomAnimations.lockFor("translate");  
159 - this.screenManager.setLoadingSnippetState(true);  
160 -  
161 - WWW glosaRequest = new WWW(SERVER_URL + WWW.EscapeURL(glosa));  
162 -  
163 - if (glosaRequest != null) 159 + lock (this.translateLocker)
164 { 160 {
165 - yield return glosaRequest.isDone; 161 + base.randomAnimations.lockFor("translate");
  162 + this.screenManager.setLoadingSnippetState(true);
  163 +
  164 + WWW glosaRequest = new WWW(SERVER_URL + WWW.EscapeURL(glosa));
166 165
167 - if (glosaRequest.error == null) 166 + if (glosaRequest != null)
168 { 167 {
169 - yield return glosaRequest; 168 + yield return glosaRequest.isDone;
170 169
171 - if ( ! String.IsNullOrEmpty(glosaRequest.text)) 170 + if (glosaRequest.error == null)
172 { 171 {
173 - Debug.Log("Server answer: " + glosaRequest.text); 172 + yield return glosaRequest;
174 173
175 - base.playNext(glosaRequest.text);  
176 - this.screenManager.setLoadingSnippetState(false);  
177 - base.randomAnimations.unlockFor("translate"); 174 + if ( ! String.IsNullOrEmpty(glosaRequest.text))
  175 + {
  176 + Debug.Log("Server answer: " + glosaRequest.text);
178 177
179 - yield break; 178 + base.playNext(glosaRequest.text);
  179 + this.screenManager.setLoadingSnippetState(false);
  180 + base.randomAnimations.unlockFor("translate");
  181 +
  182 + yield break;
  183 + }
  184 + else Debug.Log("Error at PlayerManager.translate: empty answer.");
180 } 185 }
181 - else Debug.Log("Error at PlayerManager.translate: empty answer."); 186 + else Debug.Log("Error at PlayerManager.translate: (WWW) glosaRequest: " + glosaRequest.error);
182 } 187 }
183 - else Debug.Log("Error at PlayerManager.translate: (WWW) glosaRequest: " + glosaRequest.error);  
184 - }  
185 - else Debug.Log ("Error at PlayerManager.translate: (WWW) glosaRequest is NULL."); 188 + else Debug.Log ("Error at PlayerManager.translate: (WWW) glosaRequest is NULL.");
186 189
187 - base.glosa = glosa.ToUpper(); 190 + base.glosa = glosa.ToUpper();
188 191
189 - this.screenManager.setLoadingSnippetState(false);  
190 - this.screenManager.showConnectionErrorDialog();  
191 - base.randomAnimations.unlockFor("translate"); 192 + this.screenManager.setLoadingSnippetState(false);
  193 + this.screenManager.showConnectionErrorDialog();
  194 + base.randomAnimations.unlockFor("translate");
  195 + }
192 } 196 }
193 197
194 } 198 }
Assets/Scripts/UI/ScreenManager.cs
  Diff comments   View file @ea1d06f
@@ -22,6 +22,8 @@ public class ScreenManager : MonoBehaviour { @@ -22,6 +22,8 @@ public class ScreenManager : MonoBehaviour {
22 public GameObject connectionErrorDialog; 22 public GameObject connectionErrorDialog;
23 public GameObject pauseMenu; 23 public GameObject pauseMenu;
24 24
  25 + public BoxCollider avatarCollider;
  26 +
25 private bool exit = false; 27 private bool exit = false;
26 28
27 public void Update() 29 public void Update()
@@ -58,15 +60,16 @@ public class ScreenManager : MonoBehaviour { @@ -58,15 +60,16 @@ public class ScreenManager : MonoBehaviour {
58 60
59 public bool hasActiveScreen() 61 public bool hasActiveScreen()
60 { 62 {
61 - return infoScreen.activeSelf  
62 - || translateScreen.activeSelf  
63 - || dictScreen.activeSelf  
64 - || tutorialScreen.activeSelf; 63 + return this.infoScreen.activeSelf
  64 + || this.translateScreen.activeSelf
  65 + || this.dictScreen.activeSelf
  66 + || this.tutorialScreen.activeSelf
  67 + || this.makersScreen.activeSelf;
65 } 68 }
66 69
67 public void hideScreen() 70 public void hideScreen()
68 { 71 {
69 - playerManager.SetAvatarCollider(true); 72 + setAvatarColliderState(true);
70 randomAnimations.unlockFor(LOCK_ID); 73 randomAnimations.unlockFor(LOCK_ID);
71 74
72 if (infoScreen.activeSelf) 75 if (infoScreen.activeSelf)
@@ -117,7 +120,7 @@ public class ScreenManager : MonoBehaviour { @@ -117,7 +120,7 @@ public class ScreenManager : MonoBehaviour {
117 setPauseMenuState(true); 120 setPauseMenuState(true);
118 } 121 }
119 122
120 - playerManager.SetAvatarCollider(false); 123 + setAvatarColliderState(false);
121 randomAnimations.lockFor(LOCK_ID); 124 randomAnimations.lockFor(LOCK_ID);
122 125
123 if (screen == infoScreen) 126 if (screen == infoScreen)
@@ -144,25 +147,32 @@ public class ScreenManager : MonoBehaviour { @@ -144,25 +147,32 @@ public class ScreenManager : MonoBehaviour {
144 case "dict": return this.dictScreen; 147 case "dict": return this.dictScreen;
145 case "info": return this.infoScreen; 148 case "info": return this.infoScreen;
146 case "tutorial": return this.tutorialScreen; 149 case "tutorial": return this.tutorialScreen;
  150 + case "makers": return this.makersScreen;
147 } 151 }
148 152
149 return null; 153 return null;
150 } 154 }
151 155
152 - public void setPauseMenuState(bool enabled) {  
153 - this.pauseMenu.SetActive(enabled); 156 + public void setPauseMenuState(bool active)
  157 + {
  158 + if (this.pauseMenu.activeSelf != active)
  159 + this.pauseMenu.SetActive(active);
154 } 160 }
155 161
156 - public void setLoadingSnippetState(bool state) {  
157 - this.loadingSnippet.SetActive(state); 162 + public void setLoadingSnippetState(bool active)
  163 + {
  164 + this.loadingSnippet.SetActive(active);
  165 +
  166 + if (active && this.pauseMenu.activeSelf)
  167 + this.pauseMenu.SetActive(false);
158 } 168 }
159 169
160 public void showConnectionErrorDialog() { 170 public void showConnectionErrorDialog() {
161 this.connectionErrorDialog.SetActive(true); 171 this.connectionErrorDialog.SetActive(true);
162 } 172 }
163 173
164 - public void switchToMakersScreen() {  
165 - switchScreen(this.makersScreen); 174 + public void setAvatarColliderState(bool active) {
  175 + this.avatarCollider.enabled = active;
166 } 176 }
167 177
168 } 178 }
Assets/Scripts/UI/TutorialManager.cs
  Diff comments   View file @ea1d06f
@@ -75,7 +75,7 @@ public class TutorialManager : MonoBehaviour { @@ -75,7 +75,7 @@ public class TutorialManager : MonoBehaviour {
75 if (index == 5) 75 if (index == 5)
76 { 76 {
77 //this.gameObject.SetActive(false); 77 //this.gameObject.SetActive(false);
78 - this.screenManager.switchToMakersScreen(); 78 + this.screenManager.switchScreen("makers");
79 79
80 select(0); 80 select(0);
81 } 81 }