hft-informatik/software-projekt-2-gold-wars
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

review changes

Browse Source
This commit is contained in:
Niko Jochim 2020-06-18 22:53:41 +02:00
parent adf01db4bf
commit bddad86674
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GoldWars/GoldWars/Components/SliderNode.swift
View File

@ -30,8 +30,7 @@ class SliderNode :SKNode {
sliderLine.fillColor = SKColor.white sliderLine.fillColor = SKColor.white
sliderLine.zPosition = 4 sliderLine.zPosition = 4
hiddenKnob = SliderKnob(circleOfRadius: 58 )
hiddenKnob = SliderKnob(circleOfRadius: 60)
hiddenKnob.min = position.x - width / 2 hiddenKnob.min = position.x - width / 2
hiddenKnob.max = position.x + width / 2 hiddenKnob.max = position.x + width / 2
hiddenKnob.fillColor = SKColor.red hiddenKnob.fillColor = SKColor.red
@ -52,7 +51,6 @@ class SliderNode :SKNode {
fatalError("init(coder:) has not been implemented") fatalError("init(coder:) has not been implemented")
} }
} }
class SliderKnob: SKShapeNode { class SliderKnob: SKShapeNode {

29
GoldWars/GoldWars/Entities/Modal.swift
View File

@ -53,11 +53,11 @@ class Modal: GKEntity{
switch modaltype { switch modaltype {
case .BaseAttack: case .BaseAttack:
header = SKLabelNode(text: "Angriff") header = SKLabelNode(text: "Angriff")
body = SKLabelNode(text: "Schicke \(unitCount / 2)\nEinheiten") body = SKLabelNode(text: "\(unitCount / 2) Einheiten")
footer = SKLabelNode() footer = SKLabelNode()
case .BaseMoveOwnUnits: case .BaseMoveOwnUnits:
header = SKLabelNode(text: "Formation") header = SKLabelNode(text: "Formation")
body = SKLabelNode(text: "Sende \(unitCount / 2)\nEinheiten") body = SKLabelNode(text: "\(unitCount / 2) Einheiten")
footer = SKLabelNode() footer = SKLabelNode()
case .PauseGame: case .PauseGame:
header = SKLabelNode(text: "Pause") header = SKLabelNode(text: "Pause")
@ -70,15 +70,15 @@ class Modal: GKEntity{
self.header.fontName = "HelveticaNeue-Bold" self.header.fontName = "HelveticaNeue-Bold"
self.header.fontSize = 40 self.header.fontSize = 40
self.header.zPosition = 5 self.header.zPosition = 5
self.body.position = CGPoint(x: anchorPoint.x, y: anchorPoint.y - 20) self.body.position = CGPoint(x: anchorPoint.x, y: anchorPoint.y + 15)
self.body.numberOfLines = 2 self.body.numberOfLines = 2
self.body.preferredMaxLayoutWidth = 390 self.body.preferredMaxLayoutWidth = 390
self.body.horizontalAlignmentMode = SKLabelHorizontalAlignmentMode.center self.body.horizontalAlignmentMode = SKLabelHorizontalAlignmentMode.center
self.body.fontName = "HelveticaNeue-Bold" self.body.fontName = "HelveticaNeue-Bold"
self.body.fontSize = 40 self.body.fontSize = 40
self.body.zPosition = 5 self.body.zPosition = 5
self.footer.position = CGPoint(x: anchorPoint.x, y: anchorPoint.y - 40) self.footer.position = CGPoint(x: anchorPoint.x, y: anchorPoint.y - 40)
self.footer.fontName = "HelveticaNeue-Bold" self.footer.fontName = "HelveticaNeue-Bold"
self.footer.fontSize = 40 self.footer.fontSize = 40
@ -86,17 +86,14 @@ class Modal: GKEntity{
super.init() super.init()
switch modaltype{
case .BaseAttack, .BaseMoveOwnUnits: let text = (modaltype == .BaseAttack) ? "Angriff" : "Senden"
let text = (modaltype == .BaseAttack) ? "Angriff" : "Senden" addComponent(SliderComponent(width: 300, position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 15)))
addComponent(SliderComponent(width: 300, position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 50))) addComponent(ButtonComponent(textureName: "yellow_button04", text: text, position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 95), isEnabled: true, onButtonPress: {
addComponent(ButtonComponent(textureName: "yellow_button04", text: text, position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 105), isEnabled: true, onButtonPress: { self.sendUnits(currentDraggedBase: currentDraggedBase, touchLocation: touchLocation!, gameScene: gameScene, collisionBase: collisionBase)
self.sendUnits(currentDraggedBase: currentDraggedBase, touchLocation: touchLocation!, gameScene: gameScene, collisionBase: collisionBase) EntityManager.gameEMInstance.removeModal()
EntityManager.gameEMInstance.removeModal() }))
}))
default:
break
}
} }
required init?(coder: NSCoder) { required init?(coder: NSCoder) {

2
GoldWars/GoldWars/Scenes/GameScene.swift
View File

@ -120,7 +120,7 @@ class GameScene: SKScene{
} else if Int(GameScene.sendUnits) == currentDraggedBase?.unitCount { } else if Int(GameScene.sendUnits) == currentDraggedBase?.unitCount {
GameScene.sendUnits -= 1 GameScene.sendUnits -= 1
} }
modal.body.text = "Schicke \(GameScene.sendUnits) Einheiten " modal.body.text = "\(GameScene.sendUnits) Einheiten "
} }
} }
} }