From f882b7e615b418baf206aadbc8d6a2539d78ba36 Mon Sep 17 00:00:00 2001 From: Jakob Haag Date: Sat, 30 May 2020 14:46:42 +0200 Subject: [PATCH] Remove TimeComponent and set TimerLabel in the HUD. Reset Timer via RoundTimer --- GoldWars/GoldWars.xcodeproj/project.pbxproj | 5 --- GoldWars/GoldWars/DataService.swift | 2 +- .../GoldWars/Entities/EntityManager.swift | 31 ++++++++++--------- GoldWars/GoldWars/Entities/HUD.swift | 17 +++++++++- GoldWars/GoldWars/GameCenterManager.swift | 2 +- .../GoldWars/RoundCalculatorService.swift | 3 +- GoldWars/GoldWars/RoundTimer.swift | 29 +++++++++-------- GoldWars/GoldWars/Scenes/GameScene.swift | 1 - 8 files changed, 52 insertions(+), 38 deletions(-) diff --git a/GoldWars/GoldWars.xcodeproj/project.pbxproj b/GoldWars/GoldWars.xcodeproj/project.pbxproj index 4123594..38ce07b 100644 --- a/GoldWars/GoldWars.xcodeproj/project.pbxproj +++ b/GoldWars/GoldWars.xcodeproj/project.pbxproj @@ -16,7 +16,6 @@ 110360EE244B101B008610AF /* GoldWarsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110360ED244B101B008610AF /* GoldWarsTests.swift */; }; 11036113244B3E30008610AF /* MenuScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11036112244B3E30008610AF /* MenuScene.swift */; }; 116060F7245C57D2004E5A36 /* EntityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 116060F6245C57D2004E5A36 /* EntityManager.swift */; }; - 2086465C2461B66200817C23 /* TimerComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2086465B2461B66200817C23 /* TimerComponent.swift */; }; 3E67854024728368007B9DE4 /* CElements.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E67853F24728368007B9DE4 /* CElements.swift */; }; 3E6785422472CBEC007B9DE4 /* Way.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E6785412472CBEC007B9DE4 /* Way.swift */; }; 3E6785442472CC27007B9DE4 /* DefaultWayComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E6785432472CC27007B9DE4 /* DefaultWayComponent.swift */; }; @@ -80,7 +79,6 @@ 110360EF244B101B008610AF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 11036112244B3E30008610AF /* MenuScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuScene.swift; sourceTree = ""; }; 116060F6245C57D2004E5A36 /* EntityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntityManager.swift; sourceTree = ""; }; - 2086465B2461B66200817C23 /* TimerComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerComponent.swift; sourceTree = ""; }; 3E67853F24728368007B9DE4 /* CElements.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CElements.swift; sourceTree = ""; }; 3E6785412472CBEC007B9DE4 /* Way.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Way.swift; sourceTree = ""; }; 3E6785432472CC27007B9DE4 /* DefaultWayComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultWayComponent.swift; sourceTree = ""; }; @@ -212,7 +210,6 @@ 9EC7E48A2461FBF700396BCD /* SliderNode.swift */, 9EEDE02E246FCD800096C735 /* SpinningLogoComponent.swift */, 9E78ACB7245CB75B00526FF7 /* TeamComponent.swift */, - 2086465B2461B66200817C23 /* TimerComponent.swift */, ); path = Components; sourceTree = ""; @@ -413,7 +410,6 @@ 8BB6FF402472B8F000162BBD /* SingeClickButtonNode.swift in Sources */, C064E9A8246C0EA50022B228 /* LabelNode.swift in Sources */, 3F745DF0246F48FC00CE7375 /* PlayerMoveType.swift in Sources */, - AB1D75A0245DEC0500671525 /* MapFactory.swift in Sources */, 3EAD889524801B6A0048A10A /* RoundTimer.swift in Sources */, 3E67854024728368007B9DE4 /* CElements.swift in Sources */, ABA03DA0244BD54F00A66916 /* Base.swift in Sources */, @@ -425,7 +421,6 @@ 9E174C84245DD8CE00209FF0 /* Button.swift in Sources */, 110360DB244B101A008610AF /* GameViewController.swift in Sources */, 3E6785442472CC27007B9DE4 /* DefaultWayComponent.swift in Sources */, - 2086465C2461B66200817C23 /* TimerComponent.swift in Sources */, C05BB9C4247D890C00411249 /* SliderComponent.swift in Sources */, 110360D3244B101A008610AF /* AppDelegate.swift in Sources */, 9EC86B9F245C88A300796EF3 /* Modal.swift in Sources */, diff --git a/GoldWars/GoldWars/DataService.swift b/GoldWars/GoldWars/DataService.swift index 23fe5f2..506478d 100644 --- a/GoldWars/GoldWars/DataService.swift +++ b/GoldWars/GoldWars/DataService.swift @@ -53,7 +53,7 @@ class DataService { var mapModel: MapGenerationModel? var entityManager = EntityManager.gameEMInstance - + func addMove(playerMove: PlayerMove) { var equalMove = localRoundData.localPlayerMoves.filter { (ele) -> Bool in ele.fromBase == playerMove.fromBase && ele.toBase == playerMove.toBase diff --git a/GoldWars/GoldWars/Entities/EntityManager.swift b/GoldWars/GoldWars/Entities/EntityManager.swift index 04e02fc..1b6ec78 100644 --- a/GoldWars/GoldWars/Entities/EntityManager.swift +++ b/GoldWars/GoldWars/Entities/EntityManager.swift @@ -42,14 +42,15 @@ class EntityManager { isModal = true } - if let hudEnitity = entity as? HUD { - scene.addChild(hudEnitity.hostLabel) - scene.addChild(hudEnitity.hostUnitsLabel) - scene.addChild(hudEnitity.peerLabel) - scene.addChild(hudEnitity.peerUnitsLabel) - scene.addChild(hudEnitity.defSkill) - scene.addChild(hudEnitity.atkSkill) - scene.addChild(hudEnitity.spySkill) + if let hudEntitiy = entity as? HUD { + scene.addChild(hudEntitiy.hostLabel) + scene.addChild(hudEntitiy.hostUnitsLabel) + scene.addChild(hudEntitiy.peerLabel) + scene.addChild(hudEntitiy.peerUnitsLabel) + scene.addChild(hudEntitiy.defSkill) + scene.addChild(hudEntitiy.atkSkill) + scene.addChild(hudEntitiy.spySkill) + scene.addChild(hudEntitiy.roundTimerLabel) isModal = true } @@ -60,9 +61,6 @@ class EntityManager { if let fire = entity.component(ofType: TeamComponent.self)?.fire{ scene.addChild(fire) } - if let timer = entity.component(ofType: TimerComponent.self) { - scene.addChild(timer.labelNode) - } if let buttonNode = entity.component(ofType: ButtonComponent.self)?.buttonNode { scene.addChild(buttonNode) } @@ -264,9 +262,6 @@ class EntityManager { return SnapshotModel(baseEntites: snapBase) } - func getTimer() -> TimerComponent { - return entities.filter{$0 is HUD}[0].component(ofType: TimerComponent.self)! - } func getUnitSum(by player: GKPlayer) -> Int{ let bases = getBasesByPlayer(for: player) @@ -307,4 +302,12 @@ class EntityManager { } }) } + + func getTimer() -> RoundTimer? { + return getHUD()?.roundTimer + } + + func updateTime(time: String) { + getHUD()?.roundTimerLabel.text = time + } } diff --git a/GoldWars/GoldWars/Entities/HUD.swift b/GoldWars/GoldWars/Entities/HUD.swift index 3c8a37c..0d6c4f7 100644 --- a/GoldWars/GoldWars/Entities/HUD.swift +++ b/GoldWars/GoldWars/Entities/HUD.swift @@ -24,6 +24,9 @@ class HUD: GKEntity { var defSkill: SingeClickButtonNode var atkSkill: SingeClickButtonNode + var roundTimerLabel: SKLabelNode + let roundTimer: RoundTimer + init(size: CGSize) { host = GameCenterManager.sharedInstance.hostingPlayer peer = GameCenterManager.sharedInstance.peerPlayer @@ -32,6 +35,13 @@ class HUD: GKEntity { peerLabel = SKLabelNode(text: peer?.displayName) peerUnitsLabel = SKLabelNode(text: "500") + roundTimerLabel = SKLabelNode(text: "") + roundTimerLabel.fontColor = UIColor.black + roundTimerLabel.fontSize = CGFloat(45) + roundTimerLabel.position = CGPoint(x: size.width * 0.5, y: size.height * 0.9 - 15) + + self.roundTimer = RoundTimer() + spySkill = SingeClickButtonNode( textureName: "yellow_circle", text: "Spy", @@ -62,7 +72,8 @@ class HUD: GKEntity { peerUnitsLabel.position = CGPoint(x: size.width * 0.95, y: size.height * 0.9) setColor(labelNodes: [hostLabel,hostUnitsLabel,peerLabel,peerUnitsLabel]) - addComponent(TimerComponent(anchorPoint: CGPoint(x: size.width * 0.5, y: size.height * 0.9))) + roundTimer.initTimer() + startWithDuration() } func updateUnitSum(){ @@ -80,4 +91,8 @@ class HUD: GKEntity { fatalError("init(coder:) has not been implemented") } + func startWithDuration(){ + roundTimer.startTimer() + RoundCalculatorService.sharedInstance.isCalculating = false + } } diff --git a/GoldWars/GoldWars/GameCenterManager.swift b/GoldWars/GoldWars/GameCenterManager.swift index d5b043a..e159b18 100644 --- a/GoldWars/GoldWars/GameCenterManager.swift +++ b/GoldWars/GoldWars/GameCenterManager.swift @@ -128,7 +128,7 @@ final class GameCenterManager: NSObject, GKMatchmakerViewControllerDelegate ,GKM if let snapshotModel = try? jsonDecoder.decode(SnapshotModel.self, from: data) { DataService.sharedInstance.snapshotModel = snapshotModel entityManager.updateSnapshotModel(snapshotModel: snapshotModel) - entityManager.getTimer().startWithDuration() + entityManager.getHUD()?.startWithDuration() } if let mapModel = try? jsonDecoder.decode(MapGenerationModel.self, from: data) { os_log("Peer hat Map erhalten", log: LOG, type: .info) diff --git a/GoldWars/GoldWars/RoundCalculatorService.swift b/GoldWars/GoldWars/RoundCalculatorService.swift index a3bc482..c8ac29b 100644 --- a/GoldWars/GoldWars/RoundCalculatorService.swift +++ b/GoldWars/GoldWars/RoundCalculatorService.swift @@ -128,8 +128,7 @@ class RoundCalculatorService { MultiplayerNetwork.sharedInstance.sendSnapshotModelToPlayers() DataService.sharedInstance.snapshotModel = currentSnapshotModel entityManager.updateSnapshotModel(snapshotModel: currentSnapshotModel!) - sleep(1) - entityManager.getTimer().startWithDuration() + entityManager.getHUD()?.startWithDuration() os_log("Finished calculating Round", log: RoundCalculatorService.LOG, type: .info) } diff --git a/GoldWars/GoldWars/RoundTimer.swift b/GoldWars/GoldWars/RoundTimer.swift index 0af4c8a..3dd0f8f 100644 --- a/GoldWars/GoldWars/RoundTimer.swift +++ b/GoldWars/GoldWars/RoundTimer.swift @@ -12,10 +12,9 @@ class RoundTimer: Timer { var timer: Timer? var timeLeft: Int = 0 + var calculate = false - func startTimer() { - print("start Timer") - self.timeLeft = 10 + func initTimer() { timer = Timer.scheduledTimer( timeInterval: 1.0, target: self, @@ -25,27 +24,31 @@ class RoundTimer: Timer { ) } + func startTimer() { + timeLeft = 30 + } + @objc func onTimerFires() { - print(timeLeft) - self.timeLeft = self.timeLeft - 1 + timeLeft = timeLeft - 1 + + EntityManager.gameEMInstance.updateTime(time: (timeLeft > 0 ? String(timeLeft) : "Syncing")) if timeLeft == 0 { - print("Time is up") RoundCalculatorService.sharedInstance.resetNumberOfAttacksAndFormats() - print(!MultiplayerNetwork.sharedInstance.isSending) if !MultiplayerNetwork.sharedInstance.isSending { MultiplayerNetwork.sharedInstance.sendPlayerMoves(playerMoves: DataService.sharedInstance.localPlayerMoves) } - print(!RoundCalculatorService.sharedInstance.isCalculating) - print(DataService.sharedInstance.didReceiveAllData()) - print(GameCenterManager.sharedInstance.isServer) - if !RoundCalculatorService.sharedInstance.isCalculating + calculate = true + } + if timeLeft <= 0 { + if calculate + && !RoundCalculatorService.sharedInstance.isCalculating && DataService.sharedInstance.didReceiveAllData() && GameCenterManager.sharedInstance.isServer { - RoundCalculatorService.sharedInstance.calculateRound() + RoundCalculatorService.sharedInstance.calculateRound() + calculate = false } - print("end method \(timeLeft)") } } } diff --git a/GoldWars/GoldWars/Scenes/GameScene.swift b/GoldWars/GoldWars/Scenes/GameScene.swift index 7fa2a3b..1f602df 100644 --- a/GoldWars/GoldWars/Scenes/GameScene.swift +++ b/GoldWars/GoldWars/Scenes/GameScene.swift @@ -76,7 +76,6 @@ class GameScene: SKScene{ override func update(_ currentTime: TimeInterval) { entityManager.getBackground()?.update(deltaTime: currentTime) - entityManager.getHUD()?.component(ofType: TimerComponent.self)?.update() } func addBaseDetails(touchLocation: CGPoint, spriteNode: SKNode?, touches: Set, event: UIEvent?, entity: GKEntity){