Download as
Browse Code »

Commit f5ca069a6ff7d96c4e4da6316944f67af200d73c

Authored by Mateus Lustosa
1 parent 1e2f8efb
Exists in master and in 6 other branches Export, ExportVideo, IosBuild, development, dict, region

Finishes settings fade and slide

Showing 6 changed files with 487 additions and 344 deletions   Show diff stats
Assets/Scenes/Main.unity
  Diff comments   View file @f5ca069
... ... @@ -171,7 +171,7 @@ GameObject:
171 171 - 222: {fileID: 42588293}
172 172 - 114: {fileID: 42588292}
173 173 m_Layer: 5
174   - m_Name: Checkmark
  174 + m_Name: checkmark
175 175 m_TagString: Untagged
176 176 m_Icon: {fileID: 0}
177 177 m_NavMeshLayer: 0
... ... @@ -438,7 +438,7 @@ GameObject:
438 438 - 222: {fileID: 63450837}
439 439 - 114: {fileID: 63450836}
440 440 m_Layer: 5
441   - m_Name: Label
  441 + m_Name: label
442 442 m_TagString: Untagged
443 443 m_Icon: {fileID: 0}
444 444 m_NavMeshLayer: 0
... ... @@ -459,8 +459,8 @@ RectTransform:
459 459 m_RootOrder: 1
460 460 m_AnchorMin: {x: 0, y: 0}
461 461 m_AnchorMax: {x: 1, y: 1}
462   - m_AnchoredPosition: {x: 14, y: -0.5}
463   - m_SizeDelta: {x: -38, y: -3}
  462 + m_AnchoredPosition: {x: 21, y: 0}
  463 + m_SizeDelta: {x: -42, y: 0}
464 464 m_Pivot: {x: 0.5, y: 0.5}
465 465 --- !u!114 &63450836
466 466 MonoBehaviour:
... ... @@ -488,7 +488,7 @@ MonoBehaviour:
488 488 m_BestFit: 0
489 489 m_MinSize: 10
490 490 m_MaxSize: 40
491   - m_Alignment: 0
  491 + m_Alignment: 3
492 492 m_AlignByGeometry: 0
493 493 m_RichText: 1
494 494 m_HorizontalOverflow: 0
... ... @@ -1076,6 +1076,42 @@ CanvasRenderer:
1076 1076 m_PrefabParentObject: {fileID: 0}
1077 1077 m_PrefabInternal: {fileID: 0}
1078 1078 m_GameObject: {fileID: 197321765}
  1079 +--- !u!1 &202190018
  1080 +GameObject:
  1081 + m_ObjectHideFlags: 0
  1082 + m_PrefabParentObject: {fileID: 0}
  1083 + m_PrefabInternal: {fileID: 0}
  1084 + serializedVersion: 4
  1085 + m_Component:
  1086 + - 224: {fileID: 202190019}
  1087 + m_Layer: 5
  1088 + m_Name: screens
  1089 + m_TagString: Untagged
  1090 + m_Icon: {fileID: 0}
  1091 + m_NavMeshLayer: 0
  1092 + m_StaticEditorFlags: 0
  1093 + m_IsActive: 1
  1094 +--- !u!224 &202190019
  1095 +RectTransform:
  1096 + m_ObjectHideFlags: 0
  1097 + m_PrefabParentObject: {fileID: 0}
  1098 + m_PrefabInternal: {fileID: 0}
  1099 + m_GameObject: {fileID: 202190018}
  1100 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  1101 + m_LocalPosition: {x: 0, y: 0, z: 0}
  1102 + m_LocalScale: {x: 1, y: 1, z: 1}
  1103 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  1104 + m_Children:
  1105 + - {fileID: 263018772}
  1106 + - {fileID: 1935189154}
  1107 + - {fileID: 951727302}
  1108 + m_Father: {fileID: 1414104007}
  1109 + m_RootOrder: 3
  1110 + m_AnchorMin: {x: 0, y: 0}
  1111 + m_AnchorMax: {x: 1, y: 1}
  1112 + m_AnchoredPosition: {x: 0, y: 0}
  1113 + m_SizeDelta: {x: 0, y: 0}
  1114 + m_Pivot: {x: 0.5, y: 0.5}
1079 1115 --- !u!1 &212041959
1080 1116 GameObject:
1081 1117 m_ObjectHideFlags: 0
... ... @@ -1172,7 +1208,7 @@ RectTransform:
1172 1208 type: 2}
1173 1209 m_PrefabInternal: {fileID: 0}
1174 1210 m_GameObject: {fileID: 228512393}
1175   - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  1211 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1176 1212 m_LocalPosition: {x: 0, y: 0, z: 0}
1177 1213 m_LocalScale: {x: 1, y: 1, z: 1}
1178 1214 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
... ... @@ -1180,8 +1216,8 @@ RectTransform:
1180 1216 - {fileID: 389535983}
1181 1217 - {fileID: 191800646}
1182 1218 - {fileID: 2010584310}
1183   - m_Father: {fileID: 1414104007}
1184   - m_RootOrder: 9
  1219 + m_Father: {fileID: 576472178}
  1220 + m_RootOrder: 0
1185 1221 m_AnchorMin: {x: 0, y: 0}
1186 1222 m_AnchorMax: {x: 1, y: 1}
1187 1223 m_AnchoredPosition: {x: 0, y: 0}
... ... @@ -1268,7 +1304,7 @@ RectTransform:
1268 1304 type: 2}
1269 1305 m_PrefabInternal: {fileID: 0}
1270 1306 m_GameObject: {fileID: 263018771}
1271   - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  1307 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1272 1308 m_LocalPosition: {x: 0, y: 0, z: 0}
1273 1309 m_LocalScale: {x: 1, y: 1, z: 1}
1274 1310 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
... ... @@ -1277,8 +1313,8 @@ RectTransform:
1277 1313 - {fileID: 1173561061}
1278 1314 - {fileID: 1632068377}
1279 1315 - {fileID: 1874017187}
1280   - m_Father: {fileID: 1414104007}
1281   - m_RootOrder: 5
  1316 + m_Father: {fileID: 202190019}
  1317 + m_RootOrder: 0
1282 1318 m_AnchorMin: {x: 0, y: 0}
1283 1319 m_AnchorMax: {x: 1, y: 1}
1284 1320 m_AnchoredPosition: {x: 0, y: 0}
... ... @@ -1413,7 +1449,7 @@ GameObject:
1413 1449 - 114: {fileID: 265917592}
1414 1450 - 114: {fileID: 265917591}
1415 1451 m_Layer: 5
1416   - m_Name: settings
  1452 + m_Name: panel
1417 1453 m_TagString: Untagged
1418 1454 m_Icon: {fileID: 0}
1419 1455 m_NavMeshLayer: 0
... ... @@ -1425,7 +1461,7 @@ RectTransform:
1425 1461 m_PrefabParentObject: {fileID: 0}
1426 1462 m_PrefabInternal: {fileID: 0}
1427 1463 m_GameObject: {fileID: 265917589}
1428   - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  1464 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1429 1465 m_LocalPosition: {x: 0, y: 0, z: 0}
1430 1466 m_LocalScale: {x: 1, y: 1, z: 1}
1431 1467 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
... ... @@ -1433,8 +1469,8 @@ RectTransform:
1433 1469 - {fileID: 1763219242}
1434 1470 - {fileID: 21916901}
1435 1471 - {fileID: 822147789}
1436   - m_Father: {fileID: 1414104007}
1437   - m_RootOrder: 15
  1472 + m_Father: {fileID: 1932070330}
  1473 + m_RootOrder: 1
1438 1474 m_AnchorMin: {x: 0, y: 0}
1439 1475 m_AnchorMax: {x: 0.8, y: 1}
1440 1476 m_AnchoredPosition: {x: 0, y: 0}
... ... @@ -1569,8 +1605,8 @@ RectTransform:
1569 1605 m_RootOrder: 0
1570 1606 m_AnchorMin: {x: 0, y: 0}
1571 1607 m_AnchorMax: {x: 1, y: 1}
1572   - m_AnchoredPosition: {x: -1, y: -0.5}
1573   - m_SizeDelta: {x: 2, y: 1}
  1608 + m_AnchoredPosition: {x: 0, y: 0}
  1609 + m_SizeDelta: {x: 0, y: 0}
