Commit 5a1114fc79e9f42d0a5c9925239fb4e5803a1ffc
1 parent
1d0c633b
Exists in
master
and in
6 other branches
Novas funcoes para play; Arquivo sinais.txt pego do servidor; Correcao do icone …
…do dicionario na tela de tutorial; ...
Showing
5 changed files
with
278 additions
and
295 deletions
Show diff stats
Assets/Scenes/Main.unity
... | ... | @@ -119,7 +119,7 @@ RectTransform: |
119 | 119 | m_AnchorMin: {x: 0, y: 0} |
120 | 120 | m_AnchorMax: {x: 1, y: 0} |
121 | 121 | m_AnchoredPosition: {x: 0, y: 0} |
122 | - m_SizeDelta: {x: 0, y: 0} | |
122 | + m_SizeDelta: {x: 0, y: 88.85714} | |
123 | 123 | m_Pivot: {x: 1, y: 0} |
124 | 124 | --- !u!114 &2381751 |
125 | 125 | MonoBehaviour: |
... | ... | @@ -244,10 +244,10 @@ RectTransform: |
244 | 244 | m_Children: [] |
245 | 245 | m_Father: {fileID: 1558347736} |
246 | 246 | m_RootOrder: 2 |
247 | - m_AnchorMin: {x: 0, y: 0} | |
248 | - m_AnchorMax: {x: 0, y: 0} | |
249 | - m_AnchoredPosition: {x: 0, y: 0} | |
250 | - m_SizeDelta: {x: 0, y: 0} | |
247 | + m_AnchorMin: {x: 0, y: 1} | |
248 | + m_AnchorMax: {x: 0, y: 1} | |
249 | + m_AnchoredPosition: {x: 83.384995, y: -26.657143} | |
250 | + m_SizeDelta: {x: 27.589996, y: 43.314285} | |
251 | 251 | m_Pivot: {x: 0.5, y: 0.5} |
252 | 252 | --- !u!114 &12516339 |
253 | 253 | MonoBehaviour: |
... | ... | @@ -460,12 +460,12 @@ RectTransform: |
460 | 460 | m_LocalPosition: {x: 0, y: 0, z: 0} |
461 | 461 | m_LocalScale: {x: 1, y: 1, z: 1} |
462 | 462 | m_Children: [] |
463 | - m_Father: {fileID: 1798565573} | |
463 | + m_Father: {fileID: 1357627304} | |
464 | 464 | m_RootOrder: 0 |
465 | 465 | m_AnchorMin: {x: 0, y: 1} |
466 | 466 | m_AnchorMax: {x: 0, y: 1} |
467 | - m_AnchoredPosition: {x: 45.8, y: -29.657143} | |
468 | - m_SizeDelta: {x: 31.599998, y: 49.314285} | |
467 | + m_AnchoredPosition: {x: 13.235998, y: -26.657143} | |
468 | + m_SizeDelta: {x: 26.471996, y: 43.314285} | |
469 | 469 | m_Pivot: {x: 0.5, y: 0.5} |
470 | 470 | --- !u!114 &45157147 |
471 | 471 | MonoBehaviour: |
... | ... | @@ -1222,10 +1222,10 @@ RectTransform: |
1222 | 1222 | m_Children: [] |
1223 | 1223 | m_Father: {fileID: 1558347736} |
1224 | 1224 | m_RootOrder: 3 |
1225 | - m_AnchorMin: {x: 0, y: 0} | |
1226 | - m_AnchorMax: {x: 0, y: 0} | |
1227 | - m_AnchoredPosition: {x: 0, y: 0} | |
1228 | - m_SizeDelta: {x: 0, y: 0} | |
1225 | + m_AnchorMin: {x: 0, y: 1} | |
1226 | + m_AnchorMax: {x: 0, y: 1} | |
1227 | + m_AnchoredPosition: {x: 152.97499, y: -26.657143} | |
1228 | + m_SizeDelta: {x: 27.589996, y: 43.314285} | |
1229 | 1229 | m_Pivot: {x: 0.5, y: 0.5} |
1230 | 1230 | --- !u!114 &159189991 |
1231 | 1231 | MonoBehaviour: |
... | ... | @@ -2186,10 +2186,10 @@ RectTransform: |
2186 | 2186 | m_Children: [] |
2187 | 2187 | m_Father: {fileID: 1558347736} |
2188 | 2188 | m_RootOrder: 4 |
2189 | - m_AnchorMin: {x: 0, y: 0} | |
2190 | - m_AnchorMax: {x: 0, y: 0} | |
2191 | - m_AnchoredPosition: {x: 0, y: 0} | |
2192 | - m_SizeDelta: {x: 0, y: 0} | |
2189 | + m_AnchorMin: {x: 0, y: 1} | |
2190 | + m_AnchorMax: {x: 0, y: 1} | |
2191 | + m_AnchoredPosition: {x: 222.56499, y: -26.657143} | |
2192 | + m_SizeDelta: {x: 27.589996, y: 43.314285} | |
2193 | 2193 | m_Pivot: {x: 0.5, y: 0.5} |
2194 | 2194 | --- !u!114 &221470249 |
2195 | 2195 | MonoBehaviour: |
... | ... | @@ -3073,7 +3073,7 @@ RectTransform: |
3073 | 3073 | m_AnchorMin: {x: 0, y: 0} |
3074 | 3074 | m_AnchorMax: {x: 1, y: 0} |
3075 | 3075 | m_AnchoredPosition: {x: 0, y: 0} |
3076 | - m_SizeDelta: {x: 0, y: 0} | |
3076 | + m_SizeDelta: {x: 0, y: 79.74359} | |
3077 | 3077 | m_Pivot: {x: 1, y: 0} |
3078 | 3078 | --- !u!222 &302697591 |
3079 | 3079 | CanvasRenderer: |
... | ... | @@ -4051,7 +4051,7 @@ RectTransform: |
4051 | 4051 | m_AnchorMin: {x: 0, y: 0} |
4052 | 4052 | m_AnchorMax: {x: 1, y: 0} |
4053 | 4053 | m_AnchoredPosition: {x: 0, y: 0} |
4054 | - m_SizeDelta: {x: 0, y: 98.85714} | |
4054 | + m_SizeDelta: {x: 0, y: 88.85714} | |
4055 | 4055 | m_Pivot: {x: 1, y: 0} |
4056 | 4056 | --- !u!114 &389535984 |
4057 | 4057 | MonoBehaviour: |
... | ... | @@ -4103,12 +4103,12 @@ RectTransform: |
4103 | 4103 | m_LocalPosition: {x: 0, y: 0, z: 0} |
4104 | 4104 | m_LocalScale: {x: 1, y: 1, z: 1} |
4105 | 4105 | m_Children: [] |
4106 | - m_Father: {fileID: 1798565573} | |
4106 | + m_Father: {fileID: 1357627304} | |
4107 | 4107 | m_RootOrder: 2 |
4108 | 4108 | m_AnchorMin: {x: 0, y: 1} |
4109 | 4109 | m_AnchorMax: {x: 0, y: 1} |
4110 | - m_AnchoredPosition: {x: 173, y: -29.657143} | |
4111 | - m_SizeDelta: {x: 31.599998, y: 49.314285} | |
4110 | + m_AnchoredPosition: {x: 118.17999, y: -26.657143} | |
4111 | + m_SizeDelta: {x: 26.471996, y: 43.314285} | |
4112 | 4112 | m_Pivot: {x: 0.5, y: 0.5} |
4113 | 4113 | --- !u!114 &395548683 |
4114 | 4114 | MonoBehaviour: |
... | ... | @@ -4130,7 +4130,7 @@ MonoBehaviour: |
4130 | 4130 | m_Calls: [] |
4131 | 4131 | m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, |
4132 | 4132 | Version=1.0.0.0, Culture=neutral, PublicKeyToken=null |
4133 | - m_Sprite: {fileID: 21300000, guid: 9d4cc4cb9b7a7e44ab610fb91451883b, type: 3} | |
4133 | + m_Sprite: {fileID: 21300000, guid: 9b387c328ab4e4a4f8aca6779732d2d6, type: 3} | |
4134 | 4134 | m_Type: 0 |
4135 | 4135 | m_PreserveAspect: 1 |
4136 | 4136 | m_FillCenter: 1 |
... | ... | @@ -4676,10 +4676,10 @@ RectTransform: |
4676 | 4676 | m_Children: [] |
4677 | 4677 | m_Father: {fileID: 1558347736} |
4678 | 4678 | m_RootOrder: 0 |
4679 | - m_AnchorMin: {x: 0, y: 0} | |
4680 | - m_AnchorMax: {x: 0, y: 0} | |
4681 | - m_AnchoredPosition: {x: 0, y: 0} | |
4682 | - m_SizeDelta: {x: 0, y: 0} | |
4679 | + m_AnchorMin: {x: 0, y: 1} | |
4680 | + m_AnchorMax: {x: 0, y: 1} | |
4681 | + m_AnchoredPosition: {x: 13.794998, y: -26.657143} | |
4682 | + m_SizeDelta: {x: 27.589996, y: 43.314285} | |
4683 | 4683 | m_Pivot: {x: 0.5, y: 0.5} |
4684 | 4684 | --- !u!114 &477001116 |
4685 | 4685 | MonoBehaviour: |
... | ... | @@ -4820,7 +4820,7 @@ RectTransform: |
4820 | 4820 | m_AnchorMin: {x: 0.5, y: 0} |
4821 | 4821 | m_AnchorMax: {x: 0.5, y: 1} |
4822 | 4822 | m_AnchoredPosition: {x: 0, y: 0} |
4823 | - m_SizeDelta: {x: 27.012568, y: 0} | |
4823 | + m_SizeDelta: {x: 0, y: 0} | |
4824 | 4824 | m_Pivot: {x: 0.5, y: 0.5} |
4825 | 4825 | --- !u!114 &486636723 |
4826 | 4826 | MonoBehaviour: |
... | ... | @@ -5179,12 +5179,12 @@ RectTransform: |
5179 | 5179 | m_LocalPosition: {x: 0, y: 0, z: 0} |
5180 | 5180 | m_LocalScale: {x: 1, y: 1, z: 1} |
5181 | 5181 | m_Children: [] |
5182 | - m_Father: {fileID: 1798565573} | |
5182 | + m_Father: {fileID: 1357627304} | |
5183 | 5183 | m_RootOrder: 1 |
5184 | 5184 | m_AnchorMin: {x: 0, y: 1} |
5185 | 5185 | m_AnchorMax: {x: 0, y: 1} |
5186 | - m_AnchoredPosition: {x: 109.399994, y: -29.657143} | |
5187 | - m_SizeDelta: {x: 31.599998, y: 49.314285} | |
5186 | + m_AnchoredPosition: {x: 65.70799, y: -26.657143} | |
5187 | + m_SizeDelta: {x: 26.471996, y: 43.314285} | |
5188 | 5188 | m_Pivot: {x: 0.5, y: 0.5} |
5189 | 5189 | --- !u!114 &510126320 |
5190 | 5190 | MonoBehaviour: |
... | ... | @@ -6285,10 +6285,10 @@ RectTransform: |
6285 | 6285 | m_Children: [] |
6286 | 6286 | m_Father: {fileID: 702185295} |
6287 | 6287 | m_RootOrder: 5 |
6288 | - m_AnchorMin: {x: 0, y: 1} | |
6289 | - m_AnchorMax: {x: 0, y: 1} | |
6290 | - m_AnchoredPosition: {x: 223.12398, y: -26.657143} | |
6291 | - m_SizeDelta: {x: 26.471996, y: 43.314285} | |
6288 | + m_AnchorMin: {x: 0, y: 0} | |
6289 | + m_AnchorMax: {x: 0, y: 0} | |
6290 | + m_AnchoredPosition: {x: 0, y: 0} | |
6291 | + m_SizeDelta: {x: 0, y: 0} | |
6292 | 6292 | m_Pivot: {x: 0.5, y: 0.5} |
6293 | 6293 | --- !u!114 &582478960 |
6294 | 6294 | MonoBehaviour: |
... | ... | @@ -6409,7 +6409,7 @@ RectTransform: |
6409 | 6409 | m_Father: {fileID: 342633403} |
6410 | 6410 | m_RootOrder: 0 |
6411 | 6411 | m_AnchorMin: {x: 0, y: 0} |
6412 | - m_AnchorMax: {x: 0.5, y: 1} | |
6412 | + m_AnchorMax: {x: 0, y: 0} | |
6413 | 6413 | m_AnchoredPosition: {x: 0, y: 0} |
6414 | 6414 | m_SizeDelta: {x: 10, y: -1.9} |
6415 | 6415 | m_Pivot: {x: 0.5, y: 0.5} |
... | ... | @@ -6514,7 +6514,7 @@ RectTransform: |
6514 | 6514 | m_AnchorMin: {x: 0.1, y: 0.5} |
6515 | 6515 | m_AnchorMax: {x: 0.5, y: 1} |
6516 | 6516 | m_AnchoredPosition: {x: 0, y: 0} |
6517 | - m_SizeDelta: {x: 0, y: -31.450012} | |
6517 | + m_SizeDelta: {x: 0, y: -35.674988} | |
6518 | 6518 | m_Pivot: {x: 0.5, y: 1} |
6519 | 6519 | --- !u!114 &613136922 |
6520 | 6520 | MonoBehaviour: |
... | ... | @@ -6558,12 +6558,12 @@ RectTransform: |
6558 | 6558 | m_LocalPosition: {x: 0, y: 0, z: 0} |
6559 | 6559 | m_LocalScale: {x: 1, y: 1, z: 1} |
6560 | 6560 | m_Children: [] |
6561 | - m_Father: {fileID: 1798565573} | |
6561 | + m_Father: {fileID: 1357627304} | |
6562 | 6562 | m_RootOrder: 3 |
6563 | 6563 | m_AnchorMin: {x: 0, y: 1} |
6564 | 6564 | m_AnchorMax: {x: 0, y: 1} |
6565 | - m_AnchoredPosition: {x: 236.59999, y: -29.657143} | |
6566 | - m_SizeDelta: {x: 31.599998, y: 49.314285} | |
6565 | + m_AnchoredPosition: {x: 170.65198, y: -26.657143} | |
6566 | + m_SizeDelta: {x: 26.471996, y: 43.314285} | |
6567 | 6567 | m_Pivot: {x: 0.5, y: 0.5} |
6568 | 6568 | --- !u!114 &630366172 |
6569 | 6569 | MonoBehaviour: |
... | ... | @@ -8123,9 +8123,9 @@ RectTransform: |
8123 | 8123 | m_Father: {fileID: 861767965} |
8124 | 8124 | m_RootOrder: 0 |
8125 | 8125 | m_AnchorMin: {x: 0, y: 1} |
8126 | - m_AnchorMax: {x: 1, y: 1.7} | |
8126 | + m_AnchorMax: {x: 1, y: 1.6} | |
8127 | 8127 | m_AnchoredPosition: {x: -10, y: 10} |
8128 | - m_SizeDelta: {x: -225.20001, y: -10} | |
8128 | + m_SizeDelta: {x: -267.6857, y: -10} | |
8129 | 8129 | m_Pivot: {x: 1, y: 0} |
8130 | 8130 | --- !u!114 &813876603 |
8131 | 8131 | MonoBehaviour: |
... | ... | @@ -8153,7 +8153,7 @@ MonoBehaviour: |
8153 | 8153 | m_Name: |
8154 | 8154 | m_EditorClassIdentifier: |
8155 | 8155 | m_Material: {fileID: 0} |
8156 | - m_Color: {r: 0, g: 0, b: 0, a: 0.416} | |
8156 | + m_Color: {r: 0, g: 0, b: 0, a: 0.159} | |
8157 | 8157 | m_RaycastTarget: 1 |
8158 | 8158 | m_OnCullStateChanged: |
8159 | 8159 | m_PersistentCalls: |
... | ... | @@ -8888,7 +8888,7 @@ RectTransform: |
8888 | 8888 | m_AnchorMin: {x: 0, y: 0} |
8889 | 8889 | m_AnchorMax: {x: 1, y: 0} |
8890 | 8890 | m_AnchoredPosition: {x: 0, y: 0} |
8891 | - m_SizeDelta: {x: 0, y: 76.85714} | |
8891 | + m_SizeDelta: {x: 0, y: 88.85714} | |
8892 | 8892 | m_Pivot: {x: 1, y: 0} |
8893 | 8893 | --- !u!114 &861767966 |
8894 | 8894 | MonoBehaviour: |
... | ... | @@ -9593,10 +9593,10 @@ RectTransform: |
9593 | 9593 | m_Children: [] |
9594 | 9594 | m_Father: {fileID: 702185295} |
9595 | 9595 | m_RootOrder: 0 |
9596 | - m_AnchorMin: {x: 0, y: 1} | |
9597 | - m_AnchorMax: {x: 0, y: 1} | |
9598 | - m_AnchoredPosition: {x: 13.235998, y: -26.657143} | |
9599 | - m_SizeDelta: {x: 26.471996, y: 43.314285} | |
9596 | + m_AnchorMin: {x: 0, y: 0} | |
9597 | + m_AnchorMax: {x: 0, y: 0} | |
9598 | + m_AnchoredPosition: {x: 0, y: 0} | |
9599 | + m_SizeDelta: {x: 0, y: 0} | |
9600 | 9600 | m_Pivot: {x: 0.5, y: 0.5} |
9601 | 9601 | --- !u!114 &930426944 |
9602 | 9602 | MonoBehaviour: |
... | ... | @@ -10042,7 +10042,7 @@ RectTransform: |
10042 | 10042 | m_AnchorMin: {x: 0, y: 0} |
10043 | 10043 | m_AnchorMax: {x: 1, y: 0} |
10044 | 10044 | m_AnchoredPosition: {x: 0, y: 0} |
10045 | - m_SizeDelta: {x: 0, y: 88.85714} | |
10045 | + m_SizeDelta: {x: 0, y: 0} | |
10046 | 10046 | m_Pivot: {x: 1, y: 0} |
10047 | 10047 | --- !u!114 &954173494 |
10048 | 10048 | MonoBehaviour: |
... | ... | @@ -10465,10 +10465,10 @@ RectTransform: |
10465 | 10465 | m_Children: [] |
10466 | 10466 | m_Father: {fileID: 702185295} |
10467 | 10467 | m_RootOrder: 3 |
10468 | - m_AnchorMin: {x: 0, y: 1} | |
10469 | - m_AnchorMax: {x: 0, y: 1} | |
10470 | - m_AnchoredPosition: {x: 118.17999, y: -26.657143} | |
10471 | - m_SizeDelta: {x: 26.471996, y: 43.314285} | |
10468 | + m_AnchorMin: {x: 0, y: 0} | |
10469 | + m_AnchorMax: {x: 0, y: 0} | |
10470 | + m_AnchoredPosition: {x: 0, y: 0} | |
10471 | + m_SizeDelta: {x: 0, y: 0} | |
10472 | 10472 | m_Pivot: {x: 0.5, y: 0.5} |
10473 | 10473 | --- !u!114 &1021427529 |
10474 | 10474 | MonoBehaviour: |
... | ... | @@ -10886,12 +10886,12 @@ RectTransform: |
10886 | 10886 | m_LocalPosition: {x: 0, y: 0, z: 0} |
10887 | 10887 | m_LocalScale: {x: 1, y: 1, z: 1} |
10888 | 10888 | m_Children: [] |
10889 | - m_Father: {fileID: 1798565573} | |
10889 | + m_Father: {fileID: 1357627304} | |
10890 | 10890 | m_RootOrder: 4 |
10891 | 10891 | m_AnchorMin: {x: 0, y: 1} |
10892 | 10892 | m_AnchorMax: {x: 0, y: 1} |
10893 | - m_AnchoredPosition: {x: 300.19998, y: -29.657143} | |
10894 | - m_SizeDelta: {x: 31.599998, y: 49.314285} | |
10893 | + m_AnchoredPosition: {x: 223.12398, y: -26.657143} | |
10894 | + m_SizeDelta: {x: 26.471996, y: 43.314285} | |
10895 | 10895 | m_Pivot: {x: 0.5, y: 0.5} |
10896 | 10896 | --- !u!114 &1048863674 |
10897 | 10897 | MonoBehaviour: |
... | ... | @@ -13467,6 +13467,76 @@ CanvasRenderer: |
13467 | 13467 | m_PrefabParentObject: {fileID: 0} |
13468 | 13468 | m_PrefabInternal: {fileID: 0} |
13469 | 13469 | m_GameObject: {fileID: 1357009035} |
13470 | +--- !u!1 &1357627303 | |
13471 | +GameObject: | |
13472 | + m_ObjectHideFlags: 0 | |
13473 | + m_PrefabParentObject: {fileID: 0} | |
13474 | + m_PrefabInternal: {fileID: 0} | |
13475 | + serializedVersion: 4 | |
13476 | + m_Component: | |
13477 | + - 224: {fileID: 1357627304} | |
13478 | + - 114: {fileID: 1357627306} | |
13479 | + - 114: {fileID: 1357627305} | |
13480 | + m_Layer: 5 | |
13481 | + m_Name: group | |
13482 | + m_TagString: Untagged | |
13483 | + m_Icon: {fileID: 0} | |
13484 | + m_NavMeshLayer: 0 | |
13485 | + m_StaticEditorFlags: 0 | |
13486 | + m_IsActive: 1 | |
13487 | +--- !u!224 &1357627304 | |
13488 | +RectTransform: | |
13489 | + m_ObjectHideFlags: 0 | |
13490 | + m_PrefabParentObject: {fileID: 0} | |
13491 | + m_PrefabInternal: {fileID: 0} | |
13492 | + m_GameObject: {fileID: 1357627303} | |
13493 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | |
13494 | + m_LocalPosition: {x: 0, y: 0, z: 0} | |
13495 | + m_LocalScale: {x: 1, y: 1, z: 1} | |
13496 | + m_Children: | |
13497 | + - {fileID: 45157146} | |
13498 | + - {fileID: 510126319} | |
13499 | + - {fileID: 395548682} | |
13500 | + - {fileID: 630366171} | |
13501 | + - {fileID: 1048863673} | |
13502 | + m_Father: {fileID: 1798565573} | |
13503 | + m_RootOrder: 0 | |
13504 | + m_AnchorMin: {x: 0.12, y: 0} | |
13505 | + m_AnchorMax: {x: 0.88, y: 1} | |
13506 | + m_AnchoredPosition: {x: 0, y: 0} | |
13507 | + m_SizeDelta: {x: 0, y: 0} | |
13508 | + m_Pivot: {x: 0.5, y: 0.5} | |
13509 | +--- !u!114 &1357627305 | |
13510 | +MonoBehaviour: | |
13511 | + m_ObjectHideFlags: 0 | |
13512 | + m_PrefabParentObject: {fileID: 0} | |
13513 | + m_PrefabInternal: {fileID: 0} | |
13514 | + m_GameObject: {fileID: 1357627303} | |
13515 | + m_Enabled: 1 | |
13516 | + m_EditorHideFlags: 0 | |
13517 | + m_Script: {fileID: 11500000, guid: cc684fd2c599912419e723a09bee71eb, type: 3} | |
13518 | + m_Name: | |
13519 | + m_EditorClassIdentifier: | |
13520 | +--- !u!114 &1357627306 | |
13521 | +MonoBehaviour: | |
13522 | + m_ObjectHideFlags: 0 | |
13523 | + m_PrefabParentObject: {fileID: 0} | |
13524 | + m_PrefabInternal: {fileID: 0} | |
13525 | + m_GameObject: {fileID: 1357627303} | |
13526 | + m_Enabled: 1 | |
13527 | + m_EditorHideFlags: 0 | |
13528 | + m_Script: {fileID: -405508275, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | |
13529 | + m_Name: | |
13530 | + m_EditorClassIdentifier: | |
13531 | + m_Padding: | |
13532 | + m_Left: 0 | |
13533 | + m_Right: 0 | |
13534 | + m_Top: 5 | |
13535 | + m_Bottom: 5 | |
13536 | + m_ChildAlignment: 4 | |
13537 | + m_Spacing: 26 | |
13538 | + m_ChildForceExpandWidth: 0 | |
13539 | + m_ChildForceExpandHeight: 0 | |
13470 | 13540 | --- !u!1 &1361202118 |
13471 | 13541 | GameObject: |
13472 | 13542 | m_ObjectHideFlags: 0 |
... | ... | @@ -13870,7 +13940,7 @@ RectTransform: |
13870 | 13940 | m_AnchorMin: {x: 0, y: 0} |
13871 | 13941 | m_AnchorMax: {x: 1, y: 0} |
13872 | 13942 | m_AnchoredPosition: {x: 0, y: 0} |
13873 | - m_SizeDelta: {x: 0, y: 0} | |
13943 | + m_SizeDelta: {x: 0, y: 88.85714} | |
13874 | 13944 | m_Pivot: {x: 1, y: 0} |
13875 | 13945 | --- !u!114 &1388025417 |
13876 | 13946 | MonoBehaviour: |
... | ... | @@ -14081,7 +14151,7 @@ GameObject: |
14081 | 14151 | m_Icon: {fileID: 0} |
14082 | 14152 | m_NavMeshLayer: 0 |
14083 | 14153 | m_StaticEditorFlags: 0 |
14084 | - m_IsActive: 0 | |
14154 | + m_IsActive: 1 | |
14085 | 14155 | --- !u!224 &1414104007 |
14086 | 14156 | RectTransform: |
14087 | 14157 | m_ObjectHideFlags: 0 |
... | ... | @@ -14725,10 +14795,10 @@ RectTransform: |
14725 | 14795 | m_Children: [] |
14726 | 14796 | m_Father: {fileID: 702185295} |
14727 | 14797 | m_RootOrder: 4 |
14728 | - m_AnchorMin: {x: 0, y: 1} | |
14729 | - m_AnchorMax: {x: 0, y: 1} | |
14730 | - m_AnchoredPosition: {x: 170.65198, y: -26.657143} | |
14731 | - m_SizeDelta: {x: 26.471996, y: 43.314285} | |
14798 | + m_AnchorMin: {x: 0, y: 0} | |
14799 | + m_AnchorMax: {x: 0, y: 0} | |
14800 | + m_AnchoredPosition: {x: 0, y: 0} | |
14801 | + m_SizeDelta: {x: 0, y: 0} | |
14732 | 14802 | m_Pivot: {x: 0.5, y: 0.5} |
14733 | 14803 | --- !u!114 &1445490041 |
14734 | 14804 | MonoBehaviour: |
... | ... | @@ -15527,7 +15597,7 @@ RectTransform: |
15527 | 15597 | m_AnchorMin: {x: 0, y: 0} |
15528 | 15598 | m_AnchorMax: {x: 1, y: 0} |
15529 | 15599 | m_AnchoredPosition: {x: 0, y: 0} |
15530 | - m_SizeDelta: {x: 0, y: 79.74359} | |
15600 | + m_SizeDelta: {x: 0, y: 0} | |
15531 | 15601 | m_Pivot: {x: 1, y: 0} |
15532 | 15602 | --- !u!1 &1537204752 |
15533 | 15603 | GameObject: |
... | ... | @@ -15990,7 +16060,7 @@ RectTransform: |
15990 | 16060 | m_AnchorMin: {x: 0.5, y: 0} |
15991 | 16061 | m_AnchorMax: {x: 0.5, y: 1} |
15992 | 16062 | m_AnchoredPosition: {x: 0, y: 0} |
15993 | - m_SizeDelta: {x: 0, y: 0} | |
16063 | + m_SizeDelta: {x: 27.012568, y: 0} | |
15994 | 16064 | m_Pivot: {x: 0.5, y: 0.5} |
15995 | 16065 | --- !u!114 &1591478068 |
15996 | 16066 | MonoBehaviour: |
... | ... | @@ -17419,7 +17489,7 @@ RectTransform: |
17419 | 17489 | m_AnchorMin: {x: 0.5, y: 0.5} |
17420 | 17490 | m_AnchorMax: {x: 0.9, y: 1} |
17421 | 17491 | m_AnchoredPosition: {x: 0, y: 0} |
17422 | - m_SizeDelta: {x: 0, y: -31.450016} | |
17492 | + m_SizeDelta: {x: 0, y: -35.67499} | |
17423 | 17493 | m_Pivot: {x: 0.5, y: 1} |
17424 | 17494 | --- !u!114 &1763761725 |
17425 | 17495 | MonoBehaviour: |
... | ... | @@ -17710,10 +17780,8 @@ GameObject: |
17710 | 17780 | serializedVersion: 4 |
17711 | 17781 | m_Component: |
17712 | 17782 | - 224: {fileID: 1798565573} |
17713 | - - 114: {fileID: 1798565577} | |
17714 | 17783 | - 222: {fileID: 1798565576} |
17715 | 17784 | - 114: {fileID: 1798565575} |
17716 | - - 114: {fileID: 1798565574} | |
17717 | 17785 | m_Layer: 5 |
17718 | 17786 | m_Name: bottom |
17719 | 17787 | m_TagString: Untagged |
... | ... | @@ -17732,11 +17800,7 @@ RectTransform: |
17732 | 17800 | m_LocalPosition: {x: 0, y: 0, z: 0} |
17733 | 17801 | m_LocalScale: {x: 1, y: 1, z: 1} |
17734 | 17802 | m_Children: |
17735 | - - {fileID: 45157146} | |
17736 | - - {fileID: 510126319} | |
17737 | - - {fileID: 395548682} | |
17738 | - - {fileID: 630366171} | |
17739 | - - {fileID: 1048863673} | |
17803 | + - {fileID: 1357627304} | |
17740 | 17804 | m_Father: {fileID: 389535983} |
17741 | 17805 | m_RootOrder: 1 |
17742 | 17806 | m_AnchorMin: {x: 0, y: 0} |
... | ... | @@ -17744,18 +17808,6 @@ RectTransform: |
17744 | 17808 | m_AnchoredPosition: {x: 0, y: 0} |
17745 | 17809 | m_SizeDelta: {x: 0, y: 0} |
17746 | 17810 | m_Pivot: {x: 0.5, y: 0.5} |
17747 | ---- !u!114 &1798565574 | |
17748 | -MonoBehaviour: | |
17749 | - m_ObjectHideFlags: 0 | |
17750 | - m_PrefabParentObject: {fileID: 11459920, guid: 5ccb0ba277304a14b9bb8d4e34161675, | |
17751 | - type: 2} | |
17752 | - m_PrefabInternal: {fileID: 0} | |
17753 | - m_GameObject: {fileID: 1798565572} | |
17754 | - m_Enabled: 1 | |
17755 | - m_EditorHideFlags: 0 | |
17756 | - m_Script: {fileID: 11500000, guid: cc684fd2c599912419e723a09bee71eb, type: 3} | |
17757 | - m_Name: | |
17758 | - m_EditorClassIdentifier: | |
17759 | 17811 | --- !u!114 &1798565575 |
17760 | 17812 | MonoBehaviour: |
17761 | 17813 | m_ObjectHideFlags: 0 |
... | ... | @@ -17790,27 +17842,6 @@ CanvasRenderer: |
17790 | 17842 | type: 2} |
17791 | 17843 | m_PrefabInternal: {fileID: 0} |
17792 | 17844 | m_GameObject: {fileID: 1798565572} |
17793 | ---- !u!114 &1798565577 | |
17794 | -MonoBehaviour: | |
17795 | - m_ObjectHideFlags: 0 | |
17796 | - m_PrefabParentObject: {fileID: 11484352, guid: 5ccb0ba277304a14b9bb8d4e34161675, | |
17797 | - type: 2} | |
17798 | - m_PrefabInternal: {fileID: 0} | |
17799 | - m_GameObject: {fileID: 1798565572} | |
17800 | - m_Enabled: 1 | |
17801 | - m_EditorHideFlags: 0 | |
17802 | - m_Script: {fileID: -405508275, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | |
17803 | - m_Name: | |
17804 | - m_EditorClassIdentifier: | |
17805 | - m_Padding: | |
17806 | - m_Left: 30 | |
17807 | - m_Right: 30 | |
17808 | - m_Top: 5 | |
17809 | - m_Bottom: 5 | |
17810 | - m_ChildAlignment: 4 | |
17811 | - m_Spacing: 32 | |
17812 | - m_ChildForceExpandWidth: 0 | |
17813 | - m_ChildForceExpandHeight: 0 | |
17814 | 17845 | --- !u!1 &1803052181 |
17815 | 17846 | GameObject: |
17816 | 17847 | m_ObjectHideFlags: 0 |
... | ... | @@ -18464,7 +18495,7 @@ GameObject: |
18464 | 18495 | m_Icon: {fileID: 0} |
18465 | 18496 | m_NavMeshLayer: 0 |
18466 | 18497 | m_StaticEditorFlags: 0 |
18467 | - m_IsActive: 1 | |
18498 | + m_IsActive: 0 | |
18468 | 18499 | --- !u!114 &1900832963 |
18469 | 18500 | MonoBehaviour: |
18470 | 18501 | m_ObjectHideFlags: 0 |
... | ... | @@ -20461,10 +20492,10 @@ RectTransform: |
20461 | 20492 | m_Children: [] |
20462 | 20493 | m_Father: {fileID: 702185295} |
20463 | 20494 | m_RootOrder: 2 |
20464 | - m_AnchorMin: {x: 0, y: 1} | |
20465 | - m_AnchorMax: {x: 0, y: 1} | |
20466 | - m_AnchoredPosition: {x: 65.70799, y: -26.657143} | |
20467 | - m_SizeDelta: {x: 26.471996, y: 43.314285} | |
20495 | + m_AnchorMin: {x: 0, y: 0} | |
20496 | + m_AnchorMax: {x: 0, y: 0} | |
20497 | + m_AnchoredPosition: {x: 0, y: 0} | |
20498 | + m_SizeDelta: {x: 0, y: 0} | |
20468 | 20499 | m_Pivot: {x: 0.5, y: 0.5} |
20469 | 20500 | --- !u!114 &2099411280 |
20470 | 20501 | MonoBehaviour: |
... | ... | @@ -20585,7 +20616,7 @@ RectTransform: |
20585 | 20616 | m_Father: {fileID: 717229341} |
20586 | 20617 | m_RootOrder: 0 |
20587 | 20618 | m_AnchorMin: {x: 0, y: 0} |
20588 | - m_AnchorMax: {x: 0, y: 0} | |
20619 | + m_AnchorMax: {x: 0.5, y: 1} | |
20589 | 20620 | m_AnchoredPosition: {x: 0, y: 0} |
20590 | 20621 | m_SizeDelta: {x: 10, y: -1.9} |
20591 | 20622 | m_Pivot: {x: 0.5, y: 0.5} |
... | ... | @@ -21057,8 +21088,8 @@ MonoBehaviour: |
21057 | 21088 | m_Name: |
21058 | 21089 | m_EditorClassIdentifier: |
21059 | 21090 | playerManager: {fileID: 578311381} |
21060 | - time: 12 | |
21061 | - probability: 0.8 | |
21091 | + time: 6 | |
21092 | + probability: 1 | |
21062 | 21093 | --- !u!4 &2111966983 |
21063 | 21094 | Transform: |
21064 | 21095 | m_ObjectHideFlags: 0 |
... | ... | @@ -21105,7 +21136,7 @@ RectTransform: |
21105 | 21136 | m_AnchorMin: {x: 0, y: 0} |
21106 | 21137 | m_AnchorMax: {x: 1, y: 0} |
21107 | 21138 | m_AnchoredPosition: {x: 0, y: 0} |
21108 | - m_SizeDelta: {x: 0, y: 88.85714} | |
21139 | + m_SizeDelta: {x: 0, y: 0} | |
21109 | 21140 | m_Pivot: {x: 1, y: 0} |
21110 | 21141 | --- !u!114 &2119336825 |
21111 | 21142 | MonoBehaviour: | ... | ... |
Assets/Scripts/Animation List/ListManager.cs
... | ... | @@ -45,50 +45,57 @@ public class ListManager : MonoBehaviour { |
45 | 45 | this.scrollView.onValueChanged.AddListener(checkScrollPosition); |
46 | 46 | this.input.onValueChanged.AddListener(inputChanged); |
47 | 47 | |
48 | - // Load TrieST | |
49 | - { | |
50 | - this.trie = new TrieST<string>(); | |
51 | - | |
52 | - TextAsset file = Resources.Load("sinais") as TextAsset; | |
53 | - string[] lines = file.text.Split("\n"[0]); | |
54 | - | |
55 | - foreach (string line in lines) | |
56 | - { | |
57 | - string word = line.Trim(); | |
58 | - | |
59 | - if ( ! String.IsNullOrEmpty(word)) | |
60 | - this.trie.put(word, word); | |
61 | - } | |
62 | - } | |
63 | - | |
64 | - this.itemList = getNamesByPrefix(""); | |
65 | - this.index = 0; | |
66 | - this.size = itemList.Length; | |
67 | - | |
68 | - //this.loadingItem = Instantiate (sampleLoadingItemObject) as GameObject; | |
69 | - | |
70 | 48 | if (Screen.dpi < 140) |
71 | 49 | this.itemHeight = 36; |
72 | - | |
73 | 50 | else if (Screen.dpi < 280) |
74 | 51 | this.itemHeight = 50; |
75 | - | |
76 | 52 | else if (Screen.dpi < 400) |
77 | 53 | this.itemHeight = 90; |
78 | - | |
79 | 54 | else if (Screen.dpi < 500) |
80 | 55 | this.itemHeight = 120; |
81 | - | |
82 | 56 | else |
83 | 57 | this.itemHeight = 90; |
84 | 58 | |
85 | - StartCoroutine("populateList"); | |
59 | + StartCoroutine(load()); | |
60 | + } | |
61 | + | |
62 | + public IEnumerator load() | |
63 | + { | |
64 | + string[] lines; | |
65 | + WWW www = new WWW("http://vlibras.lavid.ufpb.br/sinais.txt"); | |
66 | + yield return www; | |
67 | + | |
68 | + if (www.error != null) | |
69 | + { | |
70 | + TextAsset file = Resources.Load("sinais") as TextAsset; | |
71 | + lines = file.text.Split("\n"[0]); | |
72 | + } | |
73 | + else | |
74 | + { | |
75 | + lines = www.text.Split("\n"[0]); | |
76 | + } | |
77 | + | |
78 | + this.trie = new TrieST<string>(); | |
79 | + | |
80 | + foreach (string line in lines) | |
81 | + { | |
82 | + string word = line.Trim(); | |
83 | + | |
84 | + if ( ! String.IsNullOrEmpty(word)) | |
85 | + this.trie.put(word, word); | |
86 | + } | |
87 | + | |
88 | + this.itemList = getNamesByPrefix(""); | |
89 | + this.index = 0; | |
90 | + this.size = itemList.Length; | |
91 | + | |
92 | + populateList(); | |
86 | 93 | } |
87 | 94 | |
88 | 95 | public void checkScrollPosition(Vector2 scrollPosition) |
89 | 96 | { |
90 | 97 | if (scrollPosition.y <= 0.05F && ! this.isLoading) |
91 | - StartCoroutine("populateList"); | |
98 | + populateList(); | |
92 | 99 | } |
93 | 100 | |
94 | 101 | public void inputChanged(string text) |
... | ... | @@ -101,14 +108,11 @@ public class ListManager : MonoBehaviour { |
101 | 108 | foreach(GameObject go in GameObject.FindGameObjectsWithTag("clone")) |
102 | 109 | Destroy(go); |
103 | 110 | |
104 | - StartCoroutine("populateList"); | |
111 | + populateList(); | |
105 | 112 | } |
106 | 113 | |
107 | - private IEnumerator populateList() | |
114 | + private void populateList() | |
108 | 115 | { |
109 | - changeLoadingState(true); | |
110 | - yield return new WaitForSeconds(0); | |
111 | - | |
112 | 116 | int last = this.index + OFFSET; |
113 | 117 | if (last > size) last = this.size; |
114 | 118 | |
... | ... | @@ -126,7 +130,6 @@ public class ListManager : MonoBehaviour { |
126 | 130 | sampleItem.GetComponent<Button>().onClick.AddListener( |
127 | 131 | delegate { |
128 | 132 | listBlock.SetActive(false); |
129 | - //bar.SetActive(true); | |
130 | 133 | } |
131 | 134 | ); |
132 | 135 | |
... | ... | @@ -134,12 +137,9 @@ public class ListManager : MonoBehaviour { |
134 | 137 | newItem.transform.GetChild(1).gameObject.SetActive(false); |
135 | 138 | |
136 | 139 | newItem.transform.SetParent(contentPanel); |
137 | - //newItem.transform.SetAsFirstSibling(); | |
138 | 140 | } |
139 | 141 | |
140 | 142 | this.index = last; |
141 | - | |
142 | - changeLoadingState(false); | |
143 | 143 | } |
144 | 144 | |
145 | 145 | private string[] getNamesByPrefix(string prefix) |
... | ... | @@ -148,16 +148,4 @@ public class ListManager : MonoBehaviour { |
148 | 148 | return names.ToArray(); |
149 | 149 | } |
150 | 150 | |
151 | - private void changeLoadingState(bool active) | |
152 | - { | |
153 | - /*if (isLoading != active) | |
154 | - { | |
155 | - this.loadingItem.transform.SetParent(active ? contentPanel : null); | |
156 | - this.isLoading = active; | |
157 | - | |
158 | - if ( ! active && contentPanel.childCount > 0) | |
159 | - contentPanel.GetChild(0).GetChild(1).gameObject.SetActive(false); | |
160 | - }*/ | |
161 | - } | |
162 | - | |
163 | 151 | } | ... | ... |
Assets/Scripts/Player Manager/GenericPlayerManager.cs
... | ... | @@ -3,6 +3,7 @@ using UnityEngine; |
3 | 3 | using System.Collections; |
4 | 4 | using System.Collections.Generic; |
5 | 5 | using System; |
6 | +using System.Threading; | |
6 | 7 | using System.IO; |
7 | 8 | using System.Text; |
8 | 9 | using System.Runtime.InteropServices; |
... | ... | @@ -36,16 +37,15 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
36 | 37 | // Sinais ignorados na apresentação de legenda |
37 | 38 | private HashSet<string> flags = new HashSet<string>(); |
38 | 39 | |
39 | - // True quando está reproduzindo alguma animação de intervalo | |
40 | - private volatile bool playingIntervalAnimation = false; | |
41 | 40 | // True quando está na função LoadAndPlay |
42 | 41 | private volatile bool loading = false; |
43 | 42 | // True quando está reproduzindo qualquer animação |
44 | 43 | private volatile bool playing = false; |
45 | 44 | // True quando é chamada a função de pausa |
46 | 45 | private volatile bool paused = false; |
47 | - // True quando é possível repetir | |
48 | - private volatile bool repeatable = false; | |
46 | + | |
47 | + // Se diferente de null, não está reproduzindo animação de intervalo | |
48 | + private AnimationState intervalAnimationState = null; | |
49 | 49 | |
50 | 50 | // Gerenciador de animações de intervalo |
51 | 51 | public RandomAnimations randomAnimations; |
... | ... | @@ -93,7 +93,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
93 | 93 | COMPONENT_ANIMATION.AddClip(COMPONENT_ANIMATION[DEFAULT_ANIMATION].clip, DEFAULT_ANIMATION_MIDDLE); |
94 | 94 | } |
95 | 95 | |
96 | - public bool isPlayingIntervalAnimation() { return playingIntervalAnimation; } | |
96 | + public bool isPlayingIntervalAnimation() { return intervalAnimationState != null; } | |
97 | 97 | public bool isLoading() { return loading; } |
98 | 98 | public bool isPlaying() { return playing; } |
99 | 99 | public bool isPaused() { return paused; } |
... | ... | @@ -159,30 +159,26 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
159 | 159 | this.subtitles.setText(""); |
160 | 160 | |
161 | 161 | lock (animQueue) { animQueue.Clear(); } |
162 | - | |
163 | - COMPONENT_ANIMATION.Stop(); | |
164 | - COMPONENT_ANIMATION.CrossFade(DEFAULT_ANIMATION, fadeLength, PlayMode.StopAll); | |
165 | - | |
166 | - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 2F); | |
162 | + COMPONENT_ANIMATION.CrossFadeQueued(DEFAULT_ANIMATION, fadeLength, QueueMode.PlayNow); | |
167 | 163 | |
168 | 164 | playing = false; |
169 | 165 | paused = false; |
170 | 166 | onPlayingStateChange(); |
171 | 167 | } |
172 | 168 | |
173 | - /* Para animações */ | |
174 | - public void repeat() | |
169 | + /* Repete animações */ | |
170 | + public void repeat() { | |
171 | + repeat(true); | |
172 | + } | |
173 | + | |
174 | + /* Repete animações se now == true ou se não estiver carregando glosa */ | |
175 | + public void repeat(bool now) | |
175 | 176 | { |
176 | - if ( ! isLoading()) | |
177 | - { | |
178 | - stopAnimations(); | |
179 | - play(this.gloss, true, true, true); | |
180 | - } | |
177 | + if (now || ! this.loading) | |
178 | + playNow(this.gloss); | |
181 | 179 | } |
182 | 180 | |
183 | - /* | |
184 | - * Manda reproduzir animação e adiciona a file de animações a serem reproduzidas. | |
185 | - */ | |
181 | + /* Manda reproduzir animação e adiciona a file de animações a serem reproduzidas */ | |
186 | 182 | private AnimationState playAnimation(short type, string name, string subtitle, float speed) |
187 | 183 | { |
188 | 184 | try |
... | ... | @@ -196,8 +192,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
196 | 192 | |
197 | 193 | return state; |
198 | 194 | } |
199 | - catch (NullReferenceException nre) | |
200 | - { | |
195 | + catch (NullReferenceException nre) { | |
201 | 196 | UnityEngine.Debug.Log("'" + name + "' não foi encontrado!\n" + nre.ToString()); |
202 | 197 | } |
203 | 198 | |
... | ... | @@ -210,6 +205,16 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
210 | 205 | return playAnimation(type, name, name); |
211 | 206 | } |
212 | 207 | |
208 | + /* Enfileira em reprodução a animação de intervalo */ | |
209 | + private void playDefaultAnimation() { | |
210 | + playDefaultAnimation(false); | |
211 | + } | |
212 | + | |
213 | + /* Enfileira em reprodução a animação padrão se now == true, ou reproduz imediatamente */ | |
214 | + private void playDefaultAnimation(bool now) { | |
215 | + COMPONENT_ANIMATION.CrossFadeQueued(DEFAULT_ANIMATION, fadeLength, now ? QueueMode.PlayNow : QueueMode.CompleteOthers); | |
216 | + } | |
217 | + | |
213 | 218 | |
214 | 219 | /** |
215 | 220 | * Returns the asset bundle named aniName. |
... | ... | @@ -225,6 +230,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
225 | 230 | */ |
226 | 231 | protected abstract void onPlayingStateChange(); |
227 | 232 | |
233 | + /* Pause or continue animations */ | |
228 | 234 | public void setPauseState(bool paused) |
229 | 235 | { |
230 | 236 | if (this.paused != paused) |
... | ... | @@ -242,63 +248,63 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
242 | 248 | } |
243 | 249 | } |
244 | 250 | |
251 | + /* Pause or continue animations */ | |
245 | 252 | public void switchPauseState() { |
246 | 253 | setPauseState( ! this.paused); |
247 | 254 | } |
248 | 255 | |
249 | - public bool play() | |
256 | + private System.Object LOCKER_PLAY = new System.Object(); | |
257 | + | |
258 | + /* Play if anything loading or playing */ | |
259 | + public bool playIfEmpty(string gloss) | |
250 | 260 | { |
251 | - if (playing) | |
252 | - setPauseState( ! paused); | |
253 | - else | |
254 | - return play(this.gloss, true, true, true); | |
261 | + lock (LOCKER_PLAY) | |
262 | + { | |
263 | + if (this.loading || this.playing) | |
264 | + return false; | |
265 | + | |
266 | + StartCoroutine("loadAndPlay", gloss); | |
267 | + } | |
255 | 268 | |
256 | 269 | return true; |
257 | 270 | } |
258 | 271 | |
259 | - public bool play(string gloss) | |
272 | + /* Enqueue animations for playing */ | |
273 | + public void playQueued(string gloss) | |
260 | 274 | { |
261 | - this.gloss = gloss; | |
262 | - return this.play(); | |
275 | + lock (LOCKER_PLAY) | |
276 | + { | |
277 | + StartCoroutine("loadAndPlay", gloss); | |
278 | + } | |
263 | 279 | } |
264 | 280 | |
265 | - public bool playNext(string gloss) { | |
266 | - this.gloss = gloss; | |
267 | - return play(gloss, true, false, true); | |
281 | + /* Stop all and play */ | |
282 | + public void playNow(string gloss) | |
283 | + { | |
284 | + lock (LOCKER_PLAY) | |
285 | + { | |
286 | + stopAll(); | |
287 | + StartCoroutine("loadAndPlay", gloss); | |
288 | + } | |
268 | 289 | } |
269 | 290 | |
270 | - private System.Object playLocker = new System.Object(); | |
271 | - | |
272 | - public bool play(string gloss, bool stopLoading, bool stopPlaying, bool forceLoading) | |
291 | + /* Reproduz animação de intervalo */ | |
292 | + public bool playIntervalAnimation(string name) | |
273 | 293 | { |
274 | - lock (this.playLocker) | |
275 | - { | |
276 | - if (this.loading) | |
277 | - { | |
278 | - if (stopLoading) | |
279 | - stopAll(); | |
280 | - else | |
281 | - return false; | |
282 | - } | |
283 | - else if (this.playing) | |
284 | - { | |
285 | - if (stopPlaying) | |
286 | - stopAnimations(); | |
294 | + if ( ! Monitor.TryEnter(LOCKER_PLAY)) | |
295 | + return false; | |
287 | 296 | |
288 | - else if ( ! forceLoading) | |
289 | - return false; | |
290 | - } | |
297 | + lock (LOCKER_PLAY) | |
298 | + { | |
299 | + playDefaultAnimation(true); | |
300 | + this.intervalAnimationState = COMPONENT_ANIMATION.CrossFadeQueued(name, fadeLength, QueueMode.CompleteOthers); | |
301 | + playDefaultAnimation(false); | |
291 | 302 | } |
292 | 303 | |
293 | - StartCoroutine("loadAndPlay", gloss); | |
294 | 304 | return true; |
295 | 305 | } |
296 | 306 | |
297 | - /** | |
298 | - * Spells word. | |
299 | - * | |
300 | - * @return last animation's subtitle. | |
301 | - */ | |
307 | + /* Enfileira soletração de palavra */ | |
302 | 308 | private string spellWord(Queue<ToPlay> toPlayQueue, string word) |
303 | 309 | { |
304 | 310 | string lastAnimationSubtitle = ""; |
... | ... | @@ -337,7 +343,6 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
337 | 343 | if ( ! defaultPlayed) |
338 | 344 | { |
339 | 345 | defaultPlayed = true; |
340 | - //playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); | |
341 | 346 | toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, DEFAULT_ANIMATION_MIDDLE, lastAnimationSubtitle, this)); |
342 | 347 | |
343 | 348 | // A reprodução da próxima letra deve ser longa para não ser cortada no fade |
... | ... | @@ -348,7 +353,6 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
348 | 353 | continue; |
349 | 354 | } |
350 | 355 | |
351 | - //playAnimation(type, lastAnim, lastAnimationSubtitle); | |
352 | 356 | toPlayQueue.Enqueue(new ToPlay(type, lastAnim, lastAnimationSubtitle, this)); |
353 | 357 | |
354 | 358 | defaultPlayed = false; |
... | ... | @@ -358,6 +362,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
358 | 362 | return lastAnimationSubtitle; |
359 | 363 | } |
360 | 364 | |
365 | + /* Instruções para reprodução de aninmação */ | |
361 | 366 | private struct ToPlay |
362 | 367 | { |
363 | 368 | private short type; |
... | ... | @@ -384,11 +389,12 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
384 | 389 | } |
385 | 390 | } |
386 | 391 | |
387 | - private System.Object loadingLocker = new System.Object(); | |
392 | + private System.Object LOCKER_LOADING = new System.Object(); | |
388 | 393 | |
394 | + /* Carrega animações e reproduz */ | |
389 | 395 | private IEnumerator loadAndPlay(string gloss) |
390 | 396 | { |
391 | - lock (this.loadingLocker) | |
397 | + lock (LOCKER_LOADING) | |
392 | 398 | { |
393 | 399 | this.randomAnimations.lockFor("loadAndPlay"); |
394 | 400 | this.loading = true; |
... | ... | @@ -404,18 +410,12 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
404 | 410 | |
405 | 411 | Queue<ToPlay> toPlayQueue = new Queue<ToPlay>(); |
406 | 412 | int wordsCount = 0; |
407 | - // playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 2F); | |
408 | 413 | toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", this)); |
409 | 414 | |
410 | 415 | foreach (string aniName in stringPos) |
411 | 416 | { |
412 | 417 | wordsCount++; |
413 | - | |
414 | - try { | |
415 | - if (String.IsNullOrEmpty(aniName)) continue; | |
416 | - } catch (Exception e) { | |
417 | - UnityEngine.Debug.Log(e + " :: NotNullNotEmpty"); | |
418 | - } | |
418 | + if (String.IsNullOrEmpty(aniName)) continue; | |
419 | 419 | |
420 | 420 | bool nonexistent = nonexistentAssetBundles.Contains(aniName); |
421 | 421 | bool loaded = loadedAssetBundles.Contains(aniName); |
... | ... | @@ -457,7 +457,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
457 | 457 | if (spelled) |
458 | 458 | { |
459 | 459 | // Default |
460 | - toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, lastAnimationSubtitle, this)); | |
460 | + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, this)); | |
461 | 461 | spelled = false; |
462 | 462 | } |
463 | 463 | |
... | ... | @@ -492,7 +492,6 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
492 | 492 | |
493 | 493 | // Se já houve o soletramento de alguma palavra, reproduz animação default |
494 | 494 | if (spelled) |
495 | - //playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F); | |
496 | 495 | toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, DEFAULT_ANIMATION_MIDDLE, lastAnimationSubtitle, 1.6F)); |
497 | 496 | else |
498 | 497 | spelled = true; |
... | ... | @@ -514,19 +513,18 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
514 | 513 | } |
515 | 514 | } |
516 | 515 | |
517 | - private System.Object playingLocker = new System.Object(); | |
516 | + private System.Object LOCKER_PLAYING = new System.Object(); | |
518 | 517 | |
519 | 518 | /* Sincroniza as legendas com as animações. */ |
520 | 519 | IEnumerator handleStates() |
521 | 520 | { |
522 | - lock (this.playingLocker) | |
521 | + lock (LOCKER_PLAYING) | |
523 | 522 | { |
524 | 523 | this.randomAnimations.lockFor("handleStates"); |
525 | - | |
526 | - // this.playing = true; | |
524 | + this.playing = true; | |
525 | + onPlayingStateChange(); | |
527 | 526 | |
528 | 527 | bool isNotEmpty; |
529 | - | |
530 | 528 | lock (animQueue) { isNotEmpty = animQueue.Count > 0; } |
531 | 529 | |
532 | 530 | // Enquanto estiver executando a rotina "loadAndPlay" |
... | ... | @@ -542,31 +540,6 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
542 | 540 | |
543 | 541 | if (COMPONENT_ANIMATION.IsPlaying(reference.name)) |
544 | 542 | { |
545 | - bool changing = false; | |
546 | - | |
547 | - if ( ! this.playing) | |
548 | - { | |
549 | - this.playing = true; | |
550 | - changing = true; | |
551 | - } | |
552 | - | |
553 | - if (this.intervalAnimations.Contains(reference.name)) | |
554 | - { | |
555 | - if ( ! this.playingIntervalAnimation) | |
556 | - { | |
557 | - this.playingIntervalAnimation = true; | |
558 | - changing = true; | |
559 | - } | |
560 | - } | |
561 | - else if (this.playingIntervalAnimation) | |
562 | - { | |
563 | - this.playingIntervalAnimation = false; | |
564 | - changing = true; | |
565 | - } | |
566 | - | |
567 | - if (changing) onPlayingStateChange(); | |
568 | - | |
569 | - // reference.playing = true; | |
570 | 543 | do { yield return null; } |
571 | 544 | while (COMPONENT_ANIMATION.IsPlaying(reference.name)); |
572 | 545 | } |
... | ... | @@ -585,7 +558,6 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
585 | 558 | |
586 | 559 | this.playing = false; |
587 | 560 | this.paused = false; |
588 | - this.playingIntervalAnimation = false; | |
589 | 561 | onPlayingStateChange(); |
590 | 562 | |
591 | 563 | this.randomAnimations.unlockFor("handleStates"); | ... | ... |
Assets/Scripts/Player Manager/RandomAnimations.cs
... | ... | @@ -60,6 +60,9 @@ public class RandomAnimations : MonoBehaviour { |
60 | 60 | { |
61 | 61 | while (true) |
62 | 62 | { |
63 | + while (this.playerManager.isPlayingIntervalAnimation()) | |
64 | + yield return new WaitForSeconds(1); | |
65 | + | |
63 | 66 | bool isNotBlocked; |
64 | 67 | lock (this.blockingObjects) { |
65 | 68 | isNotBlocked = this.blockingObjects.Count == 0; |
... | ... | @@ -81,7 +84,8 @@ public class RandomAnimations : MonoBehaviour { |
81 | 84 | if (index == this.lastIndex) |
82 | 85 | index = sortIndex(); |
83 | 86 | |
84 | - this.playerManager.play(this.names[index], true, false, true); | |
87 | + //this.playerManager.play(this.names[index], true, false, true); | |
88 | + this.playerManager.playIntervalAnimation(this.names[index]); | |
85 | 89 | } |
86 | 90 | } |
87 | 91 | ... | ... |
Assets/Scripts/PlayerManager.cs
... | ... | @@ -53,30 +53,10 @@ public class PlayerManager : GenericPlayerManager { |
53 | 53 | TouchScreenKeyboard.hideInput = true; |
54 | 54 | } |
55 | 55 | |
56 | - public void start_play() { | |
57 | - base.play(); | |
58 | - } | |
59 | - | |
60 | - // Stop loading, if loading | |
61 | - // Don't stop animations, if playing | |
62 | - // Load glosa, enqueue animations | |
63 | - public void forcePlayFromCache() { | |
64 | - base.play(base.gloss, true, false, true); | |
65 | - } | |
66 | - | |
67 | - public void start_play(string gloss) | |
68 | - { | |
69 | - if (gloss == null || String.IsNullOrEmpty(gloss.Trim())) | |
70 | - return; | |
71 | - | |
72 | - base.gloss = gloss; | |
73 | - forcePlayFromCache(); | |
74 | - } | |
75 | - | |
76 | 56 | public void playDict(string word) |
77 | 57 | { |
78 | 58 | base.gloss = word; |
79 | - base.play(word, true, true, true); | |
59 | + base.playNow(word); | |
80 | 60 | |
81 | 61 | this.screenManager.hideScreen(); |
82 | 62 | this.screenManager.setPauseMenuState(false); |
... | ... | @@ -115,17 +95,16 @@ public class PlayerManager : GenericPlayerManager { |
115 | 95 | } |
116 | 96 | } |
117 | 97 | |
118 | - private System.Object stateLocker = new System.Object(); | |
98 | + private System.Object LOCKER_STATE = new System.Object(); | |
119 | 99 | |
120 | 100 | protected override void onPlayingStateChange() |
121 | 101 | { |
122 | - lock (this.stateLocker) | |
102 | + lock (LOCKER_STATE) | |
123 | 103 | { |
124 | - //this.screenManager.setRepeatLayerState(base.isRepeatable() && ! base.isPlaying()); | |
125 | - | |
126 | - if (base.isPlaying() && ! base.isPlayingIntervalAnimation()) | |
104 | + if (base.isPlaying()) | |
127 | 105 | { |
128 | 106 | setPlayingState(true); |
107 | + this.screenManager.setRepeatLayerState(false); | |
129 | 108 | |
130 | 109 | if (base.isPaused()) |
131 | 110 | { |
... | ... | @@ -138,7 +117,15 @@ public class PlayerManager : GenericPlayerManager { |
138 | 117 | this.screenManager.setPauseMenuState(false); |
139 | 118 | } |
140 | 119 | } |
141 | - else setPlayingState(false); | |
120 | + else | |
121 | + { | |
122 | + setPlayingState(false); | |
123 | + | |
124 | + Debug.Log("AQUE"); | |
125 | + | |
126 | + if ( ! String.IsNullOrEmpty(base.gloss)) | |
127 | + this.screenManager.setRepeatLayerState(true); | |
128 | + } | |
142 | 129 | } |
143 | 130 | } |
144 | 131 | |
... | ... | @@ -151,11 +138,11 @@ public class PlayerManager : GenericPlayerManager { |
151 | 138 | this.screenManager.switchScreen("translate"); |
152 | 139 | } |
153 | 140 | |
154 | - private System.Object translateLocker = new System.Object(); | |
141 | + private System.Object LOCKER_TRANSLATE = new System.Object(); | |
155 | 142 | |
156 | 143 | private IEnumerator translate(string gloss) |
157 | 144 | { |
158 | - lock (this.translateLocker) | |
145 | + lock (this.LOCKER_TRANSLATE) | |
159 | 146 | { |
160 | 147 | base.randomAnimations.lockFor("translate"); |
161 | 148 | this.screenManager.setLoadingSnippetState(true); |
... | ... | @@ -174,7 +161,8 @@ public class PlayerManager : GenericPlayerManager { |
174 | 161 | { |
175 | 162 | Debug.Log("Server answer: " + glossRequest.text); |
176 | 163 | |
177 | - base.playNext(glossRequest.text); | |
164 | + base.gloss = glossRequest.text; | |
165 | + base.playNow(glossRequest.text); | |
178 | 166 | this.screenManager.setLoadingSnippetState(false); |
179 | 167 | base.randomAnimations.unlockFor("translate"); |
180 | 168 | ... | ... |