Download as
Browse Code »

Commit 470ec4eed70a5a31b1b247db32c47e2765e853b8

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

Lista terminada

Showing 7 changed files with 68 additions and 487 deletions   Show diff stats
Assets/Scenes/Main.unity
  Diff comments   View file @470ec4e
@@ -3480,104 +3480,6 @@ CanvasRenderer: @@ -3480,104 +3480,6 @@ CanvasRenderer:
3480 type: 2} 3480 type: 2}
3481 m_PrefabInternal: {fileID: 0} 3481 m_PrefabInternal: {fileID: 0}
3482 m_GameObject: {fileID: 378764408} 3482 m_GameObject: {fileID: 378764408}
3483 ---- !u!1001 &384237974  
3484 -Prefab:  
3485 - m_ObjectHideFlags: 0  
3486 - serializedVersion: 2  
3487 - m_Modification:  
3488 - m_TransformParent: {fileID: 1995982559}  
3489 - m_Modifications:  
3490 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3491 - propertyPath: m_LocalPosition.x  
3492 - value: 0  
3493 - objectReference: {fileID: 0}  
3494 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3495 - propertyPath: m_LocalPosition.y  
3496 - value: 0  
3497 - objectReference: {fileID: 0}  
3498 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3499 - propertyPath: m_LocalPosition.z  
3500 - value: 0  
3501 - objectReference: {fileID: 0}  
3502 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3503 - propertyPath: m_LocalRotation.x  
3504 - value: 0  
3505 - objectReference: {fileID: 0}  
3506 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3507 - propertyPath: m_LocalRotation.y  
3508 - value: 0  
3509 - objectReference: {fileID: 0}  
3510 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3511 - propertyPath: m_LocalRotation.z  
3512 - value: 0  
3513 - objectReference: {fileID: 0}  
3514 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3515 - propertyPath: m_LocalRotation.w  
3516 - value: 1  
3517 - objectReference: {fileID: 0}  
3518 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3519 - propertyPath: m_RootOrder  
3520 - value: 1  
3521 - objectReference: {fileID: 0}  
3522 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3523 - propertyPath: m_AnchoredPosition.x  
3524 - value: 0  
3525 - objectReference: {fileID: 0}  
3526 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3527 - propertyPath: m_AnchoredPosition.y  
3528 - value: 0  
3529 - objectReference: {fileID: 0}  
3530 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3531 - propertyPath: m_SizeDelta.x  
3532 - value: 0  
3533 - objectReference: {fileID: 0}  
3534 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3535 - propertyPath: m_SizeDelta.y  
3536 - value: 0  
3537 - objectReference: {fileID: 0}  
3538 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3539 - propertyPath: m_AnchorMin.x  
3540 - value: 0  
3541 - objectReference: {fileID: 0}  
3542 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3543 - propertyPath: m_AnchorMin.y  
3544 - value: 0  
3545 - objectReference: {fileID: 0}  
3546 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3547 - propertyPath: m_AnchorMax.x  
3548 - value: 0  
3549 - objectReference: {fileID: 0}  
3550 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3551 - propertyPath: m_AnchorMax.y  
3552 - value: 0  
3553 - objectReference: {fileID: 0}  
3554 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3555 - propertyPath: m_Pivot.x  
3556 - value: .5  
3557 - objectReference: {fileID: 0}  
3558 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3559 - propertyPath: m_Pivot.y  
3560 - value: .5  
3561 - objectReference: {fileID: 0}  
3562 - - target: {fileID: 172766, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3563 - propertyPath: m_Name  
3564 - value: Item (1)  
3565 - objectReference: {fileID: 0}  
3566 - - target: {fileID: 11441238, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3567 - propertyPath: m_MinHeight  
3568 - value: 36  
3569 - objectReference: {fileID: 0}  
3570 - - target: {fileID: 11441238, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3571 - propertyPath: m_Enabled  
3572 - value: 1  
3573 - objectReference: {fileID: 0}  
3574 - - target: {fileID: 11441238, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3575 - propertyPath: m_IgnoreLayout  
3576 - value: 0  
3577 - objectReference: {fileID: 0}  
3578 - m_RemovedComponents: []  
3579 - m_ParentPrefab: {fileID: 100100000, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
3580 - m_IsPrefabParent: 0  
3581 --- !u!1 &391013456 3483 --- !u!1 &391013456
3582 GameObject: 3484 GameObject:
3583 m_ObjectHideFlags: 0 3485 m_ObjectHideFlags: 0
@@ -6817,92 +6719,6 @@ RectTransform: @@ -6817,92 +6719,6 @@ RectTransform:
6817 m_AnchoredPosition: {x: -5, y: 0} 6719 m_AnchoredPosition: {x: -5, y: 0}
6818 m_SizeDelta: {x: -20, y: 0} 6720 m_SizeDelta: {x: -20, y: 0}
6819 m_Pivot: {x: .5, y: .5} 6721 m_Pivot: {x: .5, y: .5}
6820 ---- !u!1001 &711789825  
6821 -Prefab:  
6822 - m_ObjectHideFlags: 0  
6823 - serializedVersion: 2  
6824 - m_Modification:  
6825 - m_TransformParent: {fileID: 1995982559}  
6826 - m_Modifications:  
6827 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6828 - propertyPath: m_LocalPosition.x  
6829 - value: 0  
6830 - objectReference: {fileID: 0}  
6831 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6832 - propertyPath: m_LocalPosition.y  
6833 - value: 0  
6834 - objectReference: {fileID: 0}  
6835 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6836 - propertyPath: m_LocalPosition.z  
6837 - value: 0  
6838 - objectReference: {fileID: 0}  
6839 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6840 - propertyPath: m_LocalRotation.x  
6841 - value: 0  
6842 - objectReference: {fileID: 0}  
6843 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6844 - propertyPath: m_LocalRotation.y  
6845 - value: 0  
6846 - objectReference: {fileID: 0}  
6847 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6848 - propertyPath: m_LocalRotation.z  
6849 - value: 0  
6850 - objectReference: {fileID: 0}  
6851 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6852 - propertyPath: m_LocalRotation.w  
6853 - value: 1  
6854 - objectReference: {fileID: 0}  
6855 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6856 - propertyPath: m_RootOrder  
6857 - value: 3  
6858 - objectReference: {fileID: 0}  
6859 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6860 - propertyPath: m_AnchoredPosition.x  
6861 - value: 0  
6862 - objectReference: {fileID: 0}  
6863 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6864 - propertyPath: m_AnchoredPosition.y  
6865 - value: 0  
6866 - objectReference: {fileID: 0}  
6867 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6868 - propertyPath: m_SizeDelta.x  
6869 - value: 0  
6870 - objectReference: {fileID: 0}  
6871 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6872 - propertyPath: m_SizeDelta.y  
6873 - value: 0  
6874 - objectReference: {fileID: 0}  
6875 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6876 - propertyPath: m_AnchorMin.x  
6877 - value: 0  
6878 - objectReference: {fileID: 0}  
6879 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6880 - propertyPath: m_AnchorMin.y  
6881 - value: 0  
6882 - objectReference: {fileID: 0}  
6883 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6884 - propertyPath: m_AnchorMax.x  
6885 - value: 0  
6886 - objectReference: {fileID: 0}  
6887 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6888 - propertyPath: m_AnchorMax.y  
6889 - value: 0  
6890 - objectReference: {fileID: 0}  
6891 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6892 - propertyPath: m_Pivot.x  
6893 - value: .5  
6894 - objectReference: {fileID: 0}  
6895 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6896 - propertyPath: m_Pivot.y  
6897 - value: .5  
6898 - objectReference: {fileID: 0}  
6899 - - target: {fileID: 172766, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6900 - propertyPath: m_Name  
6901 - value: Item (3)  
6902 - objectReference: {fileID: 0}  
6903 - m_RemovedComponents: []  
6904 - m_ParentPrefab: {fileID: 100100000, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
6905 - m_IsPrefabParent: 0  
6906 --- !u!1 &722322907 6722 --- !u!1 &722322907
6907 GameObject: 6723 GameObject:
6908 m_ObjectHideFlags: 0 6724 m_ObjectHideFlags: 0
@@ -7123,11 +6939,6 @@ CanvasRenderer: @@ -7123,11 +6939,6 @@ CanvasRenderer:
7123 type: 2} 6939 type: 2}
7124 m_PrefabInternal: {fileID: 0} 6940 m_PrefabInternal: {fileID: 0}
7125 m_GameObject: {fileID: 777615888} 6941 m_GameObject: {fileID: 777615888}
7126 ---- !u!224 &784832313 stripped  
7127 -RectTransform:  
7128 - m_PrefabParentObject: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51,  
7129 - type: 2}  
7130 - m_PrefabInternal: {fileID: 384237974}  
7131 --- !u!1 &791749485 6942 --- !u!1 &791749485
7132 GameObject: 6943 GameObject:
7133 m_ObjectHideFlags: 0 6944 m_ObjectHideFlags: 0
@@ -10488,11 +10299,6 @@ CanvasRenderer: @@ -10488,11 +10299,6 @@ CanvasRenderer:
10488 type: 2} 10299 type: 2}
10489 m_PrefabInternal: {fileID: 0} 10300 m_PrefabInternal: {fileID: 0}
10490 m_GameObject: {fileID: 1085840673} 10301 m_GameObject: {fileID: 1085840673}
10491 ---- !u!224 &1086267460 stripped  
10492 -RectTransform:  
10493 - m_PrefabParentObject: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51,  
10494 - type: 2}  
10495 - m_PrefabInternal: {fileID: 711789825}  
10496 --- !u!1 &1094177264 10302 --- !u!1 &1094177264
10497 GameObject: 10303 GameObject:
10498 m_ObjectHideFlags: 0 10304 m_ObjectHideFlags: 0
@@ -11113,7 +10919,6 @@ GameObject: @@ -11113,7 +10919,6 @@ GameObject:
11113 - 224: {fileID: 1136629774} 10919 - 224: {fileID: 1136629774}
11114 - 222: {fileID: 1136629777} 10920 - 222: {fileID: 1136629777}
11115 - 114: {fileID: 1136629776} 10921 - 114: {fileID: 1136629776}
11116 - - 114: {fileID: 1136629775}  
11117 m_Layer: 5 10922 m_Layer: 5
11118 m_Name: bar_bottom 10923 m_Name: bar_bottom
11119 m_TagString: Untagged 10924 m_TagString: Untagged
@@ -11140,18 +10945,6 @@ RectTransform: @@ -11140,18 +10945,6 @@ RectTransform:
11140 m_AnchoredPosition: {x: 0, y: 0} 10945 m_AnchoredPosition: {x: 0, y: 0}
11141 m_SizeDelta: {x: 0, y: 0} 10946 m_SizeDelta: {x: 0, y: 0}
11142 m_Pivot: {x: 1, y: 0} 10947 m_Pivot: {x: 1, y: 0}
11143 ---- !u!114 &1136629775  
11144 -MonoBehaviour:  
11145 - m_ObjectHideFlags: 0  
11146 - m_PrefabParentObject: {fileID: 0}  
11147 - m_PrefabInternal: {fileID: 0}  
11148 - m_GameObject: {fileID: 1136629773}  
11149 - m_Enabled: 1  
11150 - m_EditorHideFlags: 0  
11151 - m_Script: {fileID: 11500000, guid: cc684fd2c599912419e723a09bee71eb, type: 3}  
11152 - m_Name:  
11153 - m_EditorClassIdentifier:  
11154 - barBottomLayout: {fileID: 2045088299}  
11155 --- !u!114 &1136629776 10948 --- !u!114 &1136629776
11156 MonoBehaviour: 10949 MonoBehaviour:
11157 m_ObjectHideFlags: 0 10950 m_ObjectHideFlags: 0
@@ -13210,100 +13003,6 @@ CanvasRenderer: @@ -13210,100 +13003,6 @@ CanvasRenderer:
13210 type: 2} 13003 type: 2}
13211 m_PrefabInternal: {fileID: 0} 13004 m_PrefabInternal: {fileID: 0}
13212 m_GameObject: {fileID: 1295797750} 13005 m_GameObject: {fileID: 1295797750}
13213 ---- !u!1001 &1299486371  
13214 -Prefab:  
13215 - m_ObjectHideFlags: 0  
13216 - serializedVersion: 2  
13217 - m_Modification:  
13218 - m_TransformParent: {fileID: 1995982559}  
13219 - m_Modifications:  
13220 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13221 - propertyPath: m_LocalPosition.x  
13222 - value: 0  
13223 - objectReference: {fileID: 0}  
13224 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13225 - propertyPath: m_LocalPosition.y  
13226 - value: 0  
13227 - objectReference: {fileID: 0}  
13228 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13229 - propertyPath: m_LocalPosition.z  
13230 - value: 0  
13231 - objectReference: {fileID: 0}  
13232 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13233 - propertyPath: m_LocalRotation.x  
13234 - value: 0  
13235 - objectReference: {fileID: 0}  
13236 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13237 - propertyPath: m_LocalRotation.y  
13238 - value: 0  
13239 - objectReference: {fileID: 0}  
13240 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13241 - propertyPath: m_LocalRotation.z  
13242 - value: 0  
13243 - objectReference: {fileID: 0}  
13244 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13245 - propertyPath: m_LocalRotation.w  
13246 - value: 1  
13247 - objectReference: {fileID: 0}  
13248 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13249 - propertyPath: m_RootOrder  
13250 - value: 0  
13251 - objectReference: {fileID: 0}  
13252 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13253 - propertyPath: m_AnchoredPosition.x  
13254 - value: 0  
13255 - objectReference: {fileID: 0}  
13256 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13257 - propertyPath: m_AnchoredPosition.y  
13258 - value: 0  
13259 - objectReference: {fileID: 0}  
13260 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13261 - propertyPath: m_SizeDelta.x  
13262 - value: 0  
13263 - objectReference: {fileID: 0}  
13264 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13265 - propertyPath: m_SizeDelta.y  
13266 - value: 0  
13267 - objectReference: {fileID: 0}  
13268 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13269 - propertyPath: m_AnchorMin.x  
13270 - value: 0  
13271 - objectReference: {fileID: 0}  
13272 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13273 - propertyPath: m_AnchorMin.y  
13274 - value: 0  
13275 - objectReference: {fileID: 0}  
13276 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13277 - propertyPath: m_AnchorMax.x  
13278 - value: 0  
13279 - objectReference: {fileID: 0}  
13280 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13281 - propertyPath: m_AnchorMax.y  
13282 - value: 0  
13283 - objectReference: {fileID: 0}  
13284 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13285 - propertyPath: m_Pivot.x  
13286 - value: .5  
13287 - objectReference: {fileID: 0}  
13288 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13289 - propertyPath: m_Pivot.y  
13290 - value: .5  
13291 - objectReference: {fileID: 0}  
13292 - - target: {fileID: 11441238, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13293 - propertyPath: m_IgnoreLayout  
13294 - value: 0  
13295 - objectReference: {fileID: 0}  
13296 - - target: {fileID: 11441238, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13297 - propertyPath: m_MinHeight  
13298 - value: 36  
13299 - objectReference: {fileID: 0}  
13300 - - target: {fileID: 11441238, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13301 - propertyPath: m_PreferredWidth  
13302 - value: -1  
13303 - objectReference: {fileID: 0}  
13304 - m_RemovedComponents: []  
13305 - m_ParentPrefab: {fileID: 100100000, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
13306 - m_IsPrefabParent: 0  
13307 --- !u!1 &1327167212 13006 --- !u!1 &1327167212
13308 GameObject: 13007 GameObject:
13309 m_ObjectHideFlags: 0 13008 m_ObjectHideFlags: 0
@@ -17369,6 +17068,7 @@ GameObject: @@ -17369,6 +17068,7 @@ GameObject:
17369 - 114: {fileID: 1673087261} 17068 - 114: {fileID: 1673087261}
17370 - 222: {fileID: 1673087260} 17069 - 222: {fileID: 1673087260}
17371 - 114: {fileID: 1673087259} 17070 - 114: {fileID: 1673087259}
  17071 + - 114: {fileID: 1673087262}
17372 m_Layer: 5 17072 m_Layer: 5
17373 m_Name: bottom 17073 m_Name: bottom
17374 m_TagString: Untagged 17074 m_TagString: Untagged
@@ -17451,6 +17151,17 @@ MonoBehaviour: @@ -17451,6 +17151,17 @@ MonoBehaviour:
17451 m_Spacing: 32 17151 m_Spacing: 32
17452 m_ChildForceExpandWidth: 0 17152 m_ChildForceExpandWidth: 0
17453 m_ChildForceExpandHeight: 0 17153 m_ChildForceExpandHeight: 0
  17154 +--- !u!114 &1673087262
  17155 +MonoBehaviour:
  17156 + m_ObjectHideFlags: 0
  17157 + m_PrefabParentObject: {fileID: 0}
  17158 + m_PrefabInternal: {fileID: 0}
  17159 + m_GameObject: {fileID: 1673087257}
  17160 + m_Enabled: 1
  17161 + m_EditorHideFlags: 0
  17162 + m_Script: {fileID: 11500000, guid: cc684fd2c599912419e723a09bee71eb, type: 3}
  17163 + m_Name:
  17164 + m_EditorClassIdentifier:
17454 --- !u!1 &1682293818 17165 --- !u!1 &1682293818
17455 GameObject: 17166 GameObject:
17456 m_ObjectHideFlags: 0 17167 m_ObjectHideFlags: 0
@@ -17612,7 +17323,6 @@ GameObject: @@ -17612,7 +17323,6 @@ GameObject:
17612 - 224: {fileID: 1696360409} 17323 - 224: {fileID: 1696360409}
17613 - 222: {fileID: 1696360411} 17324 - 222: {fileID: 1696360411}
17614 - 114: {fileID: 1696360410} 17325 - 114: {fileID: 1696360410}
17615 - - 114: {fileID: 1696360412}  
17616 m_Layer: 5 17326 m_Layer: 5
17617 m_Name: i_bar 17327 m_Name: i_bar
17618 m_TagString: Untagged 17328 m_TagString: Untagged
@@ -17660,18 +17370,6 @@ CanvasRenderer: @@ -17660,18 +17370,6 @@ CanvasRenderer:
17660 type: 2} 17370 type: 2}
17661 m_PrefabInternal: {fileID: 0} 17371 m_PrefabInternal: {fileID: 0}
17662 m_GameObject: {fileID: 1696360408} 17372 m_GameObject: {fileID: 1696360408}
17663 ---- !u!114 &1696360412  
17664 -MonoBehaviour:  
17665 - m_ObjectHideFlags: 0  
17666 - m_PrefabParentObject: {fileID: 0}  
17667 - m_PrefabInternal: {fileID: 0}  
17668 - m_GameObject: {fileID: 1696360408}  
17669 - m_Enabled: 1  
17670 - m_EditorHideFlags: 0  
17671 - m_Script: {fileID: 11500000, guid: cc684fd2c599912419e723a09bee71eb, type: 3}  
17672 - m_Name:  
17673 - m_EditorClassIdentifier:  
17674 - barBottomLayout: {fileID: 1673087261}  
17675 --- !u!1 &1715340160 17373 --- !u!1 &1715340160
17676 GameObject: 17374 GameObject:
17677 m_ObjectHideFlags: 0 17375 m_ObjectHideFlags: 0
@@ -17942,96 +17640,6 @@ RectTransform: @@ -17942,96 +17640,6 @@ RectTransform:
17942 m_AnchoredPosition: {x: 0, y: 0} 17640 m_AnchoredPosition: {x: 0, y: 0}
17943 m_SizeDelta: {x: 100, y: 100} 17641 m_SizeDelta: {x: 100, y: 100}
17944 m_Pivot: {x: .5, y: .5} 17642 m_Pivot: {x: .5, y: .5}
17945 ---- !u!1001 &1728206558  
17946 -Prefab:  
17947 - m_ObjectHideFlags: 0  
17948 - serializedVersion: 2  
17949 - m_Modification:  
17950 - m_TransformParent: {fileID: 1995982559}  
17951 - m_Modifications:  
17952 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
17953 - propertyPath: m_LocalPosition.x  
17954 - value: 0  
17955 - objectReference: {fileID: 0}  
17956 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
17957 - propertyPath: m_LocalPosition.y  
17958 - value: 0  
17959 - objectReference: {fileID: 0}  
17960 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
17961 - propertyPath: m_LocalPosition.z  
17962 - value: 0  
17963 - objectReference: {fileID: 0}  
17964 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
17965 - propertyPath: m_LocalRotation.x  
17966 - value: 0  
17967 - objectReference: {fileID: 0}  
17968 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
17969 - propertyPath: m_LocalRotation.y  
17970 - value: 0  
17971 - objectReference: {fileID: 0}  
17972 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
17973 - propertyPath: m_LocalRotation.z  
17974 - value: 0  
17975 - objectReference: {fileID: 0}  
17976 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
17977 - propertyPath: m_LocalRotation.w  
17978 - value: 1  
17979 - objectReference: {fileID: 0}  
17980 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
17981 - propertyPath: m_RootOrder  
17982 - value: 2  
17983 - objectReference: {fileID: 0}  
17984 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
17985 - propertyPath: m_AnchoredPosition.x  
17986 - value: 0  
17987 - objectReference: {fileID: 0}  
17988 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
17989 - propertyPath: m_AnchoredPosition.y  
17990 - value: 0  
17991 - objectReference: {fileID: 0}  
17992 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
17993 - propertyPath: m_SizeDelta.x  
17994 - value: 0  
17995 - objectReference: {fileID: 0}  
17996 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
17997 - propertyPath: m_SizeDelta.y  
17998 - value: 0  
17999 - objectReference: {fileID: 0}  
18000 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
18001 - propertyPath: m_AnchorMin.x  
18002 - value: 0  
18003 - objectReference: {fileID: 0}  
18004 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
18005 - propertyPath: m_AnchorMin.y  
18006 - value: 0  
18007 - objectReference: {fileID: 0}  
18008 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
18009 - propertyPath: m_AnchorMax.x  
18010 - value: 0  
18011 - objectReference: {fileID: 0}  
18012 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
18013 - propertyPath: m_AnchorMax.y  
18014 - value: 0  
18015 - objectReference: {fileID: 0}  
18016 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
18017 - propertyPath: m_Pivot.x  
18018 - value: .5  
18019 - objectReference: {fileID: 0}  
18020 - - target: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
18021 - propertyPath: m_Pivot.y  
18022 - value: .5  
18023 - objectReference: {fileID: 0}  
18024 - - target: {fileID: 172766, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
18025 - propertyPath: m_Name  
18026 - value: Item (2)  
18027 - objectReference: {fileID: 0}  
18028 - - target: {fileID: 11441238, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
18029 - propertyPath: m_Enabled  
18030 - value: 1  
18031 - objectReference: {fileID: 0}  
18032 - m_RemovedComponents: []  
18033 - m_ParentPrefab: {fileID: 100100000, guid: 6f5a613f8640e6d4d814ee694f81bc51, type: 2}  
18034 - m_IsPrefabParent: 0  
18035 --- !u!1 &1728688478 17643 --- !u!1 &1728688478
18036 GameObject: 17644 GameObject:
18037 m_ObjectHideFlags: 0 17645 m_ObjectHideFlags: 0
@@ -19289,11 +18897,6 @@ CanvasRenderer: @@ -19289,11 +18897,6 @@ CanvasRenderer:
19289 type: 2} 18897 type: 2}
19290 m_PrefabInternal: {fileID: 0} 18898 m_PrefabInternal: {fileID: 0}
19291 m_GameObject: {fileID: 1800578777} 18899 m_GameObject: {fileID: 1800578777}
19292 ---- !u!224 &1804674360 stripped  
19293 -RectTransform:  
19294 - m_PrefabParentObject: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51,  
19295 - type: 2}  
19296 - m_PrefabInternal: {fileID: 1728206558}  
19297 --- !u!1 &1806492070 18900 --- !u!1 &1806492070
19298 GameObject: 18901 GameObject:
19299 m_ObjectHideFlags: 0 18902 m_ObjectHideFlags: 0
@@ -21143,11 +20746,7 @@ RectTransform: @@ -21143,11 +20746,7 @@ RectTransform:
21143 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} 20746 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
21144 m_LocalPosition: {x: 0, y: 0, z: 0} 20747 m_LocalPosition: {x: 0, y: 0, z: 0}
21145 m_LocalScale: {x: 1, y: 1, z: 1} 20748 m_LocalScale: {x: 1, y: 1, z: 1}
21146 - m_Children:  
21147 - - {fileID: 2038239531}  
21148 - - {fileID: 784832313}  
21149 - - {fileID: 1804674360}  
21150 - - {fileID: 1086267460} 20749 + m_Children: []
21151 m_Father: {fileID: 347446003} 20750 m_Father: {fileID: 347446003}
21152 m_RootOrder: 0 20751 m_RootOrder: 0
21153 m_AnchorMin: {x: 0, y: 1} 20752 m_AnchorMin: {x: 0, y: 1}
@@ -21523,11 +21122,6 @@ CanvasRenderer: @@ -21523,11 +21122,6 @@ CanvasRenderer:
21523 type: 2} 21122 type: 2}
21524 m_PrefabInternal: {fileID: 0} 21123 m_PrefabInternal: {fileID: 0}
21525 m_GameObject: {fileID: 2034820978} 21124 m_GameObject: {fileID: 2034820978}
21526 ---- !u!224 &2038239531 stripped  
21527 -RectTransform:  
21528 - m_PrefabParentObject: {fileID: 22472776, guid: 6f5a613f8640e6d4d814ee694f81bc51,  
21529 - type: 2}  
21530 - m_PrefabInternal: {fileID: 1299486371}  
21531 --- !u!1 &2045088295 21125 --- !u!1 &2045088295
21532 GameObject: 21126 GameObject:
21533 m_ObjectHideFlags: 0 21127 m_ObjectHideFlags: 0
@@ -21537,6 +21131,7 @@ GameObject: @@ -21537,6 +21131,7 @@ GameObject:
21537 m_Component: 21131 m_Component:
21538 - 224: {fileID: 2045088296} 21132 - 224: {fileID: 2045088296}
21539 - 114: {fileID: 2045088299} 21133 - 114: {fileID: 2045088299}
  21134 + - 114: {fileID: 2045088297}
