Skip to content
This repository has been archived by the owner on Sep 17, 2020. It is now read-only.

Random stamp #23

Merged
merged 5 commits into from
Nov 18, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions mezamaShare.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,21 @@
/* Begin PBXBuildFile section */
0D985D711DC46395009EB50A /* AudioPlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0D985D701DC46395009EB50A /* AudioPlay.swift */; };
3A77F99016E19504B61C684A /* Pods_mezamaShare.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D532DA86A269DF2C8D8D2585 /* Pods_mezamaShare.framework */; };
662BD6561DDE8E370051FFAB /* s_01_apple-pen.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD6471DDE8E370051FFAB /* s_01_apple-pen.mp3 */; };
662BD6571DDE8E370051FFAB /* s_02_apple.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD6481DDE8E370051FFAB /* s_02_apple.mp3 */; };
662BD6581DDE8E370051FFAB /* s_03_asa-dayo.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD6491DDE8E370051FFAB /* s_03_asa-dayo.mp3 */; };
662BD6591DDE8E370051FFAB /* s_04_dododo.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD64A1DDE8E370051FFAB /* s_04_dododo.mp3 */; };
662BD65A1DDE8E370051FFAB /* s_05_hai-okite.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD64B1DDE8E370051FFAB /* s_05_hai-okite.mp3 */; };
662BD65B1DDE8E370051FFAB /* s_06_horihori.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD64C1DDE8E370051FFAB /* s_06_horihori.mp3 */; };
662BD65C1DDE8E370051FFAB /* s_07_oh-yes.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD64D1DDE8E370051FFAB /* s_07_oh-yes.mp3 */; };
662BD65D1DDE8E370051FFAB /* s_08_ohayo.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD64E1DDE8E370051FFAB /* s_08_ohayo.mp3 */; };
662BD65E1DDE8E370051FFAB /* s_09_okiro.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD64F1DDE8E370051FFAB /* s_09_okiro.mp3 */; };
662BD65F1DDE8E370051FFAB /* s_10_pen.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD6501DDE8E370051FFAB /* s_10_pen.mp3 */; };
662BD6601DDE8E370051FFAB /* s_11_pineapple-pen.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD6511DDE8E370051FFAB /* s_11_pineapple-pen.mp3 */; };
662BD6611DDE8E370051FFAB /* s_12_pineapple.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD6521DDE8E370051FFAB /* s_12_pineapple.mp3 */; };
662BD6621DDE8E370051FFAB /* s_13_ppap.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD6531DDE8E370051FFAB /* s_13_ppap.mp3 */; };
662BD6631DDE8E370051FFAB /* s_14_sukida.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD6541DDE8E370051FFAB /* s_14_sukida.mp3 */; };
662BD6641DDE8E370051FFAB /* s_15_zugyuuuun.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 662BD6551DDE8E370051FFAB /* s_15_zugyuuuun.mp3 */; };
667C26091DCEABE3001579F5 /* SimpleAnimation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 667C26081DCEABE3001579F5 /* SimpleAnimation.framework */; };
66B2D96C1DAF1042004BBEED /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 66B2D96B1DAF1042004BBEED /* Assets.xcassets */; };
66B2D96F1DAF1042004BBEED /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 66B2D96D1DAF1042004BBEED /* LaunchScreen.storyboard */; };
Expand Down Expand Up @@ -40,6 +55,7 @@
66DB77941DCF715B00D4F094 /* WaitTimeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66DB778D1DCF715B00D4F094 /* WaitTimeView.swift */; };
66DB77951DCF715B00D4F094 /* WakeUpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66DB778E1DCF715B00D4F094 /* WakeUpView.swift */; };
66DB77971DCF718500D4F094 /* Id.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66DB77961DCF718500D4F094 /* Id.swift */; };
66EEE89F1DDE044E00F88383 /* SelectStampController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66EEE89E1DDE044E00F88383 /* SelectStampController.swift */; };
EA2155791DC45EA80055643F /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA2155781DC45EA80055643F /* ViewController.swift */; };
EA21557B1DC45F0C0055643F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA21557A1DC45F0C0055643F /* AppDelegate.swift */; };
EA21557D1DC465AD0055643F /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA21557C1DC465AD0055643F /* MainViewController.swift */; };
Expand Down Expand Up @@ -69,6 +85,21 @@
/* Begin PBXFileReference section */
0D985D701DC46395009EB50A /* AudioPlay.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AudioPlay.swift; path = Classes/ViewController/AudioPlay.swift; sourceTree = "<group>"; };
49FECF0874B843B6C314E552 /* Pods-mezamaShare.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-mezamaShare.debug.xcconfig"; path = "Pods/Target Support Files/Pods-mezamaShare/Pods-mezamaShare.debug.xcconfig"; sourceTree = "<group>"; };
662BD6471DDE8E370051FFAB /* s_01_apple-pen.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = "s_01_apple-pen.mp3"; path = "Resources/Audio/StampAudio/s_01_apple-pen.mp3"; sourceTree = "<group>"; };
662BD6481DDE8E370051FFAB /* s_02_apple.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = s_02_apple.mp3; path = Resources/Audio/StampAudio/s_02_apple.mp3; sourceTree = "<group>"; };
662BD6491DDE8E370051FFAB /* s_03_asa-dayo.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = "s_03_asa-dayo.mp3"; path = "Resources/Audio/StampAudio/s_03_asa-dayo.mp3"; sourceTree = "<group>"; };
662BD64A1DDE8E370051FFAB /* s_04_dododo.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = s_04_dododo.mp3; path = Resources/Audio/StampAudio/s_04_dododo.mp3; sourceTree = "<group>"; };
662BD64B1DDE8E370051FFAB /* s_05_hai-okite.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = "s_05_hai-okite.mp3"; path = "Resources/Audio/StampAudio/s_05_hai-okite.mp3"; sourceTree = "<group>"; };
662BD64C1DDE8E370051FFAB /* s_06_horihori.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = s_06_horihori.mp3; path = Resources/Audio/StampAudio/s_06_horihori.mp3; sourceTree = "<group>"; };
662BD64D1DDE8E370051FFAB /* s_07_oh-yes.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = "s_07_oh-yes.mp3"; path = "Resources/Audio/StampAudio/s_07_oh-yes.mp3"; sourceTree = "<group>"; };
662BD64E1DDE8E370051FFAB /* s_08_ohayo.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = s_08_ohayo.mp3; path = Resources/Audio/StampAudio/s_08_ohayo.mp3; sourceTree = "<group>"; };
662BD64F1DDE8E370051FFAB /* s_09_okiro.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = s_09_okiro.mp3; path = Resources/Audio/StampAudio/s_09_okiro.mp3; sourceTree = "<group>"; };
662BD6501DDE8E370051FFAB /* s_10_pen.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = s_10_pen.mp3; path = Resources/Audio/StampAudio/s_10_pen.mp3; sourceTree = "<group>"; };
662BD6511DDE8E370051FFAB /* s_11_pineapple-pen.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = "s_11_pineapple-pen.mp3"; path = "Resources/Audio/StampAudio/s_11_pineapple-pen.mp3"; sourceTree = "<group>"; };
662BD6521DDE8E370051FFAB /* s_12_pineapple.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = s_12_pineapple.mp3; path = Resources/Audio/StampAudio/s_12_pineapple.mp3; sourceTree = "<group>"; };
662BD6531DDE8E370051FFAB /* s_13_ppap.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = s_13_ppap.mp3; path = Resources/Audio/StampAudio/s_13_ppap.mp3; sourceTree = "<group>"; };
662BD6541DDE8E370051FFAB /* s_14_sukida.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = s_14_sukida.mp3; path = Resources/Audio/StampAudio/s_14_sukida.mp3; sourceTree = "<group>"; };
662BD6551DDE8E370051FFAB /* s_15_zugyuuuun.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = s_15_zugyuuuun.mp3; path = Resources/Audio/StampAudio/s_15_zugyuuuun.mp3; sourceTree = "<group>"; };
667C26061DCEABC3001579F5 /* SimpleAnimation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SimpleAnimation.framework; path = Carthage/Build/iOS/SimpleAnimation.framework; sourceTree = "<group>"; };
667C26081DCEABE3001579F5 /* SimpleAnimation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SimpleAnimation.framework; path = Carthage/Build/iOS/SimpleAnimation.framework; sourceTree = "<group>"; };
66B2D9611DAF1042004BBEED /* mezamaShare.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = mezamaShare.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -107,6 +138,7 @@
66DB778D1DCF715B00D4F094 /* WaitTimeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WaitTimeView.swift; path = Classes/View/Source/WaitTimeView.swift; sourceTree = "<group>"; };
66DB778E1DCF715B00D4F094 /* WakeUpView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WakeUpView.swift; path = Classes/View/Source/WakeUpView.swift; sourceTree = "<group>"; };
66DB77961DCF718500D4F094 /* Id.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Id.swift; path = Classes/Model/Id.swift; sourceTree = "<group>"; };
66EEE89E1DDE044E00F88383 /* SelectStampController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SelectStampController.swift; path = Classes/ViewController/SelectStampController.swift; sourceTree = "<group>"; };
75AFDA52917E66BA14A5B489 /* Pods_mezamaShareUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_mezamaShareUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7E7124FA7F1C90E7F6F5775A /* Pods_mezamaShareTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_mezamaShareTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8ADA0801441509D84D3CE072 /* Pods-mezamaShare.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-mezamaShare.release.xcconfig"; path = "Pods/Target Support Files/Pods-mezamaShare/Pods-mezamaShare.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -154,6 +186,7 @@
0D985D721DC471B2009EB50A /* Audio */ = {
isa = PBXGroup;
children = (
662BD6261DDE8D960051FFAB /* StampAudio */,
66DB776E1DCF6CEA00D4F094 /* mezamashare_good-morning.mp3 */,
66DB776F1DCF6CEA00D4F094 /* mezamashare_okiro.mp3 */,
66DB77701DCF6CEA00D4F094 /* mezamashare_ppap4.mp3 */,
Expand All @@ -164,6 +197,28 @@
name = Audio;
sourceTree = "<group>";
};
662BD6261DDE8D960051FFAB /* StampAudio */ = {
isa = PBXGroup;
children = (
662BD6471DDE8E370051FFAB /* s_01_apple-pen.mp3 */,
662BD6481DDE8E370051FFAB /* s_02_apple.mp3 */,
662BD6491DDE8E370051FFAB /* s_03_asa-dayo.mp3 */,
662BD64A1DDE8E370051FFAB /* s_04_dododo.mp3 */,
662BD64B1DDE8E370051FFAB /* s_05_hai-okite.mp3 */,
662BD64C1DDE8E370051FFAB /* s_06_horihori.mp3 */,
662BD64D1DDE8E370051FFAB /* s_07_oh-yes.mp3 */,
662BD64E1DDE8E370051FFAB /* s_08_ohayo.mp3 */,
662BD64F1DDE8E370051FFAB /* s_09_okiro.mp3 */,
662BD6501DDE8E370051FFAB /* s_10_pen.mp3 */,
662BD6511DDE8E370051FFAB /* s_11_pineapple-pen.mp3 */,
662BD6521DDE8E370051FFAB /* s_12_pineapple.mp3 */,
662BD6531DDE8E370051FFAB /* s_13_ppap.mp3 */,
662BD6541DDE8E370051FFAB /* s_14_sukida.mp3 */,
662BD6551DDE8E370051FFAB /* s_15_zugyuuuun.mp3 */,
);
name = StampAudio;
sourceTree = "<group>";
};
66B2D9581DAF1042004BBEED = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -349,6 +404,7 @@
EA2155841DC467A00055643F /* FightViewController.swift */,
66DB776A1DCF665300D4F094 /* RealmController.swift */,
66DB776C1DCF66BD00D4F094 /* ButtonActionController.swift */,
66EEE89E1DDE044E00F88383 /* SelectStampController.swift */,
);
name = ViewController;
sourceTree = "<group>";
Expand Down Expand Up @@ -475,21 +531,36 @@
buildActionMask = 2147483647;
files = (
EA68F8891DDC358C00EFCB5C /* FOT-CometStd-B.otf in Resources */,
662BD6571DDE8E370051FFAB /* s_02_apple.mp3 in Resources */,
662BD65C1DDE8E370051FFAB /* s_07_oh-yes.mp3 in Resources */,
66DB77831DCF711500D4F094 /* EnterRoomView.xib in Resources */,
66DB77841DCF711500D4F094 /* StampButtonView.xib in Resources */,
66DB77821DCF711500D4F094 /* CreateRoomView.xib in Resources */,
662BD65A1DDE8E370051FFAB /* s_05_hai-okite.mp3 in Resources */,
66DB77741DCF6CEA00D4F094 /* mezamashare_okiro.mp3 in Resources */,
662BD65E1DDE8E370051FFAB /* s_09_okiro.mp3 in Resources */,
662BD6621DDE8E370051FFAB /* s_13_ppap.mp3 in Resources */,
66B2D96F1DAF1042004BBEED /* LaunchScreen.storyboard in Resources */,
66DB77771DCF6CEA00D4F094 /* mezamashare_zugyuuuun.mp3 in Resources */,
66DB77851DCF711500D4F094 /* StartUpView.xib in Resources */,
66DB77871DCF711500D4F094 /* WakeUpView.xib in Resources */,
66DB77861DCF711500D4F094 /* WaitTimeView.xib in Resources */,
662BD6561DDE8E370051FFAB /* s_01_apple-pen.mp3 in Resources */,
662BD6591DDE8E370051FFAB /* s_04_dododo.mp3 in Resources */,
66DB77761DCF6CEA00D4F094 /* mezamashare_sukida.mp3 in Resources */,
66DB77811DCF711500D4F094 /* ClearView.xib in Resources */,
662BD6581DDE8E370051FFAB /* s_03_asa-dayo.mp3 in Resources */,
EA21558F1DC495020055643F /* bgm_01.mp3 in Resources */,
66B2D96C1DAF1042004BBEED /* Assets.xcassets in Resources */,
662BD6601DDE8E370051FFAB /* s_11_pineapple-pen.mp3 in Resources */,
66DB77751DCF6CEA00D4F094 /* mezamashare_ppap4.mp3 in Resources */,
662BD6641DDE8E370051FFAB /* s_15_zugyuuuun.mp3 in Resources */,
662BD6631DDE8E370051FFAB /* s_14_sukida.mp3 in Resources */,
EA35B9B81DC5AE2500625E17 /* Main.storyboard in Resources */,
662BD6611DDE8E370051FFAB /* s_12_pineapple.mp3 in Resources */,
662BD65F1DDE8E370051FFAB /* s_10_pen.mp3 in Resources */,
662BD65B1DDE8E370051FFAB /* s_06_horihori.mp3 in Resources */,
662BD65D1DDE8E370051FFAB /* s_08_ohayo.mp3 in Resources */,
66DB77731DCF6CEA00D4F094 /* mezamashare_good-morning.mp3 in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -591,6 +662,7 @@
66DB77691DCF5E0100D4F094 /* SkyWayController.swift in Sources */,
EA21557B1DC45F0C0055643F /* AppDelegate.swift in Sources */,
0D985D711DC46395009EB50A /* AudioPlay.swift in Sources */,
66EEE89F1DDE044E00F88383 /* SelectStampController.swift in Sources */,
66DB77911DCF715B00D4F094 /* EnterRoomView.swift in Sources */,
66DB77901DCF715B00D4F094 /* CreateRoomView.swift in Sources */,
EA2155791DC45EA80055643F /* ViewController.swift in Sources */,
Expand Down
21 changes: 0 additions & 21 deletions mezamaShare/Assets.xcassets/buttonImage4.imageset/Contents.json

This file was deleted.

21 changes: 0 additions & 21 deletions mezamaShare/Assets.xcassets/ohayoImage.imageset/Contents.json

This file was deleted.

Binary file not shown.
21 changes: 21 additions & 0 deletions mezamaShare/Assets.xcassets/s_01_apple-pen.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "s_01_apple-pen.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"images" : [
{
"idiom" : "universal",
"filename" : "ohyes.png",
"filename" : "s_02_apple.png",
"scale" : "1x"
},
{
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"images" : [
{
"idiom" : "universal",
"filename" : "buttonImage1.png",
"filename" : "s_03_asa-dayo.png",
"scale" : "1x"
},
{
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"images" : [
{
"idiom" : "universal",
"filename" : "sukidaImage.png",
"filename" : "s_04_dododo.png",
"scale" : "1x"
},
{
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions mezamaShare/Assets.xcassets/s_05_hai-okite.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "s_05_hai-okite.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"images" : [
{
"idiom" : "universal",
"filename" : "buttonImage3.png",
"filename" : "s_06_horihori.png",
"scale" : "1x"
},
{
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions mezamaShare/Assets.xcassets/s_07_oh-yes.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "s_07_oh-yes.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
21 changes: 21 additions & 0 deletions mezamaShare/Assets.xcassets/s_08_ohayo.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "s_08_ohayo.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
21 changes: 21 additions & 0 deletions mezamaShare/Assets.xcassets/s_09_okiro.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "s_09_okiro.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"images" : [
{
"idiom" : "universal",
"filename" : "PPAP.png",
"filename" : "s_10_pen.png",
"scale" : "1x"
},
{
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "s_11_pineapple-pen.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading