diff --git a/Assets/Prefabs/Canvas_UI.prefab b/Assets/Prefabs/Canvas_UI.prefab index f9df5b9..a8cc7fe 100644 --- a/Assets/Prefabs/Canvas_UI.prefab +++ b/Assets/Prefabs/Canvas_UI.prefab @@ -355,8 +355,8 @@ MonoBehaviour: m_Calls: [] m_text: 150 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} - m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -718,8 +718,8 @@ MonoBehaviour: m_Calls: [] m_text: Bullet Amount m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} - m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1009,8 +1009,8 @@ MonoBehaviour: m_Calls: [] m_text: 150 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} - m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1414,8 +1414,8 @@ MonoBehaviour: m_Calls: [] m_text: 150 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} - m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1701,8 +1701,8 @@ MonoBehaviour: m_Calls: [] m_text: 356 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} - m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2931,8 +2931,8 @@ MonoBehaviour: m_Calls: [] m_text: Canon Damage m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} - m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -3703,6 +3703,7 @@ RectTransform: - {fileID: 7739996578642925484} - {fileID: 8591417510463701647} - {fileID: 924189069809704397} + - {fileID: 4950234081163621392} - {fileID: 2962670241177435889} - {fileID: 5037438043825057203} - {fileID: 431853668021382708} @@ -4746,8 +4747,8 @@ MonoBehaviour: m_Calls: [] m_text: Defeat the invaders m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} - m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5210,8 +5211,8 @@ MonoBehaviour: m_Calls: [] m_text: Fire Rate m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} - m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5294,7 +5295,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1113207575844450216, guid: 88869503deba1ba4aac8b63b9b80000c, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 1113207575844450216, guid: 88869503deba1ba4aac8b63b9b80000c, type: 3} propertyPath: m_AnchorMax.x @@ -5396,7 +5397,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1113207575844450216, guid: 88869503deba1ba4aac8b63b9b80000c, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 1113207575844450216, guid: 88869503deba1ba4aac8b63b9b80000c, type: 3} propertyPath: m_AnchorMax.x @@ -6041,7 +6042,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1113207575844450216, guid: 88869503deba1ba4aac8b63b9b80000c, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 1113207575844450216, guid: 88869503deba1ba4aac8b63b9b80000c, type: 3} propertyPath: m_AnchorMax.x @@ -6347,3 +6348,161 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fc7ea5b1fff48b444b980ce43abc135c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &8641948608837194821 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7226858076299792826} + m_Modifications: + - target: {fileID: 3701006519105077860, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006519105077860, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006519105077860, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_SizeDelta.x + value: 43.15808 + objectReference: {fileID: 0} + - target: {fileID: 3701006519105077860, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 960 + objectReference: {fileID: 0} + - target: {fileID: 3701006519105077860, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 292 + objectReference: {fileID: 0} + - target: {fileID: 3701006519838106582, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006519838106582, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006519838106582, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_SizeDelta.x + value: 43.15808 + objectReference: {fileID: 0} + - target: {fileID: 3701006519838106582, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 1882 + objectReference: {fileID: 0} + - target: {fileID: 3701006519838106582, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 292 + objectReference: {fileID: 0} + - target: {fileID: 3701006520152938733, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 292 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955026, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_Name + value: AlertPanel + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} +--- !u!224 &4950234081163621392 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3701006520639955029, guid: a4e8f1f5394b65e42b322001962ce4cd, type: 3} + m_PrefabInstance: {fileID: 8641948608837194821} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Jason.unity b/Assets/Scenes/Jason.unity index c353c02..7a4b499 100644 --- a/Assets/Scenes/Jason.unity +++ b/Assets/Scenes/Jason.unity @@ -130,6 +130,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 118443340735125584, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 118443340735125584, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -178,6 +186,30 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 852356801747251430, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 852356801747251430, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 946565392929179851, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 946565392929179851, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 975399117228444407, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 975399117228444407, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -254,6 +286,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3942264960756445310, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 3942264960756445310, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -286,6 +326,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4964015081399241302, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 4964015081399241302, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size value: 1 @@ -454,6 +502,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8367707976770782541, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 8367707976770782541, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -470,6 +526,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8570802679731193335, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 8570802679731193335, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -680,6 +744,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 575ac473626334346a420aa1ebda6da6, type: 3} +--- !u!224 &373297280 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4950234079745660449, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 89540976} + m_PrefabAsset: {fileID: 0} --- !u!1 &413647990 GameObject: m_ObjectHideFlags: 0 @@ -1285,6 +1354,11 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 703399637} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!224 &750491238 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4950234080813960360, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 89540976} + m_PrefabAsset: {fileID: 0} --- !u!1 &759710055 GameObject: m_ObjectHideFlags: 0 @@ -1807,6 +1881,11 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 828477694} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!224 &840386051 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4950234080357054355, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 89540976} + m_PrefabAsset: {fileID: 0} --- !u!1 &867942699 GameObject: m_ObjectHideFlags: 0 @@ -3276,6 +3355,7 @@ MonoBehaviour: material: {fileID: 0} healthBar: {fileID: 242379725} button: {fileID: 823631620} + alert: {fileID: 750491238} layer: 7 - camera: {fileID: 799351736} texture: {fileID: 0} @@ -3283,6 +3363,7 @@ MonoBehaviour: material: {fileID: 0} healthBar: {fileID: 1147496830} button: {fileID: 916479801} + alert: {fileID: 373297280} layer: 8 - camera: {fileID: 1616849997} texture: {fileID: 0} @@ -3290,10 +3371,12 @@ MonoBehaviour: material: {fileID: 0} healthBar: {fileID: 1277501206} button: {fileID: 554716307} + alert: {fileID: 840386051} layer: 9 tabWidth: 0.05 healthBarPosFromTabEdge: 0.025 buttonPosFromTabEdge: 0.025 + alertPosFromTabEdge: 0.025 quadOffset: 1 OnChangeWorld: m_PersistentCalls: diff --git a/Assets/Scripts/WorldSwitcher.cs b/Assets/Scripts/WorldSwitcher.cs index de6c804..2c084f7 100644 --- a/Assets/Scripts/WorldSwitcher.cs +++ b/Assets/Scripts/WorldSwitcher.cs @@ -2,7 +2,6 @@ using System; using System.Collections; using UnityEngine; using UnityEngine.Events; -using UnityEngine.UIElements; [Serializable] public class IntEvent : UnityEvent {} @@ -23,6 +22,7 @@ public class WorldSwitcher : MonoBehaviour { [SerializeField] float healthBarPosFromTabEdge; [SerializeField] float buttonPosFromTabEdge; + [SerializeField] float alertPosFromTabEdge; //TODO Hardcode [SerializeField] @@ -93,11 +93,13 @@ public class WorldSwitcher : MonoBehaviour { for (int i = lastWorldIndex - 1; i >= currentWorldIndex; --i) { worldInfos[i].healthBar.gameObject.SetActive(false); worldInfos[i].button.gameObject.SetActive(false); + worldInfos[i].alert.gameObject.SetActive(false); } } else { for (int i = lastWorldIndex + 1; i <= currentWorldIndex; ++i) { worldInfos[i].healthBar.gameObject.SetActive(false); worldInfos[i].button.gameObject.SetActive(false); + worldInfos[i].alert.gameObject.SetActive(false); } } @@ -187,9 +189,16 @@ public class WorldSwitcher : MonoBehaviour { worldInfos[i].button.position.y, worldInfos[i].button.position.z ); + worldInfos[i].alert.gameObject.SetActive(true); + worldInfos[i].alert.position = new Vector3( + Screen.width * GetTabUIPos(0f, fromRight, i, alertPosFromTabEdge), + worldInfos[i].alert.position.y, + worldInfos[i].alert.position.z + ); }else { worldInfos[i].healthBar.gameObject.SetActive(false); worldInfos[i].button.gameObject.SetActive(false); + worldInfos[i].alert.gameObject.SetActive(false); } } } @@ -203,6 +212,7 @@ struct WorldInfo { [HideInInspector] public Material material; public RectTransform healthBar; public RectTransform button; + public RectTransform alert; public int layer; static readonly int CameraTexture = Shader.PropertyToID("_CameraTexture");