21540 m_Layer: 5 21135 m_Layer: 5
21541 m_Name: group 21136 m_Name: group
21542 m_TagString: Untagged 21137 m_TagString: Untagged
@@ -21567,6 +21162,17 @@ RectTransform: @@ -21567,6 +21162,17 @@ RectTransform:
21567 m_AnchoredPosition: {x: 0, y: 0} 21162 m_AnchoredPosition: {x: 0, y: 0}
21568 m_SizeDelta: {x: 0, y: 0} 21163 m_SizeDelta: {x: 0, y: 0}
21569 m_Pivot: {x: .5, y: .5} 21164 m_Pivot: {x: .5, y: .5}
  21165 +--- !u!114 &2045088297
  21166 +MonoBehaviour:
  21167 + m_ObjectHideFlags: 0
  21168 + m_PrefabParentObject: {fileID: 0}
  21169 + m_PrefabInternal: {fileID: 0}
  21170 + m_GameObject: {fileID: 2045088295}
  21171 + m_Enabled: 1
  21172 + m_EditorHideFlags: 0
  21173 + m_Script: {fileID: 11500000, guid: cc684fd2c599912419e723a09bee71eb, type: 3}
  21174 + m_Name:
  21175 + m_EditorClassIdentifier:
21570 --- !u!114 &2045088299 21176 --- !u!114 &2045088299
21571 MonoBehaviour: 21177 MonoBehaviour:
21572 m_ObjectHideFlags: 0 21178 m_ObjectHideFlags: 0
Assets/Scripts/Animation List/ListManager.cs
  Diff comments   View file @470ec4e
