diff --git a/PumpkinSmash.xcodeproj/project.xcworkspace/xcuserdata/jojobudiman.xcuserdatad/UserInterfaceState.xcuserstate b/PumpkinSmash.xcodeproj/project.xcworkspace/xcuserdata/jojobudiman.xcuserdatad/UserInterfaceState.xcuserstate index 7b10301..5d3b453 100644 Binary files a/PumpkinSmash.xcodeproj/project.xcworkspace/xcuserdata/jojobudiman.xcuserdatad/UserInterfaceState.xcuserstate and b/PumpkinSmash.xcodeproj/project.xcworkspace/xcuserdata/jojobudiman.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/PumpkinSmash/Assets.xcassets/OverworkCat_Pumpkin.imageset/Overwork Cat Pumpkin.png b/PumpkinSmash/Assets.xcassets/OverworkCat_Pumpkin.imageset/Overwork Cat Pumpkin.png index b078655..651d85f 100644 Binary files a/PumpkinSmash/Assets.xcassets/OverworkCat_Pumpkin.imageset/Overwork Cat Pumpkin.png and b/PumpkinSmash/Assets.xcassets/OverworkCat_Pumpkin.imageset/Overwork Cat Pumpkin.png differ diff --git a/PumpkinSmash/Assets.xcassets/PlayMethod.imageset/Contents.json b/PumpkinSmash/Assets.xcassets/PlayMethod.imageset/Contents.json new file mode 100644 index 0000000..686ac1f --- /dev/null +++ b/PumpkinSmash/Assets.xcassets/PlayMethod.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "PlayMethod.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/PumpkinSmash/Assets.xcassets/PlayMethod.imageset/PlayMethod.png b/PumpkinSmash/Assets.xcassets/PlayMethod.imageset/PlayMethod.png new file mode 100644 index 0000000..a85222d Binary files /dev/null and b/PumpkinSmash/Assets.xcassets/PlayMethod.imageset/PlayMethod.png differ diff --git a/PumpkinSmash/Assets.xcassets/backButton.imageset/Contents.json b/PumpkinSmash/Assets.xcassets/backButton.imageset/Contents.json new file mode 100644 index 0000000..e4571a2 --- /dev/null +++ b/PumpkinSmash/Assets.xcassets/backButton.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "backButton.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/PumpkinSmash/Assets.xcassets/backButton.imageset/backButton.png b/PumpkinSmash/Assets.xcassets/backButton.imageset/backButton.png new file mode 100644 index 0000000..2e0eb07 Binary files /dev/null and b/PumpkinSmash/Assets.xcassets/backButton.imageset/backButton.png differ diff --git a/PumpkinSmash/Assets.xcassets/easyTitle.imageset/Contents.json b/PumpkinSmash/Assets.xcassets/easyTitle.imageset/Contents.json new file mode 100644 index 0000000..1a5bdc0 --- /dev/null +++ b/PumpkinSmash/Assets.xcassets/easyTitle.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "easyTitle.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/PumpkinSmash/Assets.xcassets/easyTitle.imageset/easyTitle.png b/PumpkinSmash/Assets.xcassets/easyTitle.imageset/easyTitle.png new file mode 100644 index 0000000..ef48a20 Binary files /dev/null and b/PumpkinSmash/Assets.xcassets/easyTitle.imageset/easyTitle.png differ diff --git a/PumpkinSmash/Assets.xcassets/hardTitle.imageset/Contents.json b/PumpkinSmash/Assets.xcassets/hardTitle.imageset/Contents.json new file mode 100644 index 0000000..cc324a3 --- /dev/null +++ b/PumpkinSmash/Assets.xcassets/hardTitle.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "hardTitle.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/PumpkinSmash/Assets.xcassets/hardTitle.imageset/hardTitle.png b/PumpkinSmash/Assets.xcassets/hardTitle.imageset/hardTitle.png new file mode 100644 index 0000000..ecb8ded Binary files /dev/null and b/PumpkinSmash/Assets.xcassets/hardTitle.imageset/hardTitle.png differ diff --git a/PumpkinSmash/Assets.xcassets/normalTitle.imageset/Contents.json b/PumpkinSmash/Assets.xcassets/normalTitle.imageset/Contents.json new file mode 100644 index 0000000..5b1416f --- /dev/null +++ b/PumpkinSmash/Assets.xcassets/normalTitle.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "normalTitle.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/PumpkinSmash/Assets.xcassets/normalTitle.imageset/normalTitle.png b/PumpkinSmash/Assets.xcassets/normalTitle.imageset/normalTitle.png new file mode 100644 index 0000000..fe2ba6b Binary files /dev/null and b/PumpkinSmash/Assets.xcassets/normalTitle.imageset/normalTitle.png differ diff --git a/PumpkinSmash/HowToPlayView.swift b/PumpkinSmash/HowToPlayView.swift index dfca9bd..42255cf 100644 --- a/PumpkinSmash/HowToPlayView.swift +++ b/PumpkinSmash/HowToPlayView.swift @@ -18,7 +18,22 @@ struct HowToPlayView: View { このゲームは3つの難易度と5種類のカボチャに分かれています。 """ + let easyDesc = + """ +簡単の詳細は９穴があります。そして、時間制限は15秒になります。かぼちゃの種類合計は3個になります。 +""" + let mediumDesc = + """ +簡単の詳細は13穴があります。そして、時間制限は10秒になります。かぼちゃの種類合計も3個になります。 +""" + let hardDesc = + """ +簡単の詳細は25穴があります。そして、時間制限は5秒になります。かぼちゃの種類合計は5個になります。危険なかぼちゃがあるので、ご注意ください +""" + + var body: some View { + ScrollView { ZStack { Color("PrimaryColor") @@ -38,7 +53,7 @@ struct HowToPlayView: View { Text("Pumpkin Smashにようこそ！🎃🫰") .font(.custom("Kiwi Maru", size: 20)) .fontWeight(.bold) - .foregroundStyle(.white) + .foregroundStyle(Color("FourthColor")) Spacer() Text(longIntro) .font(.custom("Kiwi Maru", size: 16)) @@ -70,19 +85,252 @@ struct HowToPlayView: View { .foregroundStyle(Color("FourthColor")) } Spacer() - Text("内容") + HStack(spacing: 0) { + Image("easyTitle") + .resizable() + .aspectRatio(contentMode: .fit) + .scaleEffect(0.85) + .offset(x: -5) + .frame(maxWidth: .infinity) + Text(easyDesc) + .font(.custom("Kiwi Maru", size: 12)) + .fontWeight(.bold) + } + .padding() + + Spacer() + HStack(spacing: 0) { + Image("normalTitle") + .resizable() + .aspectRatio(contentMode: .fit) + .scaleEffect(0.85) + .offset(x: -5) + .frame(maxWidth: .infinity) + Text(mediumDesc) + .font(.custom("Kiwi Maru", size: 12)) + .fontWeight(.bold) + } + .padding() + Spacer() + HStack(spacing: 0) { + Image("hardTitle") + .resizable() + .aspectRatio(contentMode: .fit) + .scaleEffect(0.85) + .offset(x: -5) + .frame(maxWidth: .infinity) + Text(hardDesc) + .font(.custom("Kiwi Maru", size: 12)) + .fontWeight(.bold) + } + .padding() + Text("") .font(.custom("Kiwi Maru", size: 36)) .fontWeight(.bold) Spacer() - Text("内容") - .font(.custom("Kiwi Maru", size: 36)) + Text("5つのかぼちゃ種類は：") + .font(.custom("Kiwi Maru", size: 24)) .fontWeight(.bold) + .foregroundColor(Color("FourthColor")) Spacer() - HStack { - Text("内容") - .font(.custom("Kiwi Maru", size: 36)) + + // 普通かぼちゃ + HStack(spacing: 0) { + Image("Normal_Pumpkin") + .resizable() + .aspectRatio(contentMode: .fit) + .scaleEffect(0.75) + Text("普通かぼちゃ") + .font(.custom("Kiwi Maru", size: 24)) + .fontWeight(.bold) + .foregroundColor(.white) + .frame(maxWidth: /*@START_MENU_TOKEN@*/.infinity/*@END_MENU_TOKEN@*/) + + } + .offset(y: 20) + .padding() + Text("これは普通かぼちゃのことです。スマッシュなら、スコア+1になった。") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .padding() + + HStack(spacing: 0) { + Text("難易度：") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .foregroundStyle(.white) + Text("簡単") + .font(.custom("Kiwi Maru", size: 24)) + .foregroundStyle(Color("TertiaryColor")) + Text("、") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .foregroundStyle(.white) + Text("普通") + .font(.custom("Kiwi Maru", size: 24)) + .foregroundStyle(Color("SecondaryColor")) + Text("、") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .foregroundStyle(.white) + Text("難しい") + .font(.custom("Kiwi Maru", size: 24)) + .foregroundStyle(Color("FourthColor")) + } + + + // 金かぼちゃ + HStack(spacing: 0) { + Text("金かぼちゃ") + .font(.custom("Kiwi Maru", size: 24)) + .fontWeight(.bold) + .foregroundColor(.white) + .frame(maxWidth: /*@START_MENU_TOKEN@*/.infinity/*@END_MENU_TOKEN@*/) + Image("Gold_Pumpkin") + .resizable() + .aspectRatio(contentMode: .fit) + .scaleEffect(0.75) + + } + .offset(y: 20) + .padding() + Text("これは普通かぼちゃのことです。スマッシュなら、スコア+3になった。") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .padding() + + HStack(spacing: 0) { + Text("難易度：") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .foregroundStyle(.white) + Text("簡単") + .font(.custom("Kiwi Maru", size: 24)) + .foregroundStyle(Color("TertiaryColor")) + Text("、") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .foregroundStyle(.white) + Text("普通") + .font(.custom("Kiwi Maru", size: 24)) + .foregroundStyle(Color("SecondaryColor")) + Text("、") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .foregroundStyle(.white) + Text("難しい") + .font(.custom("Kiwi Maru", size: 24)) + .foregroundStyle(Color("FourthColor")) + } + + // 大川かぼちゃ + HStack(spacing: 0) { + Image("Ookawa_Pumpkin") + .resizable() + .aspectRatio(contentMode: .fit) + .scaleEffect(0.75) + Text("大川かぼちゃ") + .font(.custom("Kiwi Maru", size: 24)) + .fontWeight(.bold) + .foregroundColor(.white) + .frame(maxWidth: /*@START_MENU_TOKEN@*/.infinity/*@END_MENU_TOKEN@*/) + + } + .offset(y: 20) + .padding() + Text("これは普通かぼちゃのことです。スマッシュなら、スコア+3になった。") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .padding() + + HStack(spacing: 0) { + Text("難易度：") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .foregroundStyle(.white) + Text("簡単") + .font(.custom("Kiwi Maru", size: 24)) + .foregroundStyle(Color("TertiaryColor")) + Text("、") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .foregroundStyle(.white) + Text("普通") + .font(.custom("Kiwi Maru", size: 24)) + .foregroundStyle(Color("SecondaryColor")) + Text("、") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .foregroundStyle(.white) + Text("難しい") + .font(.custom("Kiwi Maru", size: 24)) + .foregroundStyle(Color("FourthColor")) + } + + // 爆弾かぼちゃ + HStack(spacing: 0) { + Text("爆弾かぼちゃ") + .font(.custom("Kiwi Maru", size: 24)) + .fontWeight(.bold) + .foregroundColor(.white) + .frame(maxWidth: /*@START_MENU_TOKEN@*/.infinity/*@END_MENU_TOKEN@*/) + Image("Bomb_Pumpkin") + .resizable() + .aspectRatio(contentMode: .fit) + .scaleEffect(0.75) + } + .offset(y: 20) + .padding() + Text("これは普通かぼちゃのことです。スマッシュなら、スコア+3になった。") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .padding() + + HStack(spacing: 0) { + Text("難易度：") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .foregroundStyle(.white) + Text("難しい") + .font(.custom("Kiwi Maru", size: 24)) + .foregroundStyle(Color("FourthColor")) + } + + // 残業猫かぼちゃ + HStack(spacing: 0) { + Image("OverworkCat_Pumpkin") + .resizable() + .aspectRatio(contentMode: .fit) + .scaleEffect(0.75) + Text("残業猫かぼちゃ 🙀🐱😺😻😺🐱🙀") + .font(.custom("Kiwi Maru", size: 24)) .fontWeight(.bold) - + .foregroundColor(.white) + .frame(maxWidth: /*@START_MENU_TOKEN@*/.infinity/*@END_MENU_TOKEN@*/) + } + .offset(y: 20) + .padding() + Text("これは普通かぼちゃのことです。スマッシュなら、スコア+3になった。") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .padding() + + HStack(spacing: 0) { + Text("難易度：") + .font(.custom("Kiwi Maru", size: 16)) + .fontWeight(.bold) + .foregroundStyle(.white) + Text("難しい") + .font(.custom("Kiwi Maru", size: 24)) + .foregroundStyle(Color("FourthColor")) + } + + + HStack { + Image("PlayMethod") + .resizable() + .aspectRatio(contentMode: .fit) + .scaleEffect(0.75) Image("Instruction") .resizable() .aspectRatio(contentMode: .fit) diff --git a/PumpkinSmash/TitleView.swift b/PumpkinSmash/TitleView.swift index 7e27717..10da3c7 100644 --- a/PumpkinSmash/TitleView.swift +++ b/PumpkinSmash/TitleView.swift @@ -20,7 +20,7 @@ struct TitleView: View { HStack { // 遊び方ボタン Button(action: { - +// path.append() }) { Image(systemName: "info.circle.fill") .foregroundColor(Color("FourthColor"))