Browse Source

Fixes: Reveal Sound, Reveal in UnitInfoPanel

bolt_update
laurids 3 years ago
parent
commit
6e29ce6480
2 changed files with 13 additions and 7 deletions
  1. +1
    -1
      Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs
  2. +12
    -6
      Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs

+ 1
- 1
Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs View File

@ -122,7 +122,7 @@ namespace GWConquest {
SelectedUnitIcon.GetComponent<Animator>().SetBool("Selected", false); SelectedUnitIcon.GetComponent<Animator>().SetBool("Selected", false);
} }
if(icon != null && icon.Unit != null)
if(icon != null && icon.Unit != null && (icon.Unit.Player == Player.CurrentPlayer || icon.Unit.RevealState == RevealState.Visible))
{ {
SelectedUnit = icon.Unit; SelectedUnit = icon.Unit;
SelectedUnitIcon = icon; SelectedUnitIcon = icon;


+ 12
- 6
Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs View File

@ -40,7 +40,7 @@ namespace GWConquest {
private RectTransform ImageTransform; private RectTransform ImageTransform;
private bool revealAnimPlayed = false;
private bool isRevealed = false;
private Animator Animator; private Animator Animator;
public bool IsHidden { public bool IsHidden {
@ -86,9 +86,11 @@ namespace GWConquest {
if(Unit.Player != Player.CurrentPlayer && Unit.RevealState == RevealState.ClassHidden) if(Unit.Player != Player.CurrentPlayer && Unit.RevealState == RevealState.ClassHidden)
{ {
GetComponent<Animator>().SetBool("Hidden", true); GetComponent<Animator>().SetBool("Hidden", true);
isRevealed = false;
} }
else { else {
GetComponent<Animator>().SetBool("Hidden", false); GetComponent<Animator>().SetBool("Hidden", false);
isRevealed = true;
} }
IconImage.gameObject.SetActive(true); IconImage.gameObject.SetActive(true);
@ -124,15 +126,19 @@ namespace GWConquest {
{ {
if(Unit.Player != Player.CurrentPlayer && Unit.RevealState == RevealState.ClassHidden) if(Unit.Player != Player.CurrentPlayer && Unit.RevealState == RevealState.ClassHidden)
{ {
GetComponent<Animator>().SetBool("Hidden", true);
if(isRevealed)
{
GetComponent<Animator>().SetBool("Hidden", true);
isRevealed = false;
}
} }
else { else {
if(!revealAnimPlayed)
if(!isRevealed)
{ {
SoundEffects.Instance.PlayEffect("Reveal"); SoundEffects.Instance.PlayEffect("Reveal");
revealAnimPlayed = true;
}
GetComponent<Animator>().SetBool("Hidden", false);
GetComponent<Animator>().SetBool("Hidden", false);
isRevealed = true;
}
} }
if(Unit.Hitpoints < Unit.Class.Hitpoints && (Unit.Player == Player.CurrentPlayer || Unit.RevealState == RevealState.Visible)) if(Unit.Hitpoints < Unit.Class.Hitpoints && (Unit.Player == Player.CurrentPlayer || Unit.RevealState == RevealState.Visible))


Loading…
Cancel
Save