🔀 merging

DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj

@@ -16,7 +16,6 @@
 		6458346D2BF5F92600E18321 /* DouShouQi_AppTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6458346C2BF5F92600E18321 /* DouShouQi_AppTests.swift */; };
 		645834772BF5F92600E18321 /* DouShouQi_AppUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645834762BF5F92600E18321 /* DouShouQi_AppUITests.swift */; };
 		645834792BF5F92600E18321 /* DouShouQi_AppUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645834782BF5F92600E18321 /* DouShouQi_AppUITestsLaunchTests.swift */; };
-		645834882BF5FEA000E18321 /* DSQ.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 645834872BF5FEA000E18321 /* DSQ.xcframework */; };
 		645B4C202BFCCA0500FD658A /* PlayerScoreResumeFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645B4C1F2BFCCA0500FD658A /* PlayerScoreResumeFrame.swift */; };
 		645B4C252BFCD3C600FD658A /* ScoreBoardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645B4C242BFCD3C600FD658A /* ScoreBoardView.swift */; };
 		647D565C2BFD0212008D02EA /* PlayerResumeFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647D565B2BFD0212008D02EA /* PlayerResumeFrame.swift */; };
@@ -30,6 +29,8 @@
 		649B59AE2BF64EAB002BAE38 /* AppImages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59AD2BF64EAB002BAE38 /* AppImages.swift */; };
 		649B59B22BF65392002BAE38 /* TextStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59B12BF65392002BAE38 /* TextStyles.swift */; };
 		649B59B42BF653E1002BAE38 /* ViewTitleTextStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59B32BF653E1002BAE38 /* ViewTitleTextStyle.swift */; };
+		64C87E272C09D5D200CCD451 /* DSQ.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C87E262C09D5D200CCD451 /* DSQ.xcframework */; };
+		64C87E2A2C09D76100CCD451 /* DSQ.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C87E262C09D5D200CCD451 /* DSQ.xcframework */; };
 		64D992722C06281B002ACBC6 /* SystemIcons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D992712C06281B002ACBC6 /* SystemIcons.swift */; };
 		64FC4D692C09C78000D08B8B /* SelectPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64FC4D682C09C78000D08B8B /* SelectPlayerView.swift */; };
 		64FC4D6B2C09C7C900D08B8B /* SelectPlayerButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64FC4D6A2C09C7C900D08B8B /* SelectPlayerButtonView.swift */; };
@@ -65,20 +66,6 @@
 		};
 /* End PBXContainerItemProxy section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-		EC9446332C0486D800AC95EE /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				EC9446322C0486D800AC95EE /* DSQ.xcframework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
 		643AB6922BFCEFD00018DA73 /* GameResumeFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameResumeFrame.swift; sourceTree = "<group>"; };
 		643AB69A2BFCFB5C0018DA73 /* HistoricView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoricView.swift; sourceTree = "<group>"; };
@@ -93,7 +80,6 @@
 		645834762BF5F92600E18321 /* DouShouQi_AppUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DouShouQi_AppUITests.swift; sourceTree = "<group>"; };
 		645834782BF5F92600E18321 /* DouShouQi_AppUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DouShouQi_AppUITestsLaunchTests.swift; sourceTree = "<group>"; };
 		645834852BF5FE1400E18321 /* DouShouQi-App-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "DouShouQi-App-Info.plist"; sourceTree = SOURCE_ROOT; };
-		645834872BF5FEA000E18321 /* DSQ.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = DSQ.xcframework; sourceTree = "<group>"; };
 		645B4C1F2BFCCA0500FD658A /* PlayerScoreResumeFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerScoreResumeFrame.swift; sourceTree = "<group>"; };
 		645B4C242BFCD3C600FD658A /* ScoreBoardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScoreBoardView.swift; sourceTree = "<group>"; };
 		647D565B2BFD0212008D02EA /* PlayerResumeFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerResumeFrame.swift; sourceTree = "<group>"; };
@@ -107,6 +93,7 @@
 		649B59AD2BF64EAB002BAE38 /* AppImages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppImages.swift; sourceTree = "<group>"; };
 		649B59B12BF65392002BAE38 /* TextStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextStyles.swift; sourceTree = "<group>"; };
 		649B59B32BF653E1002BAE38 /* ViewTitleTextStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewTitleTextStyle.swift; sourceTree = "<group>"; };
+		64C87E262C09D5D200CCD451 /* DSQ.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = DSQ.xcframework; sourceTree = "<group>"; };
 		64D992712C06281B002ACBC6 /* SystemIcons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemIcons.swift; sourceTree = "<group>"; };
 		64FC4D682C09C78000D08B8B /* SelectPlayerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectPlayerView.swift; sourceTree = "<group>"; };
 		64FC4D6A2C09C7C900D08B8B /* SelectPlayerButtonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectPlayerButtonView.swift; sourceTree = "<group>"; };
@@ -130,21 +117,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EC9446312C0486D800AC95EE /* DSQ.xcframework in Frameworks */,
+				64C87E2A2C09D76100CCD451 /* DSQ.xcframework in Frameworks */,
-			);
+				64C87E272C09D5D200CCD451 /* DSQ.xcframework in Frameworks */,
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		645834652BF5F92600E18321 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		6458346F2BF5F92600E18321 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -173,8 +147,7 @@
 				6458345A2BF5F92300E18321 /* DouShouQi_App */,
 				6458346B2BF5F92600E18321 /* DouShouQi_AppTests */,
 				645834752BF5F92600E18321 /* DouShouQi_AppUITests */,
-				645834592BF5F92300E18321 /* Products */,
+				64C87E222C09D52600CCD451 /* Frameworks */,
-				645834862BF5FE9F00E18321 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -229,14 +202,6 @@
 			path = DouShouQi_AppUITests;
 			sourceTree = "<group>";
 		};
-		645834862BF5FE9F00E18321 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				EC9446302C0486D800AC95EE /* DSQ.xcframework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		645B4C1C2BFCC95000FD658A /* Player */ = {
 			isa = PBXGroup;
 			children = (
@@ -333,6 +298,14 @@
 			path = TextStyles;
 			sourceTree = "<group>";
 		};
+		64C87E222C09D52600CCD451 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				64C87E262C09D5D200CCD451 /* DSQ.xcframework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		EC05BFC62C04D7C2000F7B19 /* Settings */ = {
 			isa = PBXGroup;
 			children = (
@@ -378,7 +351,6 @@
 				645834542BF5F92300E18321 /* Sources */,
 				645834552BF5F92300E18321 /* Frameworks */,
 				645834562BF5F92300E18321 /* Resources */,
-				EC9446332C0486D800AC95EE /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
@@ -394,7 +366,6 @@
 			buildConfigurationList = 6458347F2BF5F92600E18321 /* Build configuration list for PBXNativeTarget "DouShouQi_AppTests" */;
 			buildPhases = (
 				645834642BF5F92600E18321 /* Sources */,
-				645834652BF5F92600E18321 /* Frameworks */,
 				645834662BF5F92600E18321 /* Resources */,
 			);
 			buildRules = (
@@ -412,7 +383,6 @@
 			buildConfigurationList = 645834822BF5F92600E18321 /* Build configuration list for PBXNativeTarget "DouShouQi_AppUITests" */;
 			buildPhases = (
 				6458346E2BF5F92600E18321 /* Sources */,
-				6458346F2BF5F92600E18321 /* Frameworks */,
 				645834702BF5F92600E18321 /* Resources */,
 			);
 			buildRules = (