diff --git a/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj b/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj index 9d6ca41..b79b193 100644 --- a/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj +++ b/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj @@ -47,6 +47,9 @@ EC2DD0412C1C203000FC55C0 /* ShowAllPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC2DD0402C1C203000FC55C0 /* ShowAllPlayer.swift */; }; EC3EE4B12C0CD46000710153 /* ButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC3EE4B02C0CD46000710153 /* ButtonView.swift */; }; EC3EE4B32C0CD47000710153 /* MainButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC3EE4B22C0CD47000710153 /* MainButton.swift */; }; + EC4D7EFB2C29C1470076CD8A /* Fight.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = EC4D7EF92C29C1470076CD8A /* Fight.mp3 */; }; + EC4D7EFD2C29C14F0076CD8A /* SelectFighterSound.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = EC4D7EFC2C29C14F0076CD8A /* SelectFighterSound.mp3 */; }; + EC4D7EFF2C29C1550076CD8A /* Start.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = EC4D7EFE2C29C1550076CD8A /* Start.mp3 */; }; EC62C4FB2C038BD20048CD0B /* PlayersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC62C4FA2C038BD20048CD0B /* PlayersView.swift */; }; EC62C4FD2C0391D30048CD0B /* PlayerRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC62C4FC2C0391D30048CD0B /* PlayerRow.swift */; }; EC62C4FF2C0457AD0048CD0B /* TitleScreenMusic.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = EC62C4FE2C0457AD0048CD0B /* TitleScreenMusic.mp3 */; }; @@ -142,6 +145,9 @@ EC2DD0402C1C203000FC55C0 /* ShowAllPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowAllPlayer.swift; sourceTree = ""; }; EC3EE4B02C0CD46000710153 /* ButtonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonView.swift; sourceTree = ""; }; EC3EE4B22C0CD47000710153 /* MainButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainButton.swift; sourceTree = ""; }; + EC4D7EF92C29C1470076CD8A /* Fight.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = Fight.mp3; path = ../../../../../../Downloads/Fight.mp3; sourceTree = ""; }; + EC4D7EFC2C29C14F0076CD8A /* SelectFighterSound.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = SelectFighterSound.mp3; path = ../../../../../../Downloads/SelectFighterSound.mp3; sourceTree = ""; }; + EC4D7EFE2C29C1550076CD8A /* Start.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = Start.mp3; path = ../../../../../../Downloads/Start.mp3; sourceTree = ""; }; EC62C4FA2C038BD20048CD0B /* PlayersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayersView.swift; sourceTree = ""; }; EC62C4FC2C0391D30048CD0B /* PlayerRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerRow.swift; sourceTree = ""; }; EC62C4FE2C0457AD0048CD0B /* TitleScreenMusic.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = TitleScreenMusic.mp3; sourceTree = ""; }; @@ -167,9 +173,6 @@ ECF3FD1D2C2582B300F5E62B /* ArKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ArKit.xcodeproj; path = ../../Swift/ArKit/ArKit.xcodeproj; sourceTree = ""; }; ECF3FD302C2722C600F5E62B /* CDHistoriqueExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CDHistoriqueExtension.swift; sourceTree = ""; }; ECF3FD322C27238F00F5E62B /* Historique.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Historique.swift; sourceTree = ""; }; - ECF3FD352C299CC100F5E62B /* Fight.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Fight.mp3; sourceTree = ""; }; - ECF3FD372C299CC500F5E62B /* Start.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Start.mp3; sourceTree = ""; }; - ECF3FD382C299CC800F5E62B /* SelectFighterSound.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = SelectFighterSound.mp3; sourceTree = ""; }; ECF3FD392C29A20D00F5E62B /* HistoricListVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoricListVM.swift; sourceTree = ""; }; ECF3FD3C2C29B64100F5E62B /* ChronoVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChronoVM.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -438,9 +441,9 @@ EC62C5032C045BD30048CD0B /* Sounds */ = { isa = PBXGroup; children = ( - ECF3FD352C299CC100F5E62B /* Fight.mp3 */, - ECF3FD372C299CC500F5E62B /* Start.mp3 */, - ECF3FD382C299CC800F5E62B /* SelectFighterSound.mp3 */, + EC4D7EFE2C29C1550076CD8A /* Start.mp3 */, + EC4D7EFC2C29C14F0076CD8A /* SelectFighterSound.mp3 */, + EC4D7EF92C29C1470076CD8A /* Fight.mp3 */, EC62C50C2C046D9E0048CD0B /* SplashScreenSound.mp3 */, EC62C5052C045C1A0048CD0B /* TitleScreenButtonSound.mp3 */, ); @@ -639,6 +642,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + EC4D7EFF2C29C1550076CD8A /* Start.mp3 in Resources */, EC0540CA2C08BD8D0032E9EF /* GameMusic.mp3 in Resources */, 649B59A72BF64BA9002BAE38 /* Colors.xcassets in Resources */, 6493C1C02C046BF900B5121D /* samurai.ttf in Resources */, @@ -647,7 +651,9 @@ EC62C50D2C046D9E0048CD0B /* SplashScreenSound.mp3 in Resources */, 645834632BF5F92500E18321 /* Preview Assets.xcassets in Resources */, 645834602BF5F92500E18321 /* Assets.xcassets in Resources */, + EC4D7EFB2C29C1470076CD8A /* Fight.mp3 in Resources */, ECB636552C047992007CD5E2 /* Image.xcassets in Resources */, + EC4D7EFD2C29C14F0076CD8A /* SelectFighterSound.mp3 in Resources */, EC62C4FF2C0457AD0048CD0B /* TitleScreenMusic.mp3 in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/DouShouQi_App/DouShouQi_App/Assets/Sounds/Fight.mp3 b/DouShouQi_App/DouShouQi_App/Assets/Sounds/Fight.mp3 deleted file mode 100644 index 2ce565c..0000000 Binary files a/DouShouQi_App/DouShouQi_App/Assets/Sounds/Fight.mp3 and /dev/null differ diff --git a/DouShouQi_App/DouShouQi_App/Assets/Sounds/SelectFighterSound.mp3 b/DouShouQi_App/DouShouQi_App/Assets/Sounds/SelectFighterSound.mp3 deleted file mode 100644 index 249cb10..0000000 Binary files a/DouShouQi_App/DouShouQi_App/Assets/Sounds/SelectFighterSound.mp3 and /dev/null differ diff --git a/DouShouQi_App/DouShouQi_App/Assets/Sounds/Start.mp3 b/DouShouQi_App/DouShouQi_App/Assets/Sounds/Start.mp3 deleted file mode 100644 index ad960ee..0000000 Binary files a/DouShouQi_App/DouShouQi_App/Assets/Sounds/Start.mp3 and /dev/null differ diff --git a/DouShouQi_App/DouShouQi_App/Components/MainMenuButton.swift b/DouShouQi_App/DouShouQi_App/Components/MainMenuButton.swift index 9db4ca0..444bb42 100644 --- a/DouShouQi_App/DouShouQi_App/Components/MainMenuButton.swift +++ b/DouShouQi_App/DouShouQi_App/Components/MainMenuButton.swift @@ -26,7 +26,7 @@ struct MainMenuButton: View { var body: some View { Button(text.uppercased()) { - playSound(named: sound) + //playSound(named: sound) if let onClick: () -> Void { onClick() }