1574 1610 m_Pivot: {x: 0, y: 0.5}
1575 1611 --- !u!114 &327739039
1576 1612 MonoBehaviour:
... ... @@ -1584,7 +1620,7 @@ MonoBehaviour:
1584 1620 m_Name:
1585 1621 m_EditorClassIdentifier:
1586 1622 m_Material: {fileID: 0}
1587   - m_Color: {r: 0, g: 0, b: 0, a: 0.084}
  1623 + m_Color: {r: 0, g: 0, b: 0, a: 0.039215688}
1588 1624 m_RaycastTarget: 1
1589 1625 m_OnCullStateChanged:
1590 1626 m_PersistentCalls:
... ... @@ -2258,7 +2294,7 @@ GameObject:
2258 2294 - 222: {fileID: 405954793}
2259 2295 - 114: {fileID: 405954792}
2260 2296 m_Layer: 5
2261   - m_Name: Background
  2297 + m_Name: background
2262 2298 m_TagString: Untagged
2263 2299 m_Icon: {fileID: 0}
2264 2300 m_NavMeshLayer: 0
... ... @@ -2278,11 +2314,11 @@ RectTransform:
2278 2314 - {fileID: 42588291}
2279 2315 m_Father: {fileID: 868574982}
2280 2316 m_RootOrder: 0
2281   - m_AnchorMin: {x: 0, y: 1}
2282   - m_AnchorMax: {x: 0, y: 1}
2283   - m_AnchoredPosition: {x: 10, y: -10}
  2317 + m_AnchorMin: {x: 0, y: 0.5}
  2318 + m_AnchorMax: {x: 0, y: 0.5}
  2319 + m_AnchoredPosition: {x: 10, y: 0}
2284 2320 m_SizeDelta: {x: 20, y: 20}
2285   - m_Pivot: {x: 0.5, y: 0.5}
  2321 + m_Pivot: {x: 0, y: 0.5}
2286 2322 --- !u!114 &405954792
2287 2323 MonoBehaviour:
2288 2324 m_ObjectHideFlags: 0
... ... @@ -2558,7 +2594,7 @@ MonoBehaviour:
2558 2594 m_BoolArgument: 0
2559 2595 m_CallState: 2
2560 2596 - m_Target: {fileID: 1826236683}
2561   - m_MethodName: setVisible
  2597 + m_MethodName: fade
2562 2598 m_Mode: 6
2563 2599 m_Arguments:
2564 2600 m_ObjectArgument: {fileID: 0}
... ... @@ -3187,7 +3223,7 @@ RectTransform:
3187 3223 m_Father: {fileID: 1356520163}
3188 3224 m_RootOrder: 0
3189 3225 m_AnchorMin: {x: 0, y: 0}
3190   - m_AnchorMax: {x: 0, y: 0}
  3226 + m_AnchorMax: {x: 1, y: 1}
3191 3227 m_AnchoredPosition: {x: 0, y: 0}
3192 3228 m_SizeDelta: {x: 20, y: 20}
3193 3229 m_Pivot: {x: 0.5, y: 0.5}
... ... @@ -3338,7 +3374,7 @@ GameObject:
3338 3374 - 114: {fileID: 569556880}
3339 3375 - 114: {fileID: 569556879}
3340 3376 m_Layer: 5
3341   - m_Name: scrollbar
  3377 + m_Name: bar
3342 3378 m_TagString: Untagged
3343 3379 m_Icon: {fileID: 0}
3344 3380 m_NavMeshLayer: 0
... ... @@ -3446,6 +3482,41 @@ CanvasRenderer:
3446 3482 type: 2}
3447 3483 m_PrefabInternal: {fileID: 0}
3448 3484 m_GameObject: {fileID: 569556877}
  3485 +--- !u!1 &576472177
  3486 +GameObject:
  3487 + m_ObjectHideFlags: 0
  3488 + m_PrefabParentObject: {fileID: 0}
  3489 + m_PrefabInternal: {fileID: 0}
  3490 + serializedVersion: 4
  3491 + m_Component:
  3492 + - 224: {fileID: 576472178}
  3493 + m_Layer: 5
  3494 + m_Name: screens-full
  3495 + m_TagString: Untagged
  3496 + m_Icon: {fileID: 0}
  3497 + m_NavMeshLayer: 0
  3498 + m_StaticEditorFlags: 0
  3499 + m_IsActive: 1
  3500 +--- !u!224 &576472178
  3501 +RectTransform:
  3502 + m_ObjectHideFlags: 0
  3503 + m_PrefabParentObject: {fileID: 0}
  3504 + m_PrefabInternal: {fileID: 0}
  3505 + m_GameObject: {fileID: 576472177}
  3506 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  3507 + m_LocalPosition: {x: 0, y: 0, z: 0}
  3508 + m_LocalScale: {x: 1, y: 1, z: 1}
  3509 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  3510 + m_Children:
  3511 + - {fileID: 228512394}
  3512 + - {fileID: 2044204295}
  3513 + m_Father: {fileID: 1414104007}
  3514 + m_RootOrder: 5
  3515 + m_AnchorMin: {x: 0, y: 0}
  3516 + m_AnchorMax: {x: 1, y: 1}
  3517 + m_AnchoredPosition: {x: 0, y: 0}
  3518 + m_SizeDelta: {x: 0, y: 0}
  3519 + m_Pivot: {x: 0.5, y: 0.5}
3449 3520 --- !u!1 &578311380 stripped
3450 3521 GameObject:
3451 3522 m_PrefabParentObject: {fileID: 125100, guid: da45329542b035e4da18f1132cc3d700, type: 2}
... ... @@ -3891,7 +3962,7 @@ RectTransform:
3891 3962 m_AnchorMin: {x: 0, y: 1}
3892 3963 m_AnchorMax: {x: 1, y: 1}
3893 3964 m_AnchoredPosition: {x: 0, y: -0.000015258789}
3894   - m_SizeDelta: {x: 0, y: 0}
  3965 + m_SizeDelta: {x: 0, y: 34}
3895 3966 m_Pivot: {x: 0.5, y: 1}
3896 3967 --- !u!114 &663262206
3897 3968 MonoBehaviour:
... ... @@ -4173,7 +4244,7 @@ RectTransform:
4173 4244 m_AnchorMin: {x: 0, y: 1.1}
4174 4245 m_AnchorMax: {x: 0.97, y: 1.6}
4175 4246 m_AnchoredPosition: {x: 0, y: 0}
4176   - m_SizeDelta: {x: -267.16714, y: 0}
  4247 + m_SizeDelta: {x: -275.43857, y: 0}
4177 4248 m_Pivot: {x: 1, y: 0}
4178 4249 --- !u!114 &813876603
4179 4250 MonoBehaviour:
... ... @@ -4637,7 +4708,7 @@ Transform:
4637 4708 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4638 4709 m_Children: []
4639 4710 m_Father: {fileID: 1414104007}
4640   - m_RootOrder: 11
  4711 + m_RootOrder: 6
4641 4712 --- !u!114 &842733391
4642 4713 MonoBehaviour:
4643 4714 m_ObjectHideFlags: 0
... ... @@ -4708,14 +4779,14 @@ RectTransform:
4708 4779 m_PrefabParentObject: {fileID: 0}
4709 4780 m_PrefabInternal: {fileID: 0}
4710 4781 m_GameObject: {fileID: 848083142}
4711   - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  4782 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
4712 4783 m_LocalPosition: {x: 0, y: 0, z: 0}
4713 4784 m_LocalScale: {x: 1, y: 1, z: 1}
4714 4785 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4715 4786 m_Children:
4716 4787 - {fileID: 1164416486}
4717   - m_Father: {fileID: 1414104007}
4718   - m_RootOrder: 12
  4788 + m_Father: {fileID: 1620867682}
  4789 + m_RootOrder: 4
4719 4790 m_AnchorMin: {x: 0, y: 0}
4720 4791 m_AnchorMax: {x: 1, y: 1}
4721 4792 m_AnchoredPosition: {x: 0, y: 0}
... ... @@ -4776,18 +4847,18 @@ RectTransform:
4776 4847 m_PrefabParentObject: {fileID: 0}
4777 4848 m_PrefabInternal: {fileID: 0}
4778 4849 m_GameObject: {fileID: 861767964}
4779   - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  4850 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
4780 4851 m_LocalPosition: {x: 0, y: 0, z: 0}
4781 4852 m_LocalScale: {x: 1, y: 1, z: 1}
4782 4853 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4783 4854 m_Children:
4784 4855 - {fileID: 813876602}
4785   - m_Father: {fileID: 1414104007}
4786   - m_RootOrder: 4
  4856 + m_Father: {fileID: 1620867682}
  4857 + m_RootOrder: 3
