fix rebase issues
This commit is contained in:
parent
eadcec10d8
commit
a086a7779b
@ -201,9 +201,9 @@ class RoundCalculatorService {
|
||||
|
||||
func increaseMoveCounter(ownBase: Bool!) {
|
||||
if ownBase {
|
||||
self.numberOfOwnUnitMoves = self.numberOfOwnUnitMoves + 1
|
||||
self.numberOfOwnUnitMoves += 1
|
||||
} else {
|
||||
self.numberOfAttacks = self.numberOfAttacks + 1
|
||||
self.numberOfAttacks += 1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -31,7 +31,7 @@ class RoundTimer: Timer {
|
||||
|
||||
@objc func onTimerFires()
|
||||
{
|
||||
timeLeft = timeLeft - 1
|
||||
timeLeft -= 1
|
||||
|
||||
EntityManager.gameEMInstance.updateTime(time: (timeLeft > 0 ? String(timeLeft) : roundEnded))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user