Skip to content

Commit c2dad72

Browse files
GabrielenamieGabrielenamie
authored
Merge pull request #60 from rebeccamello/fix/architecture
Fix/architecture
2 parents cb6b3a7 + b29b500 commit c2dad72

File tree

11 files changed

+45
-37
lines changed

11 files changed

+45
-37
lines changed

‎FlyGame/FlyGame Shared/Controllers/GameSceneController.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,19 +126,19 @@ class GameSceneController: NSObject, SKPhysicsContactDelegate {
126126
}
127127

128128
@objc func clicked() {
129-
if gameDelegate?.getResumeButton().isFocused == true {
129+
if gameDelegate?.getButtons()[0].isFocused == true {
130130
gameDelegate?.resumeGame()
131131

132-
} else if gameDelegate?.getHomeButton().isFocused == true {
132+
} else if gameDelegate?.getButtons()[1].isFocused == true {
133133
gameDelegate?.goToHome()
134134

135-
} else if gameDelegate?.getRestartButton().isFocused == true {
135+
} else if gameDelegate?.getButtons()[2].isFocused == true {
136136
gameDelegate?.restartGame()
137137

138-
} else if gameDelegate?.getSoundButton().isFocused == true {
138+
} else if gameDelegate?.getButtons()[3].isFocused == true {
139139
gameDelegate?.soundAction()
140140

141-
} else if gameDelegate?.getMusicButton().isFocused == true {
141+
} else if gameDelegate?.getButtons()[4].isFocused == true {
142142
gameDelegate?.musicAction()
143143
}
144144
}
@@ -228,7 +228,7 @@ class GameSceneController: NSObject, SKPhysicsContactDelegate {
228228
}
229229

230230
if scenario2XPosition <= -scenario2Width/2 {
231-
gameDelegate?.getScenario()[0].position.x = scenario2Width/2 + scenarioXPosition*2
231+
gameDelegate?.getScenario()[1].position.x = scenario2Width/2 + scenarioXPosition*2
232232

233233
if score >= 30 && score <= 50 || score >= 80 && score <= 100 {
234234
gameDelegate?.getScenario()[1].texture = gameDelegate?.getScenarioTextures()[1]

‎FlyGame/FlyGame Shared/Controllers/MenuSceneController.swift‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,26 +52,28 @@ class MenuSceneController {
5252
}
5353
}
5454

55-
func addTapGestureRecognizer() -> UITapGestureRecognizer {
56-
tapGeneralSelection.addTarget(self, action: #selector(clicked))
57-
return tapGeneralSelection
58-
}
59-
60-
@objc func clicked() {
55+
#if os(tvOS)
56+
func addTapGestureRecognizer() -> UITapGestureRecognizer {
57+
tapGeneralSelection.addTarget(self, action: #selector(clicked))
58+
return tapGeneralSelection
59+
}
6160

62-
if ((menuDelegate?.getButtons()[3].isFocused) == true) {
63-
playGame()
61+
@objc func clicked() {
6462

65-
} else if (menuDelegate?.getButtons()[0].isFocused) == true {
66-
toggleSound()
67-
68-
} else if (menuDelegate?.getButtons()[1].isFocused) == true {
69-
toggleMusic()
70-
71-
} else if (menuDelegate?.getButtons()[2].isFocused) == true {
72-
menuDelegate?.goToGameCenter()
63+
if ((menuDelegate?.getButtons()[3].isFocused) == true) {
64+
menuDelegate?.goToGameScene()
65+
66+
} else if (menuDelegate?.getButtons()[0].isFocused) == true {
67+
toggleSound()
68+
69+
} else if (menuDelegate?.getButtons()[1].isFocused) == true {
70+
toggleMusic()
71+
72+
} else if (menuDelegate?.getButtons()[2].isFocused) == true {
73+
menuDelegate?.goToGameCenter()
74+
}
7375
}
74-
}
76+
#endif
7577

7678
func playGame() {
7779
if menuDelegate?.getTutorialStatus() == false {

‎FlyGame/FlyGame Shared/Controllers/MenuViewController.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class MenuViewController: UIViewController {
2929
// Fazendo a autenticação com o Game Center
3030
GameCenterService.shared.autenticateUser {vct, score, error in
3131
if let error = error {
32-
print("ERRO GAME CENTER: \(error.description)")
3332
return
3433
}
3534
if let vct = vct {

‎FlyGame/FlyGame Shared/Delegate/MenuLogicDelegate.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ protocol MenuLogicDelegate {
1616
func getTutorialStatus() -> Bool
1717

1818
func presentScene(scene: SKScene)
19+
20+
func goToGameScene()
1921
}

‎FlyGame/FlyGame Shared/Services/AudioService.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ class AudioService: AudioDelegate {
108108
self.loadedAudios[music.description] = audio
109109
return audio
110110
} catch {
111-
print(">>> ERRO: N foi possível reproduzir o áudio")
112111
return nil
113112
}
114113
}

‎FlyGame/FlyGame Shared/Views/GameOverScene.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import SpriteKit
99

1010
class GameOverScene: SKScene {
1111
var score: Int = 20
12+
var defaults = UserDefaults.standard
13+
var hideTutorial: Bool = false
1214

1315
lazy var scenarioImage: SKSpriteNode = {
1416
var scenario = SKSpriteNode(imageNamed: "cenario")
@@ -69,6 +71,7 @@ class GameOverScene: SKScene {
6971

7072
lazy var gameOver: GameOverSceneController = {
7173
let g = GameOverSceneController()
74+
g.gameOverDelegate = self
7275
return g
7376
}()
7477

@@ -176,6 +179,7 @@ extension GameOverScene: GameOverLogicDelegate {
176179

177180
func goToMenu() {
178181
let scene = MenuScene.newGameScene()
182+
hideTutorial = defaults.bool(forKey: "playerFirstTime")
179183
self.view?.presentScene(scene)
180184

181185
#if os(tvOS)

‎FlyGame/FlyGame Shared/Views/MenuScene.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import SpriteKit
99

1010
class MenuScene: SKScene {
11-
var hideTutorial: Bool = false
1211
var defaults = UserDefaults.standard
12+
var hideTutorial: Bool = false
1313

1414
lazy var menuLogic: MenuSceneController = {
1515
let m = MenuSceneController()
@@ -142,11 +142,6 @@ class MenuScene: SKScene {
142142
setupNodesPosition()
143143
setupNodesSize()
144144
}
145-
146-
func goToGameScene() {
147-
hideTutorial = defaults.bool(forKey: "playerFirstTime")
148-
menuLogic.playGame()
149-
}
150145

151146
private func setupNodesSize() {
152147
scenarioImage.size.width = self.size.width
@@ -227,6 +222,11 @@ extension MenuScene: MenuLogicDelegate {
227222
func presentScene(scene: SKScene) {
228223
self.view?.presentScene(scene)
229224
}
225+
226+
func goToGameScene() {
227+
hideTutorial = defaults.bool(forKey: "playerFirstTime")
228+
menuLogic.playGame()
229+
}
230230
}
231231

232232
#if os(tvOS)

‎FlyGame/FlyGame Shared/Views/TutorialScene.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import SpriteKit
1111
class TutorialScene: SKScene {
1212

1313
var hideTutorial: Bool = false
14+
var defaults = UserDefaults.standard
15+
1416
lazy var scenarioImage: SKSpriteNode = {
1517
var scenario = SKSpriteNode()
1618
scenario = SKSpriteNode(imageNamed: "cenario")

‎FlyGame/FlyGame.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@
787787
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
788788
CODE_SIGN_STYLE = Automatic;
789789
CURRENT_PROJECT_VERSION = 5;
790-
DEVELOPMENT_TEAM = ZXA7534U3Y;
790+
DEVELOPMENT_TEAM = B47883TN4D;
791791
GENERATE_INFOPLIST_FILE = YES;
792792
INFOPLIST_FILE = "FlyGame-iOS-Info.plist";
793793
INFOPLIST_KEY_CFBundleDisplayName = "Catch Fly";
@@ -819,7 +819,7 @@
819819
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
820820
CODE_SIGN_STYLE = Automatic;
821821
CURRENT_PROJECT_VERSION = 5;
822-
DEVELOPMENT_TEAM = ZXA7534U3Y;
822+
DEVELOPMENT_TEAM = B47883TN4D;
823823
GENERATE_INFOPLIST_FILE = YES;
824824
INFOPLIST_FILE = "FlyGame-iOS-Info.plist";
825825
INFOPLIST_KEY_CFBundleDisplayName = "Catch Fly";
@@ -852,7 +852,7 @@
852852
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
853853
CODE_SIGN_STYLE = Automatic;
854854
CURRENT_PROJECT_VERSION = 2;
855-
DEVELOPMENT_TEAM = ZXA7534U3Y;
855+
DEVELOPMENT_TEAM = B47883TN4D;
856856
GENERATE_INFOPLIST_FILE = YES;
857857
INFOPLIST_FILE = "FlyGame-tvOS-Info.plist";
858858
INFOPLIST_KEY_CFBundleDisplayName = "Catch Fly";
@@ -879,7 +879,7 @@
879879
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
880880
CODE_SIGN_STYLE = Automatic;
881881
CURRENT_PROJECT_VERSION = 2;
882-
DEVELOPMENT_TEAM = ZXA7534U3Y;
882+
DEVELOPMENT_TEAM = B47883TN4D;
883883
GENERATE_INFOPLIST_FILE = YES;
884884
INFOPLIST_FILE = "FlyGame-tvOS-Info.plist";
885885
INFOPLIST_KEY_CFBundleDisplayName = "Catch Fly";

‎FlyGame/FlyGame.xcodeproj/project.xcworkspace/xcuserdata/nahaliapapst.xcuserdatad/UserInterfaceState.xcuserstate‎

9.42 KB
Binary file not shown.

0 commit comments

Comments
 (0)