4787 4858 m_AnchorMin: {x: 0, y: 0}
4788 4859 m_AnchorMax: {x: 1, y: 0}
4789 4860 m_AnchoredPosition: {x: 0, y: 0}
4790   - m_SizeDelta: {x: 0, y: 92.28571}
  4861 + m_SizeDelta: {x: 0, y: 95.14286}
4791 4862 m_Pivot: {x: 1, y: 0}
4792 4863 --- !u!114 &861767966
4793 4864 MonoBehaviour:
... ... @@ -4811,6 +4882,7 @@ GameObject:
4811 4882 m_Component:
4812 4883 - 224: {fileID: 868574982}
4813 4884 - 114: {fileID: 868574983}
  4885 + - 222: {fileID: 868574985}
4814 4886 m_Layer: 5
4815 4887 m_Name: toggle
4816 4888 m_TagString: Untagged
... ... @@ -4833,10 +4905,10 @@ RectTransform:
4833 4905 - {fileID: 63450835}
4834 4906 m_Father: {fileID: 1093252621}
4835 4907 m_RootOrder: 0
4836   - m_AnchorMin: {x: 0.5, y: 0.5}
4837   - m_AnchorMax: {x: 0.5, y: 0.5}
  4908 + m_AnchorMin: {x: 0, y: 0}
  4909 + m_AnchorMax: {x: 1, y: 1}
4838 4910 m_AnchoredPosition: {x: 0, y: 0}
4839   - m_SizeDelta: {x: 160, y: 20}
  4911 + m_SizeDelta: {x: 0, y: 0}
4840 4912 m_Pivot: {x: 0.5, y: 0.5}
4841 4913 --- !u!114 &868574983
4842 4914 MonoBehaviour:
... ... @@ -4882,7 +4954,13 @@ MonoBehaviour:
4882 4954 m_Calls: []
4883 4955 m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0,
4884 4956 Culture=neutral, PublicKeyToken=null
4885   - m_IsOn: 1
  4957 + m_IsOn: 0
  4958 +--- !u!222 &868574985
  4959 +CanvasRenderer:
  4960 + m_ObjectHideFlags: 0
  4961 + m_PrefabParentObject: {fileID: 0}
  4962 + m_PrefabInternal: {fileID: 0}
  4963 + m_GameObject: {fileID: 868574981}
4886 4964 --- !u!1 &870029353
4887 4965 GameObject:
4888 4966 m_ObjectHideFlags: 0
... ... @@ -4913,8 +4991,8 @@ RectTransform:
4913 4991 m_Children: []
4914 4992 m_Father: {fileID: 457437674}
4915 4993 m_RootOrder: 0
4916   - m_AnchorMin: {x: 0.2, y: 0.2}
4917   - m_AnchorMax: {x: 0.8, y: 0.8}
  4994 + m_AnchorMin: {x: 0.25, y: 0.25}
  4995 + m_AnchorMax: {x: 0.75, y: 0.75}
4918 4996 m_AnchoredPosition: {x: 0, y: 0}
4919 4997 m_SizeDelta: {x: 0, y: 0}
4920 4998 m_Pivot: {x: 0.5, y: 0.5}
... ... @@ -5153,80 +5231,6 @@ Prefab:
5153 5231 - {fileID: 9500000, guid: 714c639770278b249bb7d0850bac50fc, type: 3}
5154 5232 m_ParentPrefab: {fileID: 100100000, guid: 714c639770278b249bb7d0850bac50fc, type: 3}
5155 5233 m_IsPrefabParent: 0
5156   ---- !u!1 &878634659
5157   -GameObject:
5158   - m_ObjectHideFlags: 0
5159   - m_PrefabParentObject: {fileID: 0}
5160   - m_PrefabInternal: {fileID: 0}
5161   - serializedVersion: 4
5162   - m_Component:
5163   - - 224: {fileID: 878634660}
5164   - - 222: {fileID: 878634662}
5165   - - 114: {fileID: 878634661}
5166   - m_Layer: 5
5167   - m_Name: text
5168   - m_TagString: Untagged
5169   - m_Icon: {fileID: 0}
5170   - m_NavMeshLayer: 0
5171   - m_StaticEditorFlags: 0
5172   - m_IsActive: 0
5173   ---- !u!224 &878634660
5174   -RectTransform:
5175   - m_ObjectHideFlags: 0
5176   - m_PrefabParentObject: {fileID: 0}
5177   - m_PrefabInternal: {fileID: 0}
5178   - m_GameObject: {fileID: 878634659}
5179   - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
5180   - m_LocalPosition: {x: 0, y: 0, z: 0}
5181   - m_LocalScale: {x: 1, y: 1, z: 1}
5182   - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5183   - m_Children: []
5184   - m_Father: {fileID: 1093252621}
5185   - m_RootOrder: 1
5186   - m_AnchorMin: {x: 0.03, y: 0.04}
5187   - m_AnchorMax: {x: 0.97, y: 0.96}
5188   - m_AnchoredPosition: {x: 0, y: 0}
5189   - m_SizeDelta: {x: 0, y: 0}
5190   - m_Pivot: {x: 0.5, y: 0.5}
5191   ---- !u!114 &878634661
5192   -MonoBehaviour:
5193   - m_ObjectHideFlags: 0
5194   - m_PrefabParentObject: {fileID: 0}
5195   - m_PrefabInternal: {fileID: 0}
5196   - m_GameObject: {fileID: 878634659}
5197   - m_Enabled: 1
5198   - m_EditorHideFlags: 0
5199   - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
5200   - m_Name:
5201   - m_EditorClassIdentifier:
5202   - m_Material: {fileID: 0}
5203   - m_Color: {r: 0.028, g: 0.626, b: 0.966, a: 1}
5204   - m_RaycastTarget: 1
5205   - m_OnCullStateChanged:
5206   - m_PersistentCalls:
5207   - m_Calls: []
5208   - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
5209   - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
5210   - m_FontData:
5211   - m_Font: {fileID: 12800000, guid: 1d71629ab414fbe4a9015401607e12a6, type: 3}
5212   - m_FontSize: 20
5213   - m_FontStyle: 0
5214   - m_BestFit: 1
5215   - m_MinSize: 10
5216   - m_MaxSize: 40
5217   - m_Alignment: 3
5218   - m_AlignByGeometry: 0
5219   - m_RichText: 1
5220   - m_HorizontalOverflow: 0
5221   - m_VerticalOverflow: 0
5222   - m_LineSpacing: 1
5223   - m_Text: "Para\xEDba"
5224   ---- !u!222 &878634662
5225   -CanvasRenderer:
5226   - m_ObjectHideFlags: 0
5227   - m_PrefabParentObject: {fileID: 0}
5228   - m_PrefabInternal: {fileID: 0}
5229   - m_GameObject: {fileID: 878634659}
5230 5234 --- !u!1 &907693709
5231 5235 GameObject:
5232 5236 m_ObjectHideFlags: 0
... ... @@ -5594,7 +5598,7 @@ RectTransform:
5594 5598 type: 2}
5595 5599 m_PrefabInternal: {fileID: 0}
5596 5600 m_GameObject: {fileID: 951727301}
5597   - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  5601 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
5598 5602 m_LocalPosition: {x: 0, y: 0, z: 0}
5599 5603 m_LocalScale: {x: 1, y: 1, z: 1}
5600 5604 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
... ... @@ -5603,8 +5607,8 @@ RectTransform:
5603 5607 - {fileID: 363895484}
5604 5608 - {fileID: 1265796708}
5605 5609 - {fileID: 1976368185}
5606   - m_Father: {fileID: 1414104007}
5607   - m_RootOrder: 7
  5610 + m_Father: {fileID: 202190019}
  5611 + m_RootOrder: 2
5608 5612 m_AnchorMin: {x: 0, y: 0}
5609 5613 m_AnchorMax: {x: 1, y: 1}
5610 5614 m_AnchoredPosition: {x: 0, y: 0}
... ... @@ -5667,7 +5671,7 @@ GameObject:
5667 5671 - 222: {fileID: 954173495}
5668 5672 - 114: {fileID: 954173494}
5669 5673 m_Layer: 5
5670   - m_Name: bar_bottom
  5674 + m_Name: bar-bottom
