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

Add logging and remove local references to files

Browse Source
This commit is contained in:
Daniel Steckert 2020-06-13 15:24:56 +02:00 committed by Marcel Schwarz
parent bd1d29d6ac
commit 7e1a80e33a
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
GoldWars/GoldWars.xcodeproj/project.pbxproj
View File

@ -16,9 +16,9 @@
110360EE244B101B008610AF /* GoldWarsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110360ED244B101B008610AF /* GoldWarsTests.swift */; }; 110360EE244B101B008610AF /* GoldWarsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110360ED244B101B008610AF /* GoldWarsTests.swift */; };
11036113244B3E30008610AF /* MenuScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11036112244B3E30008610AF /* MenuScene.swift */; }; 11036113244B3E30008610AF /* MenuScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11036112244B3E30008610AF /* MenuScene.swift */; };
116060F7245C57D2004E5A36 /* EntityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 116060F6245C57D2004E5A36 /* EntityManager.swift */; }; 116060F7245C57D2004E5A36 /* EntityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 116060F6245C57D2004E5A36 /* EntityManager.swift */; };
2068D0202493D0B400F7A368 /* attack_base.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2068D01D2493D0B400F7A368 /* attack_base.wav */; }; 205ED9CB249507E200B28718 /* use_boost.wav in Resources */ = {isa = PBXBuildFile; fileRef = 205ED9C8249507E200B28718 /* use_boost.wav */; };
2068D0212493D0B400F7A368 /* use_boost.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2068D01E2493D0B400F7A368 /* use_boost.wav */; }; 205ED9CC249507E200B28718 /* attack_base.wav in Resources */ = {isa = PBXBuildFile; fileRef = 205ED9C9249507E200B28718 /* attack_base.wav */; };
2068D0222493D0B400F7A368 /* new_round.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2068D01F2493D0B400F7A368 /* new_round.wav */; }; 205ED9CD249507E200B28718 /* new_round.wav in Resources */ = {isa = PBXBuildFile; fileRef = 205ED9CA249507E200B28718 /* new_round.wav */; };
3E67854024728368007B9DE4 /* CElements.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E67853F24728368007B9DE4 /* CElements.swift */; }; 3E67854024728368007B9DE4 /* CElements.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E67853F24728368007B9DE4 /* CElements.swift */; };
3E6785422472CBEC007B9DE4 /* Way.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E6785412472CBEC007B9DE4 /* Way.swift */; }; 3E6785422472CBEC007B9DE4 /* Way.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E6785412472CBEC007B9DE4 /* Way.swift */; };
3EAD889524801B6A0048A10A /* RoundTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EAD889424801B6A0048A10A /* RoundTimer.swift */; }; 3EAD889524801B6A0048A10A /* RoundTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EAD889424801B6A0048A10A /* RoundTimer.swift */; };
@ -84,9 +84,9 @@
110360EF244B101B008610AF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 110360EF244B101B008610AF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
11036112244B3E30008610AF /* MenuScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuScene.swift; sourceTree = "<group>"; }; 11036112244B3E30008610AF /* MenuScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuScene.swift; sourceTree = "<group>"; };
116060F6245C57D2004E5A36 /* EntityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntityManager.swift; sourceTree = "<group>"; }; 116060F6245C57D2004E5A36 /* EntityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntityManager.swift; sourceTree = "<group>"; };
2068D01D2493D0B400F7A368 /* attack_base.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = attack_base.wav; path = ../../../../Desktop/attack_base.wav; sourceTree = "<group>"; }; 205ED9C8249507E200B28718 /* use_boost.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = use_boost.wav; sourceTree = "<group>"; };
2068D01E2493D0B400F7A368 /* use_boost.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = use_boost.wav; path = ../../../../Desktop/use_boost.wav; sourceTree = "<group>"; }; 205ED9C9249507E200B28718 /* attack_base.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = attack_base.wav; sourceTree = "<group>"; };
2068D01F2493D0B400F7A368 /* new_round.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = new_round.wav; path = ../../../../Desktop/new_round.wav; sourceTree = "<group>"; }; 205ED9CA249507E200B28718 /* new_round.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = new_round.wav; sourceTree = "<group>"; };
3E67853F24728368007B9DE4 /* CElements.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CElements.swift; sourceTree = "<group>"; }; 3E67853F24728368007B9DE4 /* CElements.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CElements.swift; sourceTree = "<group>"; };
3E6785412472CBEC007B9DE4 /* Way.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Way.swift; sourceTree = "<group>"; }; 3E6785412472CBEC007B9DE4 /* Way.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Way.swift; sourceTree = "<group>"; };
3EAD889424801B6A0048A10A /* RoundTimer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundTimer.swift; sourceTree = "<group>"; }; 3EAD889424801B6A0048A10A /* RoundTimer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundTimer.swift; sourceTree = "<group>"; };
@ -170,10 +170,10 @@
110360D1244B101A008610AF /* GoldWars */ = { 110360D1244B101A008610AF /* GoldWars */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
2068D01D2493D0B400F7A368 /* attack_base.wav */,
2068D01F2493D0B400F7A368 /* new_round.wav */,
2068D01E2493D0B400F7A368 /* use_boost.wav */,
C04783ED2468583F004961FB /* intro-music.mp3 */, C04783ED2468583F004961FB /* intro-music.mp3 */,
205ED9C9249507E200B28718 /* attack_base.wav */,
205ED9CA249507E200B28718 /* new_round.wav */,
205ED9C8249507E200B28718 /* use_boost.wav */,
9ECD3699245C91F7008DEEBD /* GoldWars.entitlements */, 9ECD3699245C91F7008DEEBD /* GoldWars.entitlements */,
9E11FF74245CD79100EED3BE /* Partikels */, 9E11FF74245CD79100EED3BE /* Partikels */,
116060F5245C5709004E5A36 /* Entities */, 116060F5245C5709004E5A36 /* Entities */,
@ -379,16 +379,16 @@
isa = PBXResourcesBuildPhase; isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
2068D0222493D0B400F7A368 /* new_round.wav in Resources */, 205ED9CD249507E200B28718 /* new_round.wav in Resources */,
110360DE244B101A008610AF /* Main.storyboard in Resources */, 110360DE244B101A008610AF /* Main.storyboard in Resources */,
9E11FF79245CD81100EED3BE /* Fire.sks in Resources */, 9E11FF79245CD81100EED3BE /* Fire.sks in Resources */,
110360E0244B101B008610AF /* Assets.xcassets in Resources */, 110360E0244B101B008610AF /* Assets.xcassets in Resources */,
2068D0202493D0B400F7A368 /* attack_base.wav in Resources */,
2068D0212493D0B400F7A368 /* use_boost.wav in Resources */,
110360E3244B101B008610AF /* LaunchScreen.storyboard in Resources */, 110360E3244B101B008610AF /* LaunchScreen.storyboard in Resources */,
9E61EAC4249BAC9100334DDE /* LoserFire.sks in Resources */, 9E61EAC4249BAC9100334DDE /* LoserFire.sks in Resources */,
C04783EE2468583F004961FB /* intro-music.mp3 in Resources */, C04783EE2468583F004961FB /* intro-music.mp3 in Resources */,
205ED9CC249507E200B28718 /* attack_base.wav in Resources */,
3F79FFE02486F7CD003F79C3 /* Explosion.sks in Resources */, 3F79FFE02486F7CD003F79C3 /* Explosion.sks in Resources */,
205ED9CB249507E200B28718 /* use_boost.wav in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

4
GoldWars/GoldWars/SoundManager.swift
View File

@ -8,9 +8,11 @@
import SpriteKit import SpriteKit
import AVFoundation import AVFoundation
import os
class SoundManager { class SoundManager {
public static var sharedInstance = SoundManager() public static var sharedInstance = SoundManager()
let LOG = OSLog.init(subsystem: "SoundManager", category: "SoundManager")
var audioPlayer = AVAudioPlayer() var audioPlayer = AVAudioPlayer()
var effectPlayer = AVAudioPlayer() var effectPlayer = AVAudioPlayer()
@ -46,7 +48,7 @@ class SoundManager {
do { do {
effectPlayer = try AVAudioPlayer(contentsOf: soundEffect!) effectPlayer = try AVAudioPlayer(contentsOf: soundEffect!)
} catch { } catch {
//TODO: Add logging os_log("Could not load sound file %@", log: LOG, type: .error, pathToFile)
} }
effectPlayer.volume += volumeLevel effectPlayer.volume += volumeLevel
effectPlayer.play() effectPlayer.play()