dushes/Run-and-capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge fixes

Browse Source
This commit is contained in:
dddushesss 2022-01-05 17:48:27 +03:00
parent 2d87148a09
commit 0585266d8d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/Scripts/Units/Unit.cs
View File

@ -66,7 +66,7 @@ namespace Units
{ {
_weapon.SetModifiedDamage(0); _weapon.SetModifiedDamage(0);
} }
public void SetDefenceBonus(int duration, int value) public void SetDefenceBonus(int duration, int value)
{ {
TimerHelper.Instance.StartTimer(StopDefenceBonus, duration); TimerHelper.Instance.StartTimer(StopDefenceBonus, duration);
@ -77,7 +77,7 @@ namespace Units
{ {
_defenceBonus = 0; _defenceBonus = 0;
} }
public void Move(HexDirection direction) public void Move(HexDirection direction)
{ {
if (!_cell.GetNeighbor(direction) || _isBusy) return; if (!_cell.GetNeighbor(direction) || _isBusy) return;
@ -169,7 +169,8 @@ namespace Units
_animator = _instance.GetComponent<Animator>(); _animator = _instance.GetComponent<Animator>();
_unitView = _instance.GetComponent<UnitView>(); _unitView = _instance.GetComponent<UnitView>();
_barCanvas = _unitView.BarCanvas.GetComponent<BarCanvas>(); _barCanvas = _unitView.BarCanvas.GetComponent<BarCanvas>();
_unitView.SetUp(_barCanvas.SpawnShotUI(_weapon.shots), _weapon, RegenMana, _data.manaRegen, CaptureHex, this); _unitView.SetUp(_barCanvas.SpawnShotUI(_weapon.shots), _weapon, RegenMana, _data.manaRegen, CaptureHex,
this);
SetAnimLength(); SetAnimLength();
MusicController.Instance.AddAudioSource(_instance); MusicController.Instance.AddAudioSource(_instance);
_mana = _data.maxMana; _mana = _data.maxMana;
@ -201,6 +202,7 @@ namespace Units
{ {
_inventory.Remove(item); _inventory.Remove(item);
} }
private void MoveEnd() private void MoveEnd()
{ {
_isBusy = false; _isBusy = false;
@ -247,13 +249,8 @@ namespace Units
ball.AddComponent<WeaponView>().SetWeapon(_weapon); ball.AddComponent<WeaponView>().SetWeapon(_weapon);
ball.transform.DOMove( ball.transform.DOMove(
new Vector3(_direction.normalized.x, new Vector3(_direction.normalized.x,
<<<<<<< HEAD
0, _direction.normalized.y) * _weapon.disnatce * _hexGrid.HexDistance +
_instance.transform.position + new Vector3(0, 2, 0), // initiate
=======
0, _direction.normalized.y) * _weapon.disnatce * HexGrid.HexDistance + 0, _direction.normalized.y) * _weapon.disnatce * HexGrid.HexDistance +
_instance.transform.position + new Vector3(0, 2, 0), _instance.transform.position + new Vector3(0, 2, 0),
>>>>>>> Alexei
_weapon.speed) _weapon.speed)
.SetEase(Ease.Linear) .SetEase(Ease.Linear)
.OnComplete(() => Object.Destroy(ball)); .OnComplete(() => Object.Destroy(ball));
@ -331,7 +328,6 @@ namespace Units
private void Damage(int dmg) private void Damage(int dmg)
{ {
if (_defenceBonus == 0 && _hp - dmg <= 0f) if (_defenceBonus == 0 && _hp - dmg <= 0f)
{ {
Death(); Death();
@ -345,7 +341,7 @@ namespace Units
{ {
_hp -= dmg; _hp -= dmg;
} }
UpdateBarCanvas(); UpdateBarCanvas();
} }
} }