@@ -35,6 +35,8 @@ public class ListManager : MonoBehaviour { @@ -35,6 +35,8 @@ public class ListManager : MonoBehaviour {
35 private bool isLoading = false; 35 private bool isLoading = false;
36 private GameObject loadingItem; 36 private GameObject loadingItem;
37 37
  38 + private float itemHeight = 30F;
  39 +
38 TrieST<string> trie; 40 TrieST<string> trie;
39 41
40 void Start() 42 void Start()
@@ -49,7 +51,7 @@ public class ListManager : MonoBehaviour { @@ -49,7 +51,7 @@ public class ListManager : MonoBehaviour {
49 StreamReader s = new StreamReader(Application.dataPath + "/sinais.txt"); 51 StreamReader s = new StreamReader(Application.dataPath + "/sinais.txt");
50 52
51 if (!s.EndOfStream) s.ReadLine(); 53 if (!s.EndOfStream) s.ReadLine();
52 - 54 +
53 while (!s.EndOfStream) 55 while (!s.EndOfStream)
54 { 56 {
55 string word = s.ReadLine(); 57 string word = s.ReadLine();
@@ -63,6 +65,21 @@ public class ListManager : MonoBehaviour { @@ -63,6 +65,21 @@ public class ListManager : MonoBehaviour {
63 65
64 this.loadingItem = Instantiate (sampleLoadingItemObject) as GameObject; 66 this.loadingItem = Instantiate (sampleLoadingItemObject) as GameObject;
65 67
  68 + if (Screen.dpi < 140)
  69 + this.itemHeight = 36;
  70 +
  71 + else if (Screen.dpi < 280)
  72 + this.itemHeight = 46;
  73 +
  74 + else if (Screen.dpi < 400)
  75 + this.itemHeight = 56;
  76 +
  77 + else if (Screen.dpi < 500)
  78 + this.itemHeight = 66;
  79 +
  80 + else
  81 + this.itemHeight = 56;
  82 +
66 StartCoroutine("populateList"); 83 StartCoroutine("populateList");
67 } 84 }
68 85
@@ -81,7 +98,7 @@ public class ListManager : MonoBehaviour { @@ -81,7 +98,7 @@ public class ListManager : MonoBehaviour {
81 this.contentPanel.DetachChildren(); 98 this.contentPanel.DetachChildren();
82 foreach(GameObject go in GameObject.FindGameObjectsWithTag("clone")) 99 foreach(GameObject go in GameObject.FindGameObjectsWithTag("clone"))
83 Destroy(go); 100 Destroy(go);
84 - 101 +
85 StartCoroutine("populateList"); 102 StartCoroutine("populateList");
86 } 103 }
87 104
@@ -97,10 +114,13 @@ public class ListManager : MonoBehaviour { @@ -97,10 +114,13 @@ public class ListManager : MonoBehaviour {
97 { 114 {
98 string item = itemList[i]; 115 string item = itemList[i];
99 116
100 - GameObject newButton = Instantiate (sampleItemObject) as GameObject;  
101 - SampleItem sampleItem = newButton.GetComponent<SampleItem>(); 117 + GameObject newItem = Instantiate (sampleItemObject) as GameObject;
  118 + SampleItem sampleItem = newItem.GetComponent<SampleItem>();
102 sampleItem.title.text = item; 119 sampleItem.title.text = item;
103 120
  121 + LayoutElement le = newItem.GetComponent<LayoutElement>();
  122 + le.minHeight = this.itemHeight;
  123 +
104 sampleItem.GetComponent<Button>().onClick.AddListener( 124 sampleItem.GetComponent<Button>().onClick.AddListener(
105 delegate { 125 delegate {
106 listBlock.SetActive(false); 126 listBlock.SetActive(false);
@@ -108,12 +128,15 @@ public class ListManager : MonoBehaviour { @@ -108,12 +128,15 @@ public class ListManager : MonoBehaviour {
108 } 128 }
109 ); 129 );
110 130
111 - newButton.transform.SetParent(contentPanel);  
112 - //newButton.transform.SetAsFirstSibling(); 131 + if (contentPanel.childCount == 0)
  132 + newItem.transform.GetChild(1).gameObject.SetActive(false);
  133 +
  134 + newItem.transform.SetParent(contentPanel);
  135 + //newItem.transform.SetAsFirstSibling();
113 } 136 }
114 137
115 this.index = last; 138 this.index = last;
116 - 139 +
117 changeLoadingState(false); 140 changeLoadingState(false);
118 } 141 }
119 142
@@ -131,7 +154,10 @@ public class ListManager : MonoBehaviour { @@ -131,7 +154,10 @@ public class ListManager : MonoBehaviour {
131 { 154 {
132 this.loadingItem.transform.SetParent(active ? contentPanel : null); 155 this.loadingItem.transform.SetParent(active ? contentPanel : null);
133 this.isLoading = active; 156 this.isLoading = active;
  157 +
  158 + if ( ! active && contentPanel.childCount > 0)
  159 + contentPanel.GetChild(0).GetChild(1).gameObject.SetActive(false);
134 } 160 }
135 } 161 }
136 - 162 +
137 } 163 }
Assets/Scripts/Animation List/TrieST.cs
  Diff comments   View file @470ec4e
@@ -8,10 +8,10 @@ public class TrieST&lt;Value&gt; @@ -8,10 +8,10 @@ public class TrieST&lt;Value&gt;
8 private static int R = 42; 8 private static int R = 42;
9 private static char[] chars = { 9 private static char[] chars = {
10 ' ', '-', '(', ')', ',', '%', 10 ' ', '-', '(', ')', ',', '%',
  11 + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
11 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 12 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
12 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 13 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
13 - 'U', 'V', 'W', 'X', 'Y', 'Z',  
14 - '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' 14 + 'U', 'V', 'W', 'X', 'Y', 'Z'
15 }; 15 };
16 private static int[] indexes = new int[256]; 16 private static int[] indexes = new int[256];
17 17
Assets/Scripts/UI/BarResizer.cs
  Diff comments   View file @470ec4e
@@ -3,19 +3,19 @@ using UnityEngine.UI; @@ -3,19 +3,19 @@ using UnityEngine.UI;
3 3
4 public class BarResizer : MonoBehaviour { 4 public class BarResizer : MonoBehaviour {
5 5
6 - public HorizontalLayoutGroup barBottomLayout;  
7 -  
8 protected void Start () 6 protected void Start ()
9 { 7 {
  8 + HorizontalLayoutGroup barBottomLayout = gameObject.GetComponent<HorizontalLayoutGroup>();
  9 +
10 if (Screen.dpi < 140) 10 if (Screen.dpi < 140)
11 { 11 {
12 - barBottomLayout.spacing = 26; 12 + barBottomLayout.spacing = 22;
13 } 13 }
14 14
15 // 240 15 // 240
16 else if (Screen.dpi < 280) 16 else if (Screen.dpi < 280)
17 { 17 {
18 - barBottomLayout.spacing = 40; 18 + barBottomLayout.spacing = 44;
19 } 19 }
20 20
21 // 320 21 // 320
@@ -27,12 +27,12 @@ public class BarResizer : MonoBehaviour { @@ -27,12 +27,12 @@ public class BarResizer : MonoBehaviour {
27 // 480 27 // 480
28 else if (Screen.dpi < 500) 28 else if (Screen.dpi < 500)
29 { 29 {
30 - barBottomLayout.spacing = 98; 30 + barBottomLayout.spacing = 92;
31 } 31 }
32 32
33 else 33 else
34 { 34 {
35 - barBottomLayout.spacing = 120; 35 + barBottomLayout.spacing = 80;
36 } 36 }
37 } 37 }
38 38
Assets/Scripts/UI/BarResizer.cs.meta
  Diff comments   View file @470ec4e
1 fileFormatVersion: 2 1 fileFormatVersion: 2
2 guid: cc684fd2c599912419e723a09bee71eb 2 guid: cc684fd2c599912419e723a09bee71eb
3 -timeCreated: 1454353356 3 +timeCreated: 1455229603
4 licenseType: Pro 4 licenseType: Pro
5 MonoImporter: 5 MonoImporter:
6 serializedVersion: 2 6 serializedVersion: 2
Assets/Scripts/UI/UIManager.cs
View file @15b117f
@@ -1,39 +0,0 @@ @@ -1,39 +0,0 @@
1 -using UnityEngine;  
2 -using UnityEngine.UI;  
3 -  
4 -public class UIManager : MonoBehaviour {  
5 -  
6 - public HorizontalLayoutGroup barBottomLayout;  
7 -  
8 - protected void Start ()  
9 - {  
10 - if (Screen.dpi < 140)  
11 - {  
12 - barBottomLayout.spacing = 22;  
13 - }  
14 -  
15 - // 240  
16 - else if (Screen.dpi < 280)  
17 - {  
18 - barBottomLayout.spacing = 44;  
19 - }  
20 -  
21 - // 320  
22 - else if (Screen.dpi < 400)  
23 - {  
24 - barBottomLayout.spacing = 80;  
25 - }  
26 -  
27 - // 480  
28 - else if (Screen.dpi < 500)  
29 - {  
30 - barBottomLayout.spacing = 92;  
31 - }  
32 -  
33 - else  
34 - {  
35 - barBottomLayout.spacing = 80;  
36 - }  
37 - }  
38 -  
39 -}  
Assets/Scripts/UI/UIManager.cs.meta
View file @15b117f
@@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
1 -fileFormatVersion: 2  
2 -guid: 677e62f6b9b0cb442a0d7b89c060001e  
3 -timeCreated: 1442609163  
4 -licenseType: Pro  
5 -MonoImporter:  
6 - serializedVersion: 2  
7 - defaultReferences: []  
8 - executionOrder: 0  
9 - icon: {instanceID: 0}  
10 - userData:  
11 - assetBundleName:  
12 - assetBundleVariant: