diff --git a/GoldWars/GoldWars/Assets.xcassets/finish_button.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/finish_button.imageset/Contents.json new file mode 100644 index 0000000..6b9729c --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/finish_button.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "finish_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/finish_button.imageset/finish_button 2.png b/GoldWars/GoldWars/Assets.xcassets/finish_button.imageset/finish_button 2.png new file mode 100644 index 0000000..8beedc1 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/finish_button.imageset/finish_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 index eb589c3..935a821 100644 --- a/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/Contents.json +++ b/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "gold_button_3.png", + "filename" : "gold_button_4.png", "idiom" : "universal", "scale" : "1x" }, 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 deleted file mode 100644 index ca585e9..0000000 Binary files a/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/gold_button_3.png and /dev/null differ diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/gold_button_4.png b/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/gold_button_4.png new file mode 100644 index 0000000..bce5294 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/gold_button_3.imageset/gold_button_4.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/gold_button_4.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/gold_button_4.imageset/Contents.json new file mode 100644 index 0000000..935a821 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/gold_button_4.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "gold_button_4.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_4.imageset/gold_button_4.png b/GoldWars/GoldWars/Assets.xcassets/gold_button_4.imageset/gold_button_4.png new file mode 100644 index 0000000..f225057 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/gold_button_4.imageset/gold_button_4.png differ diff --git a/GoldWars/GoldWars/Components/SkillButtonNode.swift b/GoldWars/GoldWars/Components/SkillButtonNode.swift index 069b9d5..3c8e9f2 100644 --- a/GoldWars/GoldWars/Components/SkillButtonNode.swift +++ b/GoldWars/GoldWars/Components/SkillButtonNode.swift @@ -20,6 +20,8 @@ class SkillButtonNode: ButtonNode { self.cooldown = cooldown self.displayText = text super.init(textureName: textureName, text: text, isEnabled: isEnabled, position: position, onButtonPress: onButtonPress) + self.size = CGSize(width: 100, height: 100) + self.label.fontSize = 25 } diff --git a/GoldWars/GoldWars/Entities/HUD.swift b/GoldWars/GoldWars/Entities/HUD.swift index 070e857..b6bbeb0 100644 --- a/GoldWars/GoldWars/Entities/HUD.swift +++ b/GoldWars/GoldWars/Entities/HUD.swift @@ -98,16 +98,16 @@ class HUD: GKEntity { ) finishButton = SingeClickButtonNode( - textureName: "yellow_button04", - text: "Fertig", + textureName: "finish_button", + text: "", isEnabled: true, position: CGPoint( - x: EntityManager.gameEMInstance.scene.size.width * 0.17, - y: EntityManager.gameEMInstance.scene.size.height * 0.09), + x: EntityManager.gameEMInstance.scene.size.width / 2 , + y: EntityManager.gameEMInstance.scene.size.height * 0.1), onButtonPress: { } ) - finishButton.size = CGSize(width: 125, height: 40) - finishButton.setScale(0.9) + finishButton.size = CGSize(width: 100, height: 100) + //finishButton.setScale(0.9) finishButton.zPosition = 2 backgroundRoundCounter = SKSpriteNode(texture: SKTexture(imageNamed: "roundInfo_texture"))