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/goldWarsLettering.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/Contents.json new file mode 100644 index 0000000..7ce2a7a --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "goldWarsName.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "goldWarsName-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "goldWarsName-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName-1.png b/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName-1.png new file mode 100644 index 0000000..a1a563b Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName-1.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName-2.png b/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName-2.png new file mode 100644 index 0000000..a1a563b Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName-2.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName.png b/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName.png new file mode 100644 index 0000000..a1a563b Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/goldWarsLettering.imageset/goldWarsName.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/Contents.json new file mode 100644 index 0000000..c76b227 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "gold_button00.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "gold_button00-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "gold_button00-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00-1.png b/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00-1.png new file mode 100644 index 0000000..4ed798d Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00-1.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00-2.png b/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00-2.png new file mode 100644 index 0000000..4ed798d Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00-2.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00.png b/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00.png new file mode 100644 index 0000000..4ed798d Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/gold_button.imageset/gold_button00.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button_2.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/gold_button_2.imageset/Contents.json new file mode 100644 index 0000000..2c00476 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/gold_button_2.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "gold_button_2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button_2.imageset/gold_button_2.png b/GoldWars/GoldWars/Assets.xcassets/gold_button_2.imageset/gold_button_2.png new file mode 100644 index 0000000..14a4705 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/gold_button_2.imageset/gold_button_2.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/Contents.json new file mode 100644 index 0000000..eb589c3 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "gold_button_3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/gold_button_3.png b/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/gold_button_3.png new file mode 100644 index 0000000..ca585e9 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/gold_button_3.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 8ee6c34..d256f8e 100644 --- a/GoldWars/GoldWars/Entities/EntityManager.swift +++ b/GoldWars/GoldWars/Entities/EntityManager.swift @@ -62,6 +62,8 @@ class EntityManager { if let spinningLogoEntity = entity as? SpinningLogoEntity { scene.addChild(spinningLogoEntity.spinningLogoNode) + 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 bde9785..842a918 100644 --- a/GoldWars/GoldWars/Entities/SpinningLogoEntity.swift +++ b/GoldWars/GoldWars/Entities/SpinningLogoEntity.swift @@ -12,10 +12,26 @@ import GameplayKit class SpinningLogoEntity: GKEntity { let spinningLogoNode : SpinningLogo3DNode + let goldLetteringNode : SKSpriteNode + let warsLetteringNode : SKSpriteNode - init(position: CGPoint) { + init(sceneSize size: CGSize) { spinningLogoNode = SpinningLogo3DNode() - spinningLogoNode.position = position + 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) + + spinningLogoNode.viewportSize = CGSize(width: 200, height: 200) + 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 f7f145b..19ccec5 100644 --- a/GoldWars/GoldWars/Scenes/MenuScene.swift +++ b/GoldWars/GoldWars/Scenes/MenuScene.swift @@ -18,9 +18,9 @@ class MenuScene: SKScene { let midX = self.size.width / 2 let midY = self.size.height / 2 entityManager.add(Button(name: "startGameButton", - textureName: "yellow_button04", + 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)) @@ -35,17 +35,17 @@ class MenuScene: SKScene { } })) entityManager.add(Button(name: "settingsButton", - textureName: "yellow_button04", + 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) })) entityManager.add(Button(name: "gameCenterButton", - textureName: "yellow_button04", + 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() @@ -54,7 +54,7 @@ class MenuScene: SKScene { } })) entityManager.add(Background(size: self.size)) - entityManager.add(SpinningLogoEntity(position: CGPoint(x: midX, y: midY + 200))) + entityManager.add(SpinningLogoEntity(sceneSize: self.size)) if SoundManager.sharedInstance.isMusicPlaying == false && SoundManager.sharedInstance.isMusicEnabled == true && !CommandLine.arguments.contains("--no-music") && !UserDefaults.standard.bool(forKey: "noMusic"){ SoundManager.sharedInstance.startMenuMusic()