Binome
/
Swift_Ark
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into arkit

Browse Source
pull/28/head
enzo 10 months ago
parent dd80b85a45 a6a16c8012
commit e17e955bf3
4 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File

49
ArkitDoushiQi/ArkitDoushiQi.xcodeproj/project.pbxproj
Unescape View File

@ -11,6 +11,18 @@
161A8E932C2055EA00D1ADFE /* Placeholder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 161A8E922C2055EA00D1ADFE /* Placeholder.swift */; }; 161A8E932C2055EA00D1ADFE /* Placeholder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 161A8E922C2055EA00D1ADFE /* Placeholder.swift */; };
165725EA2C1984CC0052D7EF /* FontManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165725E92C1984CC0052D7EF /* FontManager.swift */; }; 165725EA2C1984CC0052D7EF /* FontManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165725E92C1984CC0052D7EF /* FontManager.swift */; };
16DB00A42C257BA900BA190C /* nuku1.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 165725F02C1985920052D7EF /* nuku1.ttf */; }; 16DB00A42C257BA900BA190C /* nuku1.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 165725F02C1985920052D7EF /* nuku1.ttf */; };
16DB00B32C25806500BA190C /* dog.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 16DB00A72C25806500BA190C /* dog.usdz */; };
16DB00B42C25806500BA190C /* wolf.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 16DB00A82C25806500BA190C /* wolf.usdz */; };
16DB00B52C25806500BA190C /* CatPiece.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 16DB00A92C25806500BA190C /* CatPiece.usdz */; };
16DB00B62C25806500BA190C /* lion.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 16DB00AA2C25806500BA190C /* lion.usdz */; };
16DB00B72C25806500BA190C /* tiger.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 16DB00AB2C25806500BA190C /* tiger.usdz */; };
16DB00B82C25806500BA190C /* leopard.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 16DB00AC2C25806500BA190C /* leopard.usdz */; };
16DB00B92C25806500BA190C /* board.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 16DB00AD2C25806500BA190C /* board.usdz */; };
16DB00BA2C25806500BA190C /* cat.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 16DB00AE2C25806500BA190C /* cat.usdz */; };
16DB00BB2C25806500BA190C /* CatPiece 2.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 16DB00AF2C25806500BA190C /* CatPiece 2.usdz */; };
16DB00BC2C25806500BA190C /* rat.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 16DB00B02C25806500BA190C /* rat.usdz */; };
16DB00BD2C25806500BA190C /* LionPiece.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 16DB00B12C25806500BA190C /* LionPiece.usdz */; };
16DB00BE2C25806500BA190C /* elephant.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 16DB00B22C25806500BA190C /* elephant.usdz */; };
16FA05922C1C154A0042D688 /* LanguagePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16FA05912C1C154A0042D688 /* LanguagePickerView.swift */; }; 16FA05922C1C154A0042D688 /* LanguagePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16FA05912C1C154A0042D688 /* LanguagePickerView.swift */; };
16FA05942C1C1A380042D688 /* Rules.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16FA05932C1C1A380042D688 /* Rules.swift */; }; 16FA05942C1C1A380042D688 /* Rules.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16FA05932C1C1A380042D688 /* Rules.swift */; };
16FA05962C1C1A5F0042D688 /* GameType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16FA05952C1C1A5F0042D688 /* GameType.swift */; }; 16FA05962C1C1A5F0042D688 /* GameType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16FA05952C1C1A5F0042D688 /* GameType.swift */; };
@ -35,9 +47,9 @@
C205A2B72BF373360097BD93 /* ArkitDoushiQiApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C205A2B62BF373360097BD93 /* ArkitDoushiQiApp.swift */; }; C205A2B72BF373360097BD93 /* ArkitDoushiQiApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C205A2B62BF373360097BD93 /* ArkitDoushiQiApp.swift */; };
C205A2BB2BF373380097BD93 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C205A2BA2BF373380097BD93 /* Assets.xcassets */; }; C205A2BB2BF373380097BD93 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C205A2BA2BF373380097BD93 /* Assets.xcassets */; };
C205A2BE2BF373380097BD93 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C205A2BD2BF373380097BD93 /* Preview Assets.xcassets */; }; C205A2BE2BF373380097BD93 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C205A2BD2BF373380097BD93 /* Preview Assets.xcassets */; };
C205A2C82BF373380097BD93 /* WtaTennisTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C205A2C72BF373380097BD93 /* WtaTennisTests.swift */; }; C205A2C82BF373380097BD93 /* ArkitDoushiQiTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C205A2C72BF373380097BD93 /* ArkitDoushiQiTests.swift */; };
C205A2D22BF373380097BD93 /* WtaTennisUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C205A2D12BF373380097BD93 /* WtaTennisUITests.swift */; }; C205A2D22BF373380097BD93 /* ArkitDoushiQiUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C205A2D12BF373380097BD93 /* ArkitDoushiQiUITests.swift */; };
C205A2D42BF373380097BD93 /* WtaTennisUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C205A2D32BF373380097BD93 /* WtaTennisUITestsLaunchTests.swift */; }; C205A2D42BF373380097BD93 /* ArkitDoushiQiUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C205A2D32BF373380097BD93 /* ArkitDoushiQiUITestsLaunchTests.swift */; };
C24659E52BF5FE09004E80D5 /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C24659E42BF5FE09004E80D5 /* MainMenu.swift */; }; C24659E52BF5FE09004E80D5 /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C24659E42BF5FE09004E80D5 /* MainMenu.swift */; };
C25220EE2C00AC7E0026B71F /* GameParametersMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C25220ED2C00AC7E0026B71F /* GameParametersMenuView.swift */; }; C25220EE2C00AC7E0026B71F /* GameParametersMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C25220ED2C00AC7E0026B71F /* GameParametersMenuView.swift */; };
C2DF075B2C206EEF00BEE0E1 /* Stub.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2DF075A2C206EEF00BEE0E1 /* Stub.swift */; }; C2DF075B2C206EEF00BEE0E1 /* Stub.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2DF075A2C206EEF00BEE0E1 /* Stub.swift */; };
@ -101,6 +113,18 @@
161A8E922C2055EA00D1ADFE /* Placeholder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Placeholder.swift; sourceTree = "<group>"; }; 161A8E922C2055EA00D1ADFE /* Placeholder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Placeholder.swift; sourceTree = "<group>"; };
165725E92C1984CC0052D7EF /* FontManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontManager.swift; sourceTree = "<group>"; }; 165725E92C1984CC0052D7EF /* FontManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontManager.swift; sourceTree = "<group>"; };
165725F02C1985920052D7EF /* nuku1.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = nuku1.ttf; sourceTree = "<group>"; }; 165725F02C1985920052D7EF /* nuku1.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = nuku1.ttf; sourceTree = "<group>"; };
16DB00A72C25806500BA190C /* dog.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = dog.usdz; sourceTree = "<group>"; };
16DB00A82C25806500BA190C /* wolf.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = wolf.usdz; sourceTree = "<group>"; };
16DB00A92C25806500BA190C /* CatPiece.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = CatPiece.usdz; sourceTree = "<group>"; };
16DB00AA2C25806500BA190C /* lion.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = lion.usdz; sourceTree = "<group>"; };
16DB00AB2C25806500BA190C /* tiger.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = tiger.usdz; sourceTree = "<group>"; };
16DB00AC2C25806500BA190C /* leopard.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = leopard.usdz; sourceTree = "<group>"; };
16DB00AD2C25806500BA190C /* board.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = board.usdz; sourceTree = "<group>"; };
16DB00AE2C25806500BA190C /* cat.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = cat.usdz; sourceTree = "<group>"; };
16DB00AF2C25806500BA190C /* CatPiece 2.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = "CatPiece 2.usdz"; sourceTree = "<group>"; };
16DB00B02C25806500BA190C /* rat.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = rat.usdz; sourceTree = "<group>"; };
16DB00B12C25806500BA190C /* LionPiece.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = LionPiece.usdz; sourceTree = "<group>"; };
16DB00B22C25806500BA190C /* elephant.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = elephant.usdz; sourceTree = "<group>"; };
16FA058B2C1C14F50042D688 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Localizable.strings; sourceTree = "<group>"; }; 16FA058B2C1C14F50042D688 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Localizable.strings; sourceTree = "<group>"; };
16FA058F2C1C14FD0042D688 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = Localizable.strings; sourceTree = "<group>"; }; 16FA058F2C1C14FD0042D688 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = Localizable.strings; sourceTree = "<group>"; };
16FA05912C1C154A0042D688 /* LanguagePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguagePickerView.swift; sourceTree = "<group>"; }; 16FA05912C1C154A0042D688 /* LanguagePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguagePickerView.swift; sourceTree = "<group>"; };
@ -127,10 +151,10 @@
C205A2BA2BF373380097BD93 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; C205A2BA2BF373380097BD93 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
C205A2BD2BF373380097BD93 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; }; C205A2BD2BF373380097BD93 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
C205A2C32BF373380097BD93 /* ArkitDoushiQiTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ArkitDoushiQiTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; C205A2C32BF373380097BD93 /* ArkitDoushiQiTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ArkitDoushiQiTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
C205A2C72BF373380097BD93 /* WtaTennisTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WtaTennisTests.swift; sourceTree = "<group>"; }; C205A2C72BF373380097BD93 /* ArkitDoushiQiTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArkitDoushiQiTests.swift; sourceTree = "<group>"; };
C205A2CD2BF373380097BD93 /* ArkitDoushiQiUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ArkitDoushiQiUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; C205A2CD2BF373380097BD93 /* ArkitDoushiQiUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ArkitDoushiQiUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
C205A2D12BF373380097BD93 /* WtaTennisUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WtaTennisUITests.swift; sourceTree = "<group>"; }; C205A2D12BF373380097BD93 /* ArkitDoushiQiUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArkitDoushiQiUITests.swift; sourceTree = "<group>"; };
C205A2D32BF373380097BD93 /* WtaTennisUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WtaTennisUITestsLaunchTests.swift; sourceTree = "<group>"; }; C205A2D32BF373380097BD93 /* ArkitDoushiQiUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArkitDoushiQiUITestsLaunchTests.swift; sourceTree = "<group>"; };
C24659E42BF5FE09004E80D5 /* MainMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenu.swift; sourceTree = "<group>"; usesTabs = 0; }; C24659E42BF5FE09004E80D5 /* MainMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenu.swift; sourceTree = "<group>"; usesTabs = 0; };
C25220ED2C00AC7E0026B71F /* GameParametersMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameParametersMenuView.swift; sourceTree = "<group>"; }; C25220ED2C00AC7E0026B71F /* GameParametersMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameParametersMenuView.swift; sourceTree = "<group>"; };
C2A535D82C0F56A700503472 /* DSQ.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = DSQ.xcframework; path = ../NEPASTOUCHER/DSQ.xcframework; sourceTree = "<group>"; }; C2A535D82C0F56A700503472 /* DSQ.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = DSQ.xcframework; path = ../NEPASTOUCHER/DSQ.xcframework; sourceTree = "<group>"; };
@ -338,7 +362,7 @@
C205A2C62BF373380097BD93 /* ArkitDoushiQiTests */ = { C205A2C62BF373380097BD93 /* ArkitDoushiQiTests */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
C205A2C72BF373380097BD93 /* WtaTennisTests.swift */, C205A2C72BF373380097BD93 /* ArkitDoushiQiTests.swift */,
); );
path = ArkitDoushiQiTests; path = ArkitDoushiQiTests;
sourceTree = "<group>"; sourceTree = "<group>";
@ -346,8 +370,8 @@
C205A2D02BF373380097BD93 /* ArkitDoushiQiUITests */ = { C205A2D02BF373380097BD93 /* ArkitDoushiQiUITests */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
C205A2D12BF373380097BD93 /* WtaTennisUITests.swift */, C205A2D12BF373380097BD93 /* ArkitDoushiQiUITests.swift */,
C205A2D32BF373380097BD93 /* WtaTennisUITestsLaunchTests.swift */, C205A2D32BF373380097BD93 /* ArkitDoushiQiUITestsLaunchTests.swift */,
); );
path = ArkitDoushiQiUITests; path = ArkitDoushiQiUITests;
sourceTree = "<group>"; sourceTree = "<group>";
@ -561,6 +585,7 @@
82FBE2FA2C25811400672F32 /* rat.usdz in Resources */, 82FBE2FA2C25811400672F32 /* rat.usdz in Resources */,
82FBE2F92C25811400672F32 /* elephant.usdz in Resources */, 82FBE2F92C25811400672F32 /* elephant.usdz in Resources */,
16DB00A42C257BA900BA190C /* nuku1.ttf in Resources */, 16DB00A42C257BA900BA190C /* nuku1.ttf in Resources */,
16DB00B92C25806500BA190C /* board.usdz in Resources */,
C2DF07652C20719800BEE0E1 /* FireworkLaunch.sks in Resources */, C2DF07652C20719800BEE0E1 /* FireworkLaunch.sks in Resources */,
82FBE2F22C25811400672F32 /* lion.usdz in Resources */, 82FBE2F22C25811400672F32 /* lion.usdz in Resources */,
C2DF07642C20719800BEE0E1 /* Spark.sks in Resources */, C2DF07642C20719800BEE0E1 /* Spark.sks in Resources */,
@ -638,7 +663,7 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
C205A2C82BF373380097BD93 /* WtaTennisTests.swift in Sources */, C205A2C82BF373380097BD93 /* ArkitDoushiQiTests.swift in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -646,8 +671,8 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
C205A2D42BF373380097BD93 /* WtaTennisUITestsLaunchTests.swift in Sources */, C205A2D42BF373380097BD93 /* ArkitDoushiQiUITestsLaunchTests.swift in Sources */,
C205A2D22BF373380097BD93 /* WtaTennisUITests.swift in Sources */, C205A2D22BF373380097BD93 /* ArkitDoushiQiUITests.swift in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

4
ArkitDoushiQi/ArkitDoushiQiTests/WtaTennisTests.swift → ArkitDoushiQi/ArkitDoushiQiTests/ArkitDoushiQiTests.swift
Unescape View File

@ -6,9 +6,9 @@
// //
import XCTest import XCTest
@testable import WtaTennis @testable import ArkitDoushiQi
final class WtaTennisTests: XCTestCase { final class ArkitDoushiQiTests: XCTestCase {
override func setUpWithError() throws { override func setUpWithError() throws {
// Put setup code here. This method is called before the invocation of each test method in the class. // Put setup code here. This method is called before the invocation of each test method in the class.

2
ArkitDoushiQi/ArkitDoushiQiUITests/WtaTennisUITests.swift → ArkitDoushiQi/ArkitDoushiQiUITests/ArkitDoushiQiUITests.swift
Unescape View File

@ -7,7 +7,7 @@
import XCTest import XCTest
final class WtaTennisUITests: XCTestCase { final class ArkitDoushiQiUITests: XCTestCase {
override func setUpWithError() throws { override func setUpWithError() throws {
// Put setup code here. This method is called before the invocation of each test method in the class. // Put setup code here. This method is called before the invocation of each test method in the class.

2
ArkitDoushiQi/ArkitDoushiQiUITests/WtaTennisUITestsLaunchTests.swift → ArkitDoushiQi/ArkitDoushiQiUITests/ArkitDoushiQiUITestsLaunchTests.swift
Unescape View File

@ -7,7 +7,7 @@
import XCTest import XCTest
final class WtaTennisUITestsLaunchTests: XCTestCase { final class ArkitDoushiQiUITestsLaunchTests: XCTestCase {
override class var runsForEachTargetApplicationUIConfiguration: Bool { override class var runsForEachTargetApplicationUIConfiguration: Bool {
true true
Write Preview
Loading…
Cancel
Save