From 88ddf07a050ef685eb0a32ca69d947f3de8db50c Mon Sep 17 00:00:00 2001 From: Niko Jochim <82joni1bif@hft-stuttgart.de> Date: Fri, 26 Jun 2020 01:57:08 +0200 Subject: [PATCH] HUD Layout --- .../exitButton.imageset/Contents.json | 21 +++++++++++++++ .../exitButton.imageset/exitButton.png | Bin 0 -> 4041 bytes .../finish_button 2.png | Bin 4337 -> 4126 bytes .../roundInfoTexture.imageset/Contents.json | 23 +++++++++++++++++ .../roundInfoTexture-1.png | Bin 0 -> 2815 bytes .../roundInfoTexture-2.png | Bin 0 -> 2815 bytes .../roundInfoTexture.png | Bin 0 -> 2815 bytes GoldWars/GoldWars/Entities/HUD.swift | 24 +++++++++--------- 8 files changed, 56 insertions(+), 12 deletions(-) create mode 100644 GoldWars/GoldWars/Assets.xcassets/exitButton.imageset/Contents.json create mode 100644 GoldWars/GoldWars/Assets.xcassets/exitButton.imageset/exitButton.png create mode 100644 GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/Contents.json create mode 100644 GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/roundInfoTexture-1.png create mode 100644 GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/roundInfoTexture-2.png create mode 100644 GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/roundInfoTexture.png diff --git a/GoldWars/GoldWars/Assets.xcassets/exitButton.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/exitButton.imageset/Contents.json new file mode 100644 index 0000000..7b1399e --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/exitButton.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "exitButton.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/exitButton.imageset/exitButton.png b/GoldWars/GoldWars/Assets.xcassets/exitButton.imageset/exitButton.png new file mode 100644 index 0000000000000000000000000000000000000000..7d180b7d5caa3be6d8eaabaaafcf54c47b17d6e9 GIT binary patch literal 4041 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 literal 0 HcmV?d00001 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 index 8beedc19544448d6db431a76275e5a1ba08e485e..00c4273c13b511fc2a078545ccf6863f6df97fed 100644 GIT binary patch delta 3398 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 delta 3611 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 QazOuLW&$&=G4w$F7boriZ~y=R diff --git a/GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/Contents.json new file mode 100644 index 0000000..bdb389d --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "roundInfoTexture.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "roundInfoTexture-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "roundInfoTexture-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/roundInfoTexture-1.png b/GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/roundInfoTexture-1.png new file mode 100644 index 0000000000000000000000000000000000000000..49b79a39977f97a04dc6c93c1552e0fd43025881 GIT binary patch literal 2815 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 literal 0 HcmV?d00001 diff --git a/GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/roundInfoTexture-2.png b/GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/roundInfoTexture-2.png new file mode 100644 index 0000000000000000000000000000000000000000..49b79a39977f97a04dc6c93c1552e0fd43025881 GIT binary patch literal 2815 zcmds3dpuP87T+`8BSd-S(KLfXGh=29#~7k8bi5xYub9DL@)*ou6lV0~9EH3>N%Be> zUAhg9BN7n}5-HCU*Rv?}@|ruU+qw78d;h$9fA(JAwbu9dUB9*WAHS92Xit=a?12CP zAZ251;ViK1?MGZx@NP9FcL@xL?o2!kaCoY70>_c!ZWCx{2j~c}H~WQ00B8v;00m1Ce`MK3LVw|HqNj@vRUqO)b#-UB+u7p%X<3k|2^nI^EW47>nuhfy%-R|+G<1mh#J<-dptg(u+h)FX`ZX$O)f7TN{rGIA5Zj0QJp}*k zvyFwhD--ngcv!N$n^NM8Pk*=FadT`J=DEfleGEq1)v-(FtZ-@7qxAU;eKPA%R-TBn ztAeGI@GVMu3aqqPt4_PvW6(38%I1VuSx(seeA!#x+c<7afpO3x=hIkTZO|uE6k#!s z&g+gFpCQnvyX(&o&svFg0LoCI0QQb_5XS7kbr`~;1hF%Y*Uy6|*?%_gBms`1tHR!^ z%Hg>DG?oLnJn4v;yrYCGunu@i?g$P-fi3}g(#a{eq~6SQ_SX{X zY4JxJVp1ymnpWm{DF=sVyMEKfM!kD+)o@MS;+ElKv{&CNx#n!~U|qcfs_vhDwoov+ za+$bfZ&S{wyEm!!!Z5k9=1FeQ_)6(7Vyym;@P(KO!`cH|sw&`F5SJ^|zR*)~qp-^R zO3v-IM|-a<9DD9Wnuhr{RsE_e71PR3VRN)KPS}job?&+~tNnRk+TOl%-f}KxGgans zR!`)Y(!%a~UCjp@m$Hk6&Wm%J|IQJ~`rQIS1ra2cX3oKx@qtHuSO+!dO1xwY-wZ|K zH8ElL_V4dWe)B3Qc>-T|3f$WVMgP1kTLjq>?Z|&-qL0(0^*E$7z3$thK+iO>NRema z@3!qs;>n!{iDkal=?w23;Ji0~Oq5wEc|CB?`?>a&u6vk>CZB-SM$wnG<2#d(3U+qC zmX-+Xfut97d~4@I`NO5xjz&FvVS89NWiJ}7YRcU=|CY4Fesu83oQVAX54(LJG>-Ji z)rWBH`jwoLRfW)7n`O~{6)UF^r&68Fd~c3Bz-ly3PHFwL=GObt{1|h2bD3e&I3qTR z)Yvps7df+3o!dI?oX!*RYsq@G$-_ermxbJr@hW9FY1U#$0YVBsLdo`)+$wm58 zbW6o$U#nv9?ATMsh{UmM=Gz*MD2o#5BF6=4HYQPt9*n7k-ZpRJl!Q4`C(x7{+Tkt_ z5FuTQ;_fK{M&@M}#vFk`?bzGqkmfsEcNeApzf-oZK!dW}od{9hHA7z8{ml2CBjD!n zdj9Y&tZOqrbn1HL9qi}ZPx(5C>lqcmCH~8($%A2eN&YyiFMF-*Gn6AGCn9>U?@ct= zt$Hx9L0*(0xt6ZBLrpP3i3?PoR^McJm$c6Z&bAB=$9fWbZcc9&w$W5&+Y#(P%*z>a zpI`bMX=~B3ogtAHUSu@7O;`9t#EgK4_IwQ3xe+~ zdE*NTeVS_Inciwy{(Y#JSYl^~N{A6e*r+qxr{+o8D}!HR{n8SK-9PM0ku|IC8g0!! zN4SHCkx5%e6ln*zy~!yP+B`L1)$vDv(4-gA((Qbes=K2raPronP9`>>tL(`c zAVF1s_}Du3B6dUqt_{|-G-hoTG&R=pX5$fwszW6yB?oOl6+OmD1xZzQX|aj98Q0N! zY#RnL8O}2M!bT(e$^1Wa6XF&oJ0zC()bTBz?bE{uHW5*toZIh~iUj(eV&E!kh} z)t!^Cwt<6V6~8P~+@`KQP>Ht{w%2<4^D{VmtvW5qflW0VOaC|_DxG$= z)LcsEw1(Xcy@^6`x|7E?jY4IX%YnyHS&s|DT!8s_2a-sUxs_*HI1Jlf7J!)+^S5F? zyREilng|{zy151hjPg>e#-_WdjSwy=#K}PA?wU|T7$|t-+Zm|bL0zjHdSDosK4j^| zy@5i7NXF6|6g?bW3aA^RhYw9xw13*ENLs7p0!*n6BYp4Y=vT+HTi!8OSmq%UrQ*k@ zl*O~|*&SXrW;@HVIa!x<=X}z{6MtIH0f_8N2hN{(^g)i)C=IWE+TC`ca!r4Cud#(C zT389l0^w5_eL-~t!41VXmlp9E#=@?kY%`Jcj_SBNSmi88$!=%&y1eMp%SpWb4 literal 0 HcmV?d00001 diff --git a/GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/roundInfoTexture.png b/GoldWars/GoldWars/Assets.xcassets/roundInfoTexture.imageset/roundInfoTexture.png new file mode 100644 index 0000000000000000000000000000000000000000..49b79a39977f97a04dc6c93c1552e0fd43025881 GIT binary patch literal 2815 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 literal 0 HcmV?d00001 diff --git a/GoldWars/GoldWars/Entities/HUD.swift b/GoldWars/GoldWars/Entities/HUD.swift index b6bbeb0..fc3d53f 100644 --- a/GoldWars/GoldWars/Entities/HUD.swift +++ b/GoldWars/GoldWars/Entities/HUD.swift @@ -52,17 +52,16 @@ class HUD: GKEntity { self.roundTimer = RoundTimer() - leaveGame = ButtonNode(textureName: "yellow_button04", text: "Verlassen" , isEnabled: true, position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.17, y: EntityManager.gameEMInstance.scene.size.height * 0.04), onButtonPress: { + leaveGame = ButtonNode(textureName: "exitButton", text: "" , isEnabled: true, position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.05, y: EntityManager.gameEMInstance.scene.size.height * 0.11), onButtonPress: { EntityManager.gameEMInstance.add(Modal(modaltype: .QuitGame, base: nil, anchorPoint: CGPoint(x: EntityManager.gameEMInstance.scene.size.width / 2 , y: EntityManager.gameEMInstance.scene.size.height / 2), gameScene: EntityManager.gameEMInstance.scene, currentDraggedBase: nil, touchLocation: nil, collisionBase: nil)) }) - leaveGame.setScale(0.6) - + leaveGame.size = CGSize(width: 120, height: 120); spySkill = SkillButtonNode( textureName: "spy_button", text: "Spy", isEnabled: true, cooldown: 3, - position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.80, y: EntityManager.gameEMInstance.scene.size.height * 0.1), + position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.81, y: EntityManager.gameEMInstance.scene.size.height * 0.1), onButtonPress: { EntityManager.gameEMInstance.getOpponentBases(for: EntityManager.gameEMInstance.getTeam()).forEach({base in base.component(ofType: TeamComponent.self)?.unitcountLabel.text = "\(base.unitCount)"}) GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.first.time", increasePercentComplete: 100) @@ -75,7 +74,7 @@ class HUD: GKEntity { text: "Def", isEnabled: true, cooldown: 4, - position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.90, y: EntityManager.gameEMInstance.scene.size.height * 0.1), + position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.88, y: EntityManager.gameEMInstance.scene.size.height * 0.1), onButtonPress: { DataService.sharedInstance.localRoundData.hasDefenceBoost = true GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.first.time", increasePercentComplete: 100) @@ -88,7 +87,7 @@ class HUD: GKEntity { text: "Atk", isEnabled: true, cooldown: 4, - position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.70, y: EntityManager.gameEMInstance.scene.size.height * 0.1), + position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.74, y: EntityManager.gameEMInstance.scene.size.height * 0.1), onButtonPress: { DataService.sharedInstance.localRoundData.hasAttackBoost = true GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.first.time", increasePercentComplete: 100) @@ -102,15 +101,16 @@ class HUD: GKEntity { text: "", isEnabled: true, position: CGPoint( - x: EntityManager.gameEMInstance.scene.size.width / 2 , + x: EntityManager.gameEMInstance.scene.size.width * 0.95 , y: EntityManager.gameEMInstance.scene.size.height * 0.1), onButtonPress: { } ) + + finishButton.size = CGSize(width: 100, height: 100) - //finishButton.setScale(0.9) finishButton.zPosition = 2 - backgroundRoundCounter = SKSpriteNode(texture: SKTexture(imageNamed: "roundInfo_texture")) + backgroundRoundCounter = SKSpriteNode(texture: SKTexture(imageNamed: "roundInfoTexture")) currentRoundLabel = SKLabelNode(fontNamed: "Courier-Bold") roundsLabel = SKLabelNode(fontNamed: "Courier-Bold") roundLabel = SKLabelNode(fontNamed: "Courier-Bold") @@ -169,13 +169,13 @@ class HUD: GKEntity { func initRoundInfo(size: CGSize) -> () { backgroundRoundCounter.zPosition = 2 - backgroundRoundCounter.position = CGPoint(x: Double(size.width) * 0.06, y: Double(size.height) * 0.08) - + backgroundRoundCounter.position = CGPoint(x: Double(size.width) * 0.095, y: Double(size.height) * 0.11) + backgroundRoundCounter.size = CGSize(width: 120, height: 120) currentRoundLabel.text = "\(RoundCalculatorService.sharedInstance.currentRound)" currentRoundLabel.fontSize = 50 currentRoundLabel.fontColor = SKColor.black currentRoundLabel.verticalAlignmentMode = .center - currentRoundLabel.position = CGPoint(x: backgroundRoundCounter.position.x, y: backgroundRoundCounter.position.y - 5) + currentRoundLabel.position = CGPoint(x: backgroundRoundCounter.position.x, y: backgroundRoundCounter.position.y - 4) currentRoundLabel.zPosition = backgroundRoundCounter.zPosition + 1 roundsLabel.zPosition = backgroundRoundCounter.zPosition + 1