diff --git a/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/Contents.json new file mode 100644 index 0000000..f5dfbc3 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "goldLettering.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "goldLettering-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "goldLettering-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering-1.png b/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering-1.png new file mode 100644 index 0000000..65d1c27 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering-1.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering-2.png b/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering-2.png new file mode 100644 index 0000000..65d1c27 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering-2.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering.png b/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering.png new file mode 100644 index 0000000..65d1c27 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/goldLettering.imageset/goldLettering.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/Contents.json new file mode 100644 index 0000000..76499f1 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "warsLettering.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "warsLettering-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "warsLettering-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering-1.png b/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering-1.png new file mode 100644 index 0000000..7e82460 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering-1.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering-2.png b/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering-2.png new file mode 100644 index 0000000..7e82460 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering-2.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering.png b/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering.png new file mode 100644 index 0000000..7e82460 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/warsLettering.imageset/warsLettering.png differ diff --git a/GoldWars/GoldWars/Entities/EntityManager.swift b/GoldWars/GoldWars/Entities/EntityManager.swift index 51c64e7..d256f8e 100644 --- a/GoldWars/GoldWars/Entities/EntityManager.swift +++ b/GoldWars/GoldWars/Entities/EntityManager.swift @@ -62,7 +62,8 @@ class EntityManager { if let spinningLogoEntity = entity as? SpinningLogoEntity { scene.addChild(spinningLogoEntity.spinningLogoNode) - scene.addChild(spinningLogoEntity.letteringNode) + scene.addChild(spinningLogoEntity.goldLetteringNode) + scene.addChild(spinningLogoEntity.warsLetteringNode) } if let wayEntity = entity as? Way { diff --git a/GoldWars/GoldWars/Entities/SpinningLogoEntity.swift b/GoldWars/GoldWars/Entities/SpinningLogoEntity.swift index 4938ca0..842a918 100644 --- a/GoldWars/GoldWars/Entities/SpinningLogoEntity.swift +++ b/GoldWars/GoldWars/Entities/SpinningLogoEntity.swift @@ -12,19 +12,26 @@ import GameplayKit class SpinningLogoEntity: GKEntity { let spinningLogoNode : SpinningLogo3DNode - let letteringNode : SKSpriteNode + let goldLetteringNode : SKSpriteNode + let warsLetteringNode : SKSpriteNode init(sceneSize size: CGSize) { spinningLogoNode = SpinningLogo3DNode() let midX = size.width / 2 let midY = size.height / 2 + goldLetteringNode = SKSpriteNode(texture: SKTexture(imageNamed: "goldLettering")) + goldLetteringNode.position = CGPoint(x: midX, y: midY); + goldLetteringNode.size = CGSize(width: 675, height: 284) + goldLetteringNode.position = CGPoint(x: midX , y: midY + 280); + goldLetteringNode.size = CGSize(width: 675, height: 284) + + warsLetteringNode = SKSpriteNode(texture: SKTexture(imageNamed: "warsLettering")) + warsLetteringNode.position = CGPoint(x: midX, y: midY - 300); + warsLetteringNode.size = CGSize(width: 700, height: 284) - letteringNode = SKSpriteNode(texture: SKTexture(imageNamed: "goldWarsLettering")) - letteringNode.position = CGPoint(x: midX, y: midY); - letteringNode.size = CGSize(width: 723, height: 590) spinningLogoNode.viewportSize = CGSize(width: 200, height: 200) - spinningLogoNode.zPosition = letteringNode.zPosition - 1 - spinningLogoNode.position = CGPoint(x: midX - 80, y: midY + 160); + spinningLogoNode.zPosition = goldLetteringNode.zPosition - 1 + spinningLogoNode.position = CGPoint(x: midX - 65, y: midY + 285); super.init() } diff --git a/GoldWars/GoldWars/Scenes/MenuScene.swift b/GoldWars/GoldWars/Scenes/MenuScene.swift index 9f2cbe5..19ccec5 100644 --- a/GoldWars/GoldWars/Scenes/MenuScene.swift +++ b/GoldWars/GoldWars/Scenes/MenuScene.swift @@ -20,7 +20,7 @@ class MenuScene: SKScene { entityManager.add(Button(name: "startGameButton", textureName: "gold_button_3", text: "Start Game", - position: CGPoint(x: midX, y: midY), + position: CGPoint(x: midX, y: midY + 90), onButtonPress: { if CommandLine.arguments.contains("--no-matchmaking") { self.loadScene(scene: GameScene(size: self.size)) @@ -37,7 +37,7 @@ class MenuScene: SKScene { entityManager.add(Button(name: "settingsButton", textureName: "gold_button_3", text: "Settings", - position: CGPoint(x: midX, y: midY - 80 ), + position: CGPoint(x: midX, y: midY ), onButtonPress: { let scene = SettingsScene(size: self.size) self.loadScene(scene: scene) @@ -45,7 +45,7 @@ class MenuScene: SKScene { entityManager.add(Button(name: "gameCenterButton", textureName: "gold_button_3", text: "GameCenter", - position: CGPoint(x: midX, y: midY - 160), + position: CGPoint(x: midX, y: midY - 90), onButtonPress: { if GameCenterManager.isAuthenticated { GameCenterManager.sharedInstance.presentGameCenter()