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

Merge branch '105-basen-disablen-sobald-zug-durch-done-beendet-wurde' into 'development'

Browse Source 
Resolve "Basen disablen, sobald Zug durch Done beendet wurde"

Closes #105

See merge request marcel.schwarz/software-projekt-2!126
This commit is contained in:
Marcel Schwarz 2020-06-17 22:54:26 +00:00
commit dc3ef818df
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
GoldWars/GoldWars/Entities/EntityManager.swift
View File

@ -57,6 +57,7 @@ class EntityManager {
scene.addChild(hudEntitiy.currentRoundLabel) scene.addChild(hudEntitiy.currentRoundLabel)
scene.addChild(hudEntitiy.roundsLabel) scene.addChild(hudEntitiy.roundsLabel)
scene.addChild(hudEntitiy.roundLabel) scene.addChild(hudEntitiy.roundLabel)
scene.addChild(hudEntitiy.blockWholeScreenPane)
} }
if let wayEntity = entity as? Way { if let wayEntity = entity as? Way {

21
GoldWars/GoldWars/Entities/HUD.swift
View File

@ -17,8 +17,6 @@ class HUD: GKEntity {
var peerLabel:SKLabelNode var peerLabel:SKLabelNode
var peerUnitsLabel:SKLabelNode var peerUnitsLabel:SKLabelNode
var host: GKPlayer?
var peer: GKPlayer?
var spySkill: SingeClickButtonNode var spySkill: SingeClickButtonNode
var defSkill: SingeClickButtonNode var defSkill: SingeClickButtonNode
@ -33,19 +31,19 @@ class HUD: GKEntity {
var roundLabel: SKLabelNode var roundLabel: SKLabelNode
var finishButton: ButtonNode var finishButton: ButtonNode
var blockWholeScreenPane: SKSpriteNode
init(size: CGSize) { init(size: CGSize) {
host = GameCenterManager.sharedInstance.hostingPlayer hostLabel = SKLabelNode(text: GameCenterManager.sharedInstance.hostingPlayer?.displayName)
peer = GameCenterManager.sharedInstance.peerPlayer
hostLabel = SKLabelNode(text: host?.displayName)
hostUnitsLabel = SKLabelNode(text: "500" ) hostUnitsLabel = SKLabelNode(text: "500" )
peerLabel = SKLabelNode(text: peer?.displayName) peerLabel = SKLabelNode(text: GameCenterManager.sharedInstance.peerPlayer?.displayName)
peerUnitsLabel = SKLabelNode(text: "500") peerUnitsLabel = SKLabelNode(text: "500")
roundTimerLabel = SKLabelNode(text: "") roundTimerLabel = SKLabelNode(text: "")
roundTimerLabel.fontColor = UIColor.black roundTimerLabel.fontColor = UIColor.black
roundTimerLabel.fontSize = CGFloat(45) roundTimerLabel.fontSize = CGFloat(45)
roundTimerLabel.position = CGPoint(x: size.width * 0.5, y: size.height * 0.9) roundTimerLabel.position = CGPoint(x: size.width * 0.5, y: size.height * 0.9)
roundTimerLabel.zPosition = 900
roundTimerLabel.horizontalAlignmentMode = .center roundTimerLabel.horizontalAlignmentMode = .center
self.roundTimer = RoundTimer() self.roundTimer = RoundTimer()
@ -100,6 +98,11 @@ class HUD: GKEntity {
currentRoundLabel = SKLabelNode(fontNamed: "Courier-Bold") currentRoundLabel = SKLabelNode(fontNamed: "Courier-Bold")
roundsLabel = SKLabelNode(fontNamed: "Courier-Bold") roundsLabel = SKLabelNode(fontNamed: "Courier-Bold")
roundLabel = SKLabelNode(fontNamed: "Courier-Bold") roundLabel = SKLabelNode(fontNamed: "Courier-Bold")
blockWholeScreenPane = SKSpriteNode(color: UIColor.init(red: 0, green: 0, blue: 0, alpha: 0.7), size: size)
blockWholeScreenPane.position = CGPoint(x: size.width * 0.5, y: size.height * 0.5)
blockWholeScreenPane.zPosition = 899
blockWholeScreenPane.isHidden = true
super.init() super.init()
initRoundInfo(size: size) initRoundInfo(size: size)
@ -120,8 +123,8 @@ class HUD: GKEntity {
} }
func updateUnitSum(){ func updateUnitSum(){
hostUnitsLabel.text = "\(entityManager.getUnitSum(by: host!))" hostUnitsLabel.text = "\(entityManager.getUnitSum(by: GameCenterManager.sharedInstance.hostingPlayer!))"
peerUnitsLabel.text = "\(entityManager.getUnitSum(by: peer!))" peerUnitsLabel.text = "\(entityManager.getUnitSum(by: GameCenterManager.sharedInstance.peerPlayer!))"
} }
func setColor(labelNodes: [SKLabelNode]) -> Void { func setColor(labelNodes: [SKLabelNode]) -> Void {
@ -139,9 +142,11 @@ class HUD: GKEntity {
finishButton.isEnabled = true finishButton.isEnabled = true
self.roundTimer.roundEnded = "Syncing" self.roundTimer.roundEnded = "Syncing"
RoundCalculatorService.sharedInstance.isCalculating = false RoundCalculatorService.sharedInstance.isCalculating = false
blockWholeScreenPane.isHidden = true
} }
func finishRound() -> () { func finishRound() -> () {
self.blockWholeScreenPane.isHidden = false
self.roundTimer.timeLeft = 1; self.roundTimer.timeLeft = 1;
self.roundTimer.roundEnded = "Waiting for other player..." self.roundTimer.roundEnded = "Waiting for other player..."
} }