From 23cd0ade20aea8e4d3a73a4c88125a394ac7062c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chauntalle=20Schu=CC=88le?= Date: Sun, 21 Jun 2020 23:25:58 +0200 Subject: [PATCH] changed questionmark asset --- .../Contents.json | 2 +- .../questionmark.imageset/questionmark.png | Bin 0 -> 3817 bytes .../yellow_questionmark.png | Bin 2965 -> 0 bytes GoldWars/GoldWars/RulesScene.swift | 2 +- GoldWars/GoldWars/Scenes/MenuScene.swift | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename GoldWars/GoldWars/Assets.xcassets/{yellow_questionmark.imageset => questionmark.imageset}/Contents.json (85%) create mode 100644 GoldWars/GoldWars/Assets.xcassets/questionmark.imageset/questionmark.png delete mode 100644 GoldWars/GoldWars/Assets.xcassets/yellow_questionmark.imageset/yellow_questionmark.png diff --git a/GoldWars/GoldWars/Assets.xcassets/yellow_questionmark.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/questionmark.imageset/Contents.json similarity index 85% rename from GoldWars/GoldWars/Assets.xcassets/yellow_questionmark.imageset/Contents.json rename to GoldWars/GoldWars/Assets.xcassets/questionmark.imageset/Contents.json index 8434bf1..79eca12 100644 --- a/GoldWars/GoldWars/Assets.xcassets/yellow_questionmark.imageset/Contents.json +++ b/GoldWars/GoldWars/Assets.xcassets/questionmark.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "yellow_questionmark.png", + "filename" : "questionmark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/GoldWars/GoldWars/Assets.xcassets/questionmark.imageset/questionmark.png b/GoldWars/GoldWars/Assets.xcassets/questionmark.imageset/questionmark.png new file mode 100644 index 0000000000000000000000000000000000000000..a38dc5c2bbf99c61fd7c83d336ff4f834e0142ca GIT binary patch literal 3817 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 literal 0 HcmV?d00001 diff --git a/GoldWars/GoldWars/Assets.xcassets/yellow_questionmark.imageset/yellow_questionmark.png b/GoldWars/GoldWars/Assets.xcassets/yellow_questionmark.imageset/yellow_questionmark.png deleted file mode 100644 index d973c7f664ca1491e0795cc665ab7fa1cb78741c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2965 zcmZ{mcRbXOAICrEtmDKX$-1*g#+m19pKQ*`%yx*7ku5oAbaX;S$V!+ycQAJ50*{pUN?(%g`RiH8XQ02X5-J?nE-`)@JQpLa^9 ziNv|k-auo}0MMAh{Ktdtd`4i6tT6x(BL)DtBmg)*w{RN(5RL?Z@9yVpJ^)+_E+ScJ zoG<7-O%3&cv;Rg}S5@}8!w_bS(P#Kd&&Vz$48z|-0RU5hu^!sS_w!bvU#886i^FH@ z-4!R8NOBk%+T559ehUZ_O!Z7s*|E+csc`G-5IZjAhbFb#ec<`J2v zPA8jSp4x8M=kmrnzs1UsL=XQ56p7p8Z+pUo)f~z&^domS(PB6cz12%auVdST_rBBUIh**;<~NSBk`_C&4$v&lD+EKO_SOawq8 zu3BA9Mt{up+N4eS)8;ytoSaFOzww)2?jI=gR_wX*TwIoWfmWhv-E{fs`!jN%(7Aen z3zD*{OAy@p*I5^*lj(eYer

}^15?C0{UQ|a+N6|6~QKHt%$o?S@+2`)MQFkin< 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 Ht~>re>uX`^ diff --git a/GoldWars/GoldWars/RulesScene.swift b/GoldWars/GoldWars/RulesScene.swift index 86696e4..9394923 100644 --- a/GoldWars/GoldWars/RulesScene.swift +++ b/GoldWars/GoldWars/RulesScene.swift @@ -14,7 +14,7 @@ class RulesScene: SKScene { override func sceneDidLoad() { EntityManager.rulesEMInstance.setScene(scene: self) EntityManager.rulesEMInstance.add(Button(name: "backToMenuScene", - textureName: "yellow_questionmark", + textureName: "questionmark", text: "", position: CGPoint(x: self.size.width - 50, y: self.size.height - 50), onButtonPress: { diff --git a/GoldWars/GoldWars/Scenes/MenuScene.swift b/GoldWars/GoldWars/Scenes/MenuScene.swift index 11a3333..683eaea 100644 --- a/GoldWars/GoldWars/Scenes/MenuScene.swift +++ b/GoldWars/GoldWars/Scenes/MenuScene.swift @@ -54,7 +54,7 @@ class MenuScene: SKScene { } })) entityManager.add(Button(name: "regelwerkButton", - textureName: "yellow_questionmark", + textureName: "questionmark", text: "", position: CGPoint(x: self.size.width - 50, y: self.size.height - 50), onButtonPress: {