5671 5675 m_TagString: Untagged
5672 5676 m_Icon: {fileID: 0}
5673 5677 m_NavMeshLayer: 0
... ... @@ -5687,7 +5691,7 @@ RectTransform:
5687 5691 m_Children:
5688 5692 - {fileID: 263667178}
5689 5693 m_Father: {fileID: 1414104007}
5690   - m_RootOrder: 8
  5694 + m_RootOrder: 4
5691 5695 m_AnchorMin: {x: 0, y: 0}
5692 5696 m_AnchorMax: {x: 1, y: 0}
5693 5697 m_AnchoredPosition: {x: 0, y: 0}
... ... @@ -6114,7 +6118,7 @@ RectTransform:
6114 6118 type: 2}
6115 6119 m_PrefabInternal: {fileID: 0}
6116 6120 m_GameObject: {fileID: 1024302431}
6117   - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  6121 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
6118 6122 m_LocalPosition: {x: 0, y: 0, z: 0}
6119 6123 m_LocalScale: {x: 1, y: 1, z: 0}
6120 6124 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
... ... @@ -6122,8 +6126,8 @@ RectTransform:
6122 6126 - {fileID: 490251390}
6123 6127 - {fileID: 2023188709}
6124 6128 - {fileID: 1152273570}
6125   - m_Father: {fileID: 1414104007}
6126   - m_RootOrder: 3
  6129 + m_Father: {fileID: 1620867682}
  6130 + m_RootOrder: 2
6127 6131 m_AnchorMin: {x: 0.18, y: 0.44}
6128 6132 m_AnchorMax: {x: 0.82, y: 0.56}
6129 6133 m_AnchoredPosition: {x: 0, y: 0}
... ... @@ -6173,7 +6177,6 @@ GameObject:
6173 6177 m_Component:
6174 6178 - 224: {fileID: 1031720609}
6175 6179 - 222: {fileID: 1031720612}
6176   - - 114: {fileID: 1031720611}
6177 6180 - 114: {fileID: 1031720610}
6178 6181 m_Layer: 5
6179 6182 m_Name: regions
... ... @@ -6181,7 +6184,7 @@ GameObject:
6181 6184 m_Icon: {fileID: 0}
6182 6185 m_NavMeshLayer: 0
6183 6186 m_StaticEditorFlags: 0
6184   - m_IsActive: 1
  6187 + m_IsActive: 0
6185 6188 --- !u!224 &1031720609
6186 6189 RectTransform:
6187 6190 m_ObjectHideFlags: 0
... ... @@ -6194,11 +6197,11 @@ RectTransform:
6194 6197 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6195 6198 m_Children:
6196 6199 - {fileID: 327739038}
6197   - - {fileID: 1895603214}
6198   - m_Father: {fileID: 1414104007}
6199   - m_RootOrder: 16
6200   - m_AnchorMin: {x: 0.12, y: 0.12}
6201   - m_AnchorMax: {x: 0.88, y: 0.88}
  6200 + - {fileID: 1153850832}
  6201 + m_Father: {fileID: 1932070330}
  6202 + m_RootOrder: 2
  6203 + m_AnchorMin: {x: 0.17, y: 0.12}
  6204 + m_AnchorMax: {x: 0.83, y: 0.88}
6202 6205 m_AnchoredPosition: {x: 0, y: 0}
6203 6206 m_SizeDelta: {x: 0, y: 0}
6204 6207 m_Pivot: {x: 0.5, y: 0.5}
... ... @@ -6208,44 +6211,17 @@ MonoBehaviour:
6208 6211 m_PrefabParentObject: {fileID: 0}
6209 6212 m_PrefabInternal: {fileID: 0}
6210 6213 m_GameObject: {fileID: 1031720608}
6211   - m_Enabled: 0
  6214 + m_Enabled: 1
6212 6215 m_EditorHideFlags: 0
6213   - m_Script: {fileID: 11500000, guid: 6b2f870a45d43494caa0650e4932ec5c, type: 3}
  6216 + m_Script: {fileID: 11500000, guid: 78a5b982b15318c4eb21845febd5f2df, type: 3}
6214 6217 m_Name:
6215 6218 m_EditorClassIdentifier:
6216 6219 visible: 0
6217   - slideOnX: 1
6218   - toLeft: 1
6219   - slideOnY: 0
6220   - toTop: 0
6221   - speed: 40
  6220 + visibleAlpha: 1
  6221 + hiddenAlpha: 0
  6222 + showingSpeed: 0.1
  6223 + hiddingSpeed: 0.1
6222 6224 disableWhenHidden: 1
6223   ---- !u!114 &1031720611
6224   -MonoBehaviour:
6225   - m_ObjectHideFlags: 0
6226   - m_PrefabParentObject: {fileID: 0}
6227   - m_PrefabInternal: {fileID: 0}
6228   - m_GameObject: {fileID: 1031720608}
6229   - m_Enabled: 1
6230   - m_EditorHideFlags: 0
6231   - m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
6232   - m_Name:
6233   - m_EditorClassIdentifier:
6234   - m_Material: {fileID: 0}
6235   - m_Color: {r: 1, g: 1, b: 1, a: 1}
6236   - m_RaycastTarget: 1
6237   - m_OnCullStateChanged:
6238   - m_PersistentCalls:
6239   - m_Calls: []
6240   - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
6241   - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
6242   - m_Texture: {fileID: 0}
6243   - m_UVRect:
6244   - serializedVersion: 2
6245   - x: 0
6246   - y: 0
6247   - width: 1
6248   - height: 1
6249 6225 --- !u!222 &1031720612
6250 6226 CanvasRenderer:
6251 6227 m_ObjectHideFlags: 0
... ... @@ -6634,13 +6610,12 @@ RectTransform:
6634 6610 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6635 6611 m_Children:
6636 6612 - {fileID: 868574982}
6637   - - {fileID: 878634660}
6638 6613 m_Father: {fileID: 663262205}
6639 6614 m_RootOrder: 0
6640   - m_AnchorMin: {x: 0, y: 0}
6641   - m_AnchorMax: {x: 0, y: 0}
6642   - m_AnchoredPosition: {x: 0, y: 0}
6643   - m_SizeDelta: {x: 0, y: 0}
  6615 + m_AnchorMin: {x: 0, y: 1}
  6616 + m_AnchorMax: {x: 0, y: 1}
  6617 + m_AnchoredPosition: {x: 102.88999, y: -17}
  6618 + m_SizeDelta: {x: 205.77998, y: 34}
6644 6619 m_Pivot: {x: 0.5, y: 0.5}
6645 6620 --- !u!114 &1093252622
6646 6621 MonoBehaviour:
... ... @@ -6654,7 +6629,7 @@ MonoBehaviour:
6654 6629 m_Name:
6655 6630 m_EditorClassIdentifier:
6656 6631 button: {fileID: 1093252624}
6657   - title: {fileID: 878634661}
  6632 + title: {fileID: 0}
6658 6633 --- !u!114 &1093252623
6659 6634 MonoBehaviour:
6660 6635 m_ObjectHideFlags: 0
... ... @@ -6668,7 +6643,7 @@ MonoBehaviour:
6668 6643 m_EditorClassIdentifier:
6669 6644 m_IgnoreLayout: 0
6670 6645 m_MinWidth: -1
6671   - m_MinHeight: 36
  6646 + m_MinHeight: 34
6672 6647 m_PreferredWidth: -1
6673 6648 m_PreferredHeight: -1
6674 6649 m_FlexibleWidth: -1
... ... @@ -6741,10 +6716,9 @@ GameObject:
6741 6716 - 224: {fileID: 1112380079}
6742 6717 - 114: {fileID: 1112380083}
6743 6718 - 222: {fileID: 1112380082}
6744   - - 114: {fileID: 1112380081}
6745 6719 - 114: {fileID: 1112380080}
6746 6720 m_Layer: 5
6747   - m_Name: sv_items
  6721 + m_Name: scroll-items
