diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..342418c Binary files /dev/null and b/.DS_Store differ diff --git a/ArkitDoushiQi/ArkitDoushiQi.xcodeproj/project.pbxproj b/ArkitDoushiQi/ArkitDoushiQi.xcodeproj/project.pbxproj index e0dd8c0..e76b01e 100644 --- a/ArkitDoushiQi/ArkitDoushiQi.xcodeproj/project.pbxproj +++ b/ArkitDoushiQi/ArkitDoushiQi.xcodeproj/project.pbxproj @@ -7,18 +7,10 @@ objects = { /* Begin PBXBuildFile section */ - 1607D9CB2C09CF4C000AB3F2 /* Stub.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1607D9C92C09CF4C000AB3F2 /* Stub.swift */; }; - 1607D9CC2C09CF4C000AB3F2 /* PartyEnregistery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1607D9CA2C09CF4C000AB3F2 /* PartyEnregistery.swift */; }; - 1607D9CE2C09CFD3000AB3F2 /* ItemCollectionParty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1607D9CD2C09CFD3000AB3F2 /* ItemCollectionParty.swift */; }; - 168CD4FB2C0625A400419510 /* fr.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 168CD4F92C0625A400419510 /* fr.lproj */; }; - 168CD4FC2C0625A400419510 /* en.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 168CD4FA2C0625A400419510 /* en.lproj */; }; - 168CD4FF2C06265B00419510 /* LanguageSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 168CD4FE2C06265B00419510 /* LanguageSettings.swift */; }; 82CE59E92C045D1100ADEE24 /* GameScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CE59E82C045D1100ADEE24 /* GameScene.swift */; }; 82CE59EB2C045E3800ADEE24 /* GameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CE59EA2C045E3800ADEE24 /* GameView.swift */; }; 82CE59EF2C0460E500ADEE24 /* SpriteMoople.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CE59EE2C0460E500ADEE24 /* SpriteMoople.swift */; }; - C20310D62BFCB5FB0031657D /* PickerComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20310D52BFCB5FB0031657D /* PickerComponent.swift */; }; C20310D82BFCC2410031657D /* GeneralParametersMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20310D72BFCC2410031657D /* GeneralParametersMenuView.swift */; }; - C20310DA2BFCC8600031657D /* ToggleComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20310D92BFCC8600031657D /* ToggleComponent.swift */; }; C205A2B72BF373360097BD93 /* ArkitDoushiQiApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C205A2B62BF373360097BD93 /* ArkitDoushiQiApp.swift */; }; C205A2B92BF373360097BD93 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C205A2B82BF373360097BD93 /* ContentView.swift */; }; C205A2BB2BF373380097BD93 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C205A2BA2BF373380097BD93 /* Assets.xcassets */; }; @@ -27,16 +19,24 @@ C205A2D22BF373380097BD93 /* WtaTennisUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C205A2D12BF373380097BD93 /* WtaTennisUITests.swift */; }; C205A2D42BF373380097BD93 /* WtaTennisUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C205A2D32BF373380097BD93 /* WtaTennisUITestsLaunchTests.swift */; }; C24659E52BF5FE09004E80D5 /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C24659E42BF5FE09004E80D5 /* MainMenu.swift */; }; - C24659E92BF60FAA004E80D5 /* ButtonComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C24659E82BF60FAA004E80D5 /* ButtonComponent.swift */; }; - C24DAB5C2C061DC700681CD0 /* AI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C24DAB5B2C061DC700681CD0 /* AI.swift */; }; - C24DAB5E2C061E3A00681CD0 /* Language.swift in Sources */ = {isa = PBXBuildFile; fileRef = C24DAB5D2C061E3A00681CD0 /* Language.swift */; }; - C24DAB622C062DBC00681CD0 /* ProfileEdit.swift in Sources */ = {isa = PBXBuildFile; fileRef = C24DAB612C062DBC00681CD0 /* ProfileEdit.swift */; }; C25220EE2C00AC7E0026B71F /* GameParametersMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C25220ED2C00AC7E0026B71F /* GameParametersMenuView.swift */; }; - C25220F32C00AF490026B71F /* EditTextComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C25220F22C00AF490026B71F /* EditTextComponent.swift */; }; - C2F015042C09BC6B000F7221 /* KeyboardReadable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F015032C09BC6B000F7221 /* KeyboardReadable.swift */; }; - C2F015062C09C384000F7221 /* EditImageComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F015052C09C384000F7221 /* EditImageComponent.swift */; }; - C2F394082C0462400070B4F6 /* PhotoButtonComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F394072C0462400070B4F6 /* PhotoButtonComponent.swift */; }; - C2F3940B2C0463940070B4F6 /* ProfileComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F3940A2C0463940070B4F6 /* ProfileComponent.swift */; }; + C2F015092C09D366000F7221 /* LanguageSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F015082C09D366000F7221 /* LanguageSettings.swift */; }; + C2F0150C2C09D3A4000F7221 /* KeyboardReadable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F0150B2C09D3A4000F7221 /* KeyboardReadable.swift */; }; + C2F015102C09D3C3000F7221 /* Language.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F0150E2C09D3C3000F7221 /* Language.swift */; }; + C2F015112C09D3C3000F7221 /* AI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F0150F2C09D3C3000F7221 /* AI.swift */; }; + C2F0151E2C09D3E7000F7221 /* PickerComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F015142C09D3E7000F7221 /* PickerComponent.swift */; }; + C2F0151F2C09D3E7000F7221 /* ToggleComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F015152C09D3E7000F7221 /* ToggleComponent.swift */; }; + C2F015202C09D3E7000F7221 /* ButtonComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F015162C09D3E7000F7221 /* ButtonComponent.swift */; }; + C2F015212C09D3E7000F7221 /* EditImageComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F015172C09D3E7000F7221 /* EditImageComponent.swift */; }; + C2F015222C09D3E7000F7221 /* PhotoButtonComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F015182C09D3E7000F7221 /* PhotoButtonComponent.swift */; }; + C2F015232C09D3E7000F7221 /* EditTextComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F015192C09D3E7000F7221 /* EditTextComponent.swift */; }; + C2F015242C09D3E7000F7221 /* ProfileComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F0151B2C09D3E7000F7221 /* ProfileComponent.swift */; }; + C2F015252C09D3E7000F7221 /* ItemCollectionParty.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F0151C2C09D3E7000F7221 /* ItemCollectionParty.swift */; }; + C2F015262C09D3E7000F7221 /* ProfileEdit.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F0151D2C09D3E7000F7221 /* ProfileEdit.swift */; }; + C2F0152A2C09D420000F7221 /* Stub.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F015282C09D420000F7221 /* Stub.swift */; }; + C2F0152B2C09D420000F7221 /* PartyEnregistery.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F015292C09D420000F7221 /* PartyEnregistery.swift */; }; + C2F015392C09D5A5000F7221 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C2F015372C09D5A5000F7221 /* Localizable.strings */; }; + C2F0153D2C09D5C0000F7221 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C2F0153B2C09D5C0000F7221 /* Localizable.strings */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -57,18 +57,10 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 1607D9C92C09CF4C000AB3F2 /* Stub.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Stub.swift; sourceTree = ""; }; - 1607D9CA2C09CF4C000AB3F2 /* PartyEnregistery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PartyEnregistery.swift; sourceTree = ""; }; - 1607D9CD2C09CFD3000AB3F2 /* ItemCollectionParty.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemCollectionParty.swift; sourceTree = ""; }; - 168CD4F92C0625A400419510 /* fr.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = fr.lproj; sourceTree = ""; }; - 168CD4FA2C0625A400419510 /* en.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = en.lproj; sourceTree = ""; }; - 168CD4FE2C06265B00419510 /* LanguageSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageSettings.swift; sourceTree = ""; }; 82CE59E82C045D1100ADEE24 /* GameScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameScene.swift; sourceTree = ""; }; 82CE59EA2C045E3800ADEE24 /* GameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameView.swift; sourceTree = ""; }; 82CE59EE2C0460E500ADEE24 /* SpriteMoople.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpriteMoople.swift; sourceTree = ""; }; - C20310D52BFCB5FB0031657D /* PickerComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PickerComponent.swift; sourceTree = ""; }; C20310D72BFCC2410031657D /* GeneralParametersMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralParametersMenuView.swift; sourceTree = ""; }; - C20310D92BFCC8600031657D /* ToggleComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToggleComponent.swift; sourceTree = ""; }; C205A2B32BF373360097BD93 /* ArkitDoushiQi.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ArkitDoushiQi.app; sourceTree = BUILT_PRODUCTS_DIR; }; C205A2B62BF373360097BD93 /* ArkitDoushiQiApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArkitDoushiQiApp.swift; sourceTree = ""; }; C205A2B82BF373360097BD93 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; @@ -80,16 +72,24 @@ C205A2D12BF373380097BD93 /* WtaTennisUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WtaTennisUITests.swift; sourceTree = ""; }; C205A2D32BF373380097BD93 /* WtaTennisUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WtaTennisUITestsLaunchTests.swift; sourceTree = ""; }; C24659E42BF5FE09004E80D5 /* MainMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenu.swift; sourceTree = ""; }; - C24659E82BF60FAA004E80D5 /* ButtonComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonComponent.swift; sourceTree = ""; }; - C24DAB5B2C061DC700681CD0 /* AI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AI.swift; sourceTree = ""; }; - C24DAB5D2C061E3A00681CD0 /* Language.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Language.swift; sourceTree = ""; }; - C24DAB612C062DBC00681CD0 /* ProfileEdit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileEdit.swift; sourceTree = ""; }; C25220ED2C00AC7E0026B71F /* GameParametersMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameParametersMenuView.swift; sourceTree = ""; }; - C25220F22C00AF490026B71F /* EditTextComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditTextComponent.swift; sourceTree = ""; }; - C2F015032C09BC6B000F7221 /* KeyboardReadable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardReadable.swift; sourceTree = ""; }; - C2F015052C09C384000F7221 /* EditImageComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditImageComponent.swift; sourceTree = ""; }; - C2F394072C0462400070B4F6 /* PhotoButtonComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoButtonComponent.swift; sourceTree = ""; }; - C2F3940A2C0463940070B4F6 /* ProfileComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileComponent.swift; sourceTree = ""; }; + C2F015082C09D366000F7221 /* LanguageSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LanguageSettings.swift; sourceTree = ""; }; + C2F0150B2C09D3A4000F7221 /* KeyboardReadable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardReadable.swift; sourceTree = ""; }; + C2F0150E2C09D3C3000F7221 /* Language.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Language.swift; sourceTree = ""; }; + C2F0150F2C09D3C3000F7221 /* AI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AI.swift; sourceTree = ""; }; + C2F015142C09D3E7000F7221 /* PickerComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PickerComponent.swift; sourceTree = ""; }; + C2F015152C09D3E7000F7221 /* ToggleComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ToggleComponent.swift; sourceTree = ""; }; + C2F015162C09D3E7000F7221 /* ButtonComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonComponent.swift; sourceTree = ""; }; + C2F015172C09D3E7000F7221 /* EditImageComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditImageComponent.swift; sourceTree = ""; }; + C2F015182C09D3E7000F7221 /* PhotoButtonComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoButtonComponent.swift; sourceTree = ""; }; + C2F015192C09D3E7000F7221 /* EditTextComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditTextComponent.swift; sourceTree = ""; }; + C2F0151B2C09D3E7000F7221 /* ProfileComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileComponent.swift; sourceTree = ""; }; + C2F0151C2C09D3E7000F7221 /* ItemCollectionParty.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemCollectionParty.swift; sourceTree = ""; }; + C2F0151D2C09D3E7000F7221 /* ProfileEdit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileEdit.swift; sourceTree = ""; }; + C2F015282C09D420000F7221 /* Stub.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Stub.swift; sourceTree = ""; }; + C2F015292C09D420000F7221 /* PartyEnregistery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PartyEnregistery.swift; sourceTree = ""; }; + C2F015382C09D5A5000F7221 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Localizable.strings; sourceTree = ""; }; + C2F0153C2C09D5C0000F7221 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = Localizable.strings; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -117,23 +117,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1607D9C82C09CF4C000AB3F2 /* PartyEnregistery */ = { - isa = PBXGroup; - children = ( - 1607D9C92C09CF4C000AB3F2 /* Stub.swift */, - 1607D9CA2C09CF4C000AB3F2 /* PartyEnregistery.swift */, - ); - path = PartyEnregistery; - sourceTree = ""; - }; - 168CD4FD2C06264300419510 /* Utils */ = { - isa = PBXGroup; - children = ( - 168CD4FE2C06265B00419510 /* LanguageSettings.swift */, - ); - path = Utils; - sourceTree = ""; - }; 8203E9052BF60117005F5C4A /* Frameworks */ = { isa = PBXGroup; children = ( @@ -162,8 +145,6 @@ C205A2AA2BF373360097BD93 = { isa = PBXGroup; children = ( - 168CD4FA2C0625A400419510 /* en.lproj */, - 168CD4F92C0625A400419510 /* fr.lproj */, C205A2B52BF373360097BD93 /* ArkitDoushiQi */, C205A2C62BF373380097BD93 /* ArkitDoushiQiTests */, C205A2D02BF373380097BD93 /* ArkitDoushiQiUITests */, @@ -185,7 +166,8 @@ C205A2B52BF373360097BD93 /* ArkitDoushiQi */ = { isa = PBXGroup; children = ( - 168CD4FD2C06264300419510 /* Utils */, + C2F015352C09D592000F7221 /* Resources */, + C2F015072C09D366000F7221 /* Utils */, 82CE59E52C045C7500ADEE24 /* Game */, C205A2B62BF373360097BD93 /* ArkitDoushiQiApp.swift */, C205A2B82BF373360097BD93 /* ContentView.swift */, @@ -198,13 +180,10 @@ C205A2BC2BF373380097BD93 /* Views */ = { isa = PBXGroup; children = ( -<<<<<<< HEAD - C2F015022C09BC56000F7221 /* EventTriggers */, -======= - 1607D9C82C09CF4C000AB3F2 /* PartyEnregistery */, ->>>>>>> 40ae735863a246c32eefd036739aa3e93055aaf4 - C24DAB5A2C061DAA00681CD0 /* Enum */, - C25220F02C00AD7F0026B71F /* Components */, + C2F015272C09D420000F7221 /* PartyEnregistery */, + C2F015122C09D3E7000F7221 /* Components */, + C2F0150D2C09D3C3000F7221 /* Enum */, + C2F0150A2C09D3A4000F7221 /* EventTriggers */, C25220EC2C00AC530026B71F /* GameParametersMenu */, C25220EB2C00A9230026B71F /* GeneralParametersMenu */, C25220EA2C00A9010026B71F /* MainMenu */, @@ -230,15 +209,6 @@ path = ArkitDoushiQiUITests; sourceTree = ""; }; - C24DAB5A2C061DAA00681CD0 /* Enum */ = { - isa = PBXGroup; - children = ( - C24DAB5B2C061DC700681CD0 /* AI.swift */, - C24DAB5D2C061E3A00681CD0 /* Language.swift */, - ); - path = Enum; - sourceTree = ""; - }; C25220EA2C00A9010026B71F /* MainMenu */ = { isa = PBXGroup; children = ( @@ -263,46 +233,97 @@ path = GameParametersMenu; sourceTree = ""; }; - C25220F02C00AD7F0026B71F /* Components */ = { + C2F015072C09D366000F7221 /* Utils */ = { + isa = PBXGroup; + children = ( + C2F015082C09D366000F7221 /* LanguageSettings.swift */, + ); + path = Utils; + sourceTree = ""; + }; + C2F0150A2C09D3A4000F7221 /* EventTriggers */ = { + isa = PBXGroup; + children = ( + C2F0150B2C09D3A4000F7221 /* KeyboardReadable.swift */, + ); + path = EventTriggers; + sourceTree = ""; + }; + C2F0150D2C09D3C3000F7221 /* Enum */ = { + isa = PBXGroup; + children = ( + C2F0150E2C09D3C3000F7221 /* Language.swift */, + C2F0150F2C09D3C3000F7221 /* AI.swift */, + ); + path = Enum; + sourceTree = ""; + }; + C2F015122C09D3E7000F7221 /* Components */ = { isa = PBXGroup; children = ( - C2F394092C04636C0070B4F6 /* Visuals */, - C25220F12C00ADF70026B71F /* Controls */, + C2F015132C09D3E7000F7221 /* Controls */, + C2F0151A2C09D3E7000F7221 /* Visuals */, ); path = Components; sourceTree = ""; }; - C25220F12C00ADF70026B71F /* Controls */ = { + C2F015132C09D3E7000F7221 /* Controls */ = { isa = PBXGroup; children = ( - C20310D52BFCB5FB0031657D /* PickerComponent.swift */, - C20310D92BFCC8600031657D /* ToggleComponent.swift */, - C24659E82BF60FAA004E80D5 /* ButtonComponent.swift */, - C25220F22C00AF490026B71F /* EditTextComponent.swift */, - C2F394072C0462400070B4F6 /* PhotoButtonComponent.swift */, - C2F015052C09C384000F7221 /* EditImageComponent.swift */, + C2F015142C09D3E7000F7221 /* PickerComponent.swift */, + C2F015152C09D3E7000F7221 /* ToggleComponent.swift */, + C2F015162C09D3E7000F7221 /* ButtonComponent.swift */, + C2F015172C09D3E7000F7221 /* EditImageComponent.swift */, + C2F015182C09D3E7000F7221 /* PhotoButtonComponent.swift */, + C2F015192C09D3E7000F7221 /* EditTextComponent.swift */, ); path = Controls; sourceTree = ""; }; - C2F015022C09BC56000F7221 /* EventTriggers */ = { + C2F0151A2C09D3E7000F7221 /* Visuals */ = { isa = PBXGroup; children = ( - C2F015032C09BC6B000F7221 /* KeyboardReadable.swift */, + C2F0151B2C09D3E7000F7221 /* ProfileComponent.swift */, + C2F0151C2C09D3E7000F7221 /* ItemCollectionParty.swift */, + C2F0151D2C09D3E7000F7221 /* ProfileEdit.swift */, ); - path = EventTriggers; + path = Visuals; sourceTree = ""; }; - C2F394092C04636C0070B4F6 /* Visuals */ = { + C2F015272C09D420000F7221 /* PartyEnregistery */ = { isa = PBXGroup; children = ( - 1607D9CD2C09CFD3000AB3F2 /* ItemCollectionParty.swift */, - C2F3940A2C0463940070B4F6 /* ProfileComponent.swift */, - C24DAB612C062DBC00681CD0 /* ProfileEdit.swift */, + C2F015282C09D420000F7221 /* Stub.swift */, + C2F015292C09D420000F7221 /* PartyEnregistery.swift */, ); - path = Visuals; + path = PartyEnregistery; + sourceTree = ""; + }; + C2F015352C09D592000F7221 /* Resources */ = { + isa = PBXGroup; + children = ( + C2F0153A2C09D5C0000F7221 /* fr.lproj */, + C2F015362C09D5A5000F7221 /* en.lproj */, + ); + path = Resources; sourceTree = ""; }; + C2F015362C09D5A5000F7221 /* en.lproj */ = { + isa = PBXGroup; + children = ( + C2F015372C09D5A5000F7221 /* Localizable.strings */, + ); + path = en.lproj; + sourceTree = SOURCE_ROOT; + }; + C2F0153A2C09D5C0000F7221 /* fr.lproj */ = { + isa = PBXGroup; + children = ( + C2F0153B2C09D5C0000F7221 /* Localizable.strings */, + ); + path = fr.lproj; + sourceTree = SOURCE_ROOT; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -408,9 +429,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 168CD4FC2C0625A400419510 /* en.lproj in Resources */, C205A2BE2BF373380097BD93 /* Preview Assets.xcassets in Resources */, - 168CD4FB2C0625A400419510 /* fr.lproj in Resources */, + C2F0153D2C09D5C0000F7221 /* Localizable.strings in Resources */, + C2F015392C09D5A5000F7221 /* Localizable.strings in Resources */, C205A2BB2BF373380097BD93 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -436,40 +457,29 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + C2F015112C09D3C3000F7221 /* AI.swift in Sources */, + C2F0152A2C09D420000F7221 /* Stub.swift in Sources */, + C2F015252C09D3E7000F7221 /* ItemCollectionParty.swift in Sources */, C205A2B92BF373360097BD93 /* ContentView.swift in Sources */, 82CE59EF2C0460E500ADEE24 /* SpriteMoople.swift in Sources */, + C2F0150C2C09D3A4000F7221 /* KeyboardReadable.swift in Sources */, 82CE59E92C045D1100ADEE24 /* GameScene.swift in Sources */, -<<<<<<< HEAD - C2F015062C09C384000F7221 /* EditImageComponent.swift in Sources */, - 82F9D3312BFE3A9F009EDFAF /* HistoryGameDetail.swift in Sources */, -======= ->>>>>>> 40ae735863a246c32eefd036739aa3e93055aaf4 - C24659E92BF60FAA004E80D5 /* ButtonComponent.swift in Sources */, - C24DAB5E2C061E3A00681CD0 /* Language.swift in Sources */, - C2F394082C0462400070B4F6 /* PhotoButtonComponent.swift in Sources */, + C2F015242C09D3E7000F7221 /* ProfileComponent.swift in Sources */, + C2F0151E2C09D3E7000F7221 /* PickerComponent.swift in Sources */, + C2F015212C09D3E7000F7221 /* EditImageComponent.swift in Sources */, C24659E52BF5FE09004E80D5 /* MainMenu.swift in Sources */, C20310D82BFCC2410031657D /* GeneralParametersMenuView.swift in Sources */, - 168CD4FF2C06265B00419510 /* LanguageSettings.swift in Sources */, - C2F3940B2C0463940070B4F6 /* ProfileComponent.swift in Sources */, - C2F015042C09BC6B000F7221 /* KeyboardReadable.swift in Sources */, + C2F0151F2C09D3E7000F7221 /* ToggleComponent.swift in Sources */, + C2F015202C09D3E7000F7221 /* ButtonComponent.swift in Sources */, + C2F015262C09D3E7000F7221 /* ProfileEdit.swift in Sources */, C205A2B72BF373360097BD93 /* ArkitDoushiQiApp.swift in Sources */, - 1607D9CE2C09CFD3000AB3F2 /* ItemCollectionParty.swift in Sources */, - C24DAB5C2C061DC700681CD0 /* AI.swift in Sources */, -<<<<<<< HEAD - C25220F32C00AF490026B71F /* EditTextComponent.swift in Sources */, -======= - C25220F32C00AF490026B71F /* EditComponent.swift in Sources */, - 1607D9CB2C09CF4C000AB3F2 /* Stub.swift in Sources */, ->>>>>>> 40ae735863a246c32eefd036739aa3e93055aaf4 - C20310D62BFCB5FB0031657D /* PickerComponent.swift in Sources */, + C2F015232C09D3E7000F7221 /* EditTextComponent.swift in Sources */, + C2F015222C09D3E7000F7221 /* PhotoButtonComponent.swift in Sources */, + C2F015092C09D366000F7221 /* LanguageSettings.swift in Sources */, 82CE59EB2C045E3800ADEE24 /* GameView.swift in Sources */, - C20310DA2BFCC8600031657D /* ToggleComponent.swift in Sources */, + C2F0152B2C09D420000F7221 /* PartyEnregistery.swift in Sources */, + C2F015102C09D3C3000F7221 /* Language.swift in Sources */, C25220EE2C00AC7E0026B71F /* GameParametersMenuView.swift in Sources */, -<<<<<<< HEAD - C24DAB622C062DBC00681CD0 /* ProfileEdit.swift in Sources */, -======= - 1607D9CC2C09CF4C000AB3F2 /* PartyEnregistery.swift in Sources */, ->>>>>>> 40ae735863a246c32eefd036739aa3e93055aaf4 ); runOnlyForDeploymentPostprocessing = 0; }; @@ -505,6 +515,25 @@ }; /* End PBXTargetDependency section */ +/* Begin PBXVariantGroup section */ + C2F015372C09D5A5000F7221 /* Localizable.strings */ = { + isa = PBXVariantGroup; + children = ( + C2F015382C09D5A5000F7221 /* en */, + ); + name = Localizable.strings; + sourceTree = ""; + }; + C2F0153B2C09D5C0000F7221 /* Localizable.strings */ = { + isa = PBXVariantGroup; + children = ( + C2F0153C2C09D5C0000F7221 /* fr */, + ); + name = Localizable.strings; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + /* Begin XCBuildConfiguration section */ C205A2D52BF373380097BD93 /* Debug */ = { isa = XCBuildConfiguration;