diff --git a/Project Wak Beat.resource_order b/Project Wak Beat.resource_order index 26fe8b6b..efe993c1 100644 --- a/Project Wak Beat.resource_order +++ b/Project Wak Beat.resource_order @@ -212,7 +212,7 @@ {"name":"spr_status","order":5,"path":"sprites/spr_status/spr_status.yy",}, {"name":"Sprite49","order":12,"path":"sprites/Sprite49/Sprite49.yy",}, {"name":"string_digit_with_minus","order":19,"path":"scripts/string_digit_with_minus/string_digit_with_minus.yy",}, - {"name":"kinmoku","order":24,"path":"sounds/kinmoku/kinmoku.yy",}, + {"name":"fire_again","order":24,"path":"sounds/fire_again/fire_again.yy",}, {"name":"jing_hurt","order":6,"path":"sounds/jing_hurt/jing_hurt.yy",}, {"name":"roki_timeline","order":22,"path":"timelines/roki_timeline/roki_timeline.yy",}, {"name":"favorite_sfx","order":6,"path":"sounds/favorite_sfx/favorite_sfx.yy",}, diff --git a/Project Wak Beat.yyp b/Project Wak Beat.yyp index 145c8d00..71ff9dcd 100644 --- a/Project Wak Beat.yyp +++ b/Project Wak Beat.yyp @@ -254,7 +254,7 @@ {"id":{"name":"spr_status","path":"sprites/spr_status/spr_status.yy",},}, {"id":{"name":"Sprite49","path":"sprites/Sprite49/Sprite49.yy",},}, {"id":{"name":"string_digit_with_minus","path":"scripts/string_digit_with_minus/string_digit_with_minus.yy",},}, - {"id":{"name":"kinmoku","path":"sounds/kinmoku/kinmoku.yy",},}, + {"id":{"name":"fire_again","path":"sounds/fire_again/fire_again.yy",},}, {"id":{"name":"jing_hurt","path":"sounds/jing_hurt/jing_hurt.yy",},}, {"id":{"name":"roki_timeline","path":"timelines/roki_timeline/roki_timeline.yy",},}, {"id":{"name":"favorite_sfx","path":"sounds/favorite_sfx/favorite_sfx.yy",},}, diff --git a/imgs/Albums/album14.png b/imgs/Albums/album14.png index 77606e03..98ed50b6 100644 Binary files a/imgs/Albums/album14.png and b/imgs/Albums/album14.png differ diff --git a/objects/code/Alarm_1.gml b/objects/code/Alarm_1.gml index b6c67038..17ed2427 100644 --- a/objects/code/Alarm_1.gml +++ b/objects/code/Alarm_1.gml @@ -93,9 +93,23 @@ if (global.n_score_displaying > 0) global.result_obstacle = global.crossed_obstacle_num //온라인 랭킹 점수 등록 + global.total_score_normal = 0; + global.total_score_hardcore = 0; if (send_score == 1 && global.nickname != "") { - set_score(global.nickname, global.result_score, global.t_selected_difficulty); + for(var i = 0; i < global.origin_total_map; i++) + { + if (string_pos("(Hardcore)", global.real_stage_map_name[i]) == 0) + { + global.total_score_normal += (global.real_n_score[i] != "--") ? real(global.real_n_score[i]) : 0; + } + global.total_score_hardcore += (global.real_n_score_hardcore[i] != "--") ? real(global.real_n_score_hardcore[i]) : 0; + } + + + set_score(global.nickname, global.total_score_normal+global.total_score_hardcore, 0); + get_scores(5,0); + show_debug_message("점수 전송 - ("+string(global.nickname)+")"); } diff --git a/objects/code/Create_0.gml b/objects/code/Create_0.gml index e4c657c1..6d5f092a 100644 --- a/objects/code/Create_0.gml +++ b/objects/code/Create_0.gml @@ -624,14 +624,14 @@ global.roki_effect1 = 0 //금목서 -global.real_stage_map_name[13] = "금목서 Kinmokusei (Cover by 비챤 VIichan)"; -global.real_stage_map_artist[13] = "Original by Kujira"; +global.real_stage_map_name[13] = "Fire Again (Cover by 비챤 VIichan)"; +global.real_stage_map_artist[13] = "Original by Ashnikko, Grabbitz"; global.real_stage_map_difficulty[13] = "Hard"; -global.real_stage_map_color[13] = #f2aca0; +global.real_stage_map_color[13] = c_black; global.real_stage_map_duration[13] = 6474; -global.real_stage_map_audio_name[13] = "kinmoku"; -global.real_stage_bpm[13] = 123; -global.real_stage_map_highlight_part[13] = 58.4; +global.real_stage_map_audio_name[13] = "fire_again"; +global.real_stage_bpm[13] = 99; +global.real_stage_map_highlight_part[13] = 180; global.real_detailed_difficulty[13] = 3; global.real_obtainable_type[13] = 99; global.real_requirement_level[13] = 9999; diff --git a/objects/code/Draw_73.gml b/objects/code/Draw_73.gml index 97edb272..6d8721b0 100644 --- a/objects/code/Draw_73.gml +++ b/objects/code/Draw_73.gml @@ -266,9 +266,9 @@ if (global.select_map != 0 && instance_exists(obj_player) && abs(obj_player.imag } //title - if selected_me = 0 + if (selected_me == 0) { - if locked_now = 0 && dis_alpha > 0.1 + if locked_now == 0 && dis_alpha > 0.1 { var tmp_score_n = (is_real(global.n_score[i])) ? global.n_score[i] : 0; var tmp_score_hc = (is_real(global.n_score_hardcore[i])) ? global.n_score_hardcore[i] : 0; diff --git a/objects/code/Other_19.gml b/objects/code/Other_19.gml index a3f9a82f..6665cc06 100644 --- a/objects/code/Other_19.gml +++ b/objects/code/Other_19.gml @@ -62,7 +62,7 @@ var temp_real_name = global.nametag_script_return0; var temp_text_code = global.nametag_script_return1; var text_code_col = global.nametag_script_return2; var add_nametag = global.nametag_script_return3; -var temp_score = (global.player_leaderboard_difficulty == 0) ? global.total_score_normal : global.total_score_hardcore; +var temp_score = global.total_score_normal+global.total_score_hardcore; global.unlocked_music_name_new_list[7] = "___"; global.unlocked_music_name_new_list[8] = "[현재 내 순위 - "+string(my_ranking_num); global.unlocked_music_name_new_list_color[8] = $FF56D2FF; diff --git a/objects/code/Step_1.gml b/objects/code/Step_1.gml index f7630bb6..49b01535 100644 --- a/objects/code/Step_1.gml +++ b/objects/code/Step_1.gml @@ -178,9 +178,8 @@ if (automatic_reload_player_leaderboard > 0) show_message_log("온라인 서버 연결 중..."); show_debug_message("showing 명예의 전당 now") - var temp_difficulty_str = (global.player_leaderboard_difficulty != 0) ? "하드코어" : "노말"; - global.notice_title = "명예의 전당 - "+string(temp_difficulty_str)+" 부문"; - global.notice_title_sub = "< (모든 곡의 "+string(temp_difficulty_str)+"난이도 스코어 총합 기준) >"; + global.notice_title = "명예의 전당"; + global.notice_title_sub = "< (모든 곡의 모든 난이도 스코어 총합 기준) >"; global.show_new_songs = 1 } automatic_reload_player_leaderboard++; @@ -191,33 +190,21 @@ if (automatic_reload_player_leaderboard > 0) if (automatic_reload_player_leaderboard == 3 && global.nickname != "") { - var tmp_total_score = 0; + global.total_score_normal = 0; + global.total_score_hardcore = 0; for(var i = 0; i < global.origin_total_map; i++) { - if (global.player_leaderboard_difficulty == 0) + if (string_pos("(Hardcore)", global.real_stage_map_name[i]) == 0) { - tmp_total_score += (global.real_n_score[i] != "--") ? real(global.real_n_score[i]) : 0; - } - else - { - tmp_total_score += (global.real_n_score_hardcore[i] != "--") ? real(global.real_n_score_hardcore[i]) : 0; + global.total_score_normal += (global.real_n_score[i] != "--") ? real(global.real_n_score[i]) : 0; } + global.total_score_hardcore += (global.real_n_score_hardcore[i] != "--") ? real(global.real_n_score_hardcore[i]) : 0; } - if (global.player_leaderboard_difficulty == 0) - { - set_score(global.nickname, (tmp_total_score < 1) ? 1 : tmp_total_score, 0); - get_scores(5,0); - show_debug_message("점수 전송 - "+string(tmp_total_score)+" ("+string(global.nickname)+")"); - global.total_score_normal = tmp_total_score; - } - else - { - set_score(global.nickname, (tmp_total_score < 1) ? 1 : tmp_total_score, 1); - get_scores(5,1); - show_debug_message("점수 전송 - "+string(tmp_total_score)+" ("+string(global.nickname)+")"); - global.total_score_hardcore = tmp_total_score; - } + + set_score(global.nickname, global.total_score_normal+global.total_score_hardcore, 0); + get_scores(5,0); + show_debug_message("점수 전송 - ("+string(global.nickname)+")"); } @@ -371,10 +358,10 @@ if (global.b_alpha < 0.1 && global.t_b_alpha <= 0 && global.t_b_alpha != -0.02 & check_new_song ++; - global.unlocked_music_name_new_list[check_new_song] = "대쉬 무적 판정 시간 관련 버그 수정"; + global.unlocked_music_name_new_list[check_new_song] = "개발 예정 곡 변경 (Kinmokusei 금목서 -> Fire Again)"; check_new_song ++; - global.unlocked_music_name_new_list[check_new_song] = "모바일 닉네임 입력 관련 일부 사항 수정"; + global.unlocked_music_name_new_list[check_new_song] = "명예의 전당 랭크 시스템 변경 (각 난이도별 점수 -> 모든 난이도 점수 합산)"; check_new_song ++; global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵 탄막 이미지 변경 메시지 관련 일부 사항 수정"; diff --git a/objects/obj_album_ui/Draw_73.gml b/objects/obj_album_ui/Draw_73.gml index f0e1f97c..37f0d800 100644 --- a/objects/obj_album_ui/Draw_73.gml +++ b/objects/obj_album_ui/Draw_73.gml @@ -850,22 +850,13 @@ if (global.show_title_menu == 0) var can_show_top_ten, tmp_target_score, tmp_val2, tmp_str2; - if (global.player_leaderboard_difficulty != 0) - { - can_show_top_ten = (global.top_ten_score_hardcore != -4) ? 1 : 0; - tmp_target_score = (global.n_score_hardcore[tmp_n_map_id] == "--") ? 0 : global.n_score_hardcore[tmp_n_map_id]; - tmp_val2 = tmp_target_score/global.top_ten_score_hardcore; - tmp_val2 = (tmp_val2 > 1) ? 1 : tmp_val2; - tmp_str2 = (tmp_val2 != 1) ? "명예의 전당 Top5까지 앞으로 "+string(numbers_with_comma(global.top_ten_score_hardcore - tmp_target_score))+"점!" : "명예의 전당 Top5 달성!"; - } - else - { - can_show_top_ten = (global.top_ten_score_normal != -4) ? 1 : 0; - tmp_target_score = (global.n_score[tmp_n_map_id] == "--") ? 0 : global.n_score[tmp_n_map_id]; - tmp_val2 = tmp_target_score/global.top_ten_score_normal; - tmp_val2 = (tmp_val2 > 1) ? 1 : tmp_val2; - tmp_str2 = (tmp_val2 != 1) ? "명예의 전당 Top5까지 앞으로 "+string(numbers_with_comma(global.top_ten_score_normal - tmp_target_score))+"점!" : "명예의 전당 Top5 달성!"; - } + can_show_top_ten = (global.top_ten_score_normal != -4) ? 1 : 0; + tmp_target_score = global.total_score_hardcore+global.total_score_normal; + tmp_val2 = tmp_target_score/global.top_ten_score_normal; + tmp_val2 = (tmp_val2 > 1) ? 1 : tmp_val2; + tmp_str2 = (tmp_val2 != 1) ? "명예의 전당 Top5까지 앞으로 "+string(numbers_with_comma(global.top_ten_score_normal - tmp_target_score))+"점!" : "명예의 전당 Top5 달성!"; + + if (can_show_top_ten == 1) { @@ -906,80 +897,17 @@ if (global.show_title_menu == 0) } } - if (global.notice_title == "Ranking") - { - global.new_unlocked_map_num = 11; - if (code.automatic_reload_leaderboard == 0) - { - if (keyboard_check_pressed(vk_left) || keyboard_check_pressed(vk_up)) - { - global.t_selected_difficulty--; - global.b_loaded_ranking = -1; - audio_play_sound(common_sfx1,0,false,0.2*global.master_volume*global.sfx_volume) - - code.automatic_reload_leaderboard = 1 - } - else if (keyboard_check_pressed(vk_right) || keyboard_check_pressed(vk_down)) - { - global.t_selected_difficulty++; - global.b_loaded_ranking = -1; - audio_play_sound(common_sfx1,0,false,0.2*global.master_volume*global.sfx_volume) - - code.automatic_reload_leaderboard = 1 - } - else if (global.b_alpha >= 0.85 && (keyboard_check_pressed(vk_anykey) || mouse_check_button_pressed(mb_left))) - { - global.t_b_alpha = -0.02 - code.gamestart = 5 - alarm[4] = 15 - } - } - else - { - var tmp_alpha = (code.automatic_reload_leaderboard/30 > 1) ? 1 : code.automatic_reload_leaderboard/30; - draw_sprite_ext(spr_loading,0,middle_xx,yy+yy_h*0.52,global.font_ratio_resolution_xx,1,-5*code.automatic_reload_leaderboard,c_white,tmp_alpha) - } - - - if global.t_selected_difficulty > 1 - { - global.t_selected_difficulty = 0 - } - else if global.t_selected_difficulty < 0 - { - global.t_selected_difficulty = 1 - } - - if (tmp_n_map_id >= 0 && string_pos("(Hardcore)", global.stage_map_difficulty[tmp_n_map_id]) != 0) - { - global.t_selected_difficulty = 0 - } - } - else if (global.notice_title == "명예의 전당") + if (string_last_pos("명예의 전당",global.notice_title) != 0) { if (code.automatic_reload_player_leaderboard == 0) { - if (keyboard_check_pressed(vk_left) || keyboard_check_pressed(vk_up)) - { - global.player_leaderboard_difficulty-- - audio_play_sound(common_sfx1,0,false,0.2*global.master_volume*global.sfx_volume) - - code.automatic_reload_player_leaderboard = 1; - } - else if (keyboard_check_pressed(vk_right) || keyboard_check_pressed(vk_down)) - { - global.player_leaderboard_difficulty++ - audio_play_sound(common_sfx1,0,false,0.2*global.master_volume*global.sfx_volume) - - - code.automatic_reload_player_leaderboard = 1; - } - else if (global.b_alpha >= 0.85 && (keyboard_check_pressed(vk_anykey) || mouse_check_button_pressed(mb_left))) + global.player_leaderboard_difficulty = 0; + if (global.b_alpha >= 0.85 && (keyboard_check_pressed(vk_anykey) || mouse_check_button_pressed(mb_left))) { - global.t_b_alpha = -0.02 - code.gamestart = 5 - alarm[4] = 15 + global.t_b_alpha = -0.02; + code.gamestart = 5; + alarm[4] = 15; } } else @@ -991,11 +919,11 @@ if (global.show_title_menu == 0) if global.player_leaderboard_difficulty > 1 { - global.player_leaderboard_difficulty = 0 + global.player_leaderboard_difficulty = 0; } else if global.player_leaderboard_difficulty < 0 { - global.player_leaderboard_difficulty = 1 + global.player_leaderboard_difficulty = 1; } } else if (global.notice_title == "게임을 시작하기 전...") @@ -1027,7 +955,7 @@ if (global.show_title_menu == 0) if (keyboard_check_released(vk_space)) { - holding_now = 0 + holding_now = 0; } } @@ -1043,7 +971,7 @@ if (global.show_title_menu == 0) if (string_length(global.nickname) <= 15) { - global.nickname = string_replace_all(global.nickname," ","") + global.nickname = string_replace_all(global.nickname," ",""); } else { @@ -1052,8 +980,8 @@ if (global.show_title_menu == 0) if (global.mobile_mode == 1 && (keyboard_string == "\n" || keyboard_string == "\r")) { - keyboard_input_display = 999 - keyboard_virtual_hide() + keyboard_input_display = 999; + keyboard_virtual_hide(); } keyboard_string = ""; @@ -1073,7 +1001,7 @@ if (global.show_title_menu == 0) } - if holding_now > 90 + if (holding_now > 90) { global.nickname = string_replace_all(global.nickname," ","") global.t_b_alpha = -0.02 @@ -1104,9 +1032,9 @@ if (global.show_title_menu == 0) } else { - global.t_b_alpha = -0.02 - code.gamestart = 5 - alarm[4] = 15 + global.t_b_alpha = -0.02; + code.gamestart = 5; + alarm[4] = 15; } } diff --git a/scripts/convert_score_to_rank/convert_score_to_rank.gml b/scripts/convert_score_to_rank/convert_score_to_rank.gml index e3b23d87..41d0b7b6 100644 --- a/scripts/convert_score_to_rank/convert_score_to_rank.gml +++ b/scripts/convert_score_to_rank/convert_score_to_rank.gml @@ -11,14 +11,7 @@ function convert_score_to_rank(argument0,argument1) var tmp_score = real(argument0)/10000; if (argument1 == 1) { - if (global.player_leaderboard_difficulty == 0) - { - tmp_score /= (global.both_difficulty_num); - } - else - { - tmp_score /= (global.both_difficulty_num+global.hardcore_only_num); - } + tmp_score /= (global.both_difficulty_num*2+global.hardcore_only_num); } if (tmp_score >= 15) diff --git a/sounds/fire_again/fire_again.mp3 b/sounds/fire_again/fire_again.mp3 new file mode 100644 index 00000000..c34c4c1e Binary files /dev/null and b/sounds/fire_again/fire_again.mp3 differ diff --git a/sounds/kinmoku/kinmoku.yy b/sounds/fire_again/fire_again.yy similarity index 78% rename from sounds/kinmoku/kinmoku.yy rename to sounds/fire_again/fire_again.yy index f8f709a1..2e37135c 100644 --- a/sounds/kinmoku/kinmoku.yy +++ b/sounds/fire_again/fire_again.yy @@ -1,7 +1,7 @@ { "resourceType": "GMSound", "resourceVersion": "1.0", - "name": "kinmoku", + "name": "fire_again", "audioGroupId": { "name": "musics", "path": "audiogroups/musics", @@ -10,14 +10,14 @@ "bitRate": 512, "compression": 0, "conversionMode": 0, - "duration": 107.907814, + "duration": 206.83755, "parent": { "name": "Musics", "path": "folders/사운드/Musics.yy", }, "preload": false, "sampleRate": 48000, - "soundFile": "kinmoku.wav", + "soundFile": "fire_again.mp3", "type": 1, - "volume": 0.57, + "volume": 1.0, } \ No newline at end of file diff --git a/sounds/kinmoku/kinmoku.wav b/sounds/kinmoku/kinmoku.wav deleted file mode 100644 index ce4c5184..00000000 Binary files a/sounds/kinmoku/kinmoku.wav and /dev/null differ diff --git a/sprites/Sprite86/2efb0cf5-f2a9-4989-92db-481609ea6694.png b/sprites/Sprite86/2efb0cf5-f2a9-4989-92db-481609ea6694.png deleted file mode 100644 index 9e269dfc..00000000 Binary files a/sprites/Sprite86/2efb0cf5-f2a9-4989-92db-481609ea6694.png and /dev/null differ diff --git a/sprites/Sprite86/Sprite86.yy b/sprites/Sprite86/Sprite86.yy index d44966be..e0dbfe88 100644 --- a/sprites/Sprite86/Sprite86.yy +++ b/sprites/Sprite86/Sprite86.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "Sprite86", - "bbox_bottom": 556, + "bbox_bottom": 511, "bbox_left": 0, - "bbox_right": 499, - "bbox_top": 6, + "bbox_right": 511, + "bbox_top": 0, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -13,14 +13,14 @@ "edgeFiltering": false, "For3D": false, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"2efb0cf5-f2a9-4989-92db-481609ea6694",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"afae2f0b-d2ee-4ae5-bfe3-a73e6585252f",}, ], "gridX": 0, "gridY": 0, - "height": 557, + "height": 512, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"82661fd5-8cf7-4edc-8d92-c5848cc0c028","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a7c6d7c6-0de3-4127-95b4-9fc652c5301a","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 0, @@ -54,7 +54,7 @@ "timeUnits": 1, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"2efb0cf5-f2a9-4989-92db-481609ea6694","path":"sprites/Sprite86/Sprite86.yy",},},},"Disabled":false,"id":"d0666f83-12ce-44cc-980b-6832d9175bcd","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"afae2f0b-d2ee-4ae5-bfe3-a73e6585252f","path":"sprites/Sprite86/Sprite86.yy",},},},"Disabled":false,"id":"955b2f5c-0def-41f0-9b78-cb0666744333","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, @@ -70,5 +70,5 @@ }, "type": 0, "VTile": false, - "width": 500, + "width": 512, } \ No newline at end of file diff --git a/sprites/Sprite86/afae2f0b-d2ee-4ae5-bfe3-a73e6585252f.png b/sprites/Sprite86/afae2f0b-d2ee-4ae5-bfe3-a73e6585252f.png new file mode 100644 index 00000000..38d016cc Binary files /dev/null and b/sprites/Sprite86/afae2f0b-d2ee-4ae5-bfe3-a73e6585252f.png differ diff --git a/sprites/Sprite86/layers/2efb0cf5-f2a9-4989-92db-481609ea6694/82661fd5-8cf7-4edc-8d92-c5848cc0c028.png b/sprites/Sprite86/layers/2efb0cf5-f2a9-4989-92db-481609ea6694/82661fd5-8cf7-4edc-8d92-c5848cc0c028.png deleted file mode 100644 index 9e269dfc..00000000 Binary files a/sprites/Sprite86/layers/2efb0cf5-f2a9-4989-92db-481609ea6694/82661fd5-8cf7-4edc-8d92-c5848cc0c028.png and /dev/null differ diff --git a/sprites/Sprite86/layers/afae2f0b-d2ee-4ae5-bfe3-a73e6585252f/a7c6d7c6-0de3-4127-95b4-9fc652c5301a.png b/sprites/Sprite86/layers/afae2f0b-d2ee-4ae5-bfe3-a73e6585252f/a7c6d7c6-0de3-4127-95b4-9fc652c5301a.png new file mode 100644 index 00000000..4343cab2 Binary files /dev/null and b/sprites/Sprite86/layers/afae2f0b-d2ee-4ae5-bfe3-a73e6585252f/a7c6d7c6-0de3-4127-95b4-9fc652c5301a.png differ diff --git a/sprites/spr_album/828baa1d-cb05-4c56-a605-2315ce275c34.png b/sprites/spr_album/828baa1d-cb05-4c56-a605-2315ce275c34.png new file mode 100644 index 00000000..c8755620 Binary files /dev/null and b/sprites/spr_album/828baa1d-cb05-4c56-a605-2315ce275c34.png differ diff --git a/sprites/spr_album/f2ad723d-6d4c-474a-b74a-20e1ab473282.png b/sprites/spr_album/f2ad723d-6d4c-474a-b74a-20e1ab473282.png deleted file mode 100644 index 5895d280..00000000 Binary files a/sprites/spr_album/f2ad723d-6d4c-474a-b74a-20e1ab473282.png and /dev/null differ diff --git a/sprites/spr_album/layers/828baa1d-cb05-4c56-a605-2315ce275c34/944706ef-7de9-49ba-909e-9b56ea6ec60a.png b/sprites/spr_album/layers/828baa1d-cb05-4c56-a605-2315ce275c34/944706ef-7de9-49ba-909e-9b56ea6ec60a.png new file mode 100644 index 00000000..c8755620 Binary files /dev/null and b/sprites/spr_album/layers/828baa1d-cb05-4c56-a605-2315ce275c34/944706ef-7de9-49ba-909e-9b56ea6ec60a.png differ diff --git a/sprites/spr_album/layers/f2ad723d-6d4c-474a-b74a-20e1ab473282/944706ef-7de9-49ba-909e-9b56ea6ec60a.png b/sprites/spr_album/layers/f2ad723d-6d4c-474a-b74a-20e1ab473282/944706ef-7de9-49ba-909e-9b56ea6ec60a.png deleted file mode 100644 index 5ccd231b..00000000 Binary files a/sprites/spr_album/layers/f2ad723d-6d4c-474a-b74a-20e1ab473282/944706ef-7de9-49ba-909e-9b56ea6ec60a.png and /dev/null differ diff --git a/sprites/spr_album/spr_album.yy b/sprites/spr_album/spr_album.yy index b15a295b..09f99fdf 100644 --- a/sprites/spr_album/spr_album.yy +++ b/sprites/spr_album/spr_album.yy @@ -28,7 +28,7 @@ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1ec50050-ba8c-4b20-b5be-fb4792aa9885",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"12bd2b74-7b30-47f3-93a4-c07c43b09fe7",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"c2f61cd7-53c1-435d-a9c2-3068530b2a23",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f2ad723d-6d4c-474a-b74a-20e1ab473282",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"828baa1d-cb05-4c56-a605-2315ce275c34",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4ec18e76-53ad-4f2a-ab84-1fdc5be130e4",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"05003c2e-4b9a-49e6-93e9-d886790e2361",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b918b0db-dc87-4fe6-ad60-2147ceef9d4e",}, @@ -99,7 +99,7 @@ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1ec50050-ba8c-4b20-b5be-fb4792aa9885","path":"sprites/spr_album/spr_album.yy",},},},"Disabled":false,"id":"fb8b4697-97c9-4b37-8416-edb9340f74fa","IsCreationKey":false,"Key":12.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"12bd2b74-7b30-47f3-93a4-c07c43b09fe7","path":"sprites/spr_album/spr_album.yy",},},},"Disabled":false,"id":"9f347be6-c9d3-4ee2-ad7f-be7d3adc903d","IsCreationKey":false,"Key":13.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c2f61cd7-53c1-435d-a9c2-3068530b2a23","path":"sprites/spr_album/spr_album.yy",},},},"Disabled":false,"id":"42b74439-1ecf-4d1d-a773-f2f5d540ee5b","IsCreationKey":false,"Key":14.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f2ad723d-6d4c-474a-b74a-20e1ab473282","path":"sprites/spr_album/spr_album.yy",},},},"Disabled":false,"id":"2bddabe2-6e4e-4ee2-954c-be890064fcca","IsCreationKey":false,"Key":15.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"828baa1d-cb05-4c56-a605-2315ce275c34","path":"sprites/spr_album/spr_album.yy",},},},"Disabled":false,"id":"800a2f98-db48-477c-b213-cf9ed72273f9","IsCreationKey":false,"Key":15.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4ec18e76-53ad-4f2a-ab84-1fdc5be130e4","path":"sprites/spr_album/spr_album.yy",},},},"Disabled":false,"id":"97ffa248-d749-4588-a847-021799266458","IsCreationKey":false,"Key":16.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"05003c2e-4b9a-49e6-93e9-d886790e2361","path":"sprites/spr_album/spr_album.yy",},},},"Disabled":false,"id":"2f95bd76-843f-40b2-8395-d28374a49388","IsCreationKey":false,"Key":17.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b918b0db-dc87-4fe6-ad60-2147ceef9d4e","path":"sprites/spr_album/spr_album.yy",},},},"Disabled":false,"id":"831de4cc-cbdf-417d-82c0-1459d6d3c9e8","IsCreationKey":false,"Key":18.0,"Length":1.0,"Stretch":false,},