2023_10_22

minor bug fixed
new sound effects added

objects/code/Alarm_3.gml

@@ -1,12 +1,14 @@
 /// @description automaticLoadPlayerRanking
 // You can write your code in this editor
-
-if (automatic_reload_player_leaderboard == 0)
+if (global.cannot_connect < 20)
 {
-	global.player_leaderboard_difficulty = 1;
-	automatic_reload_player_leaderboard = 2;
-}
-else
-{
-	alarm[3] = 1;
+	if (automatic_reload_player_leaderboard == 0)
+	{
+		global.player_leaderboard_difficulty = 1;
+		automatic_reload_player_leaderboard = 2;
+	}
+	else
+	{
+		alarm[3] = 1;
+	}
 }

objects/code/Create_0.gml

@@ -20,6 +20,7 @@ global.title_menu_animation1 = 0;
 global.title_menu_animation2 = 0;
 global.overtime_highlight_song = 1;
 global.automatic_load_ranking = 0;
+global.cannot_connect = 0;
 global.show_credit = 1;
 global.beta_tester = 0;
 global.tutorial_played = 0;
@@ -786,16 +787,16 @@ global.unlocked_player_skin_require_num[2] = "아무 곡이나 대쉬를 사용
 global.unlocked_player_skin_name[3] = "우왁굳 (왁굳향100%)"
 global.unlocked_player_skin_require_type[3] = 0;
 global.unlocked_player_skin_require_num[3] = global.max_artifact_owned[0];
-global.unlocked_player_skin_name[4] = "아이네"
+global.unlocked_player_skin_name[4] = "아잉네"
 global.unlocked_player_skin_require_type[4] = 1;
 global.unlocked_player_skin_require_num[4] = global.max_artifact_owned[1];
-global.unlocked_player_skin_name[5] = "아이네 (엔젤)"
+global.unlocked_player_skin_name[5] = "아잉네 (엔젤)"
 global.unlocked_player_skin_require_type[5] = 1;
 global.unlocked_player_skin_require_num[5] = global.max_artifact_owned[1];
-global.unlocked_player_skin_name[6] = "아이네 (산타)"
+global.unlocked_player_skin_name[6] = "아잉네 (산타)"
 global.unlocked_player_skin_require_type[6] = 1;
 global.unlocked_player_skin_require_num[6] = global.max_artifact_owned[1];
-global.unlocked_player_skin_name[7] = "아이네 (후드)"
+global.unlocked_player_skin_name[7] = "아잉네 (후드)"
 global.unlocked_player_skin_require_type[7] = 1;
 global.unlocked_player_skin_require_num[7] = global.max_artifact_owned[1]+2;
 global.unlocked_player_skin_name[8] = "비챤"

objects/code/KeyPress_116.gml

@@ -2,6 +2,8 @@
 // You can write your code in this editor
 if (global.dev_mode == 1)
 {
+	obj_album_ui.result_alpha1 = 0
+	obj_album_ui.result_alpha2 = 0
 	var check_new_song = 0;
 	global.notice_title = "Result";
 	var temp_highscore = (global.t_selected_difficulty == 1) ? global.real_n_score[global.n_map_id] : global.real_n_score_hardcore[global.n_map_id];

objects/code/Step_1.gml

@@ -80,12 +80,30 @@ else
 	}
 }
 
+if (automatic_reload_leaderboard <= 0 && automatic_reload_player_leaderboard <= 0)
+{
+	if (global.cannot_connect > 0)
+	{
+		global.cannot_connect -= 0.05;
+	}
+}
+else
+{
+	if (global.cannot_connect >= 20)
+	{
+		automatic_reload_leaderboard = 0;
+		automatic_reload_player_leaderboard = 0;
+		show_message_log("온라인 서버에 연결할 수 없습니다. 잠시 후 다시 시도 해주세요. ("+string(round(1+(global.cannot_connect-10)/3))+"s)");
+	}
+}
+
 
 //자동 리로드 플레이어 전체 리더보드
 if (automatic_reload_player_leaderboard > 0)
 {
 	if (automatic_reload_player_leaderboard == 1)
 	{
+		global.cannot_connect += 1+global.cannot_connect;
 		show_message_log("온라인 서버 연결 중...");
 		for(var i = 0; i < global.total_map; i++)
 		{
@@ -195,6 +213,7 @@ if (automatic_reload_leaderboard > 0)
 
 	if (automatic_reload_leaderboard == 2)
 	{
+		global.cannot_connect += 1+global.cannot_connect;
 		show_message_log("온라인 서버 연결 중...");
 
 		for(var i = 0; i < global.total_map; i++)

objects/obj_album_ui/Create_0.gml

@@ -65,4 +65,8 @@ rank_temp_val2 = 0
 //tutorial_key_animation
 anime_tuto_key_timer = 0
 anime_tuto_key1_alpha = 0
-anime_tuto_key2_alpha = 0
+anime_tuto_key2_alpha = 0
+
+//result alpha
+result_alpha1 = 0;
+result_alpha2 = 0;

objects/obj_album_ui/Draw_73.gml

@@ -738,18 +738,30 @@ if instance_exists(code)
 
 			if (global.show_new_songs > 60)
 			{
-				global.n_progress_artifact += (tmp_val+0.01 - global.n_progress_artifact)*0.1
-				global.n_progress_artifact = (global.n_progress_artifact > 1) ? 1 : global.n_progress_artifact;
-			}
-			else
-			{
-				global.n_progress_artifact = 0;
+				result_alpha1 += (1 - result_alpha1)*0.1
+				if (result_alpha1 < 0.999)
+				{
+					if (!audio_is_playing(setting_scroll_sfx))
+					{
+						audio_play_sound(setting_scroll_sfx,0,false,global.master_volume*global.sfx_volume*32)
+					}
+				}
+
+				if (result_alpha1 > 0)
+				{
+					global.n_progress_artifact += (tmp_val+0.01 - global.n_progress_artifact)*0.1
+					global.n_progress_artifact = (global.n_progress_artifact > 1) ? 1 : global.n_progress_artifact;
+				}
+				else
+				{
+					global.n_progress_artifact = 0;
+				}
 			}
 
-			draw_sprite_ext(spr_W,tmp_art_type,middle_xx-1760*0.7*0.5*global.font_ratio_resolution_xx+64,yy+yy_h*0.72-global.new_song_scroll,0.2*global.font_ratio_resolution_xx,0.2,0,c_white,global.show_new_songs/100)
-			draw_text_k_scale(middle_xx-1760*0.7*0.5*global.font_ratio_resolution_xx+128,yy+yy_h*0.7-global.new_song_scroll,"아티팩트 수집률 ("+string(floor(global.n_progress_artifact*100))+"%)",scale*48,-1,global.show_new_songs/100,c_white,0,-1,normal_font,0.35*global.font_ratio_resolution_xx*scale,0.35*scale,0)
-			draw_sprite_ext(spr_level_bar,0,middle_xx-1760*0.7*0.5*global.font_ratio_resolution_xx,yy+yy_h*0.75-global.new_song_scroll,global.font_ratio_resolution_xx*0.7,0.5,0,#171628,global.show_new_songs/100)
-			draw_sprite_part_ext(spr_level_bar,0,0,0,global.n_progress_artifact*1760,64,middle_xx-1760*0.5*0.7*global.font_ratio_resolution_xx,yy+yy_h*0.75-global.new_song_scroll,global.font_ratio_resolution_xx*0.7,0.5,color_table[tmp_art_type],global.show_new_songs/160)
+			draw_sprite_ext(spr_W,tmp_art_type,middle_xx-1760*0.7*0.5*global.font_ratio_resolution_xx+64,yy+yy_h*0.72-global.new_song_scroll,0.2*global.font_ratio_resolution_xx,0.2,0,c_white,result_alpha1)
+			draw_text_k_scale(middle_xx-1760*0.7*0.5*global.font_ratio_resolution_xx+128,yy+yy_h*0.7-global.new_song_scroll,"아티팩트 수집률 ("+string(floor(global.n_progress_artifact*100))+"%)",scale*48,-1,result_alpha1,c_white,0,-1,normal_font,0.35*global.font_ratio_resolution_xx*scale,0.35*scale,0)
+			draw_sprite_ext(spr_level_bar,0,middle_xx-1760*0.7*0.5*global.font_ratio_resolution_xx,yy+yy_h*0.75-global.new_song_scroll,global.font_ratio_resolution_xx*0.7,0.5,0,#171628,result_alpha1)
+			draw_sprite_part_ext(spr_level_bar,0,0,0,global.n_progress_artifact*1760,64,middle_xx-1760*0.5*0.7*global.font_ratio_resolution_xx,yy+yy_h*0.75-global.new_song_scroll,global.font_ratio_resolution_xx*0.7,0.5,color_table[tmp_art_type],result_alpha1)
 
 
 
@@ -773,20 +785,24 @@ if instance_exists(code)
 
 			if (can_show_top_ten == 1)
 			{	
-				if (global.show_new_songs > 60)
-				{
-					global.n_progress_score += (tmp_val2+0.01 - global.n_progress_score)*0.1
-					global.n_progress_score = (global.n_progress_score > 1) ? 1 : global.n_progress_score;
-				}
-				else
+				if (result_alpha1 > 0.7)
 				{
-					global.n_progress_score = 0;
+					result_alpha2 += (1 - result_alpha2)*0.1
+					if (result_alpha2 > 0)
+					{
+						global.n_progress_score += (tmp_val2+0.01 - global.n_progress_score)*0.1
+						global.n_progress_score = (global.n_progress_score > 1) ? 1 : global.n_progress_score;
+					}
+					else
+					{
+						global.n_progress_score = 0;
+					}
 				}
 
-				draw_sprite_ext(spr_star,tmp_art_type,middle_xx-1760*0.7*0.5*global.font_ratio_resolution_xx+64,yy+yy_h*0.82-global.new_song_scroll,0.18*global.font_ratio_resolution_xx,0.18,0,c_white,global.show_new_songs/100)
-				draw_text_k_scale(middle_xx-1760*0.7*0.5*global.font_ratio_resolution_xx+128,yy+yy_h*0.8-global.new_song_scroll,string(tmp_str2),scale*48,-1,global.show_new_songs/100,c_white,0,-1,normal_font,0.35*global.font_ratio_resolution_xx*scale,0.35*scale,0)
-				draw_sprite_ext(spr_level_bar,0,middle_xx-1760*0.7*0.5*global.font_ratio_resolution_xx,yy+yy_h*0.85-global.new_song_scroll,global.font_ratio_resolution_xx*0.7,0.5,0,#171628,global.show_new_songs/100)
-				draw_sprite_part_ext(spr_level_bar,0,0,0,global.n_progress_score*1760,64,middle_xx-1760*0.5*0.7*global.font_ratio_resolution_xx,yy+yy_h*0.85-global.new_song_scroll,global.font_ratio_resolution_xx*0.7,0.5,$FF56D2FF,global.show_new_songs/160)
+				draw_sprite_ext(spr_star,tmp_art_type,middle_xx-1760*0.7*0.5*global.font_ratio_resolution_xx+64,yy+yy_h*0.82-global.new_song_scroll,0.18*global.font_ratio_resolution_xx,0.18,0,c_white,result_alpha2)
+				draw_text_k_scale(middle_xx-1760*0.7*0.5*global.font_ratio_resolution_xx+128,yy+yy_h*0.8-global.new_song_scroll,string(tmp_str2),scale*48,-1,result_alpha2,c_white,0,-1,normal_font,0.35*global.font_ratio_resolution_xx*scale,0.35*scale,0)
+				draw_sprite_ext(spr_level_bar,0,middle_xx-1760*0.7*0.5*global.font_ratio_resolution_xx,yy+yy_h*0.85-global.new_song_scroll,global.font_ratio_resolution_xx*0.7,0.5,0,#171628,result_alpha2)
+				draw_sprite_part_ext(spr_level_bar,0,0,0,global.n_progress_score*1760,64,middle_xx-1760*0.5*0.7*global.font_ratio_resolution_xx,yy+yy_h*0.85-global.new_song_scroll,global.font_ratio_resolution_xx*0.7,0.5,$FF56D2FF,result_alpha2)
 			}
 		}
 

objects/obj_album_ui/Step_2.gml

@@ -53,7 +53,14 @@ if (global.select_difficulty == 0 && global.show_new_songs <= 0 && global.unlock
 			}
 			else
 			{
-				code.automatic_reload_leaderboard = 1;
+				if (global.cannot_connect >= 10)
+				{
+					show_message_log("온라인 서버에 연결할 수 없습니다. 잠시 후 다시 시도 해주세요. ("+string(round(1+(global.cannot_connect-10)/3))+"s)");
+				}
+				else
+				{
+					code.automatic_reload_leaderboard = 1;
+				}
 			}
 		}
 		else if (global.n_map_id >= 0 && global.show_new_songs <= 0 && global.sync_setting != 1 && global.character_setting != 1 && ((mouse_check_button_released(mb_left) && point_distance(mouse_x,mouse_y,global.c_x+104,global.c_y+910) < 80) || keyboard_check_pressed(ord("Q"))))
@@ -64,8 +71,15 @@ if (global.select_difficulty == 0 && global.show_new_songs <= 0 && global.unlock
 			}
 			else
 			{
-				global.automatic_load_ranking = 0;
-				code.automatic_reload_player_leaderboard = 1;
+				if (global.cannot_connect >= 10)
+				{
+					show_message_log("온라인 서버에 연결할 수 없습니다. 잠시 후 다시 시도 해주세요. ("+string(round(1+(global.cannot_connect-10)/3))+"s)");
+				}
+				else
+				{
+					global.automatic_load_ranking = 0;
+					code.automatic_reload_player_leaderboard = 1;
+				}
 			}
 		}
 	}