Commit 470ec4eed70a5a31b1b247db32c47e2765e853b8
1 parent
15b117f4
Exists in
master
and in
7 other branches
Lista terminada
Showing
7 changed files
with
68 additions
and
487 deletions
Show diff stats
Assets/Scenes/Main.unity
| ... | ... | @@ -3480,104 +3480,6 @@ CanvasRenderer: |
| 3480 | 3480 | type: 2} |
| 3481 | 3481 | m_PrefabInternal: {fileID: 0} |
| 3482 | 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 | 3483 | --- !u!1 &391013456 |
| 3582 | 3484 | GameObject: |
| 3583 | 3485 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -6817,92 +6719,6 @@ RectTransform: |
| 6817 | 6719 | m_AnchoredPosition: {x: -5, y: 0} |
| 6818 | 6720 | m_SizeDelta: {x: -20, y: 0} |
| 6819 | 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 | 6722 | --- !u!1 &722322907 |
| 6907 | 6723 | GameObject: |
| 6908 | 6724 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -7123,11 +6939,6 @@ CanvasRenderer: |
| 7123 | 6939 | type: 2} |
| 7124 | 6940 | m_PrefabInternal: {fileID: 0} |
| 7125 | 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 | 6942 | --- !u!1 &791749485 |
| 7132 | 6943 | GameObject: |
| 7133 | 6944 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -10488,11 +10299,6 @@ CanvasRenderer: |
| 10488 | 10299 | type: 2} |
| 10489 | 10300 | m_PrefabInternal: {fileID: 0} |
| 10490 | 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 | 10302 | --- !u!1 &1094177264 |
| 10497 | 10303 | GameObject: |
| 10498 | 10304 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -11113,7 +10919,6 @@ GameObject: |
| 11113 | 10919 | - 224: {fileID: 1136629774} |
| 11114 | 10920 | - 222: {fileID: 1136629777} |
| 11115 | 10921 | - 114: {fileID: 1136629776} |
| 11116 | - - 114: {fileID: 1136629775} | |
| 11117 | 10922 | m_Layer: 5 |
| 11118 | 10923 | m_Name: bar_bottom |
| 11119 | 10924 | m_TagString: Untagged |
| ... | ... | @@ -11140,18 +10945,6 @@ RectTransform: |
| 11140 | 10945 | m_AnchoredPosition: {x: 0, y: 0} |
| 11141 | 10946 | m_SizeDelta: {x: 0, y: 0} |
| 11142 | 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 | 10948 | --- !u!114 &1136629776 |
| 11156 | 10949 | MonoBehaviour: |
| 11157 | 10950 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -13210,100 +13003,6 @@ CanvasRenderer: |
| 13210 | 13003 | type: 2} |
| 13211 | 13004 | m_PrefabInternal: {fileID: 0} |
| 13212 | 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 | 13006 | --- !u!1 &1327167212 |
| 13308 | 13007 | GameObject: |
| 13309 | 13008 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -17369,6 +17068,7 @@ GameObject: |
| 17369 | 17068 | - 114: {fileID: 1673087261} |
| 17370 | 17069 | - 222: {fileID: 1673087260} |
| 17371 | 17070 | - 114: {fileID: 1673087259} |
| 17071 | + - 114: {fileID: 1673087262} | |
| 17372 | 17072 | m_Layer: 5 |
| 17373 | 17073 | m_Name: bottom |
| 17374 | 17074 | m_TagString: Untagged |
| ... | ... | @@ -17451,6 +17151,17 @@ MonoBehaviour: |
| 17451 | 17151 | m_Spacing: 32 |
| 17452 | 17152 | m_ChildForceExpandWidth: 0 |
| 17453 | 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 | 17165 | --- !u!1 &1682293818 |
| 17455 | 17166 | GameObject: |
| 17456 | 17167 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -17612,7 +17323,6 @@ GameObject: |
| 17612 | 17323 | - 224: {fileID: 1696360409} |
| 17613 | 17324 | - 222: {fileID: 1696360411} |
| 17614 | 17325 | - 114: {fileID: 1696360410} |
| 17615 | - - 114: {fileID: 1696360412} | |
| 17616 | 17326 | m_Layer: 5 |
| 17617 | 17327 | m_Name: i_bar |
| 17618 | 17328 | m_TagString: Untagged |
| ... | ... | @@ -17660,18 +17370,6 @@ CanvasRenderer: |
| 17660 | 17370 | type: 2} |
| 17661 | 17371 | m_PrefabInternal: {fileID: 0} |
| 17662 | 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 | 17373 | --- !u!1 &1715340160 |
| 17676 | 17374 | GameObject: |
| 17677 | 17375 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -17942,96 +17640,6 @@ RectTransform: |
| 17942 | 17640 | m_AnchoredPosition: {x: 0, y: 0} |
| 17943 | 17641 | m_SizeDelta: {x: 100, y: 100} |
| 17944 | 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 | 17643 | --- !u!1 &1728688478 |
| 18036 | 17644 | GameObject: |
| 18037 | 17645 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -19289,11 +18897,6 @@ CanvasRenderer: |
| 19289 | 18897 | type: 2} |
| 19290 | 18898 | m_PrefabInternal: {fileID: 0} |
| 19291 | 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 | 18900 | --- !u!1 &1806492070 |
| 19298 | 18901 | GameObject: |
| 19299 | 18902 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -21143,11 +20746,7 @@ RectTransform: |
| 21143 | 20746 | m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
| 21144 | 20747 | m_LocalPosition: {x: 0, y: 0, z: 0} |
| 21145 | 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 | 20750 | m_Father: {fileID: 347446003} |
| 21152 | 20751 | m_RootOrder: 0 |
| 21153 | 20752 | m_AnchorMin: {x: 0, y: 1} |
| ... | ... | @@ -21523,11 +21122,6 @@ CanvasRenderer: |
| 21523 | 21122 | type: 2} |
| 21524 | 21123 | m_PrefabInternal: {fileID: 0} |
| 21525 | 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 | 21125 | --- !u!1 &2045088295 |
| 21532 | 21126 | GameObject: |
| 21533 | 21127 | m_ObjectHideFlags: 0 |
| ... | ... | @@ -21537,6 +21131,7 @@ GameObject: |
| 21537 | 21131 | m_Component: |
| 21538 | 21132 | - 224: {fileID: 2045088296} |
| 21539 | 21133 | - 114: {fileID: 2045088299} |
| 21134 | + - 114: {fileID: 2045088297} | |
| 21540 | 21135 | m_Layer: 5 |
| 21541 | 21136 | m_Name: group |
| 21542 | 21137 | m_TagString: Untagged |
| ... | ... | @@ -21567,6 +21162,17 @@ RectTransform: |
| 21567 | 21162 | m_AnchoredPosition: {x: 0, y: 0} |
| 21568 | 21163 | m_SizeDelta: {x: 0, y: 0} |
| 21569 | 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 | 21176 | --- !u!114 &2045088299 |
| 21571 | 21177 | MonoBehaviour: |
| 21572 | 21178 | m_ObjectHideFlags: 0 | ... | ... |
Assets/Scripts/Animation List/ListManager.cs
| ... | ... | @@ -35,6 +35,8 @@ public class ListManager : MonoBehaviour { |
| 35 | 35 | private bool isLoading = false; |
| 36 | 36 | private GameObject loadingItem; |
| 37 | 37 | |
| 38 | + private float itemHeight = 30F; | |
| 39 | + | |
| 38 | 40 | TrieST<string> trie; |
| 39 | 41 | |
| 40 | 42 | void Start() |
| ... | ... | @@ -49,7 +51,7 @@ public class ListManager : MonoBehaviour { |
| 49 | 51 | StreamReader s = new StreamReader(Application.dataPath + "/sinais.txt"); |
| 50 | 52 | |
| 51 | 53 | if (!s.EndOfStream) s.ReadLine(); |
| 52 | - | |
| 54 | + | |
| 53 | 55 | while (!s.EndOfStream) |
| 54 | 56 | { |
| 55 | 57 | string word = s.ReadLine(); |
| ... | ... | @@ -63,6 +65,21 @@ public class ListManager : MonoBehaviour { |
| 63 | 65 | |
| 64 | 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 | 83 | StartCoroutine("populateList"); |
| 67 | 84 | } |
| 68 | 85 | |
| ... | ... | @@ -81,7 +98,7 @@ public class ListManager : MonoBehaviour { |
| 81 | 98 | this.contentPanel.DetachChildren(); |
| 82 | 99 | foreach(GameObject go in GameObject.FindGameObjectsWithTag("clone")) |
| 83 | 100 | Destroy(go); |
| 84 | - | |
| 101 | + | |
| 85 | 102 | StartCoroutine("populateList"); |
| 86 | 103 | } |
| 87 | 104 | |
| ... | ... | @@ -97,10 +114,13 @@ public class ListManager : MonoBehaviour { |
| 97 | 114 | { |
| 98 | 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 | 119 | sampleItem.title.text = item; |
| 103 | 120 | |
| 121 | + LayoutElement le = newItem.GetComponent<LayoutElement>(); | |
| 122 | + le.minHeight = this.itemHeight; | |
| 123 | + | |
| 104 | 124 | sampleItem.GetComponent<Button>().onClick.AddListener( |
| 105 | 125 | delegate { |
| 106 | 126 | listBlock.SetActive(false); |
| ... | ... | @@ -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 | 138 | this.index = last; |
| 116 | - | |
| 139 | + | |
| 117 | 140 | changeLoadingState(false); |
| 118 | 141 | } |
| 119 | 142 | |
| ... | ... | @@ -131,7 +154,10 @@ public class ListManager : MonoBehaviour { |
| 131 | 154 | { |
| 132 | 155 | this.loadingItem.transform.SetParent(active ? contentPanel : null); |
| 133 | 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
| ... | ... | @@ -8,10 +8,10 @@ public class TrieST<Value> |
| 8 | 8 | private static int R = 42; |
| 9 | 9 | private static char[] chars = { |
| 10 | 10 | ' ', '-', '(', ')', ',', '%', |
| 11 | + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', | |
| 11 | 12 | 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', |
| 12 | 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 | 16 | private static int[] indexes = new int[256]; |
| 17 | 17 | ... | ... |
Assets/Scripts/UI/BarResizer.cs
| ... | ... | @@ -3,19 +3,19 @@ using UnityEngine.UI; |
| 3 | 3 | |
| 4 | 4 | public class BarResizer : MonoBehaviour { |
| 5 | 5 | |
| 6 | - public HorizontalLayoutGroup barBottomLayout; | |
| 7 | - | |
| 8 | 6 | protected void Start () |
| 9 | 7 | { |
| 8 | + HorizontalLayoutGroup barBottomLayout = gameObject.GetComponent<HorizontalLayoutGroup>(); | |
| 9 | + | |
| 10 | 10 | if (Screen.dpi < 140) |
| 11 | 11 | { |
| 12 | - barBottomLayout.spacing = 26; | |
| 12 | + barBottomLayout.spacing = 22; | |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | // 240 |
| 16 | 16 | else if (Screen.dpi < 280) |
| 17 | 17 | { |
| 18 | - barBottomLayout.spacing = 40; | |
| 18 | + barBottomLayout.spacing = 44; | |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | // 320 |
| ... | ... | @@ -27,12 +27,12 @@ public class BarResizer : MonoBehaviour { |
| 27 | 27 | // 480 |
| 28 | 28 | else if (Screen.dpi < 500) |
| 29 | 29 | { |
| 30 | - barBottomLayout.spacing = 98; | |
| 30 | + barBottomLayout.spacing = 92; | |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | else |
| 34 | 34 | { |
| 35 | - barBottomLayout.spacing = 120; | |
| 35 | + barBottomLayout.spacing = 80; | |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | ... | ... |
Assets/Scripts/UI/BarResizer.cs.meta
Assets/Scripts/UI/UIManager.cs
| ... | ... | @@ -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
| ... | ... | @@ -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: |