Skip to content
Extraits de code Groupes Projets
Valider d7e35428 rédigé par auroxy's avatar auroxy
Parcourir les fichiers

come back to main menu

parent ed50d2fb
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -512,10 +512,10 @@ RectTransform:
m_Father: {fileID: 699894262}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.4, y: 0.05989327}
m_AnchorMax: {x: 0.6, y: 0.1644427}
m_AnchoredPosition: {x: 0, y: -0.9899597}
m_SizeDelta: {x: 0, y: 1.9799805}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -129.8}
m_SizeDelta: {x: 160, y: 66.49}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1383451576
MonoBehaviour:
......@@ -593,7 +593,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Sprite: {fileID: 21300000, guid: c5c4951a193fbc34da07fe22fa3cbb2a, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -669,8 +669,8 @@ RectTransform:
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: 0.0000076293945}
m_SizeDelta: {x: 0, y: 0.000015259}
m_AnchoredPosition: {x: 0, y: 0.22499847}
m_SizeDelta: {x: 0, y: -28.589996}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1558906696
MonoBehaviour:
......@@ -694,7 +694,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 34e09558e1b8605408763d2cc2ec47de, type: 3}
m_FontSize: 34
m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
......@@ -748,8 +748,8 @@ RectTransform:
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: 0.0000076293945}
m_SizeDelta: {x: 0, y: 0.000015259}
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:
......@@ -772,12 +772,12 @@ MonoBehaviour:
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: 32
m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3}
m_FontSize: 23
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 86
m_MaxSize: 223
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
......@@ -960,7 +960,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2138685254
RectTransform:
m_ObjectHideFlags: 0
......@@ -976,10 +976,10 @@ RectTransform:
m_Father: {fileID: 699894262}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.25500003, y: 0.05989327}
m_AnchorMax: {x: 0.44750002, y: 0.1644427}
m_AnchoredPosition: {x: -1.1999817, y: 0.32000732}
m_SizeDelta: {x: 6, y: 1.9799805}
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:
......@@ -1025,7 +1025,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2138685258}
m_MethodName: Retry
m_MethodName: Menu
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
......@@ -1057,7 +1057,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Sprite: {fileID: 21300000, guid: c5c4951a193fbc34da07fe22fa3cbb2a, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
......
Ce diff est replié.
......@@ -47,6 +47,7 @@ public class Card : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
{
Debug.Log("this card has no effects!");
}
this.transform.localScale = Vector3.one;
highlightBorder.SetActive(false);
}
......@@ -76,6 +77,8 @@ public class Card : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
{
mChoice.Select();
}
this.transform.localScale = Vector3.one;
highlightBorder.SetActive(false);
}
/* Run all effects for a duplicated card*/
......
......@@ -10,7 +10,7 @@ public class StopTurnEffect : Effect
if (GameManager.Instance.Score.IsPlayerWinning())
GameManager.Instance.Score.WinAnim();
else
GameManager.Instance.Lose();
GameManager.Instance.Score.LoseAnim();
}
public override string GetDescription()
......
......@@ -135,6 +135,8 @@ public class GameManager : MonoBehaviour
SceneManager.LoadScene("Defeat Scene");
}
public void NextState()
{
switch(currentState)
......
......@@ -9,4 +9,9 @@ public class RetryButton : MonoBehaviour
{
SceneManager.LoadScene("Game");
}
public void Menu()
{
SceneManager.LoadScene("MainMenu");
}
}
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter