diff --git a/objects/code/Alarm_1.gml b/objects/code/Alarm_1.gml index 6ef809e2..ac408116 100644 --- a/objects/code/Alarm_1.gml +++ b/objects/code/Alarm_1.gml @@ -115,7 +115,7 @@ var temp_score = ((convert_rank_to_num(target_rank))*100+global.crossed_obstacle if (global.t_selected_difficulty == 1) { global.n_rank[global.n_map_id] = target_rank; - if (global.n_map_list != 2 && (global.real_n_score[global.n_map_id] == "--" || temp_score > global.real_n_score[global.n_map_id])) + if (global.nickname != "" && global.n_map_list != 2 && (global.real_n_score[global.n_map_id] == "--" || temp_score > global.real_n_score[global.n_map_id])) { LootLockerSetPlayerName(string(global.nickname)); LootLockerSubmitScore("JWAB_map"+string(global.n_map_id+1)+"_"+string(global.t_selected_difficulty+1),real(temp_score)); @@ -128,7 +128,7 @@ if (global.t_selected_difficulty == 1) else { global.n_rank_hardcore[global.n_map_id] = target_rank; - if (global.n_map_list != 2 && (global.real_n_score_hardcore[global.n_map_id] == "--" || temp_score > global.real_n_score_hardcore[global.n_map_id])) + if (global.nickname != "" && global.n_map_list != 2 && (global.real_n_score_hardcore[global.n_map_id] == "--" || temp_score > global.real_n_score_hardcore[global.n_map_id])) { LootLockerSetPlayerName(string(global.nickname)); LootLockerSubmitScore("JWAB_map"+string(global.n_map_id+1)+"_"+string(global.t_selected_difficulty+1),real(temp_score)); diff --git a/objects/code/Step_1.gml b/objects/code/Step_1.gml index 3f85c401..60be481f 100644 --- a/objects/code/Step_1.gml +++ b/objects/code/Step_1.gml @@ -8,17 +8,16 @@ if (automatic_reload_leaderboard > 0) { event_user(5) } - - if (automatic_reload_leaderboard == 1) - { - global.unlocked_music_name_new_list_rightside[0] = ""; - global.notice_title_sub = "" - } - + if (automatic_reload_leaderboard == 2) { event_user(5) global.show_new_songs = 1; + + if (global.b_loaded_ranking == global.n_map_id) + { + automatic_reload_leaderboard = 0; + } } if (automatic_reload_leaderboard == 30) @@ -26,6 +25,7 @@ if (automatic_reload_leaderboard > 0) LootLockerReset() LootLockerSetPlayerName(""); LootLockerSubmitScore("JWAB_map"+string(global.n_map_id+1)+"_"+string(global.t_selected_difficulty+1),0); + global.b_loaded_ranking = global.n_map_id event_user(5) } diff --git a/objects/obj_album_ui/Alarm_4.gml b/objects/obj_album_ui/Alarm_4.gml index afb5976b..000d73ee 100644 --- a/objects/obj_album_ui/Alarm_4.gml +++ b/objects/obj_album_ui/Alarm_4.gml @@ -9,6 +9,7 @@ global.joystick_yy = -4 if (global.show_new_songs > 0) { + global.notice_title = "" global.t_b_alpha = -0.01 global.show_new_songs = 0 global.unlocked_music_name_new_list_rightside[0] = ""; diff --git a/objects/obj_album_ui/Create_0.gml b/objects/obj_album_ui/Create_0.gml index 2c0ebe67..001a661e 100644 --- a/objects/obj_album_ui/Create_0.gml +++ b/objects/obj_album_ui/Create_0.gml @@ -28,6 +28,7 @@ blind_xx_start = 0 blind_xx_final = 0 ding_dong_animation = 0 credit_text_alpha = -1 +global.b_loaded_ranking = -1 if global.title_menu_animation1 = 0 @@ -40,6 +41,7 @@ if global.title_menu_animation1 = 0 global.can_show = 0.1 +global.open_ranking = 0 holding_now = 0 \ No newline at end of file diff --git a/objects/obj_album_ui/Draw_73.gml b/objects/obj_album_ui/Draw_73.gml index 295d3108..30c75f0d 100644 --- a/objects/obj_album_ui/Draw_73.gml +++ b/objects/obj_album_ui/Draw_73.gml @@ -646,6 +646,11 @@ if instance_exists(code) { global.t_selected_difficulty = 1 } + + if (string_pos("(Hardcore)", global.stage_map_difficulty[code.n_stage]) != 0) + { + global.t_selected_difficulty = 0 + } } else if (global.notice_title == "잠시만요!") { @@ -740,6 +745,7 @@ if instance_exists(code) global.t_b_alpha = -0.01 global.unlocked_music_name_new_list_rightside[0] = ""; global.notice_title_sub = "" + global.notice_title = "" code.gamestart = 0 } } diff --git a/objects/obj_album_ui/Step_2.gml b/objects/obj_album_ui/Step_2.gml index b4120f15..1104170c 100644 --- a/objects/obj_album_ui/Step_2.gml +++ b/objects/obj_album_ui/Step_2.gml @@ -32,14 +32,7 @@ if (global.select_difficulty = 0 && global.show_new_songs <= 0) } else if (mouse_check_button_released(mb_left) && point_distance(mouse_x,mouse_y,global.c_x+104,global.c_y+920) < 80) || keyboard_check_pressed(vk_tab) { - if (global.nickname != "") - { - if global.sync_setting <= 0 && global.character_setting <= 0 - { - code.automatic_reload_leaderboard = 1 - } - } - else + if (global.nickname == "") { global.notice_title = "잠시만요!"; global.notice_title_sub = "온라인 랭킹에 사용할 이름을 설정해주세요!"; @@ -55,5 +48,10 @@ if (global.select_difficulty = 0 && global.show_new_songs <= 0) global.show_new_songs = 1; global.new_unlocked_map_num = 4; } + else + { + code.automatic_reload_leaderboard = 1 + global.open_ranking = 1; + } } }