6748 6722 m_TagString: Untagged
6749 6723 m_Icon: {fileID: 0}
6750 6724 m_NavMeshLayer: 0
... ... @@ -6768,8 +6742,8 @@ RectTransform:
6768 6742 m_RootOrder: 0
6769 6743 m_AnchorMin: {x: 0, y: 0}
6770 6744 m_AnchorMax: {x: 1, y: 1}
6771   - m_AnchoredPosition: {x: 0, y: 0}
6772   - m_SizeDelta: {x: 0, y: 0}
  6745 + m_AnchoredPosition: {x: 0, y: -10}
  6746 + m_SizeDelta: {x: -10, y: -20}
6773 6747 m_Pivot: {x: 0.5, y: 1}
6774 6748 --- !u!114 &1112380080
6775 6749 MonoBehaviour:
... ... @@ -6784,51 +6758,23 @@ MonoBehaviour:
6784 6758 m_Name:
6785 6759 m_EditorClassIdentifier:
6786 6760 m_ShowMaskGraphic: 1
6787   ---- !u!114 &1112380081
  6761 +--- !u!222 &1112380082
  6762 +CanvasRenderer:
  6763 + m_ObjectHideFlags: 0
  6764 + m_PrefabParentObject: {fileID: 22222300, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  6765 + type: 2}
  6766 + m_PrefabInternal: {fileID: 0}
  6767 + m_GameObject: {fileID: 1112380078}
  6768 +--- !u!114 &1112380083
