Skip to content
Snippets Groups Projects
Commit 447778b7 authored by Eunae Jang's avatar Eunae Jang
Browse files

Merge branch 'code-cleanup-eunae' into 'master'

Code clean up

See merge request !50
parents 290daef3 2f2459d5
No related branches found
No related tags found
1 merge request!50Code clean up
Showing
with 2 additions and 125 deletions
......@@ -21,8 +21,6 @@
66C7AF5325A6D57200F5A304 /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66C7AF5225A6D57100F5A304 /* Timer.swift */; };
8078002B25D01CF8005C2DAC /* BTLobbyMusic.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 8078002A25D01CF8005C2DAC /* BTLobbyMusic.mp3 */; };
8084DEE625C040350053D095 /* HapticResponseController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8084DEE525C040350053D095 /* HapticResponseController.swift */; };
8084DEEB25C043E00053D095 /* FeedbackController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8084DEEA25C043E00053D095 /* FeedbackController.swift */; };
8084DEF025C044050053D095 /* SoundFeedbackConrtoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8084DEEF25C044050053D095 /* SoundFeedbackConrtoller.swift */; };
808F8C9625ACFFE500C7FFFE /* LevelSelectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 808F8C9525ACFFE500C7FFFE /* LevelSelectionViewController.swift */; };
808F8CB425AD08AD00C7FFFE /* PlayMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 808F8CB325AD08AD00C7FFFE /* PlayMode.swift */; };
80BA662725D1C277003AA747 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 80BA662625D1C277003AA747 /* LaunchScreen.storyboard */; };
......@@ -91,8 +89,6 @@
66C7AF5225A6D57100F5A304 /* Timer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Timer.swift; sourceTree = "<group>"; };
8078002A25D01CF8005C2DAC /* BTLobbyMusic.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = BTLobbyMusic.mp3; sourceTree = "<group>"; };
8084DEE525C040350053D095 /* HapticResponseController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HapticResponseController.swift; sourceTree = "<group>"; };
8084DEEA25C043E00053D095 /* FeedbackController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackController.swift; sourceTree = "<group>"; };
8084DEEF25C044050053D095 /* SoundFeedbackConrtoller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoundFeedbackConrtoller.swift; sourceTree = "<group>"; };
808F8C9525ACFFE500C7FFFE /* LevelSelectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LevelSelectionViewController.swift; sourceTree = "<group>"; };
808F8CB325AD08AD00C7FFFE /* PlayMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayMode.swift; sourceTree = "<group>"; };
80BA662625D1C277003AA747 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
......@@ -210,8 +206,6 @@
isa = PBXGroup;
children = (
F228C65025C4D6C100E4E701 /* GameGyroscopeController.swift */,
8084DEEA25C043E00053D095 /* FeedbackController.swift */,
8084DEEF25C044050053D095 /* SoundFeedbackConrtoller.swift */,
8084DEE525C040350053D095 /* HapticResponseController.swift */,
);
path = Controls;
......@@ -452,7 +446,6 @@
F233606525BE86F500452818 /* CharacterAction.swift in Sources */,
F2AB5B9025CD7D1600F8BA8E /* Spinner.swift in Sources */,
F2DFAFBB25A1304D00F982BA /* TutorialScene.swift in Sources */,
8084DEF025C044050053D095 /* SoundFeedbackConrtoller.swift in Sources */,
808F8C9625ACFFE500C7FFFE /* LevelSelectionViewController.swift in Sources */,
80F869BC25A65CFD00CF3D59 /* MutliplayerManager.swift in Sources */,
80BBBDCB25AE41EE006DA00A /* LocalTeamPlayManager.swift in Sources */,
......@@ -467,7 +460,6 @@
80CD582A25CB6B030078031F /* CharacterManager.swift in Sources */,
667FBD3625A26FE400569A6D /* Character.swift in Sources */,
F2FD145B25A098D100A0181C /* PlayerModeSelectorViewController.swift in Sources */,
8084DEEB25C043E00053D095 /* FeedbackController.swift in Sources */,
F233607825BE8E0700452818 /* CodableHelper.swift in Sources */,
66383771259F8C340033D344 /* GameViewController.swift in Sources */,
F233606D25BE8B6A00452818 /* SessionAction.swift in Sources */,
......@@ -646,14 +638,14 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NYTT9V938N;
DEVELOPMENT_TEAM = V6FHC84522;
INFOPLIST_FILE = "Better Together/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.2;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.example.Better-Together";
PRODUCT_BUNDLE_IDENTIFIER = "com.example1.Better-Together";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
......
{
"images" : [
{
"filename" : "baseLeft.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "baseLeft@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "baseLeft@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Better Together/Better Together/Assets.xcassets/baseLeft.imageset/baseLeft.png

3.12 KiB

{
"images" : [
{
"filename" : "baseRight.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "baseRight@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "baseRight@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Better Together/Better Together/Assets.xcassets/baseRight.imageset/baseRight.png

3.18 KiB

{
"images" : [
{
"filename" : "grapButtonLeft.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "grapButtonLeft@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "grapButtonLeft@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "grapButtonLeftOn.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "grapButtonLeftOn@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "grapButtonLeftOn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "grapButtonRight.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "grapButtonRight@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "grapButtonRight@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment