From ff2ffc1164b0a1d9f943564fe7a0f9b1c31b676d Mon Sep 17 00:00:00 2001 From: Simon Kellner Date: Thu, 25 Jun 2020 14:59:31 +0200 Subject: [PATCH 1/2] Add skill cooldowns and new skill button assets --- GoldWars/GoldWars.xcodeproj/project.pbxproj | 4 ++ .../atk_button.imageset/Contents.json | 21 +++++++ .../atk_button.imageset/atk_button.png | Bin 0 -> 7061 bytes .../def_button.imageset/Contents.json | 21 +++++++ .../def_button.imageset/def_button.png | Bin 0 -> 6930 bytes .../spy_button.imageset/Contents.json | 21 +++++++ .../spy_button.imageset/spy_button.png | Bin 0 -> 7852 bytes .../GoldWars/Components/SkillButtonNode.swift | 56 ++++++++++++++++++ GoldWars/GoldWars/Entities/HUD.swift | 34 +++++++---- GoldWars/GoldWars/GameCenterManager.swift | 1 - 10 files changed, 145 insertions(+), 13 deletions(-) create mode 100644 GoldWars/GoldWars/Assets.xcassets/atk_button.imageset/Contents.json create mode 100644 GoldWars/GoldWars/Assets.xcassets/atk_button.imageset/atk_button.png create mode 100644 GoldWars/GoldWars/Assets.xcassets/def_button.imageset/Contents.json create mode 100644 GoldWars/GoldWars/Assets.xcassets/def_button.imageset/def_button.png create mode 100644 GoldWars/GoldWars/Assets.xcassets/spy_button.imageset/Contents.json create mode 100644 GoldWars/GoldWars/Assets.xcassets/spy_button.imageset/spy_button.png create mode 100644 GoldWars/GoldWars/Components/SkillButtonNode.swift diff --git a/GoldWars/GoldWars.xcodeproj/project.pbxproj b/GoldWars/GoldWars.xcodeproj/project.pbxproj index 7d6a026..cd744fc 100644 --- a/GoldWars/GoldWars.xcodeproj/project.pbxproj +++ b/GoldWars/GoldWars.xcodeproj/project.pbxproj @@ -25,6 +25,7 @@ 3EBD242E245D9332003CECE7 /* Team.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EBD242D245D9332003CECE7 /* Team.swift */; }; 3F79FFE02486F7CD003F79C3 /* Explosion.sks in Resources */ = {isa = PBXBuildFile; fileRef = 3F79FFDF2486F7CD003F79C3 /* Explosion.sks */; }; 3FE19DB5246C7A22004827AB /* RoundCalculatorService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FE19DB4246C7A22004827AB /* RoundCalculatorService.swift */; }; + 8B9CA5F1249A3C2E00561704 /* SkillButtonNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B9CA5F0249A3C2E00561704 /* SkillButtonNode.swift */; }; 8BB6FF402472B8F000162BBD /* SingeClickButtonNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BB6FF3F2472B8F000162BBD /* SingeClickButtonNode.swift */; }; 9E0E459724796262009817A6 /* GameCenterManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E0E459624796262009817A6 /* GameCenterManager.swift */; }; 9E11FF79245CD81100EED3BE /* Fire.sks in Resources */ = {isa = PBXBuildFile; fileRef = 9E11FF77245CD81100EED3BE /* Fire.sks */; }; @@ -92,6 +93,7 @@ 3EBD242D245D9332003CECE7 /* Team.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Team.swift; sourceTree = ""; }; 3F79FFDF2486F7CD003F79C3 /* Explosion.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = Explosion.sks; sourceTree = ""; }; 3FE19DB4246C7A22004827AB /* RoundCalculatorService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundCalculatorService.swift; sourceTree = ""; }; + 8B9CA5F0249A3C2E00561704 /* SkillButtonNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkillButtonNode.swift; sourceTree = ""; }; 8BB6FF3F2472B8F000162BBD /* SingeClickButtonNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingeClickButtonNode.swift; sourceTree = ""; }; 9E0E459624796262009817A6 /* GameCenterManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameCenterManager.swift; sourceTree = ""; }; 9E11FF77245CD81100EED3BE /* Fire.sks */ = {isa = PBXFileReference; lastKnownFileType = file.sks; path = Fire.sks; sourceTree = ""; }; @@ -217,6 +219,7 @@ C064E9A7246C0EA50022B228 /* LabelNode.swift */, 9EC2FBA62476B1EC00ABF11F /* PlayerInfoComponent.swift */, 8BB6FF3F2472B8F000162BBD /* SingeClickButtonNode.swift */, + 8B9CA5F0249A3C2E00561704 /* SkillButtonNode.swift */, C05BB9C3247D890C00411249 /* SliderComponent.swift */, 9EC7E48A2461FBF700396BCD /* SliderNode.swift */, 9E78ACB7245CB75B00526FF7 /* TeamComponent.swift */, @@ -427,6 +430,7 @@ 9E174C8A245E1A0A00209FF0 /* Background.swift in Sources */, 8BB6FF402472B8F000162BBD /* SingeClickButtonNode.swift in Sources */, C064E9A8246C0EA50022B228 /* LabelNode.swift in Sources */, + 8B9CA5F1249A3C2E00561704 /* SkillButtonNode.swift in Sources */, 3EAD889524801B6A0048A10A /* RoundTimer.swift in Sources */, 3E67854024728368007B9DE4 /* CElements.swift in Sources */, ABA03DA0244BD54F00A66916 /* Base.swift in Sources */, diff --git a/GoldWars/GoldWars/Assets.xcassets/atk_button.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/atk_button.imageset/Contents.json new file mode 100644 index 0000000..fc47f62 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/atk_button.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "atk_button.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/atk_button.imageset/atk_button.png b/GoldWars/GoldWars/Assets.xcassets/atk_button.imageset/atk_button.png new file mode 100644 index 0000000000000000000000000000000000000000..7b685da673af8b6ebab907f6540f7d0d2f8ba147 GIT binary patch literal 7061 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 bxKQfT*YHkwLLT<-r!0iJo?5kv-LwAzgnL56 literal 0 HcmV?d00001 diff --git a/GoldWars/GoldWars/Assets.xcassets/spy_button.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/spy_button.imageset/Contents.json new file mode 100644 index 0000000..9f41e34 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/spy_button.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "spy_button.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/spy_button.imageset/spy_button.png b/GoldWars/GoldWars/Assets.xcassets/spy_button.imageset/spy_button.png new file mode 100644 index 0000000000000000000000000000000000000000..975c77aefe82af8132922d8c6df3c271fce3e420 GIT binary patch literal 7852 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 G%zpu6^)c@N literal 0 HcmV?d00001 diff --git a/GoldWars/GoldWars/Components/SkillButtonNode.swift b/GoldWars/GoldWars/Components/SkillButtonNode.swift new file mode 100644 index 0000000..069b9d5 --- /dev/null +++ b/GoldWars/GoldWars/Components/SkillButtonNode.swift @@ -0,0 +1,56 @@ +// +// SkillButtonNode.swift +// GoldWars +// +// Created by Simon Kellner on 17.06.20. +// Copyright © 2020 SP2. All rights reserved. +// + +import SpriteKit + +class SkillButtonNode: ButtonNode { + + + var cooldownCounter = 0 + var hasCooled: Bool = false + let cooldown: Int + let displayText: String + + init(textureName: String, text: String, isEnabled: Bool, cooldown: Int, position: CGPoint, onButtonPress: @escaping () -> ()) { + self.cooldown = cooldown + self.displayText = text + super.init(textureName: textureName, text: text, isEnabled: isEnabled, position: position, onButtonPress: onButtonPress) + } + + + override func touchesBegan(_ touches: Set, with event: UIEvent?) { + super.touchesBegan(touches, with: event) + super.isEnabled = false + self.cooldownCounter = self.cooldown + self.hasCooled = true + } + + func decreaseCooldown() { + if self.cooldownCounter <= 1 { + super.isEnabled = true + super.label.text = self.displayText + let newRoundAction = SKAction.sequence([ + SKAction.scale(by: 1.5, duration: 1), + SKAction.scale(by: 1/1.5, duration: 1), + ]) + if hasCooled { + self.run(newRoundAction) + self.hasCooled = false + } + } else { + super.isEnabled = false + self.cooldownCounter -= 1 + super.label.text = self.cooldownCounter.description + } + } + + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } +} diff --git a/GoldWars/GoldWars/Entities/HUD.swift b/GoldWars/GoldWars/Entities/HUD.swift index 54793d5..659215d 100644 --- a/GoldWars/GoldWars/Entities/HUD.swift +++ b/GoldWars/GoldWars/Entities/HUD.swift @@ -18,9 +18,9 @@ class HUD: GKEntity { var peerLabel:SKLabelNode var peerUnitsLabel:SKLabelNode - var spySkill: SingeClickButtonNode - var defSkill: SingeClickButtonNode - var atkSkill: SingeClickButtonNode + var spySkill: SkillButtonNode + var defSkill: SkillButtonNode + var atkSkill: SkillButtonNode var roundTimerLabel: SKLabelNode let roundTimer: RoundTimer @@ -50,11 +50,12 @@ class HUD: GKEntity { self.roundTimer = RoundTimer() - spySkill = SingeClickButtonNode( - textureName: "yellow_circle", + spySkill = SkillButtonNode( + textureName: "spy_button", text: "Spy", isEnabled: true, - position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.75, y: EntityManager.gameEMInstance.scene.size.height * 0.1), + cooldown: 3, + position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.80, 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) @@ -62,11 +63,12 @@ class HUD: GKEntity { SoundManager.sharedInstance.playSoundEffect(pathToFile: "use_boost",fileExtension: "wav", volumeLevel: 0.0) } ) - defSkill = SingeClickButtonNode( - textureName: "yellow_circle", + defSkill = SkillButtonNode( + textureName: "def_button", text: "Def", isEnabled: true, - position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.85, y: EntityManager.gameEMInstance.scene.size.height * 0.1), + cooldown: 4, + position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.90, 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) @@ -74,11 +76,12 @@ class HUD: GKEntity { SoundManager.sharedInstance.playSoundEffect(pathToFile: "use_boost",fileExtension: "wav",volumeLevel: 0.0) } ) - atkSkill = SingeClickButtonNode( - textureName: "yellow_circle", + atkSkill = SkillButtonNode( + textureName: "atk_button", text: "Atk", isEnabled: true, - position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.95, y: EntityManager.gameEMInstance.scene.size.height * 0.1), + cooldown: 4, + position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.70, 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) @@ -190,5 +193,12 @@ class HUD: GKEntity { ]) currentRoundLabel.run(newRoundAction) SoundManager.sharedInstance.playSoundEffect(pathToFile: "new_round", fileExtension: "wav", volumeLevel: 0.0) + self.decreaseSkillRoundCooldownCounter() + } + + func decreaseSkillRoundCooldownCounter() { + self.spySkill.decreaseCooldown() + self.atkSkill.decreaseCooldown() + self.defSkill.decreaseCooldown() } } diff --git a/GoldWars/GoldWars/GameCenterManager.swift b/GoldWars/GoldWars/GameCenterManager.swift index a29fdd2..f3b15df 100644 --- a/GoldWars/GoldWars/GameCenterManager.swift +++ b/GoldWars/GoldWars/GameCenterManager.swift @@ -100,7 +100,6 @@ final class GameCenterManager: NSObject, GKMatchmakerViewControllerDelegate, GKG GKAchievement.loadAchievements { (achievements: [GKAchievement]?, err: Error?) in var achievementExists: Bool = false achievements?.forEach({ (achievement: GKAchievement) in - print(achievement.identifier) if achievement.identifier == identifier { achievementExists = true achievement.percentComplete += increasePercentComplete From 9b3ca1060e2eb86761ac59fcce2852787c473783 Mon Sep 17 00:00:00 2001 From: Aldin Duraki Date: Thu, 25 Jun 2020 15:17:24 +0200 Subject: [PATCH 2/2] Alpha value fix for buttons --- GoldWars/GoldWars/Entities/EntityManager.swift | 7 ------- 1 file changed, 7 deletions(-) diff --git a/GoldWars/GoldWars/Entities/EntityManager.swift b/GoldWars/GoldWars/Entities/EntityManager.swift index 0621bf1..a368d9e 100644 --- a/GoldWars/GoldWars/Entities/EntityManager.swift +++ b/GoldWars/GoldWars/Entities/EntityManager.swift @@ -352,13 +352,6 @@ class EntityManager { button.buttonNode.removeFromParent() } self.remove(modal) - - for child in scene.children { - if(child.name != "fire"){ - child.alpha = 1 - } - } - isModal = false } })