6788 6769 MonoBehaviour:
6789 6770 m_ObjectHideFlags: 0
6790   - m_PrefabParentObject: {fileID: 11451276, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  6771 + m_PrefabParentObject: {fileID: 11466044, guid: 5ccb0ba277304a14b9bb8d4e34161675,
6791 6772 type: 2}
6792 6773 m_PrefabInternal: {fileID: 0}
6793 6774 m_GameObject: {fileID: 1112380078}
6794 6775 m_Enabled: 1
6795 6776 m_EditorHideFlags: 0
6796   - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
6797   - m_Name:
6798   - m_EditorClassIdentifier:
6799   - m_Material: {fileID: 0}
6800   - m_Color: {r: 1, g: 1, b: 1, a: 1}
6801   - m_RaycastTarget: 1
6802   - m_OnCullStateChanged:
6803   - m_PersistentCalls:
6804   - m_Calls: []
6805   - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
6806   - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
6807   - m_Sprite: {fileID: 0}
6808   - m_Type: 0
6809   - m_PreserveAspect: 0
6810   - m_FillCenter: 1
6811   - m_FillMethod: 4
6812   - m_FillAmount: 1
6813   - m_FillClockwise: 1
6814   - m_FillOrigin: 0
6815   ---- !u!222 &1112380082
6816   -CanvasRenderer:
6817   - m_ObjectHideFlags: 0
6818   - m_PrefabParentObject: {fileID: 22222300, guid: 5ccb0ba277304a14b9bb8d4e34161675,
6819   - type: 2}
6820   - m_PrefabInternal: {fileID: 0}
6821   - m_GameObject: {fileID: 1112380078}
6822   ---- !u!114 &1112380083
6823   -MonoBehaviour:
6824   - m_ObjectHideFlags: 0
6825   - m_PrefabParentObject: {fileID: 11466044, guid: 5ccb0ba277304a14b9bb8d4e34161675,
6826   - type: 2}
6827   - m_PrefabInternal: {fileID: 0}
6828   - m_GameObject: {fileID: 1112380078}
6829   - m_Enabled: 1
6830   - m_EditorHideFlags: 0
6831   - m_Script: {fileID: 1367256648, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  6777 + m_Script: {fileID: 1367256648, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
6832 6778 m_Name:
6833 6779 m_EditorClassIdentifier:
6834 6780 m_Content: {fileID: 663262205}
... ... @@ -6995,8 +6941,10 @@ GameObject:
6995 6941 serializedVersion: 4
6996 6942 m_Component:
6997 6943 - 224: {fileID: 1153850832}
  6944 + - 222: {fileID: 1153850834}
  6945 + - 114: {fileID: 1153850833}
6998 6946 m_Layer: 5
6999   - m_Name: container_items
  6947 + m_Name: selector
7000 6948 m_TagString: Untagged
7001 6949 m_Icon: {fileID: 0}
7002 6950 m_NavMeshLayer: 0
... ... @@ -7015,13 +6963,45 @@ RectTransform:
7015 6963 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7016 6964 m_Children:
7017 6965 - {fileID: 1112380079}
7018   - m_Father: {fileID: 1895603214}
7019   - m_RootOrder: 0
  6966 + m_Father: {fileID: 1031720609}
  6967 + m_RootOrder: 1
7020 6968 m_AnchorMin: {x: 0, y: 0}
7021 6969 m_AnchorMax: {x: 1, y: 1}
7022   - m_AnchoredPosition: {x: 0, y: 0}
7023   - m_SizeDelta: {x: 0, y: 0}
  6970 + m_AnchoredPosition: {x: 0, y: 0.5}
  6971 + m_SizeDelta: {x: -4, y: -3}
7024 6972 m_Pivot: {x: 0.5, y: 0.5}
  6973 +--- !u!114 &1153850833
  6974 +MonoBehaviour:
  6975 + m_ObjectHideFlags: 0
  6976 + m_PrefabParentObject: {fileID: 0}
  6977 + m_PrefabInternal: {fileID: 0}
  6978 + m_GameObject: {fileID: 1153850831}
  6979 + m_Enabled: 1
  6980 + m_EditorHideFlags: 0
  6981 + m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  6982 + m_Name:
  6983 + m_EditorClassIdentifier:
  6984 + m_Material: {fileID: 0}
  6985 + m_Color: {r: 1, g: 1, b: 1, a: 1}
  6986 + m_RaycastTarget: 1
  6987 + m_OnCullStateChanged:
  6988 + m_PersistentCalls:
  6989 + m_Calls: []
  6990 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  6991 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  6992 + m_Texture: {fileID: 0}
  6993 + m_UVRect:
  6994 + serializedVersion: 2
  6995 + x: 0
  6996 + y: 0
  6997 + width: 1
  6998 + height: 1
  6999 +--- !u!222 &1153850834
  7000 +CanvasRenderer:
  7001 + m_ObjectHideFlags: 0
  7002 + m_PrefabParentObject: {fileID: 0}
  7003 + m_PrefabInternal: {fileID: 0}
  7004 + m_GameObject: {fileID: 1153850831}
7025 7005 --- !u!1 &1157915784
7026 7006 GameObject:
7027 7007 m_ObjectHideFlags: 0
... ... @@ -7682,7 +7662,29 @@ MonoBehaviour:
7682 7662 m_TargetGraphic: {fileID: 1221056138}
7683 7663 m_OnClick:
7684 7664 m_PersistentCalls:
7685   - m_Calls: []
  7665 + m_Calls:
  7666 + - m_Target: {fileID: 265917591}
  7667 + m_MethodName: setVisible
  7668 + m_Mode: 6
  7669 + m_Arguments:
  7670 + m_ObjectArgument: {fileID: 0}
  7671 + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
  7672 + m_IntArgument: 0
  7673 + m_FloatArgument: 0
  7674 + m_StringArgument:
  7675 + m_BoolArgument: 0
  7676 + m_CallState: 2
  7677 + - m_Target: {fileID: 1031720610}
  7678 + m_MethodName: fade
  7679 + m_Mode: 6
  7680 + m_Arguments:
  7681 + m_ObjectArgument: {fileID: 0}
  7682 + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
  7683 + m_IntArgument: 0
  7684 + m_FloatArgument: 0
  7685 + m_StringArgument:
  7686 + m_BoolArgument: 1
  7687 + m_CallState: 2
7686 7688 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
7687 7689 Culture=neutral, PublicKeyToken=null
7688 7690 --- !u!114 &1221056138
... ... @@ -7861,13 +7863,13 @@ RectTransform:
7861 7863 type: 2}
7862 7864 m_PrefabInternal: {fileID: 0}
7863 7865 m_GameObject: {fileID: 1265043069}
7864   - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  7866 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
7865 7867 m_LocalPosition: {x: 0, y: 0, z: 0}
7866 7868 m_LocalScale: {x: 1, y: 1, z: 1}
7867 7869 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7868 7870 m_Children:
7869 7871 - {fileID: 1952387009}
7870   - m_Father: {fileID: 1414104007}
  7872 + m_Father: {fileID: 1620867682}
7871 7873 m_RootOrder: 0
7872 7874 m_AnchorMin: {x: 0, y: 0}
7873 7875 m_AnchorMax: {x: 1, y: 1}
... ... @@ -8847,6 +8849,7 @@ GameObject:
8847 8849 - 223: {fileID: 1414104010}
8848 8850 - 114: {fileID: 1414104009}
8849 8851 - 114: {fileID: 1414104008}
  8852 + - 114: {fileID: 1414104011}
8850 8853 m_Layer: 5
8851 8854 m_Name: canvas
8852 8855 m_TagString: Untagged
... ... @@ -8866,23 +8869,14 @@ RectTransform:
8866 8869 m_LocalScale: {x: 0, y: 0, z: 0}
8867 8870 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8868 8871 m_Children:
8869   - - {fileID: 1265043070}
8870   - - {fileID: 1533000892}
  8872 + - {fileID: 1613520792}
  8873 + - {fileID: 1620867682}
8871 8874 - {fileID: 2119336824}
8872   - - {fileID: 1024302432}
8873   - - {fileID: 861767965}
8874   - - {fileID: 263018772}
8875   - - {fileID: 1935189154}
8876   - - {fileID: 951727302}
  8875 + - {fileID: 202190019}
8877 8876 - {fileID: 954173493}
8878   - - {fileID: 228512394}
8879   - - {fileID: 2044204295}
  8877 + - {fileID: 576472178}
8880 8878 - {fileID: 842733390}
8881   - - {fileID: 848083143}
8882   - - {fileID: 1613520792}
8883   - - {fileID: 1826236680}
8884   - - {fileID: 265917590}
8885   - - {fileID: 1031720609}
  8879 + - {fileID: 1932070330}
8886 8880 m_Father: {fileID: 0}
8887 8881 m_RootOrder: 0
8888 8882 m_AnchorMin: {x: 0, y: 0}
... ... @@ -8949,6 +8943,21 @@ Canvas:
8949 8943 m_SortingLayerID: 0
8950 8944 m_SortingOrder: 0
8951 8945 m_TargetDisplay: 0
  8946 +--- !u!114 &1414104011
  8947 +MonoBehaviour:
  8948 + m_ObjectHideFlags: 0
  8949 + m_PrefabParentObject: {fileID: 0}
  8950 + m_PrefabInternal: {fileID: 0}
  8951 + m_GameObject: {fileID: 1414104006}
  8952 + m_Enabled: 1
  8953 + m_EditorHideFlags: 0
  8954 + m_Script: {fileID: 11500000, guid: f82554c3806c65a4581001e16ff994db, type: 3}
  8955 + m_Name:
  8956 + m_EditorClassIdentifier:
  8957 + gameObjects:
  8958 + - {fileID: 1826236679}
  8959 + - {fileID: 265917589}
  8960 + - {fileID: 1031720608}
8952 8961 --- !u!1 &1416567424
8953 8962 GameObject:
8954 8963 m_ObjectHideFlags: 0
... ... @@ -10023,13 +10032,13 @@ RectTransform:
10023 10032 type: 2}
10024 10033 m_PrefabInternal: {fileID: 0}
10025 10034 m_GameObject: {fileID: 1533000889}
10026   - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  10035 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
10027 10036 m_LocalPosition: {x: 0, y: 0, z: 0}
10028 10037 m_LocalScale: {x: 1, y: 1, z: 1}
10029 10038 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10030 10039 m_Children:
10031 10040 - {fileID: 1697118936}
10032   - m_Father: {fileID: 1414104007}
  10041 + m_Father: {fileID: 1620867682}
10033 10042 m_RootOrder: 1
10034 10043 m_AnchorMin: {x: 0, y: 0}
10035 10044 m_AnchorMax: {x: 1, y: 0}
... ... @@ -10326,7 +10335,7 @@ RectTransform:
10326 10335 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10327 10336 m_Children: []
10328 10337 m_Father: {fileID: 1414104007}
10329   - m_RootOrder: 13
  10338 + m_RootOrder: 0
10330 10339 m_AnchorMin: {x: 0, y: 1}
10331 10340 m_AnchorMax: {x: 0, y: 1}
10332 10341 m_AnchoredPosition: {x: 16, y: -16}
... ... @@ -10383,7 +10392,7 @@ MonoBehaviour:
10383 10392 m_BoolArgument: 1
10384 10393 m_CallState: 2
10385 10394 - m_Target: {fileID: 1826236683}
10386   - m_MethodName: setVisible
  10395 + m_MethodName: fade
10387 10396 m_Mode: 6
10388 10397 m_Arguments:
10389 10398 m_ObjectArgument: {fileID: 0}
... ... @@ -10454,6 +10463,44 @@ MonoBehaviour:
10454 10463 ctrlBochecha_L: {fileID: 0}
10455 10464 ctrlBochecha_R: {fileID: 0}
10456 10465 BnMandibula: {fileID: 0}
  10466 +--- !u!1 &1620867681
  10467 +GameObject:
  10468 + m_ObjectHideFlags: 0
  10469 + m_PrefabParentObject: {fileID: 0}
  10470 + m_PrefabInternal: {fileID: 0}
  10471 + serializedVersion: 4
  10472 + m_Component:
  10473 + - 224: {fileID: 1620867682}
  10474 + m_Layer: 5
  10475 + m_Name: layers
  10476 + m_TagString: Untagged
  10477 + m_Icon: {fileID: 0}
  10478 + m_NavMeshLayer: 0
  10479 + m_StaticEditorFlags: 0
  10480 + m_IsActive: 1
  10481 +--- !u!224 &1620867682
  10482 +RectTransform:
  10483 + m_ObjectHideFlags: 0
  10484 + m_PrefabParentObject: {fileID: 0}
  10485 + m_PrefabInternal: {fileID: 0}
  10486 + m_GameObject: {fileID: 1620867681}
  10487 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  10488 + m_LocalPosition: {x: 0, y: 0, z: 0}
  10489 + m_LocalScale: {x: 1, y: 1, z: 1}
  10490 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  10491 + m_Children:
  10492 + - {fileID: 1265043070}
  10493 + - {fileID: 1533000892}
  10494 + - {fileID: 1024302432}
  10495 + - {fileID: 861767965}
  10496 + - {fileID: 848083143}
  10497 + m_Father: {fileID: 1414104007}
  10498 + m_RootOrder: 1
  10499 + m_AnchorMin: {x: 0, y: 0}
  10500 + m_AnchorMax: {x: 1, y: 1}
  10501 + m_AnchoredPosition: {x: 0, y: 0}
  10502 + m_SizeDelta: {x: 0, y: 0}
  10503 + m_Pivot: {x: 0.5, y: 0.5}
10457 10504 --- !u!1 &1623694772
10458 10505 GameObject:
10459 10506 m_ObjectHideFlags: 0
... ... @@ -11287,20 +11334,20 @@ GameObject:
11287 11334 m_Icon: {fileID: 0}
11288 11335 m_NavMeshLayer: 0
11289 11336 m_StaticEditorFlags: 0
11290   - m_IsActive: 1
  11337 + m_IsActive: 0
11291 11338 --- !u!224 &1826236680
11292 11339 RectTransform:
11293 11340 m_ObjectHideFlags: 0
11294 11341 m_PrefabParentObject: {fileID: 0}
11295 11342 m_PrefabInternal: {fileID: 0}
11296 11343 m_GameObject: {fileID: 1826236679}
11297   - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  11344 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
11298 11345 m_LocalPosition: {x: 0, y: 0, z: 0}
11299 11346 m_LocalScale: {x: 1, y: 1, z: 1}
11300 11347 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11301 11348 m_Children: []
11302   - m_Father: {fileID: 1414104007}
11303   - m_RootOrder: 14
  11349 + m_Father: {fileID: 1932070330}
  11350 + m_RootOrder: 0
11304 11351 m_AnchorMin: {x: 0, y: 0}
11305 11352 m_AnchorMax: {x: 1, y: 1}
11306 11353 m_AnchoredPosition: {x: 0, y: 0}
... ... @@ -11350,9 +11397,10 @@ MonoBehaviour:
11350 11397 m_Name:
11351 11398 m_EditorClassIdentifier:
11352 11399 visible: 0
11353   - visibleAlpha: 0.18
  11400 + visibleAlpha: 1
11354 11401 hiddenAlpha: 0
11355   - speed: 0.05
  11402 + showingSpeed: 0.05
  11403 + hiddingSpeed: 0.16
11356 11404 disableWhenHidden: 1
11357 11405 --- !u!114 &1826236684
11358 11406 MonoBehaviour:
... ... @@ -11405,7 +11453,18 @@ MonoBehaviour:
11405 11453 m_BoolArgument: 0
11406 11454 m_CallState: 2
11407 11455 - m_Target: {fileID: 1826236683}
11408   - m_MethodName: setVisible
  11456 + m_MethodName: fade
  11457 + m_Mode: 6
  11458 + m_Arguments:
  11459 + m_ObjectArgument: {fileID: 0}
  11460 + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
  11461 + m_IntArgument: 0
  11462 + m_FloatArgument: 0
  11463 + m_StringArgument:
  11464 + m_BoolArgument: 0
  11465 + m_CallState: 2
  11466 + - m_Target: {fileID: 1031720610}
  11467 + m_MethodName: fade
11409 11468 m_Mode: 6
11410 11469 m_Arguments:
11411 11470 m_ObjectArgument: {fileID: 0}
... ... @@ -11561,7 +11620,40 @@ MonoBehaviour:
11561 11620 m_TargetGraphic: {fileID: 1839813418}
11562 11621 m_OnClick:
11563 11622 m_PersistentCalls:
11564   - m_Calls: []
  11623 + m_Calls:
  11624 + - m_Target: {fileID: 2131993094}
  11625 + m_MethodName: switchScreen
  11626 + m_Mode: 2
  11627 + m_Arguments:
  11628 + m_ObjectArgument: {fileID: 263018771}
  11629 + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine
  11630 + m_IntArgument: 0
  11631 + m_FloatArgument: 0
  11632 + m_StringArgument:
  11633 + m_BoolArgument: 0
  11634 + m_CallState: 2
  11635 + - m_Target: {fileID: 265917591}
  11636 + m_MethodName: setVisible
  11637 + m_Mode: 6
  11638 + m_Arguments:
  11639 + m_ObjectArgument: {fileID: 0}
  11640 + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
  11641 + m_IntArgument: 0
  11642 + m_FloatArgument: 0
  11643 + m_StringArgument:
  11644 + m_BoolArgument: 0
  11645 + m_CallState: 2
  11646 + - m_Target: {fileID: 1826236683}
  11647 + m_MethodName: set
  11648 + m_Mode: 6
  11649 + m_Arguments:
  11650 + m_ObjectArgument: {fileID: 0}
  11651 + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
  11652 + m_IntArgument: 0
  11653 + m_FloatArgument: 0
  11654 + m_StringArgument:
  11655 + m_BoolArgument: 0
  11656 + m_CallState: 2
11565 11657 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
11566 11658 Culture=neutral, PublicKeyToken=null
11567 11659 --- !u!114 &1839813418
... ... @@ -11702,74 +11794,6 @@ CanvasRenderer:
11702 11794 m_PrefabParentObject: {fileID: 0}
11703 11795 m_PrefabInternal: {fileID: 0}
11704 11796 m_GameObject: {fileID: 1878890614}
11705   ---- !u!1 &1895603213
11706   -GameObject:
11707   - m_ObjectHideFlags: 0
11708   - m_PrefabParentObject: {fileID: 0}
11709   - m_PrefabInternal: {fileID: 0}
11710   - serializedVersion: 4
11711   - m_Component:
11712   - - 224: {fileID: 1895603214}
11713   - - 222: {fileID: 1895603216}
11714   - - 114: {fileID: 1895603215}
11715   - m_Layer: 5
11716   - m_Name: content
11717   - m_TagString: Untagged
11718   - m_Icon: {fileID: 0}
11719   - m_NavMeshLayer: 0
11720   - m_StaticEditorFlags: 0
11721   - m_IsActive: 1
11722   ---- !u!224 &1895603214
11723   -RectTransform:
11724   - m_ObjectHideFlags: 0
11725   - m_PrefabParentObject: {fileID: 0}
11726   - m_PrefabInternal: {fileID: 0}
11727   - m_GameObject: {fileID: 1895603213}
11728   - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
11729   - m_LocalPosition: {x: 0, y: 0, z: 0}
11730   - m_LocalScale: {x: 1, y: 1, z: 1}
11731   - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11732   - m_Children:
11733   - - {fileID: 1153850832}
11734   - m_Father: {fileID: 1031720609}
11735   - m_RootOrder: 1
11736   - m_AnchorMin: {x: 0, y: 0}
11737   - m_AnchorMax: {x: 1, y: 1}
11738   - m_AnchoredPosition: {x: 0, y: 0}
11739   - m_SizeDelta: {x: 0, y: 0}
11740   - m_Pivot: {x: 0.5, y: 0.5}
11741   ---- !u!114 &1895603215
11742   -MonoBehaviour:
11743   - m_ObjectHideFlags: 0
11744   - m_PrefabParentObject: {fileID: 0}
11745   - m_PrefabInternal: {fileID: 0}
11746   - m_GameObject: {fileID: 1895603213}
11747   - m_Enabled: 1
11748   - m_EditorHideFlags: 0
11749   - m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
11750   - m_Name:
11751   - m_EditorClassIdentifier:
11752   - m_Material: {fileID: 0}
11753   - m_Color: {r: 1, g: 1, b: 1, a: 1}
11754   - m_RaycastTarget: 1
11755   - m_OnCullStateChanged:
11756   - m_PersistentCalls:
11757   - m_Calls: []
11758   - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
11759   - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
11760   - m_Texture: {fileID: 0}
11761   - m_UVRect:
11762   - serializedVersion: 2
11763   - x: 0
11764   - y: 0
11765   - width: 1
11766   - height: 1
11767   ---- !u!222 &1895603216
11768   -CanvasRenderer:
11769   - m_ObjectHideFlags: 0
11770   - m_PrefabParentObject: {fileID: 0}
11771   - m_PrefabInternal: {fileID: 0}
11772   - m_GameObject: {fileID: 1895603213}
11773 11797 --- !u!1 &1920630438
11774 11798 GameObject:
11775 11799 m_ObjectHideFlags: 0
... ... @@ -12094,6 +12118,42 @@ Prefab:
12094 12118 - {fileID: 11435512, guid: da45329542b035e4da18f1132cc3d700, type: 2}
12095 12119 m_ParentPrefab: {fileID: 100100000, guid: da45329542b035e4da18f1132cc3d700, type: 2}
12096 12120 m_IsPrefabParent: 0
  12121 +--- !u!1 &1932070329
  12122 +GameObject:
  12123 + m_ObjectHideFlags: 0
  12124 + m_PrefabParentObject: {fileID: 0}
  12125 + m_PrefabInternal: {fileID: 0}
  12126 + serializedVersion: 4
  12127 + m_Component:
  12128 + - 224: {fileID: 1932070330}
  12129 + m_Layer: 5
  12130 + m_Name: settings
  12131 + m_TagString: Untagged
  12132 + m_Icon: {fileID: 0}
  12133 + m_NavMeshLayer: 0
  12134 + m_StaticEditorFlags: 0
  12135 + m_IsActive: 1
  12136 +--- !u!224 &1932070330
  12137 +RectTransform:
  12138 + m_ObjectHideFlags: 0
  12139 + m_PrefabParentObject: {fileID: 0}
  12140 + m_PrefabInternal: {fileID: 0}
  12141 + m_GameObject: {fileID: 1932070329}
  12142 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  12143 + m_LocalPosition: {x: 0, y: 0, z: 0}
  12144 + m_LocalScale: {x: 1, y: 1, z: 1}
  12145 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  12146 + m_Children:
  12147 + - {fileID: 1826236680}
  12148 + - {fileID: 265917590}
  12149 + - {fileID: 1031720609}
  12150 + m_Father: {fileID: 1414104007}
  12151 + m_RootOrder: 7
  12152 + m_AnchorMin: {x: 0, y: 0}
  12153 + m_AnchorMax: {x: 1, y: 1}
  12154 + m_AnchoredPosition: {x: 0, y: 0}
  12155 + m_SizeDelta: {x: 0, y: 0}
  12156 + m_Pivot: {x: 0.5, y: 0.5}
12097 12157 --- !u!1 &1935189153
12098 12158 GameObject:
12099 12159 m_ObjectHideFlags: 0
... ... @@ -12119,7 +12179,7 @@ RectTransform:
12119 12179 type: 2}
12120 12180 m_PrefabInternal: {fileID: 0}
12121 12181 m_GameObject: {fileID: 1935189153}
12122   - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  12182 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
12123 12183 m_LocalPosition: {x: 0, y: 0, z: 0}
12124 12184 m_LocalScale: {x: 1, y: 1, z: 1}
12125 12185 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
... ... @@ -12130,8 +12190,8 @@ RectTransform:
12130 12190 - {fileID: 1999953885}
12131 12191 - {fileID: 2002966284}
12132 12192 - {fileID: 1175405161}
12133   - m_Father: {fileID: 1414104007}
12134   - m_RootOrder: 6
  12193 + m_Father: {fileID: 202190019}
  12194 + m_RootOrder: 1
