diff --git a/Assets/Animations/Birds/EvilDuckDance.anim b/Assets/Animations/Birds/EvilDuckDance.anim index c4f5bdd6c7345cf87762b1f54ad203beae5ba82e..9a654a023e76e248628a370f49c60b1baee01ac4 100644 --- a/Assets/Animations/Birds/EvilDuckDance.anim +++ b/Assets/Animations/Birds/EvilDuckDance.anim @@ -17,21 +17,49 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -7191105378189866728, guid: 76d48e4ed5e734747ae0a5ec3ed3d650, + type: 3} + - time: 0.083333336 + value: {fileID: -2568042730344263758, guid: 76d48e4ed5e734747ae0a5ec3ed3d650, + type: 3} + - time: 0.16666667 + value: {fileID: 2336415242956950666, guid: 76d48e4ed5e734747ae0a5ec3ed3d650, + type: 3} + - time: 0.25 + value: {fileID: -4329476993096501442, guid: 76d48e4ed5e734747ae0a5ec3ed3d650, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -7191105378189866728, guid: 76d48e4ed5e734747ae0a5ec3ed3d650, type: 3} + - {fileID: -2568042730344263758, guid: 76d48e4ed5e734747ae0a5ec3ed3d650, type: 3} + - {fileID: 2336415242956950666, guid: 76d48e4ed5e734747ae0a5ec3ed3d650, type: 3} + - {fileID: -4329476993096501442, guid: 76d48e4ed5e734747ae0a5ec3ed3d650, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Birds/MallardDance.anim b/Assets/Animations/Birds/MallardDance.anim index 4a1ab54969d110ad06b8506d65979da41735b0b5..83e8f60aed0a8b7e05387fc381148012b71a8152 100644 --- a/Assets/Animations/Birds/MallardDance.anim +++ b/Assets/Animations/Birds/MallardDance.anim @@ -20,57 +20,22 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: -6035198323484584581, guid: a5f1cacbc729d2f438be4c8535f5c749, + value: {fileID: -8110033421052298560, guid: 25358e4787ff6e249b94ce988253091c, type: 3} - time: 0.083333336 - value: {fileID: 2303852143255586727, guid: a5f1cacbc729d2f438be4c8535f5c749, + value: {fileID: 4399915327577904522, guid: 25358e4787ff6e249b94ce988253091c, type: 3} - time: 0.16666667 - value: {fileID: 90072850326552456, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} + value: {fileID: 2669691853359153199, guid: 25358e4787ff6e249b94ce988253091c, + type: 3} - time: 0.25 - value: {fileID: 4470770905331974204, guid: a5f1cacbc729d2f438be4c8535f5c749, + value: {fileID: -1666631276788681395, guid: 25358e4787ff6e249b94ce988253091c, type: 3} - time: 0.33333334 - value: {fileID: 4145097113387001990, guid: a5f1cacbc729d2f438be4c8535f5c749, + value: {fileID: -7165058996076027596, guid: 25358e4787ff6e249b94ce988253091c, type: 3} - time: 0.41666666 - value: {fileID: 6446869939242326220, guid: a5f1cacbc729d2f438be4c8535f5c749, - type: 3} - - time: 0.5 - value: {fileID: -4571335008401796961, guid: a5f1cacbc729d2f438be4c8535f5c749, - type: 3} - - time: 0.5833333 - value: {fileID: -5140612369115349627, guid: a5f1cacbc729d2f438be4c8535f5c749, - type: 3} - - time: 0.6666667 - value: {fileID: 8164595165708743126, guid: a5f1cacbc729d2f438be4c8535f5c749, - type: 3} - - time: 0.75 - value: {fileID: -9004415310525556266, guid: a5f1cacbc729d2f438be4c8535f5c749, - type: 3} - - time: 0.8333333 - value: {fileID: 6213195786121436837, guid: a5f1cacbc729d2f438be4c8535f5c749, - type: 3} - - time: 0.9166667 - value: {fileID: -6119130353935335158, guid: a5f1cacbc729d2f438be4c8535f5c749, - type: 3} - - time: 1 - value: {fileID: -6821573177214688077, guid: a5f1cacbc729d2f438be4c8535f5c749, - type: 3} - - time: 1.0833334 - value: {fileID: 995755038939216784, guid: a5f1cacbc729d2f438be4c8535f5c749, - type: 3} - - time: 1.1666666 - value: {fileID: -7757175850570952243, guid: a5f1cacbc729d2f438be4c8535f5c749, - type: 3} - - time: 1.25 - value: {fileID: -7035989477814015886, guid: a5f1cacbc729d2f438be4c8535f5c749, - type: 3} - - time: 1.3333334 - value: {fileID: 7617224370104719062, guid: a5f1cacbc729d2f438be4c8535f5c749, - type: 3} - - time: 1.4166666 - value: {fileID: 4687022968534964866, guid: a5f1cacbc729d2f438be4c8535f5c749, + value: {fileID: 5056149580859517942, guid: 25358e4787ff6e249b94ce988253091c, type: 3} attribute: m_Sprite path: @@ -91,30 +56,18 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: -6035198323484584581, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: 2303852143255586727, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: 90072850326552456, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: 4470770905331974204, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: 4145097113387001990, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: 6446869939242326220, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: -4571335008401796961, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: -5140612369115349627, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: 8164595165708743126, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: -9004415310525556266, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: 6213195786121436837, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: -6119130353935335158, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: -6821573177214688077, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: 995755038939216784, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: -7757175850570952243, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: -7035989477814015886, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: 7617224370104719062, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - - {fileID: 4687022968534964866, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} + - {fileID: -8110033421052298560, guid: 25358e4787ff6e249b94ce988253091c, type: 3} + - {fileID: 4399915327577904522, guid: 25358e4787ff6e249b94ce988253091c, type: 3} + - {fileID: 2669691853359153199, guid: 25358e4787ff6e249b94ce988253091c, type: 3} + - {fileID: -1666631276788681395, guid: 25358e4787ff6e249b94ce988253091c, type: 3} + - {fileID: -7165058996076027596, guid: 25358e4787ff6e249b94ce988253091c, type: 3} + - {fileID: 5056149580859517942, guid: 25358e4787ff6e249b94ce988253091c, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.5 + m_StopTime: 0.5 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Data/Fights/CostaHummingFight11-13.asset b/Assets/Data/Fights/CostaHummingFight11-13.asset index ab3f2d811c5f372afd3dc8285331fa269237a311..bf53e481bcf5f44454b9a261df3b6811f7f6d36c 100644 --- a/Assets/Data/Fights/CostaHummingFight11-13.asset +++ b/Assets/Data/Fights/CostaHummingFight11-13.asset @@ -16,7 +16,8 @@ MonoBehaviour: scoreToMatch: 20 tierMin: 11 tierMax: 13 - FightDescription: + FightDescription: 'Coastal Hummingbird the Annoying. Score : 20. Decreases your + draw.' alterationEffects: - validity: 1 type: 5 diff --git a/Assets/Data/Fights/CostaHummingFight8-10.asset b/Assets/Data/Fights/CostaHummingFight8-10.asset index b445b8b92d4bbcf5d926ded4f04dde96ad4cff0f..e33e6f1fee557be3bd4f382698d76e41f8144063 100644 --- a/Assets/Data/Fights/CostaHummingFight8-10.asset +++ b/Assets/Data/Fights/CostaHummingFight8-10.asset @@ -16,7 +16,8 @@ MonoBehaviour: scoreToMatch: 16 tierMin: 8 tierMax: 10 - FightDescription: + FightDescription: 'Coastal Hummingbird the Annoying. Score : 16. Decreases your + draw.' alterationEffects: - validity: 1 type: 5 diff --git a/Assets/Data/Fights/EvilDuck.asset b/Assets/Data/Fights/EvilDuck.asset index f2b8bffd8198739b0eea4c3c07d1e4115877ef73..33c63a7b4325522dd8bf61f4066fecfcc15eea81 100644 --- a/Assets/Data/Fights/EvilDuck.asset +++ b/Assets/Data/Fights/EvilDuck.asset @@ -12,12 +12,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3} m_Name: EvilDuck m_EditorClassIdentifier: - bird: {fileID: 474526092802846135, guid: 775251d046894854ba1fbe6f49a3bd2d, type: 3} - scoreToMatch: 10 - tierMin: 11 - tierMax: 13 - FightDescription: + bird: {fileID: 1695193658733767104, guid: f7d632d63b642d14d9ae01213b67367d, type: 3} + scoreToMatch: 60 + tierMin: 14 + tierMax: 14 + FightDescription: Evil Duck, your archnemesis. alterationEffects: - validity: 1 type: 2 - value: -3 + value: -1 + - validity: 1 + type: 0 + value: -1 diff --git a/Assets/Data/Fights/FightList.asset b/Assets/Data/Fights/FightList.asset index e853b54dbbb95742caa26df0af0cff70f8042db4..ab03933f0f17212eb742db69e4570ec237fe6f21 100644 --- a/Assets/Data/Fights/FightList.asset +++ b/Assets/Data/Fights/FightList.asset @@ -32,3 +32,4 @@ MonoBehaviour: - {fileID: 11400000, guid: b8033fb6859374147a1d0ec69d3e0da4, type: 2} - {fileID: 11400000, guid: e869eece8fc7644408f640e8a1948c50, type: 2} - {fileID: 11400000, guid: ce075116411ddfd4a8685407103d6740, type: 2} + - {fileID: 11400000, guid: d8e96a72ccdd5dc4996a8d19d7e4a494, type: 2} diff --git a/Assets/Data/Fights/FlameBowerFight1.asset b/Assets/Data/Fights/FlameBowerFight1.asset index eadfcbc13ee99f4baddbbd20e3bd3decfc0125e6..e44c805833ae0035503041d0d24156138cb51df2 100644 --- a/Assets/Data/Fights/FlameBowerFight1.asset +++ b/Assets/Data/Fights/FlameBowerFight1.asset @@ -16,4 +16,5 @@ MonoBehaviour: scoreToMatch: 6 tierMin: 1 tierMax: 1 + FightDescription: 'Flame Bowerbird the Plain. Score : 6.' alterationEffects: [] diff --git a/Assets/Data/Fights/FlameBowerFight11-13.asset b/Assets/Data/Fights/FlameBowerFight11-13.asset index 5ce2ea5893b39207af1217dc70d35202ad061e5f..6d0095cc2bb06e33d54a5d30ff10bfddab3d18e0 100644 --- a/Assets/Data/Fights/FlameBowerFight11-13.asset +++ b/Assets/Data/Fights/FlameBowerFight11-13.asset @@ -16,5 +16,5 @@ MonoBehaviour: scoreToMatch: 32 tierMin: 11 tierMax: 13 - FightDescription: + FightDescription: 'Flame Bowerbird the Plain. Score : 32.' alterationEffects: [] diff --git a/Assets/Data/Fights/FlameBowerFight2-4.asset b/Assets/Data/Fights/FlameBowerFight2-4.asset index ac5175e16cc3e5d927e98dc7a404749f3175deed..70c2055348c8071f15bc49b8b0b587cb944fcf2d 100644 --- a/Assets/Data/Fights/FlameBowerFight2-4.asset +++ b/Assets/Data/Fights/FlameBowerFight2-4.asset @@ -16,5 +16,5 @@ MonoBehaviour: scoreToMatch: 12 tierMin: 2 tierMax: 4 - FightDescription: + FightDescription: 'Flame Bowerbird the Plain. Score : 12.' alterationEffects: [] diff --git a/Assets/Data/Fights/FlameBowerFight5-7.asset b/Assets/Data/Fights/FlameBowerFight5-7.asset index b127a87247251ff8a095f215e792751da01ccdc2..7b46e0b491d331252bfcb5fa8f8045fdbef9e60c 100644 --- a/Assets/Data/Fights/FlameBowerFight5-7.asset +++ b/Assets/Data/Fights/FlameBowerFight5-7.asset @@ -16,5 +16,5 @@ MonoBehaviour: scoreToMatch: 18 tierMin: 5 tierMax: 7 - FightDescription: + FightDescription: 'Flame Bowerbird the Plain. Score : 18.' alterationEffects: [] diff --git a/Assets/Data/Fights/FlameBowerFight8-10.asset b/Assets/Data/Fights/FlameBowerFight8-10.asset index 9276f113255a37bf877e3599dbd63558ae7f07ff..5b13f845d9e77ea88675a1f0070fd087b84dde54 100644 --- a/Assets/Data/Fights/FlameBowerFight8-10.asset +++ b/Assets/Data/Fights/FlameBowerFight8-10.asset @@ -16,5 +16,5 @@ MonoBehaviour: scoreToMatch: 24 tierMin: 8 tierMax: 10 - FightDescription: + FightDescription: 'Flame Bowerbird the Plain. Score : 24.' alterationEffects: [] diff --git a/Assets/Data/Fights/GreaterFightOfParadise7-11.asset b/Assets/Data/Fights/GreaterFightOfParadise7-11.asset index 5b4cf1cdc1f3ce0ec16f9b6bb395c09f67248ff9..5080a28341e420363b61601a7be4890adc16ce10 100644 --- a/Assets/Data/Fights/GreaterFightOfParadise7-11.asset +++ b/Assets/Data/Fights/GreaterFightOfParadise7-11.asset @@ -16,7 +16,8 @@ MonoBehaviour: scoreToMatch: 16 tierMin: 11 tierMax: 13 - FightDescription: + FightDescription: 'Greater Bird of Paradise, the Stunning. Score : 16. Leeches score + from your actions.' alterationEffects: - validity: 1 type: 0 diff --git a/Assets/Data/Fights/MagnificentRiflefight11-13.asset b/Assets/Data/Fights/MagnificentRiflefight11-13.asset index dbcc175fe69eecb4e679bdf05d75b5cd7d7dec91..791631ccc8bf24b61906c8d43d51033f6c90217e 100644 --- a/Assets/Data/Fights/MagnificentRiflefight11-13.asset +++ b/Assets/Data/Fights/MagnificentRiflefight11-13.asset @@ -16,7 +16,8 @@ MonoBehaviour: scoreToMatch: 18 tierMin: 11 tierMax: 13 - FightDescription: + FightDescription: 'Magnificent Riflebird the Copycat. Score : 18. Gains score when + you do.' alterationEffects: - validity: 1 type: 3 diff --git a/Assets/Data/Fights/MagnificentRiflefight2-4.asset b/Assets/Data/Fights/MagnificentRiflefight2-4.asset index f764e1ee4192130f525a0e3ea8a55456b7c137d9..981f305f04aab6320a80ff97a86b6be9dde8d492 100644 --- a/Assets/Data/Fights/MagnificentRiflefight2-4.asset +++ b/Assets/Data/Fights/MagnificentRiflefight2-4.asset @@ -16,7 +16,8 @@ MonoBehaviour: scoreToMatch: 10 tierMin: 2 tierMax: 4 - FightDescription: + FightDescription: 'Magnificent Riflebird the Copycat. Score : 10. Gains score when + you do.' alterationEffects: - validity: 1 type: 3 diff --git a/Assets/Data/Fights/MagnificentRiflefight5-7.asset b/Assets/Data/Fights/MagnificentRiflefight5-7.asset index f4747245f9456e0ad55196f65d771df243a95dc7..fc8dfd5e0b419b9b4c231a5f7cc683013c1fe2f8 100644 --- a/Assets/Data/Fights/MagnificentRiflefight5-7.asset +++ b/Assets/Data/Fights/MagnificentRiflefight5-7.asset @@ -16,7 +16,8 @@ MonoBehaviour: scoreToMatch: 15 tierMin: 5 tierMax: 7 - FightDescription: + FightDescription: 'Magnificent Riflebird the Copycat. Score : 15. Gains score when + you do.' alterationEffects: - validity: 1 type: 3 diff --git a/Assets/Data/Fights/MagnificentRiflefight8-10.asset b/Assets/Data/Fights/MagnificentRiflefight8-10.asset index 12a23c1089756d1e7a586e0b57ae2f18fe751105..8dfb3e09402dd419ef599af5e7d461c521c8a53b 100644 --- a/Assets/Data/Fights/MagnificentRiflefight8-10.asset +++ b/Assets/Data/Fights/MagnificentRiflefight8-10.asset @@ -16,7 +16,8 @@ MonoBehaviour: scoreToMatch: 15 tierMin: 8 tierMax: 10 - FightDescription: + FightDescription: 'Magnificent Riflebird the Copycat. Score : 15. Gains score when + you do.' alterationEffects: - validity: 1 type: 3 diff --git a/Assets/Data/Fights/MonalPheasant11-13.asset b/Assets/Data/Fights/MonalPheasant11-13.asset index d18fdc74d85813595098e4876ac7100100800fc4..e00cb4143ce7232e9dc1e82029102e89c5a66477 100644 --- a/Assets/Data/Fights/MonalPheasant11-13.asset +++ b/Assets/Data/Fights/MonalPheasant11-13.asset @@ -16,7 +16,8 @@ MonoBehaviour: scoreToMatch: 18 tierMin: 11 tierMax: 13 - FightDescription: + FightDescription: 'Monal Pheasant the Intimidating. Score : 18. Makes you less efficient + overall.' alterationEffects: - validity: 1 type: 3 diff --git a/Assets/Data/Fights/SatyrTragopan11-13.asset b/Assets/Data/Fights/SatyrTragopan11-13.asset index 10d9204c741570838aaa1ee4fb7f27971495b68d..e4c4645e0fa605078e209a3d3e18d6e1b962beef 100644 --- a/Assets/Data/Fights/SatyrTragopan11-13.asset +++ b/Assets/Data/Fights/SatyrTragopan11-13.asset @@ -16,7 +16,8 @@ MonoBehaviour: scoreToMatch: 120 tierMin: 11 tierMax: 13 - FightDescription: + FightDescription: 'Satyr Tragopan the Self-Absorbed. Score : 120. Lets you duplicate + cards you play.' alterationEffects: - validity: 1 type: 1 diff --git a/Assets/Data/Fights/SatyrTragopan8-10.asset b/Assets/Data/Fights/SatyrTragopan8-10.asset index ed3ef11a2ab0a9fb1881e02caa2ee2b875ec3e7d..7a324c3520e73c2a9c53167c292723919a140b28 100644 --- a/Assets/Data/Fights/SatyrTragopan8-10.asset +++ b/Assets/Data/Fights/SatyrTragopan8-10.asset @@ -16,7 +16,8 @@ MonoBehaviour: scoreToMatch: 60 tierMin: 8 tierMax: 10 - FightDescription: + FightDescription: 'Satyr Tragopan the Self-Absorbed. Score : 60. Lets you duplicate + cards you play.' alterationEffects: - validity: 1 type: 1 diff --git a/Assets/Data/Fights/SuperbFightOfParadise11-13.asset b/Assets/Data/Fights/SuperbFightOfParadise11-13.asset index be3457f89f12e0cd54fad8eb8e92d7f3dc41b90d..5bfa6f94148c8d9ec381123a2f681b70d23d68bb 100644 --- a/Assets/Data/Fights/SuperbFightOfParadise11-13.asset +++ b/Assets/Data/Fights/SuperbFightOfParadise11-13.asset @@ -16,7 +16,8 @@ MonoBehaviour: scoreToMatch: 10 tierMin: 11 tierMax: 13 - FightDescription: + FightDescription: 'Superb Bird Of Paradise the Judgemental. Score : 10. Gets score + when you draw.' alterationEffects: - validity: 1 type: 2 diff --git a/Assets/Data/Fights/SuperbFightOfParadise2-4.asset b/Assets/Data/Fights/SuperbFightOfParadise2-4.asset index a7eb025019c2edf618419c210809d046dcac29eb..6913e2b30a64a5193b70d7d346dd5bdead17d38c 100644 --- a/Assets/Data/Fights/SuperbFightOfParadise2-4.asset +++ b/Assets/Data/Fights/SuperbFightOfParadise2-4.asset @@ -16,7 +16,8 @@ MonoBehaviour: scoreToMatch: 5 tierMin: 2 tierMax: 4 - FightDescription: + FightDescription: 'Superb Bird Of Paradise the Judgemental. Score : 5. Gets score + when you draw.' alterationEffects: - validity: 1 type: 2 diff --git a/Assets/Data/Fights/SuperbFightOfParadise5-7.asset b/Assets/Data/Fights/SuperbFightOfParadise5-7.asset index f3807db9fa7a980194ecb2708e53b3e4d5a8c514..8666e2dda8b3a52b6b6553e9dd12457bb7599f0a 100644 --- a/Assets/Data/Fights/SuperbFightOfParadise5-7.asset +++ b/Assets/Data/Fights/SuperbFightOfParadise5-7.asset @@ -13,10 +13,11 @@ MonoBehaviour: m_Name: SuperbFightOfParadise5-7 m_EditorClassIdentifier: bird: {fileID: 474526092802846135, guid: 775251d046894854ba1fbe6f49a3bd2d, type: 3} - scoreToMatch: 5 + scoreToMatch: 10 tierMin: 5 tierMax: 7 - FightDescription: + FightDescription: 'Superb Bird Of Paradise the Judgemental. Score : 10. Gets score + when you draw.' alterationEffects: - validity: 1 type: 2 diff --git a/Assets/Data/Fights/SuperbFightOfParadise8-10.asset b/Assets/Data/Fights/SuperbFightOfParadise8-10.asset index 03dbdf70081918fca55c41d268b1efb2e58ff863..cb651dcf69bed746edb81a980deb7cb14f1d665c 100644 --- a/Assets/Data/Fights/SuperbFightOfParadise8-10.asset +++ b/Assets/Data/Fights/SuperbFightOfParadise8-10.asset @@ -16,7 +16,8 @@ MonoBehaviour: scoreToMatch: 10 tierMin: 8 tierMax: 10 - FightDescription: + FightDescription: 'Superb Bird Of Paradise the Judgemental. Score : 10. Gets score + when you draw.' alterationEffects: - validity: 1 type: 2 diff --git a/Assets/Fonts/DuckTales.otf b/Assets/Fonts/DuckTales.otf new file mode 100644 index 0000000000000000000000000000000000000000..d340044e8c15d8abdf7f301cb07ee2a665b3f171 Binary files /dev/null and b/Assets/Fonts/DuckTales.otf differ diff --git a/Assets/Fonts/DuckTales.otf.meta b/Assets/Fonts/DuckTales.otf.meta new file mode 100644 index 0000000000000000000000000000000000000000..4e1af496a34fc7c94558b4354f35cf0750e3b2b2 --- /dev/null +++ b/Assets/Fonts/DuckTales.otf.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6dddb6f842c7aaf43aa3e5835a3ad79c +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: DuckTales + fontNames: + - DuckTales + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/VCR_OSD_MONO_1.001.ttf b/Assets/Fonts/VCR_OSD_MONO_1.001.ttf new file mode 100644 index 0000000000000000000000000000000000000000..dcca687a434d5c7b6a3027e65e0b7d8728b25c71 Binary files /dev/null and b/Assets/Fonts/VCR_OSD_MONO_1.001.ttf differ diff --git a/Assets/Fonts/VCR_OSD_MONO_1.001.ttf.meta b/Assets/Fonts/VCR_OSD_MONO_1.001.ttf.meta new file mode 100644 index 0000000000000000000000000000000000000000..60276f9853022bc8e4b1f236d917c5192e64b8c8 --- /dev/null +++ b/Assets/Fonts/VCR_OSD_MONO_1.001.ttf.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 287383bed421b0149809de5b6c864be6 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: VCR OSD Mono + fontNames: + - VCR OSD Mono + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameObjects/Birbs/EvilDuck.prefab b/Assets/GameObjects/Birbs/EvilDuck.prefab index 71b8c56f029730117ef4d6b5714c975e44e8bc20..8e42dd83f6c2cc9d95d26b9b172710c68b39fed0 100644 --- a/Assets/GameObjects/Birbs/EvilDuck.prefab +++ b/Assets/GameObjects/Birbs/EvilDuck.prefab @@ -97,8 +97,7 @@ PrefabInstance: value: objectReference: {fileID: -7191105378189866728, guid: 76d48e4ed5e734747ae0a5ec3ed3d650, type: 3} - m_RemovedComponents: - - {fileID: 2279991570626666871, guid: 7c1a879494b7b094bbe9684a3d74359c, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c1a879494b7b094bbe9684a3d74359c, type: 3} --- !u!1 &1695193658733767104 stripped GameObject: diff --git a/Assets/Scenes/Defeat Scene.unity b/Assets/Scenes/Defeat Scene.unity index 449de33cfe5d6a1dd1e0fbfe2e19f8e7b17bd341..c9bd04f5796fbe9bc3ee8c3115b599a088fa4e14 100644 --- a/Assets/Scenes/Defeat Scene.unity +++ b/Assets/Scenes/Defeat Scene.unity @@ -170,15 +170,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 192c5bb13eb19f648962f571c196509a, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -277,102 +277,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &462688426 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 462688427} - - component: {fileID: 462688430} - - component: {fileID: 462688429} - - component: {fileID: 462688428} - m_Layer: 5 - m_Name: LOSE - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &462688427 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462688426} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 699894262} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 105.75, y: 77.129} - m_SizeDelta: {x: -428.5, y: -237.4} - m_Pivot: {x: 0.50000006, y: 0.46649483} ---- !u!114 &462688428 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462688426} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f2e8edb4aba47544a9943f5d1e40938a, type: 3} - m_Name: - m_EditorClassIdentifier: - approachSpeed: 0.01 - growthBound: 1 - shrinkBound: 1.2 - rectTransform: {fileID: 462688427} ---- !u!114 &462688429 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462688426} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.5188679, g: 0.05557231, b: 0.01713244, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 34e09558e1b8605408763d2cc2ec47de, type: 3} - m_FontSize: 241 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 8 - m_MaxSize: 241 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: LOSE ---- !u!222 &462688430 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462688426} - m_CullTransparentMesh: 0 --- !u!1 &699894258 GameObject: m_ObjectHideFlags: 0 @@ -464,9 +368,6 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 117225234} - - {fileID: 1986861850} - - {fileID: 462688427} - - {fileID: 2138685254} - {fileID: 1383451575} m_Father: {fileID: 0} m_RootOrder: 2 @@ -510,7 +411,7 @@ RectTransform: m_Children: - {fileID: 1558906695} m_Father: {fileID: 699894262} - m_RootOrder: 4 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -714,87 +615,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1558906694} m_CullTransparentMesh: 0 ---- !u!1 &1699179200 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1699179201} - - component: {fileID: 1699179203} - - component: {fileID: 1699179202} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1699179201 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1699179200} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2138685254} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -2.2199984} - m_SizeDelta: {x: 0, y: -30.219997} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1699179202 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1699179200} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.5188679, g: 0.05557231, b: 0.01713244, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3} - m_FontSize: 23 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 223 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Retry - -' ---- !u!222 &1699179203 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1699179200} - m_CullTransparentMesh: 0 --- !u!1 &1934602929 GameObject: m_ObjectHideFlags: 0 @@ -861,241 +681,3 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1986861849 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1986861850} - - component: {fileID: 1986861852} - - component: {fileID: 1986861851} - m_Layer: 5 - m_Name: U - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1986861850 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1986861849} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 699894262} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -172, y: 69.2} - m_SizeDelta: {x: -691.69, y: -237.35} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1986861851 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1986861849} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 34e09558e1b8605408763d2cc2ec47de, type: 3} - m_FontSize: 241 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 8 - m_MaxSize: 241 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'U ' ---- !u!222 &1986861852 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1986861849} - m_CullTransparentMesh: 0 ---- !u!1 &2138685253 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2138685254} - - component: {fileID: 2138685257} - - component: {fileID: 2138685256} - - component: {fileID: 2138685255} - - component: {fileID: 2138685258} - - component: {fileID: 2138685259} - m_Layer: 5 - m_Name: Retry - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2138685254 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2138685253} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1699179201} - m_Father: {fileID: 699894262} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -50.8} - m_SizeDelta: {x: 160, y: 64.97998} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2138685255 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2138685253} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 2138685256} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2138685258} - m_MethodName: Menu - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &2138685256 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2138685253} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c5c4951a193fbc34da07fe22fa3cbb2a, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &2138685257 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2138685253} - m_CullTransparentMesh: 0 ---- !u!114 &2138685258 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2138685253} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41e4cc4368156fd4bb0f9ccef5062223, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2138685259 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2138685253} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 94e28702722e1fd41a7ba153d52efac7, type: 3} - m_Name: - m_EditorClassIdentifier: - mScaling: 1.2 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index c5101adff5e2cee694ca8d01dddc938926f590db..cd00402669677c9323173776e4dfda50e31df92a 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -138,6 +138,85 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2e1543283fedf0d4bb0d65a8d0a7a56a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &98934739 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 98934740} + - component: {fileID: 98934742} + - component: {fileID: 98934741} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &98934740 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 98934739} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 809165409} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000030517578, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &98934741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 98934739} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 287383bed421b0149809de5b6c864be6, type: 3} + m_FontSize: 26 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 94 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: ' ftfzlfkzokfziokfziokfzofkozkfozkofkzokfozkfozkofkokokokokook' +--- !u!222 &98934742 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 98934739} + m_CullTransparentMesh: 0 --- !u!1 &134461202 GameObject: m_ObjectHideFlags: 0 @@ -171,6 +250,7 @@ RectTransform: - {fileID: 1324837649} - {fileID: 259032563} - {fileID: 2117013686} + - {fileID: 1409868150} m_Father: {fileID: 481556386} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -233,6 +313,159 @@ MonoBehaviour: - {fileID: 259032565} - {fileID: 2117013688} Pool: {fileID: 11400000, guid: 4dc02c97ea10d0d4dac39a8351f10ce8, type: 2} +--- !u!1 &171562247 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 171562248} + - component: {fileID: 171562250} + - component: {fileID: 171562249} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &171562248 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 171562247} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2075023670} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000030517578, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &171562249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 171562247} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 287383bed421b0149809de5b6c864be6, type: 3} + m_FontSize: 26 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 94 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: ' ftfzlfkzokfziokfziokfzofkozkfozkofkzokfozkfozkofkokokokokook' +--- !u!222 &171562250 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 171562247} + m_CullTransparentMesh: 0 +--- !u!1 &185771888 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 185771889} + - component: {fileID: 185771891} + - component: {fileID: 185771890} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &185771889 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185771888} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1311090355} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.009933472, y: 0} + m_SizeDelta: {x: 0.022064209, y: 0.000061035156} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &185771890 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185771888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.49056602, g: 0.46511212, b: 0.46511212, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &185771891 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185771888} + m_CullTransparentMesh: 0 --- !u!1 &259032562 GameObject: m_ObjectHideFlags: 0 @@ -386,6 +619,152 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 687538358} m_PrefabAsset: {fileID: 0} +--- !u!1 &446496069 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 446496070} + - component: {fileID: 446496074} + - component: {fileID: 446496073} + - component: {fileID: 446496072} + - component: {fileID: 446496071} + m_Layer: 5 + m_Name: FightSpot1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &446496070 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446496069} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2075023670} + m_Father: {fileID: 1251018139} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.21830761, y: 0.483} + m_AnchorMax: {x: 0.27, y: 0.586} + m_AnchoredPosition: {x: 533, y: -87} + m_SizeDelta: {x: 1, y: -3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &446496071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446496069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 446496072} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 446496074} + m_MethodName: Select + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &446496072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446496069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &446496073 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446496069} + m_CullTransparentMesh: 0 +--- !u!114 &446496074 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446496069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d1a05b825ad452247a680dbeb558109b, type: 3} + m_Name: + m_EditorClassIdentifier: + onHover: {fileID: 2075023669} --- !u!1 &449465898 GameObject: m_ObjectHideFlags: 0 @@ -1118,12 +1497,12 @@ PrefabInstance: - target: {fileID: 139765660913410017, guid: d0234dba4f26d784da07183cd1e0aa62, type: 3} propertyPath: m_AnchoredPosition.x - value: -494.18 + value: -439 objectReference: {fileID: 0} - target: {fileID: 139765660913410017, guid: d0234dba4f26d784da07183cd1e0aa62, type: 3} propertyPath: m_AnchoredPosition.y - value: 111.18 + value: 88.685 objectReference: {fileID: 0} - target: {fileID: 139765660913410017, guid: d0234dba4f26d784da07183cd1e0aa62, type: 3} @@ -1202,7 +1581,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -490, y: -321} + m_AnchoredPosition: {x: 426.5, y: 209} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &783529344 @@ -1234,15 +1613,237 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!222 &783529345 +--- !u!222 &783529345 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783529342} + m_CullTransparentMesh: 0 +--- !u!1 &798548317 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 798548318} + - component: {fileID: 798548321} + - component: {fileID: 798548320} + - component: {fileID: 798548319} + - component: {fileID: 798548322} + m_Layer: 5 + m_Name: FightSpot3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &798548318 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798548317} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 809165409} + m_Father: {fileID: 1251018139} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.77800006, y: 0.483} + m_AnchorMax: {x: 0.83100003, y: 0.586} + m_AnchoredPosition: {x: 0, y: -3.5} + m_SizeDelta: {x: -2, y: -3} + m_Pivot: {x: 0.4999997, y: 0.5} +--- !u!114 &798548319 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798548317} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d1a05b825ad452247a680dbeb558109b, type: 3} + m_Name: + m_EditorClassIdentifier: + onHover: {fileID: 809165408} +--- !u!114 &798548320 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798548317} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &798548321 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798548317} + m_CullTransparentMesh: 0 +--- !u!114 &798548322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798548317} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 798548320} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 798548319} + m_MethodName: Select + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1 &809165408 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 809165409} + - component: {fileID: 809165411} + - component: {fileID: 809165410} + m_Layer: 5 + m_Name: OnHover (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &809165409 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809165408} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1437392427} + - {fileID: 98934740} + m_Father: {fileID: 798548318} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0, y: -83.60004} + m_SizeDelta: {x: 177.57007, y: 194.99994} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &809165410 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809165408} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &809165411 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 783529342} + m_GameObject: {fileID: 809165408} m_CullTransparentMesh: 0 ---- !u!1 &798548317 +--- !u!1 &853956213 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1250,142 +1851,77 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 798548318} - - component: {fileID: 798548321} - - component: {fileID: 798548320} - - component: {fileID: 798548319} - - component: {fileID: 798548322} + - component: {fileID: 853956214} + - component: {fileID: 853956216} + - component: {fileID: 853956215} m_Layer: 5 - m_Name: FightSpot3 + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &798548318 +--- !u!224 &853956214 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 798548317} + m_GameObject: {fileID: 853956213} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1251018139} - m_RootOrder: 2 + m_Father: {fileID: 1311090355} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 584, y: 31} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.4999997, y: 0.5} ---- !u!114 &798548319 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 798548317} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d1a05b825ad452247a680dbeb558109b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &798548320 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000030517578, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &853956215 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 798548317} + m_GameObject: {fileID: 853956213} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &798548321 + m_FontData: + m_Font: {fileID: 12800000, guid: 287383bed421b0149809de5b6c864be6, type: 3} + m_FontSize: 26 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 94 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: ' ftfzlfkzokfziokfziokfzofkozkfozkofkzokfozkfozkofkokokokokook' +--- !u!222 &853956216 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 798548317} + m_GameObject: {fileID: 853956213} m_CullTransparentMesh: 0 ---- !u!114 &798548322 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 798548317} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 798548320} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 798548319} - m_MethodName: Select - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!224 &872592475 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6477196409435443291, guid: bdc35112fe6b03a4a93248988eb89992, @@ -1579,14 +2115,15 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1311090355} m_Father: {fileID: 1251018139} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -488, y: 31} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0.21830761, y: 0.483} + m_AnchorMax: {x: 0.27, y: 0.586} + m_AnchoredPosition: {x: 2.5, y: -3.5} + m_SizeDelta: {x: 1, y: -3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1113481713 MonoBehaviour: @@ -1637,6 +2174,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d1a05b825ad452247a680dbeb558109b, type: 3} m_Name: m_EditorClassIdentifier: + onHover: {fileID: 1311090354} --- !u!114 &1113481716 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1736,7 +2274,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1283166458} + - {fileID: 446496070} - {fileID: 1113481712} - {fileID: 798548318} - {fileID: 2023522679} @@ -1762,7 +2300,7 @@ MonoBehaviour: m_EditorClassIdentifier: mFightList: {fileID: 11400000, guid: 71bca705dc62a4a43b480382ca7f2402, type: 2} mSpots: - - {fileID: 1283166459} + - {fileID: 446496074} - {fileID: 1113481715} - {fileID: 798548319} --- !u!114 &1251018141 @@ -1817,7 +2355,7 @@ MonoBehaviour: state1: {fileID: 21300000, guid: e6b41250160d9454f820e29ecf617953, type: 3} state2: {fileID: 21300000, guid: b1834cc07e07ab041b604fcb0d8dfd5e, type: 3} image: {fileID: 1251018141} ---- !u!1 &1283166457 +--- !u!1 &1288275030 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1825,143 +2363,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1283166458} - - component: {fileID: 1283166461} - - component: {fileID: 1283166460} - - component: {fileID: 1283166459} - - component: {fileID: 1283166462} + - component: {fileID: 1288275031} + - component: {fileID: 1288275032} m_Layer: 5 - m_Name: FightSpot1 + m_Name: Dump m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1283166458 +--- !u!224 &1288275031 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283166457} + m_GameObject: {fileID: 1288275030} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1251018139} - m_RootOrder: 0 + m_Father: {fileID: 481556386} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1283166459 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283166457} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d1a05b825ad452247a680dbeb558109b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1283166460 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283166457} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1283166461 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283166457} - m_CullTransparentMesh: 0 ---- !u!114 &1283166462 +--- !u!114 &1288275032 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283166457} + m_GameObject: {fileID: 1288275030} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: db8123992f78b004a888a3ac87945fe3, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1283166460} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1283166459} - m_MethodName: Select - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!1 &1288275030 +--- !u!1 &1311090354 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1969,46 +2411,74 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1288275031} - - component: {fileID: 1288275032} + - component: {fileID: 1311090355} + - component: {fileID: 1311090357} + - component: {fileID: 1311090356} m_Layer: 5 - m_Name: Dump + m_Name: OnHover (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1288275031 +--- !u!224 &1311090355 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1288275030} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1311090354} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 481556386} - m_RootOrder: 2 + m_Children: + - {fileID: 185771889} + - {fileID: 853956214} + m_Father: {fileID: 1113481712} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 8, y: -83.60003} + m_SizeDelta: {x: 177.07794, y: 194.99994} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1288275032 +--- !u!114 &1311090356 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1288275030} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db8123992f78b004a888a3ac87945fe3, type: 3} - m_Name: - m_EditorClassIdentifier: + m_GameObject: {fileID: 1311090354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1311090357 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1311090354} + m_CullTransparentMesh: 0 --- !u!1 &1324837648 GameObject: m_ObjectHideFlags: 0 @@ -2066,6 +2536,85 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b61867857006a804bb19514977646b18, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1409868149 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1409868150} + - component: {fileID: 1409868152} + - component: {fileID: 1409868151} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1409868150 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1409868149} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 134461203} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.24961522, y: 0.595} + m_AnchorMax: {x: 0.73482907, y: 0.81500006} + m_AnchoredPosition: {x: -0.000030517578, y: -2} + m_SizeDelta: {x: 0, y: -4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1409868151 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1409868149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3} + m_FontSize: 86 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 121 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Choose your card +--- !u!222 &1409868152 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1409868149} + m_CullTransparentMesh: 0 --- !u!1 &1427303021 GameObject: m_ObjectHideFlags: 0 @@ -2149,6 +2698,80 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1437392426 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1437392427} + - component: {fileID: 1437392429} + - component: {fileID: 1437392428} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1437392427 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437392426} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 809165409} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.009933472, y: 0} + m_SizeDelta: {x: 0.022064209, y: 0.000061035156} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1437392428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437392426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.49056602, g: 0.46511212, b: 0.46511212, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1437392429 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437392426} + m_CullTransparentMesh: 0 --- !u!1 &1810478631 GameObject: m_ObjectHideFlags: 0 @@ -2456,7 +3079,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.29712826, y: 0.57500005} m_AnchorMax: {x: 0.7007779, y: 0.89900005} - m_AnchoredPosition: {x: 2.0079994, y: 3} + m_AnchoredPosition: {x: 2.0079956, y: 3} m_SizeDelta: {x: -3, y: -6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2023522680 @@ -2501,6 +3124,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023522678} m_CullTransparentMesh: 0 +--- !u!1 &2075023669 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2075023670} + - component: {fileID: 2075023672} + - component: {fileID: 2075023671} + m_Layer: 5 + m_Name: OnHover + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2075023670 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2075023669} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2125143289} + - {fileID: 171562248} + m_Father: {fileID: 446496070} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -1, y: -0.099998474} + m_SizeDelta: {x: 177.07794, y: 194.99994} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2075023671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2075023669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &2075023672 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2075023669} + m_CullTransparentMesh: 0 --- !u!1 &2117013685 GameObject: m_ObjectHideFlags: 0 @@ -2558,6 +3257,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2117013685} m_CullTransparentMesh: 0 +--- !u!1 &2125143288 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2125143289} + - component: {fileID: 2125143291} + - component: {fileID: 2125143290} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2125143289 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2125143288} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2075023670} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.009933472, y: 0} + m_SizeDelta: {x: 0.022064209, y: 0.000061035156} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2125143290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2125143288} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.49056602, g: 0.46511212, b: 0.46511212, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &2125143291 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2125143288} + m_CullTransparentMesh: 0 --- !u!1001 &1848200219665833529 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Fights/FightCard.cs b/Assets/Scripts/Fights/FightCard.cs index 4dcfde41a1af22d891d705757f2cd747ce0f5cb0..88dcded780add44ba5ae8354d74ca729bbba0173 100644 --- a/Assets/Scripts/Fights/FightCard.cs +++ b/Assets/Scripts/Fights/FightCard.cs @@ -1,14 +1,19 @@ using System.Collections; using System.Collections.Generic; +using System.IO.IsolatedStorage; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.UI; -public class FightCard : MonoBehaviour +public class FightCard : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler { private FightInfo mInfo; - + private Image mImage; + private Text mDesc; + private Image mPopupImage; + [SerializeField] private GameObject onHover; public void Reset() { @@ -22,10 +27,29 @@ public class FightCard : MonoBehaviour mImage.color = new Color(255, 255, 255, 255); mInfo = info; mImage.sprite = info.bird.GetComponent<SpriteRenderer>().sprite; + + onHover.SetActive(true); + + mDesc = onHover.GetComponentInChildren<Text>(); + mDesc.text = info.FightDescription; + mPopupImage = onHover.GetComponentInChildren<Image>(); + mPopupImage.sprite = info.bird.GetComponent<SpriteRenderer>().sprite; + + onHover.SetActive(false); } public void Select() { GameManager.Instance.SelectFight(mInfo); } + + public void OnPointerEnter(PointerEventData eventData) + { + onHover.SetActive(true); + } + + public void OnPointerExit(PointerEventData eventData) + { + onHover.SetActive(false); + } } diff --git a/Assets/Scripts/Fights/FightSelection.cs b/Assets/Scripts/Fights/FightSelection.cs index 249eb394221dfc4f3243b087bcdbffedb66ecb3e..8322a16852141e6ac7e534986a228b8f89628591 100644 --- a/Assets/Scripts/Fights/FightSelection.cs +++ b/Assets/Scripts/Fights/FightSelection.cs @@ -26,9 +26,13 @@ public class FightSelection : MonoBehaviour fightCard.Reset(); if (mValidFights.Count > i) { - Debug.Log("Sherlock"); + fightCard.gameObject.SetActive(true); fightCard.Init(mValidFights[i]); } + else + { + fightCard.gameObject.SetActive(false); + } i++; } } @@ -45,7 +49,6 @@ public class FightSelection : MonoBehaviour } Deck.Shuffle<FightInfo>(mValidFights); //reuse deck shuffle - Debug.Log(mValidFights.Count + " valid fights for current tier found"); if (mValidFights.Count == 0) GameManager.Instance.Win(); //No more opponents, WE WIN! diff --git a/Assets/Sprites/Birbs/Dancing/UPDB_Main_duck_cou.png b/Assets/Sprites/Birbs/Dancing/UPDB_Main_duck_cou.png new file mode 100644 index 0000000000000000000000000000000000000000..fea87c7855e3de908f087115023aec2264e617bc Binary files /dev/null and b/Assets/Sprites/Birbs/Dancing/UPDB_Main_duck_cou.png differ diff --git a/Assets/Sprites/Birbs/Dancing/UPDB_Main_duck_cou.png.meta b/Assets/Sprites/Birbs/Dancing/UPDB_Main_duck_cou.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..c9b6f3ddcc5f10a68ebd34801c6f797b6a33275a --- /dev/null +++ b/Assets/Sprites/Birbs/Dancing/UPDB_Main_duck_cou.png.meta @@ -0,0 +1,245 @@ +fileFormatVersion: 2 +guid: 25358e4787ff6e249b94ce988253091c +TextureImporter: + internalIDToNameTable: + - first: + 213: -8110033421052298560 + second: UPDB_Main_duck_cou_0 + - first: + 213: 4399915327577904522 + second: UPDB_Main_duck_cou_1 + - first: + 213: 2669691853359153199 + second: UPDB_Main_duck_cou_2 + - first: + 213: -1666631276788681395 + second: UPDB_Main_duck_cou_3 + - first: + 213: -7165058996076027596 + second: UPDB_Main_duck_cou_4 + - first: + 213: 5056149580859517942 + second: UPDB_Main_duck_cou_5 + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: UPDB_Main_duck_cou_0 + rect: + serializedVersion: 2 + x: 0 + y: 400 + width: 400 + height: 400 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d2a5580fa884d3548b330b1d7cf85923 + internalID: -8110033421052298560 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UPDB_Main_duck_cou_1 + rect: + serializedVersion: 2 + x: 400 + y: 400 + width: 400 + height: 400 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bd1f7779f45bd35438915f610834a1e9 + internalID: 4399915327577904522 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UPDB_Main_duck_cou_2 + rect: + serializedVersion: 2 + x: 800 + y: 400 + width: 400 + height: 400 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4931878a99d479a4cb8c7abca8a64fc9 + internalID: 2669691853359153199 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UPDB_Main_duck_cou_3 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 400 + height: 400 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c1d47ae1a1e683346bbdbaaf68076389 + internalID: -1666631276788681395 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UPDB_Main_duck_cou_4 + rect: + serializedVersion: 2 + x: 400 + y: 0 + width: 400 + height: 400 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a16c561bbae059d4f93c6ed97120b82b + internalID: -7165058996076027596 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UPDB_Main_duck_cou_5 + rect: + serializedVersion: 2 + x: 800 + y: 0 + width: 400 + height: 400 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 12212bb44a04c6940992f31751334fab + internalID: 5056149580859517942 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ad18b3921db61c24a9c351bb66ea96c9 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: