From bfb035f9e8d43568112397764a706182bb976dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9phine=20Barthel?= <josephine.barthel11@gmail.com> Date: Sun, 4 Aug 2019 22:21:33 +0200 Subject: [PATCH] yhryuryryry --- Assets/Data/Fights/CostaHummingFight9-11.asset | 9 ++++----- Assets/Data/Fights/FightList.asset | 4 ++++ Assets/Scripts/Deck/ScoreBar.cs | 1 + Assets/Scripts/Ui/CardUi.cs | 2 +- ProjectSettings/EditorBuildSettings.asset | 7 +++++-- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Assets/Data/Fights/CostaHummingFight9-11.asset b/Assets/Data/Fights/CostaHummingFight9-11.asset index acef4fe..2973cee 100644 --- a/Assets/Data/Fights/CostaHummingFight9-11.asset +++ b/Assets/Data/Fights/CostaHummingFight9-11.asset @@ -13,11 +13,10 @@ MonoBehaviour: m_Name: CostaHummingFight9-11 m_EditorClassIdentifier: bird: {fileID: 498878385731201535, guid: 39963b9ecc6e40e49a45816d4f379193, type: 3} - scoreToMatch: 16 - tierMin: 12 - tierMax: 14 - FightDescription: 'Coastal Hummingbird the Annoying. Score : 16. Decreases your - draw.' + scoreToMatch: 8 + tierMin: 9 + tierMax: 11 + FightDescription: 'Coastal Hummingbird the Annoying. Score : 8. Decreases your draw.' alterationEffects: - validity: 1 type: 5 diff --git a/Assets/Data/Fights/FightList.asset b/Assets/Data/Fights/FightList.asset index ab03933..3c2a2ad 100644 --- a/Assets/Data/Fights/FightList.asset +++ b/Assets/Data/Fights/FightList.asset @@ -33,3 +33,7 @@ MonoBehaviour: - {fileID: 11400000, guid: e869eece8fc7644408f640e8a1948c50, type: 2} - {fileID: 11400000, guid: ce075116411ddfd4a8685407103d6740, type: 2} - {fileID: 11400000, guid: d8e96a72ccdd5dc4996a8d19d7e4a494, type: 2} + - {fileID: 11400000, guid: 824eec0d9354b4f40aad025657feed24, type: 2} + - {fileID: 11400000, guid: 7036b75f56e9d254688f1d4d1481a87c, type: 2} + - {fileID: 11400000, guid: 205b82b8f15806c46a385b1a783edff8, type: 2} + - {fileID: 11400000, guid: ff59436e13936a54c8352261d30912dd, type: 2} diff --git a/Assets/Scripts/Deck/ScoreBar.cs b/Assets/Scripts/Deck/ScoreBar.cs index b4958b0..f468175 100644 --- a/Assets/Scripts/Deck/ScoreBar.cs +++ b/Assets/Scripts/Deck/ScoreBar.cs @@ -88,6 +88,7 @@ public class ScoreBar : MonoBehaviour public void ResetScore() { playerScore = 0; + enemyScore = 0; mSlider.maxValue = enemyScore + playerScore; mSlider.value = playerScore; UpdateText(); diff --git a/Assets/Scripts/Ui/CardUi.cs b/Assets/Scripts/Ui/CardUi.cs index fde24ec..59ddb21 100644 --- a/Assets/Scripts/Ui/CardUi.cs +++ b/Assets/Scripts/Ui/CardUi.cs @@ -27,7 +27,7 @@ public class CardUi : MonoBehaviour public void OnCardPlayed(UnityAction onAnimationEnd) { - StartCoroutine(FadeOut(onAnimationEnd)); + //StartCoroutine(FadeOut(onAnimationEnd)); } void Start() diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 687d4e6..7cca590 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -12,8 +12,8 @@ EditorBuildSettings: path: Assets/Scenes/MainMenu.unity guid: 3c61257c9f1ecde4ab9e5d16cf0f56de - enabled: 1 - path: Assets/Scenes/Game.unity - guid: a1633885aff01f04688aa4a949522219 + path: Assets/Scenes/Romaric.unity + guid: e006de4c46665344ca108f7e917ec4d8 - enabled: 1 path: Assets/Scenes/Defeat Scene.unity guid: ae0871f57a637e44ab155159a55c57f6 @@ -23,4 +23,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Credits.unity guid: 390804f369176e048a38da574f370332 + - enabled: 0 + path: Assets/Scenes/Game.unity + guid: a1633885aff01f04688aa4a949522219 m_configObjects: {} -- GitLab