diff --git a/GoldWars/GoldWars.xcodeproj/project.pbxproj b/GoldWars/GoldWars.xcodeproj/project.pbxproj index d42f8be..8566de1 100644 --- a/GoldWars/GoldWars.xcodeproj/project.pbxproj +++ b/GoldWars/GoldWars.xcodeproj/project.pbxproj @@ -614,6 +614,7 @@ CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = DDKFQG46BQ; INFOPLIST_FILE = GoldWars/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -637,6 +638,7 @@ CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = DDKFQG46BQ; INFOPLIST_FILE = GoldWars/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/GoldWars/GoldWars/GameCenterManager.swift b/GoldWars/GoldWars/GameCenterManager.swift index ead0e7d..05cb687 100644 --- a/GoldWars/GoldWars/GameCenterManager.swift +++ b/GoldWars/GoldWars/GameCenterManager.swift @@ -178,9 +178,9 @@ final class GameCenterManager: NSObject, GKMatchmakerViewControllerDelegate, GKG (EntityManager.gameEMInstance.scene as! GameScene).gameEnd() case 6: os_log("State 6 erhalten, Peer hat Spiel verlassen ", log: LOG, type: .info) - (EntityManager.gameEMInstance.scene as! GameScene).gameQuit() opponentQuit = true quitGame = true + (EntityManager.gameEMInstance.scene as! GameScene).gameQuit() default: break } diff --git a/GoldWars/GoldWars/GameViewController.swift b/GoldWars/GoldWars/GameViewController.swift index 3ab5d6e..600fbc6 100644 --- a/GoldWars/GoldWars/GameViewController.swift +++ b/GoldWars/GoldWars/GameViewController.swift @@ -22,8 +22,8 @@ class GameViewController: UIViewController { scene.scaleMode = .aspectFill view.presentScene(scene) //TODO: create dev profile or remove on delivery - view.showsFPS = true - view.showsNodeCount = true +// view.showsFPS = true +// view.showsNodeCount = true } GameCenterManager.sharedInstance.viewController = self } diff --git a/GoldWars/GoldWars/Partikels/Explosion.sks b/GoldWars/GoldWars/Partikels/Explosion.sks index 05170cb..8e57ed7 100644 Binary files a/GoldWars/GoldWars/Partikels/Explosion.sks and b/GoldWars/GoldWars/Partikels/Explosion.sks differ diff --git a/GoldWars/GoldWars/Partikels/Fire.sks b/GoldWars/GoldWars/Partikels/Fire.sks index 93a4b74..f78fb6b 100644 Binary files a/GoldWars/GoldWars/Partikels/Fire.sks and b/GoldWars/GoldWars/Partikels/Fire.sks differ diff --git a/GoldWars/GoldWars/Partikels/LoserFire.sks b/GoldWars/GoldWars/Partikels/LoserFire.sks index bd7ef75..318f58b 100644 Binary files a/GoldWars/GoldWars/Partikels/LoserFire.sks and b/GoldWars/GoldWars/Partikels/LoserFire.sks differ diff --git a/GoldWars/GoldWars/RoundCalculatorService.swift b/GoldWars/GoldWars/RoundCalculatorService.swift index d146659..1a6e106 100644 --- a/GoldWars/GoldWars/RoundCalculatorService.swift +++ b/GoldWars/GoldWars/RoundCalculatorService.swift @@ -20,7 +20,7 @@ class RoundCalculatorService { let ATK_BOOST_MULTIPLICATOR = 1.1 let DEF_BOOST_MULTIPLICATOR = 1.1 - let MAX_ROUNDS = 3 + let MAX_ROUNDS = 20 var currentRound = 1 var isCalculating = false var numberOfAttacks = 0