12135 12195 m_AnchorMin: {x: 0, y: 0}
12136 12196 m_AnchorMax: {x: 1, y: 1}
12137 12197 m_AnchoredPosition: {x: 0, y: 0}
... ... @@ -12887,7 +12947,7 @@ RectTransform:
12887 12947 m_PrefabParentObject: {fileID: 0}
12888 12948 m_PrefabInternal: {fileID: 0}
12889 12949 m_GameObject: {fileID: 2044204294}
12890   - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  12950 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
12891 12951 m_LocalPosition: {x: 0, y: 0, z: 0}
12892 12952 m_LocalScale: {x: 1, y: 1, z: 1}
12893 12953 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
... ... @@ -12895,8 +12955,8 @@ RectTransform:
12895 12955 - {fileID: 1412335970}
12896 12956 - {fileID: 815279418}
12897 12957 - {fileID: 1221700622}
12898   - m_Father: {fileID: 1414104007}
12899   - m_RootOrder: 10
  12958 + m_Father: {fileID: 576472178}
  12959 + m_RootOrder: 1
12900 12960 m_AnchorMin: {x: 0, y: 0}
12901 12961 m_AnchorMax: {x: 1, y: 1}
12902 12962 m_AnchoredPosition: {x: 0, y: 0}
... ... @@ -13781,7 +13841,7 @@ GameObject:
13781 13841 - 222: {fileID: 2119336826}
13782 13842 - 114: {fileID: 2119336825}
13783 13843 m_Layer: 5
13784   - m_Name: bar_top
  13844 + m_Name: bar-top
