diff --git a/Sw1/Sw1-1.xcodeproj/project.pbxproj b/Sw1/Sw1-1.xcodeproj/project.pbxproj index cd515bc..6f603f8 100755 --- a/Sw1/Sw1-1.xcodeproj/project.pbxproj +++ b/Sw1/Sw1-1.xcodeproj/project.pbxproj @@ -287,11 +287,25 @@ files = ( 2F53228B1C5B7561003B0A68 /* after.png in Resources */, 2FF9E4F31C1AC36600B3900F /* GAME.mp3 in Resources */, +<<<<<<< Updated upstream 2F1475791C59153C005CD232 /* kick1.mp3 in Resources */, 2FADB4051BFA07AB00675914 /* LaunchScreen.storyboard in Resources */, +======= + 2F5322AE1C5B774F003B0A68 /* wall.png in Resources */, + 2F5322A71C5B774F003B0A68 /* Motorless-Specimen.pdf in Resources */, + 2F1475791C59153C005CD232 /* kick1.mp3 in Resources */, + 2FADB4051BFA07AB00675914 /* LaunchScreen.storyboard in Resources */, + 2F5322A21C5B774F003B0A68 /* kabe.png in Resources */, + 2F5322A41C5B774F003B0A68 /* Motorless-Default.ttf in Resources */, + 2F5322AD1C5B774F003B0A68 /* read me.txt in Resources */, +>>>>>>> Stashed changes 2F5322A91C5B774F003B0A68 /* PAPERWORK-Black.otf in Resources */, 2F5322921C5B7694003B0A68 /* Icon.png in Resources */, 2F5322AC1C5B774F003B0A68 /* PAPERWORK-Striped.otf in Resources */, +<<<<<<< Updated upstream +======= + 2F5322A61C5B774F003B0A68 /* Motorless-Hammered.ttf in Resources */, +>>>>>>> Stashed changes 2F5322AB1C5B774F003B0A68 /* PAPERWORK-Outline.otf in Resources */, 2FF9E4F11C1AC36600B3900F /* BGM.mp3 in Resources */, 2F53228F1C5B7577003B0A68 /* apple.png in Resources */, diff --git a/Sw1/Sw1-1.xcodeproj/project.xcworkspace/xcuserdata/e145759.xcuserdatad/UserInterfaceState.xcuserstate b/Sw1/Sw1-1.xcodeproj/project.xcworkspace/xcuserdata/e145759.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..c93bfe0 Binary files /dev/null and b/Sw1/Sw1-1.xcodeproj/project.xcworkspace/xcuserdata/e145759.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Sw1/Sw1-1.xcodeproj/xcuserdata/e145759.xcuserdatad/xcschemes/Sw1-1.xcscheme b/Sw1/Sw1-1.xcodeproj/xcuserdata/e145759.xcuserdatad/xcschemes/Sw1-1.xcscheme new file mode 100644 index 0000000..b8ff141 --- /dev/null +++ b/Sw1/Sw1-1.xcodeproj/xcuserdata/e145759.xcuserdatad/xcschemes/Sw1-1.xcscheme @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Sw1/Sw1-1.xcodeproj/xcuserdata/e145759.xcuserdatad/xcschemes/xcschememanagement.plist b/Sw1/Sw1-1.xcodeproj/xcuserdata/e145759.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..b6c97fc --- /dev/null +++ b/Sw1/Sw1-1.xcodeproj/xcuserdata/e145759.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,32 @@ + + + + + SchemeUserState + + Sw1-1.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 2FADB3F61BFA07AB00675914 + + primary + + + 2FADB40A1BFA07AC00675914 + + primary + + + 2FADB4151BFA07AC00675914 + + primary + + + + +