diff --git a/Documents/Images/Game Page.png b/Documents/Images/Game Page.png new file mode 100644 index 0000000..e657f37 Binary files /dev/null and b/Documents/Images/Game Page.png differ diff --git a/Documents/Images/Historique Page.png b/Documents/Images/Historique Page.png index 7c2dc2c..2b4ff47 100644 Binary files a/Documents/Images/Historique Page.png and b/Documents/Images/Historique Page.png differ diff --git a/Documents/Images/Home page.png b/Documents/Images/Home page.png index f71b006..bee21c7 100644 Binary files a/Documents/Images/Home page.png and b/Documents/Images/Home page.png differ diff --git a/Documents/Images/Maquettes.png b/Documents/Images/Maquettes.png new file mode 100644 index 0000000..8e63cc1 Binary files /dev/null and b/Documents/Images/Maquettes.png differ diff --git a/Documents/Images/Players Page.png b/Documents/Images/Players Page.png index a36f92b..94275ad 100644 Binary files a/Documents/Images/Players Page.png and b/Documents/Images/Players Page.png differ diff --git a/Documents/Images/Scores Pages.png b/Documents/Images/Scores Pages.png index 5caf3bc..27f6cc8 100644 Binary files a/Documents/Images/Scores Pages.png and b/Documents/Images/Scores Pages.png differ diff --git a/Documents/Images/Select Players Page.png b/Documents/Images/Select Players Page.png index ab1d13c..6f5ef6f 100644 Binary files a/Documents/Images/Select Players Page.png and b/Documents/Images/Select Players Page.png differ diff --git a/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj b/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj index c791b8d..3af62c2 100644 --- a/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj +++ b/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj @@ -46,6 +46,7 @@ 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 */; }; + EC4D7F042C29FED70076CD8A /* DSQ.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EC4D7F032C29FED70076CD8A /* DSQ.xcframework */; }; 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 */; }; @@ -77,8 +78,6 @@ ECF3FD332C27238F00F5E62B /* Historique.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECF3FD322C27238F00F5E62B /* Historique.swift */; }; ECF3FD3A2C29A20D00F5E62B /* HistoricListVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECF3FD392C29A20D00F5E62B /* HistoricListVM.swift */; }; ECF3FD3D2C29B64100F5E62B /* ChronoVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECF3FD3C2C29B64100F5E62B /* ChronoVM.swift */; }; - ECF9AD2C2C29CF5C00238A06 /* DSQ.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECCBA6B32C29BCCD00D6D9FB /* DSQ.xcframework */; }; - ECF9AD2D2C29CF5C00238A06 /* DSQ.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ECCBA6B32C29BCCD00D6D9FB /* DSQ.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; ECF9AD352C29D46A00238A06 /* Start.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = ECF9AD322C29D46A00238A06 /* Start.mp3 */; }; ECF9AD362C29D46A00238A06 /* Fight.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = ECF9AD332C29D46A00238A06 /* Fight.mp3 */; }; ECF9AD372C29D46A00238A06 /* SelectFighterSound.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = ECF9AD342C29D46A00238A06 /* SelectFighterSound.mp3 */; }; @@ -101,20 +100,6 @@ }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - ECF9AD2E2C29CF5C00238A06 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ECF9AD2D2C29CF5C00238A06 /* DSQ.xcframework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 6437FF122C25846F009D0EAF /* PlayingGameVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayingGameVM.swift; sourceTree = ""; }; 645834582BF5F92300E18321 /* DouShouQi_App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DouShouQi_App.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -159,6 +144,7 @@ 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 = ""; }; + EC4D7F032C29FED70076CD8A /* DSQ.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = DSQ.xcframework; path = ../../SwiftUI_ARKit_2024/XCFramework/DSQ.xcframework; 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 = ""; }; @@ -179,7 +165,6 @@ ECB636502C046379007CD5E2 /* MusicPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicPlayer.swift; sourceTree = ""; }; ECB636522C0463A9007CD5E2 /* SoundPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoundPlayer.swift; sourceTree = ""; }; ECB636542C047992007CD5E2 /* Image.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Image.xcassets; sourceTree = ""; }; - ECCBA6B32C29BCCD00D6D9FB /* DSQ.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = DSQ.xcframework; path = "../../../Downloads/swiftui_arkit_2024 2/XCFramework/DSQ.xcframework"; sourceTree = ""; }; ECCBA6B72C29BE1900D6D9FB /* ARKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ARKit.framework; path = System/Library/Frameworks/ARKit.framework; sourceTree = SDKROOT; }; ECCBA6B92C29BE2800D6D9FB /* RealityKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RealityKit.framework; path = System/Library/Frameworks/RealityKit.framework; sourceTree = SDKROOT; }; ECCBA6BC2C29BFF600D6D9FB /* ARBoard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ARBoard.swift; sourceTree = ""; }; @@ -203,7 +188,7 @@ files = ( ECCBA6BA2C29BE2800D6D9FB /* RealityKit.framework in Frameworks */, ECCBA6B82C29BE1900D6D9FB /* ARKit.framework in Frameworks */, - ECF9AD2C2C29CF5C00238A06 /* DSQ.xcframework in Frameworks */, + EC4D7F042C29FED70076CD8A /* DSQ.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -438,9 +423,9 @@ 64C87E222C09D52600CCD451 /* Frameworks */ = { isa = PBXGroup; children = ( + EC4D7F032C29FED70076CD8A /* DSQ.xcframework */, ECCBA6B92C29BE2800D6D9FB /* RealityKit.framework */, ECCBA6B72C29BE1900D6D9FB /* ARKit.framework */, - ECCBA6B32C29BCCD00D6D9FB /* DSQ.xcframework */, ); name = Frameworks; sourceTree = ""; @@ -560,7 +545,6 @@ 645834542BF5F92300E18321 /* Sources */, 645834552BF5F92300E18321 /* Frameworks */, 645834562BF5F92300E18321 /* Resources */, - ECF9AD2E2C29CF5C00238A06 /* Embed Frameworks */, ); buildRules = ( ); diff --git a/README.md b/README.md index 08f4601..47b5a14 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,9 @@ La racine de notre gitlab est composé de deux dossier : :warning: Code de l'application en cours! +## Maquettes +Voici les maquettes de l'applicaton, celles sur qui nous nous sommes basé pour l'interface finale : + ## Fonctionnement @@ -69,31 +72,32 @@ La racine de notre gitlab est composé de deux dossier : ### Accueil - + ### Sélection des joueurs - + ### Partie + ### Historique - + ### Meilleurs scores - + ### Joueurs - + ## Déploiement