13785 13845 m_TagString: Untagged
13786 13846 m_Icon: {fileID: 0}
13787 13847 m_NavMeshLayer: 0
... ...
Assets/Scripts/Player Manager/Utils.cs 0 → 100644
  Diff comments   View file @f5ca069
... ... @@ -0,0 +1,14 @@
  1 +using UnityEngine;
  2 +
  3 +namespace Utils {
  4 +
  5 + public static class Definitions {
  6 +
  7 + public static Color SetAlpha(this Color color, float alpha)
  8 + {
  9 + return new Color(color.r, color.g, color.b, alpha);
  10 + }
  11 +
  12 + }
  13 +
  14 +}
... ...
Assets/Scripts/Player Manager/Utils.cs.meta 0 → 100644
  Diff comments   View file @f5ca069
... ... @@ -0,0 +1,12 @@
  1 +fileFormatVersion: 2
  2 +guid: f266f4b1009c51f4fb7b314f642d068a
  3 +timeCreated: 1474777810
  4 +licenseType: Free
  5 +MonoImporter:
  6 + serializedVersion: 2
  7 + defaultReferences: []
  8 + executionOrder: 0
  9 + icon: {instanceID: 0}
  10 + userData:
  11 + assetBundleName:
  12 + assetBundleVariant:
... ...
Assets/Scripts/UI/ActiveOnStart.cs 0 → 100644
  Diff comments   View file @f5ca069
... ... @@ -0,0 +1,14 @@
  1 +using UnityEngine;
  2 +using System.Collections;
  3 +
  4 +public class ActiveOnStart : MonoBehaviour {
  5 +
  6 + public GameObject[] gameObjects;
  7 +
  8 + void Start ()
  9 + {
  10 + foreach (GameObject obj in gameObjects)
  11 + obj.SetActive(true);
  12 + }
  13 +
  14 +}
... ...
Assets/Scripts/UI/ActiveOnStart.cs.meta 0 → 100644
  Diff comments   View file @f5ca069
... ... @@ -0,0 +1,12 @@
  1 +fileFormatVersion: 2
  2 +guid: f82554c3806c65a4581001e16ff994db
  3 +timeCreated: 1474815735
  4 +licenseType: Free
  5 +MonoImporter:
  6 + serializedVersion: 2
  7 + defaultReferences: []
  8 + executionOrder: 0
  9 + icon: {instanceID: 0}
  10 + userData:
  11 + assetBundleName:
  12 + assetBundleVariant:
... ...
Assets/Scripts/UI/Fadder.cs
  Diff comments   View file @f5ca069
... ... @@ -6,43 +6,74 @@ public class Fadder : MonoBehaviour {
6 6 public bool visible = true;
7 7 public float visibleAlpha = 1f;
8 8 public float hiddenAlpha = 0f;
9   - public float speed = 0.01f;
  9 + public float showingSpeed = 0.01f;
  10 + public float hiddingSpeed = 0.01f;
10 11 public bool disableWhenHidden = true;
11 12  
12   - private RawImage image;
13   - private Color color;
  13 + private CanvasRenderer mainRenderer;
  14 + private CanvasRenderer[] renderers;
  15 + private bool visibilityChange = false;
14 16  
15   - public void setVisible(bool visible)
  17 + public void fade(bool visible)
  18 + {
  19 + if (this.visible != visible)
  20 + {
  21 + this.gameObject.transform.localScale = new Vector3(1, 1, 1);
  22 + this.visible = visible;
  23 +
  24 + visibilityChange = true;
  25 + }
  26 + }
  27 +
  28 + public void set(bool visible)
16 29 {
17   - this.gameObject.SetActive(true);
18 30 this.visible = visible;
  31 +
  32 + float alpha = visible ? visibleAlpha : hiddenAlpha;
  33 +
  34 + foreach (CanvasRenderer renderer in renderers)
  35 + renderer.SetAlpha(alpha);
  36 +
  37 + updateScale();
  38 + }
  39 +
  40 + private void updateScale()
  41 + {
  42 + if (disableWhenHidden && this.mainRenderer.GetAlpha() == hiddenAlpha)
  43 + this.gameObject.transform.localScale = new Vector3(0, 0, 0);
19 44 }
20 45  
21 46 void Start ()
22 47 {
23   - image = this.gameObject.GetComponent<RawImage>();
  48 + mainRenderer = this.gameObject.GetComponent<CanvasRenderer>();
  49 + renderers = this.gameObject.GetComponentsInChildren<CanvasRenderer>();
24 50  
25   - color = image.color;
26   - color.a = visible ? visibleAlpha : hiddenAlpha;
27   -
28   - image.color = color;
29   - this.gameObject.SetActive(!disableWhenHidden || color.a != hiddenAlpha);
30   - }
  51 + hiddingSpeed = -hiddingSpeed;
  52 +
  53 + set(visible);
  54 + }
31 55  
32 56 void Update ()
33 57 {
34   - float alpha = visible ? visibleAlpha : hiddenAlpha;
35   -
36   - if (color.a != alpha)
  58 + if (visibilityChange)
37 59 {
38   - if (Mathf.Abs(color.a - alpha) < speed)
39   - color.a = alpha;
40   - else
41   - color.a += color.a < alpha ? speed : -speed;
42   - }
  60 + float objective = visible ? visibleAlpha : hiddenAlpha;
  61 + visibilityChange = false;
  62 +
  63 + foreach (CanvasRenderer renderer in renderers)
  64 + {
  65 + float alpha = renderer.GetAlpha();
43 66  
44   - image.color = color;
45   - this.gameObject.SetActive(!disableWhenHidden || color.a != hiddenAlpha);
  67 + if (alpha != objective)
  68 + {
  69 + float speed = visible ? showingSpeed : hiddingSpeed;
  70 + renderer.SetAlpha(Mathf.Abs(alpha - objective) < Mathf.Abs(speed) ? objective : alpha + speed);
  71 + visibilityChange = true;
  72 + }
  73 + }
  74 +
  75 + if (visibilityChange) updateScale();
  76 + }
46 77 }
47 78  
48 79 }
... ...