From f211b162248f9a6bfeb4572f99cb208d800b27b7 Mon Sep 17 00:00:00 2001 From: tkrmagid-desktop Date: Sat, 23 May 2026 17:40:05 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/mq/function/commands/test.mcfunction | 8 +++++--- .../data/mq/function/init/buttons.mcfunction | 13 +++++++------ .../data/mq/function/init/config.mcfunction | 3 +-- .../mq/function/repeat/buttons/btn.mcfunction | 15 ++++++++------- .../repeat/buttons/btn_prep.mcfunction | 3 ++- .../data/mq/function/repeat/timer.mcfunction | 4 ++-- .../function/repeat/timers/init10.mcfunction | 18 +++++++++++++++--- .../mq/function/repeat/timers/init2.mcfunction | 18 +++++++++--------- .../mq/function/repeat/timers/init6.mcfunction | 18 +++--------------- .../data/mq/painting_variant/cover_01.json | 6 ++---- .../data/mq/painting_variant/cover_02.json | 6 ++---- .../data/mq/painting_variant/cover_03.json | 6 ++---- .../data/mq/painting_variant/cover_04.json | 6 ++---- .../data/mq/painting_variant/cover_05.json | 6 ++---- .../data/mq/painting_variant/cover_06.json | 6 ++---- .../data/mq/painting_variant/cover_07.json | 6 ++---- .../data/mq/painting_variant/cover_08.json | 6 ++---- .../data/mq/painting_variant/cover_09.json | 6 ++---- .../data/mq/painting_variant/cover_10.json | 6 ++---- .../data/mq/painting_variant/cover_11.json | 6 ++---- .../data/mq/painting_variant/cover_12.json | 6 ++---- .../data/mq/painting_variant/cover_13.json | 6 ++---- .../data/mq/painting_variant/cover_14.json | 6 ++---- .../data/mq/painting_variant/cover_15.json | 6 ++---- .../data/mq/painting_variant/cover_16.json | 6 ++---- .../data/mq/painting_variant/cover_17.json | 6 ++---- .../data/mq/painting_variant/cover_18.json | 5 +++++ .../data/mq/painting_variant/cover_19.json | 5 +++++ .../data/mq/painting_variant/cover_20.json | 5 +++++ .../data/mq/painting_variant/cover_21.json | 5 +++++ .../data/mq/painting_variant/cover_22.json | 5 +++++ .../data/mq/painting_variant/cover_23.json | 5 +++++ .../data/mq/painting_variant/cover_24.json | 5 +++++ .../data/mq/painting_variant/cover_25.json | 5 +++++ .../data/mq/painting_variant/cover_26.json | 5 +++++ .../data/mq/painting_variant/cover_27.json | 5 +++++ .../data/mq/painting_variant/cover_28.json | 5 +++++ .../data/mq/painting_variant/cover_29.json | 5 +++++ .../data/mq/painting_variant/cover_30.json | 5 +++++ .../data/mq/painting_variant/cover_31.json | 5 +++++ .../data/mq/painting_variant/cover_32.json | 5 +++++ .../data/mq/painting_variant/cover_33.json | 5 +++++ .../data/mq/painting_variant/cover_34.json | 5 +++++ .../data/mq/painting_variant/cover_35.json | 5 +++++ .../data/mq/painting_variant/cover_36.json | 5 +++++ .../data/mq/painting_variant/cover_37.json | 5 +++++ .../data/mq/painting_variant/cover_38.json | 5 +++++ .../data/mq/painting_variant/cover_39.json | 5 +++++ .../data/mq/painting_variant/cover_40.json | 5 +++++ .../data/mq/painting_variant/cover_41.json | 5 +++++ .../data/mq/painting_variant/cover_42.json | 5 +++++ .../data/mq/painting_variant/cover_43.json | 5 +++++ .../data/mq/painting_variant/cover_44.json | 5 +++++ .../data/mq/painting_variant/cover_45.json | 5 +++++ .../data/mq/painting_variant/cover_46.json | 5 +++++ .../data/mq/painting_variant/cover_47.json | 5 +++++ .../data/mq/painting_variant/cover_48.json | 5 +++++ .../data/mq/painting_variant/cover_49.json | 5 +++++ .../data/mq/painting_variant/cover_50.json | 5 +++++ music_quiz/data/mq/painting_variant/gif.json | 6 ++---- 60 files changed, 253 insertions(+), 120 deletions(-) create mode 100644 music_quiz/data/mq/painting_variant/cover_18.json create mode 100644 music_quiz/data/mq/painting_variant/cover_19.json create mode 100644 music_quiz/data/mq/painting_variant/cover_20.json create mode 100644 music_quiz/data/mq/painting_variant/cover_21.json create mode 100644 music_quiz/data/mq/painting_variant/cover_22.json create mode 100644 music_quiz/data/mq/painting_variant/cover_23.json create mode 100644 music_quiz/data/mq/painting_variant/cover_24.json create mode 100644 music_quiz/data/mq/painting_variant/cover_25.json create mode 100644 music_quiz/data/mq/painting_variant/cover_26.json create mode 100644 music_quiz/data/mq/painting_variant/cover_27.json create mode 100644 music_quiz/data/mq/painting_variant/cover_28.json create mode 100644 music_quiz/data/mq/painting_variant/cover_29.json create mode 100644 music_quiz/data/mq/painting_variant/cover_30.json create mode 100644 music_quiz/data/mq/painting_variant/cover_31.json create mode 100644 music_quiz/data/mq/painting_variant/cover_32.json create mode 100644 music_quiz/data/mq/painting_variant/cover_33.json create mode 100644 music_quiz/data/mq/painting_variant/cover_34.json create mode 100644 music_quiz/data/mq/painting_variant/cover_35.json create mode 100644 music_quiz/data/mq/painting_variant/cover_36.json create mode 100644 music_quiz/data/mq/painting_variant/cover_37.json create mode 100644 music_quiz/data/mq/painting_variant/cover_38.json create mode 100644 music_quiz/data/mq/painting_variant/cover_39.json create mode 100644 music_quiz/data/mq/painting_variant/cover_40.json create mode 100644 music_quiz/data/mq/painting_variant/cover_41.json create mode 100644 music_quiz/data/mq/painting_variant/cover_42.json create mode 100644 music_quiz/data/mq/painting_variant/cover_43.json create mode 100644 music_quiz/data/mq/painting_variant/cover_44.json create mode 100644 music_quiz/data/mq/painting_variant/cover_45.json create mode 100644 music_quiz/data/mq/painting_variant/cover_46.json create mode 100644 music_quiz/data/mq/painting_variant/cover_47.json create mode 100644 music_quiz/data/mq/painting_variant/cover_48.json create mode 100644 music_quiz/data/mq/painting_variant/cover_49.json create mode 100644 music_quiz/data/mq/painting_variant/cover_50.json diff --git a/music_quiz/data/mq/function/commands/test.mcfunction b/music_quiz/data/mq/function/commands/test.mcfunction index 4e2d178..835c50b 100644 --- a/music_quiz/data/mq/function/commands/test.mcfunction +++ b/music_quiz/data/mq/function/commands/test.mcfunction @@ -1,6 +1,8 @@ stopsound @a block minecraft:block.stone_button.click_on function mq:tellraw {"text":"띵!!!","color":"white","msg":'""'} + +$stopsound @a player $(namespace):bell # warn-off execute-group -execute as @a at @s run playsound minecraft:block.note_block.bell weather @s ~ ~ ~ 1 0.9 -execute as @a at @s run playsound minecraft:block.note_block.bell weather @s ~ ~ ~ 1 0.9 -execute as @a at @s run playsound minecraft:block.note_block.bell weather @s ~ ~ ~ 1 0.9 +$execute as @a at @s run playsound $(namespace):bell $(source) @s ~ ~ ~ 1 0.9 +$execute as @a at @s run playsound $(namespace):bell $(source) @s ~ ~ ~ 1 0.9 +$execute as @a at @s run playsound $(namespace):bell $(source) @s ~ ~ ~ 1 0.9 \ No newline at end of file diff --git a/music_quiz/data/mq/function/init/buttons.mcfunction b/music_quiz/data/mq/function/init/buttons.mcfunction index 9c3876a..69c33b2 100644 --- a/music_quiz/data/mq/function/init/buttons.mcfunction +++ b/music_quiz/data/mq/function/init/buttons.mcfunction @@ -9,15 +9,16 @@ # label_color : 텍스트 색 (예 "black", "red", "#FFAA00"). 기본 "black". # label_font : 텍스트 폰트 (예 "minecraft:default"). 기본 "minecraft:default". # label_scale : 텍스트 크기 (Vector3f 한 축, 3축 동일). 기본 "1.0". +# label_addY : 추가할 높이. 기본 "-0.1". # # interaction entity 의 위치/크기와 text_display 의 위치/회전은 facing 만 # 보면 결정됨 — 매번 손으로 ox/oy/oz 를 적지 않는다. 실제 오프셋 테이블은 # repeat/buttons/btn 안에서 한 곳에만 정의되어 있다. data modify storage mq:main button_defs set value [] -data modify storage mq:main button_defs append value {n:"start", x:2773, y:86, z:5968, f:"north", c:"function mq:commands/start with storage mq:main", label:"게임시작"} -data modify storage mq:main button_defs append value {n:"stop", x:2771, y:86, z:5968, f:"north", c:"function mq:commands/stop with storage mq:main", label:"정지"} -data modify storage mq:main button_defs append value {n:"skip", x:2769, y:86, z:5968, f:"north", c:"function mq:commands/skip", label:"넘기기"} -data modify storage mq:main button_defs append value {n:"hint", x:2767, y:86, z:5968, f:"north", c:"function mq:commands/hint", label:"힌트"} -data modify storage mq:main button_defs append value {n:"replay", x:2765, y:86, z:5968, f:"north", c:"function mq:commands/replay", label:"다시듣기"} -data modify storage mq:main button_defs append value {n:"test", x:2769, y:87, z:5957, f:"south", c:"function mq:commands/test", label:"소리 테스트"} +data modify storage mq:main button_defs append value {n:"start", x:2773, y:86, z:5968, f:"north", c:"function mq:commands/start with storage mq:main", label:"게임시작"} +data modify storage mq:main button_defs append value {n:"stop", x:2771, y:86, z:5968, f:"north", c:"function mq:commands/stop with storage mq:main", label:"정지"} +data modify storage mq:main button_defs append value {n:"skip", x:2769, y:86, z:5968, f:"north", c:"function mq:commands/skip", label:"넘기기"} +data modify storage mq:main button_defs append value {n:"hint", x:2767, y:86, z:5968, f:"north", c:"function mq:commands/hint", label:"힌트"} +data modify storage mq:main button_defs append value {n:"replay", x:2765, y:86, z:5968, f:"north", c:"function mq:commands/replay", label:"다시듣기"} +data modify storage mq:main button_defs append value {n:"test", x:2769, y:87, z:5957, f:"south", c:"function mq:commands/test with storage mq:main audio", label:"소리\n테스트", label_addY: "-0.2"} diff --git a/music_quiz/data/mq/function/init/config.mcfunction b/music_quiz/data/mq/function/init/config.mcfunction index 53240d6..548143b 100644 --- a/music_quiz/data/mq/function/init/config.mcfunction +++ b/music_quiz/data/mq/function/init/config.mcfunction @@ -7,8 +7,7 @@ data modify storage mq:main spawn set value {x: 2769, y: 85, z: 5963, r: 0, f: 0 # 음원 재생 — minecraft_launcher 리소스팩의 musicquiz:track_NN 사운드 이벤트 # namespace — 리소스팩 네임스페이스 (기본 "musicquiz") # source — /playsound 채널. stopsound 와 동일해야 함. 노래는 "player" 채널로 -# 재생 (음성/플레이어 채널 슬라이더로 음량 제어). 타이머/UI 비프는 -# 별도로 weather 채널 사용. +# 재생 (음성/플레이어 채널 슬라이더로 음량 제어). # volume — 기본 음량. 곡별 override 는 init/songs.mcfunction 의 volume 필드 사용 # pitch — 1.0 = 원본 속도 data modify storage mq:main audio set value {namespace: "musicquiz", source: "player", volume: 1.0, pitch: 1.0} diff --git a/music_quiz/data/mq/function/repeat/buttons/btn.mcfunction b/music_quiz/data/mq/function/repeat/buttons/btn.mcfunction index d93ee18..2e6d666 100644 --- a/music_quiz/data/mq/function/repeat/buttons/btn.mcfunction +++ b/music_quiz/data/mq/function/repeat/buttons/btn.mcfunction @@ -1,6 +1,6 @@ # warn-off-file always-pass-condition # 버튼 1개에 대한 매 tick 처리. -# 매크로 인자(mq:tmp.btn): n, x, y, z, f, c, label, label_color, label_font, label_scale +# 매크로 인자(mq:tmp.btn): n, x, y, z, f, c, label, label_color, label_font, label_scale, label_addY # buttons 점수 상태: # ..-2 : 비활성 (버튼 블록 제거, interaction 응답 차단) # -1 : 초기화 단계 (버튼 블록 + interaction × 3 + text_display 보장 후 0) @@ -80,25 +80,25 @@ $execute if score $(n) buttons matches -1 run kill @e[distance=0..,tag=mq,tag=$( $execute if score $(n) buttons matches -1 if data storage mq:tmp btn{f:"south"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:interaction ~0.37 ~0.37 ~0.07 {Tags:["mq","$(n)"],width:0.125f,height:0.26f,response:0b} $execute if score $(n) buttons matches -1 if data storage mq:tmp btn{f:"south"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:interaction ~0.5 ~0.37 ~0.07 {Tags:["mq","$(n)"],width:0.13f,height:0.26f,response:0b} $execute if score $(n) buttons matches -1 if data storage mq:tmp btn{f:"south"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:interaction ~0.63 ~0.37 ~0.07 {Tags:["mq","$(n)"],width:0.125f,height:0.26f,response:0b} -$execute if score $(n) buttons matches -1 unless data storage mq:tmp btn{label:""} if data storage mq:tmp btn{f:"south"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:text_display ~0.5 ~-0.5 ~0.01 {Tags:["mq","$(n)"],Rotation:[0f,0f],background:0,text:{text:"$(label)",color:"$(label_color)",font:"$(label_font)",bold:true},transformation:{scale:[$(label_scale)f,$(label_scale)f,$(label_scale)f],translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f]}} +$execute if score $(n) buttons matches -1 unless data storage mq:tmp btn{label:""} if data storage mq:tmp btn{f:"south"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:text_display ~0.5 ~-0.5 ~0.01 {Tags:["mq","$(n)"],Rotation:[0f,0f],background:0,text:{text:"$(label)",color:"$(label_color)",font:"$(label_font)",bold:true},transformation:{scale:[$(label_scale)f,$(label_scale)f,$(label_scale)f],translation:[0f,$(label_addY)f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f]}} # north: 깊이축=z(+0.8125, 플레이어 쪽), 가로축=x, 3 타일 + 라벨 $execute if score $(n) buttons matches -1 if data storage mq:tmp btn{f:"north"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:interaction ~0.37 ~0.37 ~0.93 {Tags:["mq","$(n)"],width:0.125f,height:0.26f,response:0b} $execute if score $(n) buttons matches -1 if data storage mq:tmp btn{f:"north"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:interaction ~0.5 ~0.37 ~0.93 {Tags:["mq","$(n)"],width:0.13f,height:0.26f,response:0b} $execute if score $(n) buttons matches -1 if data storage mq:tmp btn{f:"north"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:interaction ~0.63 ~0.37 ~0.93 {Tags:["mq","$(n)"],width:0.125f,height:0.26f,response:0b} -$execute if score $(n) buttons matches -1 unless data storage mq:tmp btn{label:""} if data storage mq:tmp btn{f:"north"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:text_display ~0.5 ~-0.5 ~0.99 {Tags:["mq","$(n)"],Rotation:[180f,0f],background:0,text:{text:"$(label)",color:"$(label_color)",font:"$(label_font)",bold:true},transformation:{scale:[$(label_scale)f,$(label_scale)f,$(label_scale)f],translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f]}} +$execute if score $(n) buttons matches -1 unless data storage mq:tmp btn{label:""} if data storage mq:tmp btn{f:"north"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:text_display ~0.5 ~-0.5 ~0.99 {Tags:["mq","$(n)"],Rotation:[180f,0f],background:0,text:{text:"$(label)",color:"$(label_color)",font:"$(label_font)",bold:true},transformation:{scale:[$(label_scale)f,$(label_scale)f,$(label_scale)f],translation:[0f,$(label_addY)f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f]}} # east: 깊이축=x(+0.1875, 플레이어 쪽), 가로축=z, 3 타일 + 라벨 $execute if score $(n) buttons matches -1 if data storage mq:tmp btn{f:"east"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:interaction ~0.07 ~0.37 ~0.37 {Tags:["mq","$(n)"],width:0.125f,height:0.26f,response:0b} $execute if score $(n) buttons matches -1 if data storage mq:tmp btn{f:"east"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:interaction ~0.07 ~0.37 ~0.5 {Tags:["mq","$(n)"],width:0.13f,height:0.26f,response:0b} $execute if score $(n) buttons matches -1 if data storage mq:tmp btn{f:"east"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:interaction ~0.07 ~0.37 ~0.63 {Tags:["mq","$(n)"],width:0.125f,height:0.26f,response:0b} -$execute if score $(n) buttons matches -1 unless data storage mq:tmp btn{label:""} if data storage mq:tmp btn{f:"east"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:text_display ~0.01 ~-0.5 ~0.5 {Tags:["mq","$(n)"],Rotation:[-90f,0f],background:0,text:{text:"$(label)",color:"$(label_color)",font:"$(label_font)",bold:true},transformation:{scale:[$(label_scale)f,$(label_scale)f,$(label_scale)f],translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f]}} +$execute if score $(n) buttons matches -1 unless data storage mq:tmp btn{label:""} if data storage mq:tmp btn{f:"east"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:text_display ~0.01 ~-0.5 ~0.5 {Tags:["mq","$(n)"],Rotation:[-90f,0f],background:0,text:{text:"$(label)",color:"$(label_color)",font:"$(label_font)",bold:true},transformation:{scale:[$(label_scale)f,$(label_scale)f,$(label_scale)f],translation:[0f,$(label_addY)f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f]}} # west: 깊이축=x(+0.8125, 플레이어 쪽), 가로축=z, 3 타일 + 라벨 $execute if score $(n) buttons matches -1 if data storage mq:tmp btn{f:"west"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:interaction ~0.93 ~0.37 ~0.37 {Tags:["mq","$(n)"],width:0.125f,height:0.26f,response:0b} $execute if score $(n) buttons matches -1 if data storage mq:tmp btn{f:"west"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:interaction ~0.93 ~0.37 ~0.5 {Tags:["mq","$(n)"],width:0.13f,height:0.26f,response:0b} $execute if score $(n) buttons matches -1 if data storage mq:tmp btn{f:"west"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:interaction ~0.93 ~0.37 ~0.63 {Tags:["mq","$(n)"],width:0.125f,height:0.26f,response:0b} -$execute if score $(n) buttons matches -1 unless data storage mq:tmp btn{label:""} if data storage mq:tmp btn{f:"west"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:text_display ~0.99 ~-0.5 ~0.5 {Tags:["mq","$(n)"],Rotation:[90f,0f],background:0,text:{text:"$(label)",color:"$(label_color)",font:"$(label_font)",bold:true},transformation:{scale:[$(label_scale)f,$(label_scale)f,$(label_scale)f],translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f]}} +$execute if score $(n) buttons matches -1 unless data storage mq:tmp btn{label:""} if data storage mq:tmp btn{f:"west"} positioned $(x).0 $(y).0 $(z).0 run summon minecraft:text_display ~0.99 ~-0.5 ~0.5 {Tags:["mq","$(n)"],Rotation:[90f,0f],background:0,text:{text:"$(label)",color:"$(label_color)",font:"$(label_font)",bold:true},transformation:{scale:[$(label_scale)f,$(label_scale)f,$(label_scale)f],translation:[0f,$(label_addY)f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f]}} $execute if score $(n) buttons matches -1 run scoreboard players set $(n) buttons 0 @@ -109,8 +109,9 @@ $execute if score $(n) buttons matches -1 run scoreboard players set $(n) button # (나머지는 target 부재로 체인 중단). limit=1 을 두면 MC 가 임의로 1개를 # 골라 잘못된 entity 만 검사하므로 limit 두지 않음. $execute as @e[distance=0..,tag=mq,tag=$(n),type=minecraft:interaction] on target as @s positioned $(x).0 $(y).0 $(z).0 run playsound minecraft:block.stone_button.click_on block @s ~ ~ ~ 1 1 -$execute as @e[distance=0..,tag=mq,tag=$(n),type=minecraft:interaction] on target as @s positioned $(x).0 $(y).0 $(z).0 if score init main matches 0 run $(c) -$execute as @e[distance=0..,tag=mq,tag=$(n),type=minecraft:interaction] on target as @s positioned $(x).0 $(y).0 $(z).0 unless score init main matches 0 run trigger $(n) +$execute as @e[distance=0..,tag=mq,tag=$(n),type=minecraft:interaction] on target if data storage mq:tmp btn{n:"test"} run $(c) +$execute as @e[distance=0..,tag=mq,tag=$(n),type=minecraft:interaction] on target unless data storage mq:tmp btn{n:"test"} as @s positioned $(x).0 $(y).0 $(z).0 if score init main matches 0 run $(c) +$execute as @e[distance=0..,tag=mq,tag=$(n),type=minecraft:interaction] on target unless data storage mq:tmp btn{n:"test"} as @s positioned $(x).0 $(y).0 $(z).0 unless score init main matches 0 run trigger $(n) # ---- 처리 후 attack/interaction NBT 클리어 (다음 tick 중복 발화 방지) ---- $execute as @e[distance=0..,tag=mq,tag=$(n),type=minecraft:interaction] at @s run data remove entity @s attack diff --git a/music_quiz/data/mq/function/repeat/buttons/btn_prep.mcfunction b/music_quiz/data/mq/function/repeat/buttons/btn_prep.mcfunction index 3f9521c..7d7682f 100644 --- a/music_quiz/data/mq/function/repeat/buttons/btn_prep.mcfunction +++ b/music_quiz/data/mq/function/repeat/buttons/btn_prep.mcfunction @@ -6,6 +6,7 @@ # label_color : 기본 "black" # label_font : 기본 "minecraft:default" # label_scale : 기본 "1.0" (Vector3f 의 한 축, 3축 동일하게 사용됨) +# label_addY : 기본 "-0.1" # # 구현: defaults 컴파운드를 먼저 만들고 entry (mq:tmp.btn) 를 그 위에 merge # 한 뒤 다시 mq:tmp.btn 으로 되돌린다. data modify ... merge from 은 source @@ -16,6 +17,6 @@ # 방식이었으나 MC 26.1.2 parser 가 해당 라인을 거부했음. merge 방식은 문제 # 난 execute-unless-data 구문 자체를 제거.) -data modify storage mq:tmp btn_default set value {label:"",label_color:"black",label_font:"minecraft:default",label_scale:"1.0"} +data modify storage mq:tmp btn_default set value {label:"",label_color:"black",label_font:"minecraft:default",label_scale:"1.0",label_addY:"-0.1"} data modify storage mq:tmp btn_default merge from storage mq:tmp btn data modify storage mq:tmp btn set from storage mq:tmp btn_default diff --git a/music_quiz/data/mq/function/repeat/timer.mcfunction b/music_quiz/data/mq/function/repeat/timer.mcfunction index 0687447..505602c 100644 --- a/music_quiz/data/mq/function/repeat/timer.mcfunction +++ b/music_quiz/data/mq/function/repeat/timer.mcfunction @@ -6,10 +6,10 @@ execute unless score init main matches 2 \ run scoreboard players set timer main 0 # start title timer -execute if score init main matches 2 run function mq:repeat/timers/init2 +execute if score init main matches 2 run function mq:repeat/timers/init2 with storage mq:main audio # next song timer execute if score init main matches 6 run function mq:repeat/timers/init6 # endding timer -execute if score init main matches 10 run function mq:repeat/timers/init10 +execute if score init main matches 10 run function mq:repeat/timers/init10 with storage mq:main audio diff --git a/music_quiz/data/mq/function/repeat/timers/init10.mcfunction b/music_quiz/data/mq/function/repeat/timers/init10.mcfunction index eba4b9f..b0eae81 100644 --- a/music_quiz/data/mq/function/repeat/timers/init10.mcfunction +++ b/music_quiz/data/mq/function/repeat/timers/init10.mcfunction @@ -1,3 +1,15 @@ -execute if score timer main matches 300 run title @a title {"text":""} -execute if score timer main matches 290 run function mq:images/clear -execute if score timer main matches 300.. run function mq:quiz/select with storage mq:main +# warn-off-file execute-group +execute if score timer main matches 60 run function mq:tellraw {"text":"퀴즈가 종료되었습니다.","color":"white","msg":""} +$execute if score timer main matches 60 as @a at @s run playsound minecraft:ui.button.click $(source) @s ~ ~ ~ 1 1 +$execute if score timer main matches 60 as @a at @s run playsound minecraft:ui.button.click $(source) @s ~ ~ ~ 1 1 +$execute if score timer main matches 60 as @a at @s run playsound minecraft:ui.button.click $(source) @s ~ ~ ~ 1 1 +execute if score timer main matches 180 run function mq:tellraw {"text":"퀴즈를 다시 시작하시려면 종료를 눌러주세요.","color":"white","msg":""} +execute if score timer main matches 120 as @a at @s run scoreboard players set stop buttons -1 +$execute if score timer main matches 120 as @a at @s run playsound minecraft:ui.button.click $(source) @s ~ ~ ~ 1 1 +$execute if score timer main matches 120 as @a at @s run playsound minecraft:ui.button.click $(source) @s ~ ~ ~ 1 1 +$execute if score timer main matches 120 as @a at @s run playsound minecraft:ui.button.click $(source) @s ~ ~ ~ 1 1 +execute if score timer main matches 120 run function mq:tellraw {"text":"플레이 해주셔서 감사합니다.","color":"white","msg":""} +$execute if score timer main matches 180 as @a at @s run playsound minecraft:ui.button.click $(source) @s ~ ~ ~ 1 1 +$execute if score timer main matches 180 as @a at @s run playsound minecraft:ui.button.click $(source) @s ~ ~ ~ 1 1 +$execute if score timer main matches 180 as @a at @s run playsound minecraft:ui.button.click $(source) @s ~ ~ ~ 1 1 +execute if score timer main matches 200.. run scoreboard players set init main 11 diff --git a/music_quiz/data/mq/function/repeat/timers/init2.mcfunction b/music_quiz/data/mq/function/repeat/timers/init2.mcfunction index 4c92604..634ce7a 100644 --- a/music_quiz/data/mq/function/repeat/timers/init2.mcfunction +++ b/music_quiz/data/mq/function/repeat/timers/init2.mcfunction @@ -1,15 +1,15 @@ # warn-off-file execute-group execute if score timer main matches 20 run title @a title {"text":"3"} -execute if score timer main matches 20 as @a at @s run playsound minecraft:block.note_block.iron_xylophone weather @s ~ ~ ~ 1 1 -execute if score timer main matches 20 as @a at @s run playsound minecraft:block.note_block.iron_xylophone weather @s ~ ~ ~ 1 1 -execute if score timer main matches 20 as @a at @s run playsound minecraft:block.note_block.iron_xylophone weather @s ~ ~ ~ 1 1 +$execute if score timer main matches 20 as @a at @s run playsound minecraft:block.note_block.iron_xylophone $(source) @s ~ ~ ~ 1 1 +$execute if score timer main matches 20 as @a at @s run playsound minecraft:block.note_block.iron_xylophone $(source) @s ~ ~ ~ 1 1 +$execute if score timer main matches 20 as @a at @s run playsound minecraft:block.note_block.iron_xylophone $(source) @s ~ ~ ~ 1 1 execute if score timer main matches 40 run title @a title {"text":"2"} -execute if score timer main matches 40 as @a at @s run playsound minecraft:block.note_block.iron_xylophone weather @s ~ ~ ~ 1 1 -execute if score timer main matches 40 as @a at @s run playsound minecraft:block.note_block.iron_xylophone weather @s ~ ~ ~ 1 1 -execute if score timer main matches 40 as @a at @s run playsound minecraft:block.note_block.iron_xylophone weather @s ~ ~ ~ 1 1 +$execute if score timer main matches 40 as @a at @s run playsound minecraft:block.note_block.iron_xylophone $(source) @s ~ ~ ~ 1 1 +$execute if score timer main matches 40 as @a at @s run playsound minecraft:block.note_block.iron_xylophone $(source) @s ~ ~ ~ 1 1 +$execute if score timer main matches 40 as @a at @s run playsound minecraft:block.note_block.iron_xylophone $(source) @s ~ ~ ~ 1 1 execute if score timer main matches 60 run title @a title {"text":"1"} -execute if score timer main matches 60 as @a at @s run playsound minecraft:block.note_block.iron_xylophone weather @s ~ ~ ~ 1 1 -execute if score timer main matches 60 as @a at @s run playsound minecraft:block.note_block.iron_xylophone weather @s ~ ~ ~ 1 1 -execute if score timer main matches 60 as @a at @s run playsound minecraft:block.note_block.iron_xylophone weather @s ~ ~ ~ 1 1 +$execute if score timer main matches 60 as @a at @s run playsound minecraft:block.note_block.iron_xylophone $(source) @s ~ ~ ~ 1 1 +$execute if score timer main matches 60 as @a at @s run playsound minecraft:block.note_block.iron_xylophone $(source) @s ~ ~ ~ 1 1 +$execute if score timer main matches 60 as @a at @s run playsound minecraft:block.note_block.iron_xylophone $(source) @s ~ ~ ~ 1 1 execute if score timer main matches 100 run title @a title {"text":""} execute if score timer main matches 100.. run function mq:quiz/select with storage mq:main diff --git a/music_quiz/data/mq/function/repeat/timers/init6.mcfunction b/music_quiz/data/mq/function/repeat/timers/init6.mcfunction index 4daccd5..eba4b9f 100644 --- a/music_quiz/data/mq/function/repeat/timers/init6.mcfunction +++ b/music_quiz/data/mq/function/repeat/timers/init6.mcfunction @@ -1,15 +1,3 @@ -# warn-off-file execute-group -execute if score timer main matches 60 run function mq:tellraw {"text":"퀴즈가 종료되었습니다.","color":"white","msg":""} -execute if score timer main matches 60 as @a at @s run playsound minecraft:ui.button.click weather @s ~ ~ ~ 1 1 -execute if score timer main matches 60 as @a at @s run playsound minecraft:ui.button.click weather @s ~ ~ ~ 1 1 -execute if score timer main matches 60 as @a at @s run playsound minecraft:ui.button.click weather @s ~ ~ ~ 1 1 -execute if score timer main matches 180 run function mq:tellraw {"text":"퀴즈를 다시 시작하시려면 종료를 눌러주세요.","color":"white","msg":""} -execute if score timer main matches 120 as @a at @s run scoreboard players set stop buttons -1 -execute if score timer main matches 120 as @a at @s run playsound minecraft:ui.button.click weather @s ~ ~ ~ 1 1 -execute if score timer main matches 120 as @a at @s run playsound minecraft:ui.button.click weather @s ~ ~ ~ 1 1 -execute if score timer main matches 120 as @a at @s run playsound minecraft:ui.button.click weather @s ~ ~ ~ 1 1 -execute if score timer main matches 120 run function mq:tellraw {"text":"플레이 해주셔서 감사합니다.","color":"white","msg":""} -execute if score timer main matches 180 as @a at @s run playsound minecraft:ui.button.click weather @s ~ ~ ~ 1 1 -execute if score timer main matches 180 as @a at @s run playsound minecraft:ui.button.click weather @s ~ ~ ~ 1 1 -execute if score timer main matches 180 as @a at @s run playsound minecraft:ui.button.click weather @s ~ ~ ~ 1 1 -execute if score timer main matches 200.. run scoreboard players set init main 11 +execute if score timer main matches 300 run title @a title {"text":""} +execute if score timer main matches 290 run function mq:images/clear +execute if score timer main matches 300.. run function mq:quiz/select with storage mq:main diff --git a/music_quiz/data/mq/painting_variant/cover_01.json b/music_quiz/data/mq/painting_variant/cover_01.json index 15bea26..046db53 100644 --- a/music_quiz/data/mq/painting_variant/cover_01.json +++ b/music_quiz/data/mq/painting_variant/cover_01.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_01", - "width": 2, - "height": 2, - "title": "cover_01", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_02.json b/music_quiz/data/mq/painting_variant/cover_02.json index e7701d0..83ac462 100644 --- a/music_quiz/data/mq/painting_variant/cover_02.json +++ b/music_quiz/data/mq/painting_variant/cover_02.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_02", - "width": 2, - "height": 2, - "title": "cover_02", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_03.json b/music_quiz/data/mq/painting_variant/cover_03.json index d26a803..5f8fafb 100644 --- a/music_quiz/data/mq/painting_variant/cover_03.json +++ b/music_quiz/data/mq/painting_variant/cover_03.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_03", - "width": 2, - "height": 2, - "title": "cover_03", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_04.json b/music_quiz/data/mq/painting_variant/cover_04.json index 8b26fa6..78670d7 100644 --- a/music_quiz/data/mq/painting_variant/cover_04.json +++ b/music_quiz/data/mq/painting_variant/cover_04.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_04", - "width": 2, - "height": 2, - "title": "cover_04", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_05.json b/music_quiz/data/mq/painting_variant/cover_05.json index c04439f..e2854e9 100644 --- a/music_quiz/data/mq/painting_variant/cover_05.json +++ b/music_quiz/data/mq/painting_variant/cover_05.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_05", - "width": 2, - "height": 2, - "title": "cover_05", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_06.json b/music_quiz/data/mq/painting_variant/cover_06.json index d921c09..c3a911d 100644 --- a/music_quiz/data/mq/painting_variant/cover_06.json +++ b/music_quiz/data/mq/painting_variant/cover_06.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_06", - "width": 2, - "height": 2, - "title": "cover_06", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_07.json b/music_quiz/data/mq/painting_variant/cover_07.json index 9f3419b..a0a7f16 100644 --- a/music_quiz/data/mq/painting_variant/cover_07.json +++ b/music_quiz/data/mq/painting_variant/cover_07.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_07", - "width": 2, - "height": 2, - "title": "cover_07", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_08.json b/music_quiz/data/mq/painting_variant/cover_08.json index a788a99..bef5200 100644 --- a/music_quiz/data/mq/painting_variant/cover_08.json +++ b/music_quiz/data/mq/painting_variant/cover_08.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_08", - "width": 2, - "height": 2, - "title": "cover_08", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_09.json b/music_quiz/data/mq/painting_variant/cover_09.json index eaad9d1..b3c44ed 100644 --- a/music_quiz/data/mq/painting_variant/cover_09.json +++ b/music_quiz/data/mq/painting_variant/cover_09.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_09", - "width": 2, - "height": 2, - "title": "cover_09", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_10.json b/music_quiz/data/mq/painting_variant/cover_10.json index f0f0ff6..eecccd9 100644 --- a/music_quiz/data/mq/painting_variant/cover_10.json +++ b/music_quiz/data/mq/painting_variant/cover_10.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_10", - "width": 2, - "height": 2, - "title": "cover_10", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_11.json b/music_quiz/data/mq/painting_variant/cover_11.json index f46b9bf..8bb173f 100644 --- a/music_quiz/data/mq/painting_variant/cover_11.json +++ b/music_quiz/data/mq/painting_variant/cover_11.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_11", - "width": 2, - "height": 2, - "title": "cover_11", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_12.json b/music_quiz/data/mq/painting_variant/cover_12.json index a09694a..e05d1fe 100644 --- a/music_quiz/data/mq/painting_variant/cover_12.json +++ b/music_quiz/data/mq/painting_variant/cover_12.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_12", - "width": 2, - "height": 2, - "title": "cover_12", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_13.json b/music_quiz/data/mq/painting_variant/cover_13.json index 04d377b..3bc50f4 100644 --- a/music_quiz/data/mq/painting_variant/cover_13.json +++ b/music_quiz/data/mq/painting_variant/cover_13.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_13", - "width": 2, - "height": 2, - "title": "cover_13", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_14.json b/music_quiz/data/mq/painting_variant/cover_14.json index 79c3468..dc00743 100644 --- a/music_quiz/data/mq/painting_variant/cover_14.json +++ b/music_quiz/data/mq/painting_variant/cover_14.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_14", - "width": 2, - "height": 2, - "title": "cover_14", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_15.json b/music_quiz/data/mq/painting_variant/cover_15.json index 0ba314a..82779b8 100644 --- a/music_quiz/data/mq/painting_variant/cover_15.json +++ b/music_quiz/data/mq/painting_variant/cover_15.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_15", - "width": 2, - "height": 2, - "title": "cover_15", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_16.json b/music_quiz/data/mq/painting_variant/cover_16.json index 4a784bd..c0097b4 100644 --- a/music_quiz/data/mq/painting_variant/cover_16.json +++ b/music_quiz/data/mq/painting_variant/cover_16.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_16", - "width": 2, - "height": 2, - "title": "cover_16", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_17.json b/music_quiz/data/mq/painting_variant/cover_17.json index e7a50c4..6cad7e2 100644 --- a/music_quiz/data/mq/painting_variant/cover_17.json +++ b/music_quiz/data/mq/painting_variant/cover_17.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:cover_17", - "width": 2, - "height": 2, - "title": "cover_17", - "author": "musicquiz" + "width": 1, + "height": 1 } diff --git a/music_quiz/data/mq/painting_variant/cover_18.json b/music_quiz/data/mq/painting_variant/cover_18.json new file mode 100644 index 0000000..81c16ce --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_18.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_18", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_19.json b/music_quiz/data/mq/painting_variant/cover_19.json new file mode 100644 index 0000000..de0bb93 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_19.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_19", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_20.json b/music_quiz/data/mq/painting_variant/cover_20.json new file mode 100644 index 0000000..fc33242 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_20.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_20", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_21.json b/music_quiz/data/mq/painting_variant/cover_21.json new file mode 100644 index 0000000..2836a22 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_21.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_21", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_22.json b/music_quiz/data/mq/painting_variant/cover_22.json new file mode 100644 index 0000000..2485aa7 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_22.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_22", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_23.json b/music_quiz/data/mq/painting_variant/cover_23.json new file mode 100644 index 0000000..a88f8a6 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_23.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_23", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_24.json b/music_quiz/data/mq/painting_variant/cover_24.json new file mode 100644 index 0000000..fa9b490 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_24.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_24", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_25.json b/music_quiz/data/mq/painting_variant/cover_25.json new file mode 100644 index 0000000..6b96d8e --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_25.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_25", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_26.json b/music_quiz/data/mq/painting_variant/cover_26.json new file mode 100644 index 0000000..1f5c5dd --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_26.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_26", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_27.json b/music_quiz/data/mq/painting_variant/cover_27.json new file mode 100644 index 0000000..fdb4781 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_27.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_27", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_28.json b/music_quiz/data/mq/painting_variant/cover_28.json new file mode 100644 index 0000000..5179090 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_28.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_28", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_29.json b/music_quiz/data/mq/painting_variant/cover_29.json new file mode 100644 index 0000000..52ead53 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_29.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_29", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_30.json b/music_quiz/data/mq/painting_variant/cover_30.json new file mode 100644 index 0000000..edec2cc --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_30.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_30", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_31.json b/music_quiz/data/mq/painting_variant/cover_31.json new file mode 100644 index 0000000..f743eea --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_31.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_31", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_32.json b/music_quiz/data/mq/painting_variant/cover_32.json new file mode 100644 index 0000000..07857f4 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_32.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_32", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_33.json b/music_quiz/data/mq/painting_variant/cover_33.json new file mode 100644 index 0000000..1ae4165 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_33.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_33", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_34.json b/music_quiz/data/mq/painting_variant/cover_34.json new file mode 100644 index 0000000..7ad2476 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_34.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_34", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_35.json b/music_quiz/data/mq/painting_variant/cover_35.json new file mode 100644 index 0000000..cd75677 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_35.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_35", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_36.json b/music_quiz/data/mq/painting_variant/cover_36.json new file mode 100644 index 0000000..b404331 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_36.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_36", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_37.json b/music_quiz/data/mq/painting_variant/cover_37.json new file mode 100644 index 0000000..5473447 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_37.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_37", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_38.json b/music_quiz/data/mq/painting_variant/cover_38.json new file mode 100644 index 0000000..8efee00 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_38.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_38", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_39.json b/music_quiz/data/mq/painting_variant/cover_39.json new file mode 100644 index 0000000..c1180eb --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_39.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_39", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_40.json b/music_quiz/data/mq/painting_variant/cover_40.json new file mode 100644 index 0000000..2f615dd --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_40.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_40", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_41.json b/music_quiz/data/mq/painting_variant/cover_41.json new file mode 100644 index 0000000..1d4c17c --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_41.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_41", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_42.json b/music_quiz/data/mq/painting_variant/cover_42.json new file mode 100644 index 0000000..9cfc55d --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_42.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_42", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_43.json b/music_quiz/data/mq/painting_variant/cover_43.json new file mode 100644 index 0000000..3dd1fac --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_43.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_43", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_44.json b/music_quiz/data/mq/painting_variant/cover_44.json new file mode 100644 index 0000000..e2f7928 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_44.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_44", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_45.json b/music_quiz/data/mq/painting_variant/cover_45.json new file mode 100644 index 0000000..d3be956 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_45.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_45", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_46.json b/music_quiz/data/mq/painting_variant/cover_46.json new file mode 100644 index 0000000..32adb1a --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_46.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_46", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_47.json b/music_quiz/data/mq/painting_variant/cover_47.json new file mode 100644 index 0000000..a3fc253 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_47.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_47", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_48.json b/music_quiz/data/mq/painting_variant/cover_48.json new file mode 100644 index 0000000..bad13de --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_48.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_48", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_49.json b/music_quiz/data/mq/painting_variant/cover_49.json new file mode 100644 index 0000000..7c6a7b2 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_49.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_49", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/cover_50.json b/music_quiz/data/mq/painting_variant/cover_50.json new file mode 100644 index 0000000..ee03522 --- /dev/null +++ b/music_quiz/data/mq/painting_variant/cover_50.json @@ -0,0 +1,5 @@ +{ + "asset_id": "musicquiz:cover_50", + "width": 1, + "height": 1 +} diff --git a/music_quiz/data/mq/painting_variant/gif.json b/music_quiz/data/mq/painting_variant/gif.json index 4c895d1..398cbb0 100644 --- a/music_quiz/data/mq/painting_variant/gif.json +++ b/music_quiz/data/mq/painting_variant/gif.json @@ -1,7 +1,5 @@ { "asset_id": "musicquiz:gif", - "width": 2, - "height": 2, - "title": "gif", - "author": "musicquiz" + "width": 1, + "height": 1 }