From 74a7df551c551a244bfbeec8229629e4262bbb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chauntalle=20Schu=CC=88le?= Date: Wed, 3 Jun 2020 01:18:17 +0200 Subject: [PATCH] Resolve rebase problems --- GoldWars/GoldWars.xcodeproj/project.pbxproj | 46 +++++++++------------ GoldWars/GoldWars/States/GameState.swift | 4 +- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/GoldWars/GoldWars.xcodeproj/project.pbxproj b/GoldWars/GoldWars.xcodeproj/project.pbxproj index c01ff0e..b3b049d 100644 --- a/GoldWars/GoldWars.xcodeproj/project.pbxproj +++ b/GoldWars/GoldWars.xcodeproj/project.pbxproj @@ -46,11 +46,11 @@ AB21D7D5246C748A00B09CBA /* MapFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB21D7D4246C748A00B09CBA /* MapFactory.swift */; }; ABA03DA0244BD54F00A66916 /* Base.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABA03D9F244BD54F00A66916 /* Base.swift */; }; ABC0C3732481509300387B8F /* MapUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC0C3722481509300387B8F /* MapUtils.swift */; }; - AE6BB1C224807AC00063ECAE /* StateManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6BB1C124807AC00063ECAE /* StateManager.swift */; }; - AE6BB1C424807C490063ECAE /* MenuState.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6BB1C324807C490063ECAE /* MenuState.swift */; }; - AE6BB1C624807CDA0063ECAE /* SyncingState.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6BB1C524807CDA0063ECAE /* SyncingState.swift */; }; - AE6BB1C824807E6A0063ECAE /* GameState.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6BB1C724807E6A0063ECAE /* GameState.swift */; }; - AE6BB1CA24807FDB0063ECAE /* EndGameState.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6BB1C924807FDB0063ECAE /* EndGameState.swift */; }; + AE57F11D248713D7003F0802 /* StateManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE57F118248713D7003F0802 /* StateManager.swift */; }; + AE57F11E248713D7003F0802 /* SyncingState.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE57F119248713D7003F0802 /* SyncingState.swift */; }; + AE57F11F248713D7003F0802 /* EndGameState.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE57F11A248713D7003F0802 /* EndGameState.swift */; }; + AE57F120248713D7003F0802 /* GameState.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE57F11B248713D7003F0802 /* GameState.swift */; }; + AE57F121248713D7003F0802 /* MenuState.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE57F11C248713D7003F0802 /* MenuState.swift */; }; C04783EE2468583F004961FB /* intro-music.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C04783ED2468583F004961FB /* intro-music.mp3 */; }; C04783F024685995004961FB /* SettingsScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = C04783EF24685995004961FB /* SettingsScene.swift */; }; C05BB9C4247D890C00411249 /* SliderComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C05BB9C3247D890C00411249 /* SliderComponent.swift */; }; @@ -116,11 +116,11 @@ AB21D7D4246C748A00B09CBA /* MapFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapFactory.swift; sourceTree = ""; }; ABA03D9F244BD54F00A66916 /* Base.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Base.swift; sourceTree = ""; }; ABC0C3722481509300387B8F /* MapUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapUtils.swift; sourceTree = ""; }; - AE6BB1C124807AC00063ECAE /* StateManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StateManager.swift; sourceTree = ""; }; - AE6BB1C324807C490063ECAE /* MenuState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuState.swift; sourceTree = ""; }; - AE6BB1C524807CDA0063ECAE /* SyncingState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncingState.swift; sourceTree = ""; }; - AE6BB1C724807E6A0063ECAE /* GameState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameState.swift; sourceTree = ""; }; - AE6BB1C924807FDB0063ECAE /* EndGameState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndGameState.swift; sourceTree = ""; }; + AE57F118248713D7003F0802 /* StateManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StateManager.swift; sourceTree = ""; }; + AE57F119248713D7003F0802 /* SyncingState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyncingState.swift; sourceTree = ""; }; + AE57F11A248713D7003F0802 /* EndGameState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EndGameState.swift; sourceTree = ""; }; + AE57F11B248713D7003F0802 /* GameState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameState.swift; sourceTree = ""; }; + AE57F11C248713D7003F0802 /* MenuState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuState.swift; sourceTree = ""; }; C04783ED2468583F004961FB /* intro-music.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = "intro-music.mp3"; sourceTree = ""; }; C04783EF24685995004961FB /* SettingsScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsScene.swift; sourceTree = ""; }; C05BB9C3247D890C00411249 /* SliderComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SliderComponent.swift; sourceTree = ""; }; @@ -193,12 +193,6 @@ 9E0E459624796262009817A6 /* GameCenterManager.swift */, C04783EF24685995004961FB /* SettingsScene.swift */, 3EAD889424801B6A0048A10A /* RoundTimer.swift */, - AE6BB1BF248030720063ECAE /* StateTypes.swift */, - AE6BB1C124807AC00063ECAE /* StateManager.swift */, - AE6BB1C324807C490063ECAE /* MenuState.swift */, - AE6BB1C524807CDA0063ECAE /* SyncingState.swift */, - AE6BB1C724807E6A0063ECAE /* GameState.swift */, - AE6BB1C924807FDB0063ECAE /* EndGameState.swift */, ); path = GoldWars; sourceTree = ""; @@ -306,11 +300,11 @@ AE6BB1CB2481941D0063ECAE /* States */ = { isa = PBXGroup; children = ( - AE6BB1C124807AC00063ECAE /* StateManager.swift */, - AE6BB1C324807C490063ECAE /* MenuState.swift */, - AE6BB1C924807FDB0063ECAE /* EndGameState.swift */, - AE6BB1C724807E6A0063ECAE /* GameState.swift */, - AE6BB1C524807CDA0063ECAE /* SyncingState.swift */, + AE57F11A248713D7003F0802 /* EndGameState.swift */, + AE57F11B248713D7003F0802 /* GameState.swift */, + AE57F11C248713D7003F0802 /* MenuState.swift */, + AE57F118248713D7003F0802 /* StateManager.swift */, + AE57F119248713D7003F0802 /* SyncingState.swift */, ); path = States; sourceTree = ""; @@ -424,21 +418,20 @@ 3FE19DB5246C7A22004827AB /* RoundCalculatorService.swift in Sources */, 9EC239E1246878A900952F74 /* MultiplayerNetwork.swift in Sources */, 9EA3ABEB245C6DFA006BC61D /* BaseNode.swift in Sources */, - AE6BB1CA24807FDB0063ECAE /* EndGameState.swift in Sources */, 3E6785422472CBEC007B9DE4 /* Way.swift in Sources */, 110360D9244B101A008610AF /* GameScene.swift in Sources */, C04783F024685995004961FB /* SettingsScene.swift in Sources */, 116060F7245C57D2004E5A36 /* EntityManager.swift in Sources */, C064E9AA246C114C0022B228 /* LabelComponent.swift in Sources */, - AE6BB1C424807C490063ECAE /* MenuState.swift in Sources */, 3EBD242E245D9332003CECE7 /* Team.swift in Sources */, 9E174C88245DF1FF00209FF0 /* BackgroundComponent.swift in Sources */, 9E78ACBA245CBDAF00526FF7 /* HUD.swift in Sources */, 9EC2FBA72476B1EC00ABF11F /* PlayerInfoComponent.swift in Sources */, - AE6BB1C624807CDA0063ECAE /* SyncingState.swift in Sources */, + AE57F11F248713D7003F0802 /* EndGameState.swift in Sources */, 9EEDE02D246FCD770096C735 /* SpinningLogoEntity.swift in Sources */, - AE6BB1C224807AC00063ECAE /* StateManager.swift in Sources */, - AE6BB1C824807E6A0063ECAE /* GameState.swift in Sources */, + AE57F11D248713D7003F0802 /* StateManager.swift in Sources */, + AE57F11E248713D7003F0802 /* SyncingState.swift in Sources */, + AE57F120248713D7003F0802 /* GameState.swift in Sources */, 9E174C86245DD91500209FF0 /* ButtonComponent.swift in Sources */, 11036113244B3E30008610AF /* MenuScene.swift in Sources */, C099579C246C5E5C0016AA22 /* DataService.swift in Sources */, @@ -462,6 +455,7 @@ C05BB9C4247D890C00411249 /* SliderComponent.swift in Sources */, 110360D3244B101A008610AF /* AppDelegate.swift in Sources */, 9EC86B9F245C88A300796EF3 /* Modal.swift in Sources */, + AE57F121248713D7003F0802 /* MenuState.swift in Sources */, C05FAED62468559D0006AF2E /* SoundManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/GoldWars/GoldWars/States/GameState.swift b/GoldWars/GoldWars/States/GameState.swift index 45de27a..ab768a7 100644 --- a/GoldWars/GoldWars/States/GameState.swift +++ b/GoldWars/GoldWars/States/GameState.swift @@ -29,15 +29,13 @@ class GameState: GKState { os_log("Entered Game State", log: LOG, type: .info) if CommandLine.arguments.contains("--no-matchmaking") { StateManager.sharedInstance.menuSc!.loadScene(scene: GameScene(size: StateManager.sharedInstance.menuSc!.size)) - } - if RoundCalculatorService.sharedInstance.roundNr == 1 { + } else if RoundCalculatorService.sharedInstance.roundNr == 1 { StateManager.sharedInstance.menuSc!.loadScene(scene: StateManager.sharedInstance.gameSc!) } } override func update(deltaTime seconds: TimeInterval) { EntityManager.gameEMInstance.getBackground()?.update(deltaTime: seconds) - EntityManager.gameEMInstance.getHUD()?.component(ofType: TimerComponent.self)?.update() } override func willExit(to nextState: GKState) {