Feedbacks da Paulinha

caroltaus · caroltaus · commit 10ae90a8a2e0 · 2022-04-05T15:14:53.000-03:00
diff --git a/FlyGame/FlyGame Shared/Controllers/GameSceneController.swift b/FlyGame/FlyGame Shared/Controllers/GameSceneController.swift
@@ -151,23 +151,6 @@ class GameSceneController: NSObject, SKPhysicsContactDelegate {
     
 #endif
     
-    func calculateObstacleMovement(allObstacles: [SKNode]) {
-        for obstacle in allObstacles {
-            if gameDelegate?.pausedStatus() == true {
-                obstacle.position.x -= 0
-            }
-            else {
-#if os(iOS)
-                let moveObstAction = SKAction.moveTo(x: (-100000), duration: duration*100)
-#elseif os(tvOS)
-                let moveObstAction = SKAction.moveTo(x: (-100000), duration: durationTV*100)
-#endif
-                
-                obstacle.run(moveObstAction)
-            }
-        }
-    }
-    
 #if os(tvOS)
     func addTargetToPauseActionToTV() -> UITapGestureRecognizer {
         self.buttonTvOS.addTarget(self, action: #selector(self.tvOSAction))
@@ -393,7 +376,6 @@ class GameSceneController: NSObject, SKPhysicsContactDelegate {
             AudioService.shared.soundManager(with: .coin, soundAction: .play)
             increaseScore(player: player, enemy: enemy)
             coinsInRun += 1
-            print(coinsInRun)
             if coinsInRun == 5 {
                 GameCenterService.shared.showAchievements(achievementID: "firstCoinsInRunID")
             }
diff --git a/FlyGame/FlyGame Shared/Views/GameScene.swift b/FlyGame/FlyGame Shared/Views/GameScene.swift
@@ -43,6 +43,7 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
     
     lazy var pauseMenu: PauseMenu = {
         var menu = PauseMenu()
+        menu.zPosition = 4
         menu.gameDelegate = self
         return menu
     }()
@@ -91,9 +92,6 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
     
     // MARK: - setUpScenne
     func setUpScene() {
-        removeAllChildren()
-        removeAllActions()
-        
         #if os(tvOS)
             addPauseActionGesture()
         #endif
@@ -110,9 +108,7 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
         
         self.addChild(pauseMenu)
         self.addChild(scoreLabel)
-        
-        setNodesSize()
-        setNodesPosition()
+    
         addSwipeGestures()
         gameLogic.buttonActions()
         
@@ -175,7 +171,8 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
     
     // MARK: didChangeSize
     override func didChangeSize(_ oldSize: CGSize) {
-        self.setUpScene()
+        setNodesSize()
+        setNodesPosition()
         
         setPhysics(node: playerNode)
     }
diff --git a/FlyGame/FlyGame Shared/Views/MenuScene.swift b/FlyGame/FlyGame Shared/Views/MenuScene.swift
@@ -169,41 +169,7 @@ class MenuScene: SKScene {
             chandelier.setScale(self.size.height/350)
             chair.setScale(self.size.height/350)
             flyAction.setScale(self.size.height/3150)
-            
-            scenarioImage.position = CGPoint(x: self.size.width/2, y: self.size.height/2)
-            scenarioImage.zPosition = 0
-            
-            soundButton.position = CGPoint(x: self.size.width/2, y: self.size.height/3.5)
-            soundButton.zPosition = 1
-            
-            scoreLabel.position = CGPoint(x: self.size.width/2, y: self.size.height/2.5)
-            scoreLabel.zPosition = 1
-            scoreLabel.fontSize = self.size.height/15
-            
-            musicButton.position = CGPoint(x: soundButton.position.x + self.size.width/9.5, y: self.size.height/3.5)
-            musicButton.zPosition = 1
-            
-            gameCenterButton.position = CGPoint(x: soundButton.position.x - self.size.width/9.5, y: self.size.height/3.5)
-            gameCenterButton.zPosition = 1
-            
-            playButton.position = CGPoint(x: self.size.width/2, y: self.size.height/1.6)
-            playButton.zPosition = 1
-            
-            piano.position = CGPoint(x: self.size.width/8.5, y: self.size.height/3.5)
-            piano.zPosition = 1
-            
-            catAction.position = CGPoint(x: self.size.width/6, y: self.size.height/1.55)
-            catAction.zPosition = 2
-            
-            chandelier.position = CGPoint(x: self.size.width/1.3, y: self.size.height/1.13)
-            chandelier.zPosition = 1
-            
-            chair.position = CGPoint(x: self.size.width/1.215, y: self.size.height/7.5)
-            chair.zPosition = 1
-            
-            flyAction.position = CGPoint(x: self.size.width/1.215, y: self.size.height/2.6)
-            flyAction.zPosition = 1
-            
+
         default:
             break
         }
@@ -244,6 +210,48 @@ class MenuScene: SKScene {
         
         flyAction.position = CGPoint(x: self.size.width/1.215, y: self.size.height/2.28)
         flyAction.zPosition = 1
+        
+#if os(iOS)
+        switch UIDevice.current.userInterfaceIdiom {
+        case .pad:
+            scenarioImage.position = CGPoint(x: self.size.width/2, y: self.size.height/2)
+            scenarioImage.zPosition = 0
+            
+            soundButton.position = CGPoint(x: self.size.width/2, y: self.size.height/3.5)
+            soundButton.zPosition = 1
+            
+            scoreLabel.position = CGPoint(x: self.size.width/2, y: self.size.height/2.5)
+            scoreLabel.zPosition = 1
+            scoreLabel.fontSize = self.size.height/15
+            
+            musicButton.position = CGPoint(x: soundButton.position.x + self.size.width/9.5, y: self.size.height/3.5)
+            musicButton.zPosition = 1
+            
+            gameCenterButton.position = CGPoint(x: soundButton.position.x - self.size.width/9.5, y: self.size.height/3.5)
+            gameCenterButton.zPosition = 1
+            
+            playButton.position = CGPoint(x: self.size.width/2, y: self.size.height/1.6)
+            playButton.zPosition = 1
+            
+            piano.position = CGPoint(x: self.size.width/8.5, y: self.size.height/3.5)
+            piano.zPosition = 1
+            
+            catAction.position = CGPoint(x: self.size.width/6, y: self.size.height/1.55)
+            catAction.zPosition = 2
+            
+            chandelier.position = CGPoint(x: self.size.width/1.3, y: self.size.height/1.13)
+            chandelier.zPosition = 1
+            
+            chair.position = CGPoint(x: self.size.width/1.215, y: self.size.height/7.5)
+            chair.zPosition = 1
+            
+            flyAction.position = CGPoint(x: self.size.width/1.215, y: self.size.height/2.6)
+            flyAction.zPosition = 1
+            
+        default:
+            break
+        }
+#endif
     }
     
     #if os(tvOS)
