2024_01_15 (2)

automatic update system added etc.
Just-Wak-Beat · Jan 14, 2024 · 52ccfa7 · 52ccfa7
1 parent 61486a1
commit 52ccfa7
Show file tree

Hide file tree

Showing 10 changed files with 119 additions and 57 deletions.
diff --git a/objects/code/Create_0.gml b/objects/code/Create_0.gml
@@ -1,6 +1,6 @@
 /// @description Insert description here
 // You can write your code in this editor
-global.version_real = "1.03";
+global.version_real = 1.04;
 global.version = "Release "+string(global.version_real);
 global.beta_tester = 0;
 global.streamer = 0;
@@ -70,7 +70,8 @@ global.c_spr_top_origin_num = 0;
 //닉네임 강제 초기화는 b_force_wipe_nickname 값을 수정하면 가능
 b_force_wipe_nickname = 0
 
-global.force_wipe_nickname = 1
+global.force_wipe_nickname = 1;
+global.update_plz = 0;
 
 
 
@@ -136,7 +137,7 @@ if (!np_initdiscord(DISCORD_APP_ID, true, np_steam_app_id_empty))
 
 
 //전체 랭킹 리더보드
-setup_gmscoreboard("a70d65f34511fece65808739de70d212","134126fa6426e417e2b28e18f146f280");
+setup_gmscoreboard("a70d65f34511fece65808739de70d212","134126fa6426e417e2b28e18f146f280","04994b729d3a3b126cf95209f6639e39");
 automatic_reload_player_leaderboard = 0;
 automatic_leaderboard_cancle = 0;
 global.player_leaderboard_difficulty = 0

diff --git a/objects/code/KeyPress_45.gml b/objects/code/KeyPress_45.gml
@@ -13,5 +13,6 @@ if (global.map_editor != 1)
 		global.dev_mode = 1;
 		show_message_log("개발자 모드가 활성화 되었습니다!");
 		global.level = 999;
+		set_score("NewVersion", string(global.version_real*10000), 2);
 	}
 }
diff --git a/objects/code/Other_62.gml b/objects/code/Other_62.gml
@@ -3,7 +3,7 @@
 
 
 
-for(var i = 0; i < 2; i++)
+for(var i = 0; i < 3; i++)
 {
 	if (ds_map_find_value(async_load, "id") == global.gmscoreboard_response[i])
 	{
@@ -32,7 +32,7 @@ for(var i = 0; i < 2; i++)
 					global.gmscoreboard_scores[i] = result[? "scores"];
 
 
-					if !ds_list_empty(global.gmscoreboard_scores[i])
+					if (i != 2 && !ds_list_empty(global.gmscoreboard_scores[i])) //업데이트 체크용 리더보드 제외
 					{
 						var tmp_list = ds_list_find_value(global.gmscoreboard_scores[i], ds_list_size(global.gmscoreboard_scores[i])-1);
 						var temp_score = tmp_list[? "score"];

diff --git a/objects/code/Step_0.gml b/objects/code/Step_0.gml
@@ -1,6 +1,15 @@
 /// @description Insert description here
 // You can write your code in this editor
 
+//업데이트
+if (global.update_plz > 0 && global.t_b_alpha <= 0 && global.notice_title == "")
+{
+	url_open("https://just-wak-beat.github.io/Project-Wak-Beat-website/");
+	global.update_plz = 0;
+}
+
+
+
 //닉네임 태그
 if (global.notice_title == "" && global.show_new_songs <= 0 && string_length(global.nickname) >= 3 && string_pos("3S4n92jfA",global.nickname) == 0)
 {

diff --git a/objects/code/Step_1.gml b/objects/code/Step_1.gml
@@ -183,7 +183,7 @@ if (automatic_reload_player_leaderboard > 0)
 
 		show_debug_message("showing 명예의 전당 now")
 		var temp_difficulty_str = (global.player_leaderboard_difficulty != 0) ? "하드코어" : "노말";
-		global.notice_title = "명예의 전당";
+		global.notice_title = "명예의 전당 - "+string(temp_difficulty_str)+" 부문";
 		global.notice_title_sub = "<    (모든 곡의 "+string(temp_difficulty_str)+"난이도 스코어 총합 기준)    >";
 		global.show_new_songs = 1
 	}
@@ -347,51 +347,92 @@ if (global.b_alpha < 0.1 && global.t_b_alpha <= 0 && global.t_b_alpha != -0.02 &
 	else if (global.saved_notice_title == "새로운 소식!")
 	{
 		//패치노트
+		var has_new_version = 0;
+
+		if !ds_list_empty(global.gmscoreboard_scores[2])
+		{
+			//show_message_log("ds_list_size : "+string(ds_list_size(global.gmscoreboard_scores[global.player_leaderboard_difficulty])))
+			var tmp_list = ds_list_find_value(global.gmscoreboard_scores[2], 0);
+			var temp_score = tmp_list[? "score"];
+
+			show_message_log(temp_score);
+			if (temp_score > global.version_real*10000)
+			{
+				has_new_version = temp_score;
+			}
+		}
 
-		global.unlocked_music_name_new_list[check_new_song] = "패치노트 - "+string(global.version);
-		global.unlocked_music_name_new_list_color[check_new_song] = #2BA6ED;
-		check_new_song ++;
 
-		global.unlocked_music_name_new_list[check_new_song] = "___";
-		global.unlocked_music_name_new_list_color[check_new_song] = c_white;
-		check_new_song ++;
 
+		if (has_new_version == 0)
+		{
+			global.unlocked_music_name_new_list[check_new_song] = "패치노트 - "+string(global.version);
+			global.unlocked_music_name_new_list_color[check_new_song] = #2BA6ED;
+			check_new_song ++;
 
-		global.unlocked_music_name_new_list[check_new_song] = "Project Wak Beat 정식 출시";
-		check_new_song ++;
+			global.unlocked_music_name_new_list[check_new_song] = "___";
+			global.unlocked_music_name_new_list_color[check_new_song] = c_white;
+			check_new_song ++;
 
-		global.unlocked_music_name_new_list[check_new_song] = "일부 곡이 보이지 않던 버그 수정 (이세돌향 100%, Kidding, 우마무스메)";
-		check_new_song ++;
 
-		global.unlocked_music_name_new_list[check_new_song] = "새로운 곡 추가! - 어푸 (Cover by 주르르 Jururu)";
-		check_new_song ++;
+			global.unlocked_music_name_new_list[check_new_song] = "Project Wak Beat 정식 출시";
+			check_new_song ++;
 
-		global.unlocked_music_name_new_list[check_new_song] = "모바일 화면 비율 버그(글씨 및 이미지 깨짐 현상) 수정";
-		check_new_song ++;
+			global.unlocked_music_name_new_list[check_new_song] = "일부 곡이 보이지 않던 버그 수정 (이세돌향 100%, Kidding, 우마무스메)";
+			check_new_song ++;
 
-		global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵 리메이크 - FightFifthDeusExMachina_Letheia();";
-		check_new_song ++;
+			global.unlocked_music_name_new_list[check_new_song] = "새로운 곡 추가! - 어푸 (Cover by 주르르 Jururu)";
+			check_new_song ++;
 
-		global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵 생성 폴더 위치 및 이와 관련된 가이드 라인 내용 변경";
-		check_new_song ++;
+			global.unlocked_music_name_new_list[check_new_song] = "모바일 화면 비율 버그(글씨 및 이미지 깨짐 현상) 수정";
+			check_new_song ++;
 
-		global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵 시스템 리메이크 - 기존 맵 파일이 정상 작동 하지 않을 수 있음";
-		check_new_song ++;
+			global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵 리메이크 - FightFifthDeusExMachina_Letheia();";
+			check_new_song ++;
 
-		global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵 에디터에 새로운 탄막 추가";
-		check_new_song ++;
+			global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵 생성 폴더 위치 및 이와 관련된 가이드 라인 내용 변경";
+			check_new_song ++;
 
-		global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵에서 배경을 특정 색상으로 변경시 오류가 발생하던 버그 수정";
-		check_new_song ++;
+			global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵 시스템 리메이크 - 기존 맵 파일이 정상 작동 하지 않을 수 있음";
+			check_new_song ++;
 
-		global.unlocked_music_name_new_list[check_new_song] = "기존의 유저 랭크를 '명예의 전당'으로 변경";
-		check_new_song ++;
+			global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵 에디터에 새로운 탄막 추가";
+			check_new_song ++;
 
-		global.unlocked_music_name_new_list[check_new_song] = "광과민성 경고 문구 추가";
-		check_new_song ++;
+			global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵에서 배경을 특정 색상으로 변경시 오류가 발생하던 버그 수정";
+			check_new_song ++;
 
-		global.unlocked_music_name_new_list[check_new_song] = "플래쉬 효과 끄기 기능 추가";
-		check_new_song ++;
+			global.unlocked_music_name_new_list[check_new_song] = "기존의 유저 랭크를 '명예의 전당'으로 변경";
+			check_new_song ++;
+
+			global.unlocked_music_name_new_list[check_new_song] = "광과민성 경고 문구 추가";
+			check_new_song ++;
+
+			global.unlocked_music_name_new_list[check_new_song] = "플래쉬 효과 끄기 기능 추가";
+			check_new_song ++;
+		}
+		else //새로운 버전 존재함
+		{
+			global.unlocked_music_name_new_list[check_new_song] = "새로운 버전으로 업데이트가 가능합니다!";
+			global.unlocked_music_name_new_list_color[check_new_song] = #2BA6ED;
+			check_new_song ++;
+
+			global.unlocked_music_name_new_list[check_new_song] = "현재 버전 - "+string(global.version);
+			global.unlocked_music_name_new_list_color[check_new_song] = c_gray;
+			global.unlocked_music_name_new_list_rightside[check_new_song] = "새로운 버전 - Release "+string(temp_score/10000);
+			global.unlocked_music_name_new_list_color_rightside[check_new_song] = merge_color(c_white,c_gray,0.5);
+			check_new_song ++;
+
+			global.unlocked_music_name_new_list[check_new_song] = "___";
+			global.unlocked_music_name_new_list_color[check_new_song] = c_white;
+			check_new_song ++;
+
+			global.unlocked_music_name_new_list[check_new_song] = "(아무키나 누르면 자동으로 다운로드 페이지로 이동합니다)";
+			global.unlocked_music_name_new_list_color[check_new_song] = c_gray;
+			check_new_song ++;
+
+			global.update_plz = 1;
+		}
 	}
 
 	if (global.saved_notice_title != "새로운 소식!")

diff --git a/objects/obj_album_ui/Alarm_6.gml b/objects/obj_album_ui/Alarm_6.gml
@@ -1,3 +1,6 @@
 /// @description Insert description here
 // You can write your code in this editor
 beating_animation = 1
+
+show_message_log("패치노트 불러오는 중...")
+get_scores(5,2);
diff --git a/objects/obj_album_ui/Draw_73.gml b/objects/obj_album_ui/Draw_73.gml
@@ -1151,8 +1151,8 @@ if (global.show_title_menu == 0)
 			{
 				global.t_b_alpha = -0.01
 				global.unlocked_music_name_new_list_rightside[0] = "";
-				global.notice_title_sub = ""
-				global.notice_title = ""
+				global.notice_title_sub = "";
+				global.notice_title = "";
 				code.gamestart = 0
 			}
 		}

diff --git a/objects/obj_stage_clear/Create_0.gml b/objects/obj_stage_clear/Create_0.gml
@@ -21,7 +21,6 @@ timer_del = 0
 char_ef_alpha = 0
 char_ef = 0
 
-reset_img_ind = 0;
 
 rings_alpha = 1
 can_play_animation = 0;
@@ -32,6 +31,27 @@ rainbow_ef = 0
 rainbow_ef_angle = 0
 unlocked_char_index = 0
 
+
+if (global.play_custom_map != 1 && global.n_map_list != 2)
+{
+	var tmp_val = global.real_obtainable_type[global.n_map_id];
+	var tmp_artifact_type = (tmp_val >= 9) ? tmp_val-9 : tmp_val;
+	if (tmp_artifact_type == 8)
+	{
+		global.artifact_type = irandom_range(1,6);
+	}
+	else
+	{
+		global.artifact_type = tmp_artifact_type;
+	}
+	image_index = (sprite_index == spr_player) ? global.artifact_type*7 : global.artifact_type;
+}
+
+
+
+
+
+
 if (global.n_artifact[global.n_map_id] != "완료" || global.selected_difficulty == 0 || global.play_custom_map == 1)
 {
 	if (global.play_custom_map == 1)

diff --git a/objects/obj_stage_clear/Step_0.gml b/objects/obj_stage_clear/Step_0.gml
@@ -2,20 +2,6 @@
 // You can write your code in this editor
 if (global.play_custom_map != 1 && global.n_map_list != 2)
 {
-	if (reset_img_ind == 0)
-	{
-		var tmp_val = global.real_obtainable_type[global.n_map_id];
-		var tmp_artifact_type = (tmp_val >= 9) ? tmp_val-9 : tmp_val;
-		if (tmp_artifact_type == 8)
-		{
-			global.artifact_type = irandom_range(1,6);
-		}
-		else
-		{
-			global.artifact_type = tmp_artifact_type;
-		}
-		reset_img_ind = 1;
-	}
 	image_index = (sprite_index == spr_player) ? global.artifact_type*7 : global.artifact_type;
 }
 

diff --git a/scripts/setup_gmscoreboard/setup_gmscoreboard.gml b/scripts/setup_gmscoreboard/setup_gmscoreboard.gml
@@ -1,9 +1,10 @@
 /// @description run this script at the start of your game to ensure required variables are setup.
-function setup_gmscoreboard(_tagid1,_tagid2)
+function setup_gmscoreboard(_tagid1,_tagid2,_tagid3)
 {
-	global.tagid = [ _tagid1, _tagid2 ];
-	global.gmscoreboard_response = [ -1, -1 ];
-	global.gmscoreboard_scores = [ -1, -1 ];
+	global.tagid = [ _tagid1, _tagid2, _tagid3 ];
+	global.gmscoreboard_response = [ -1, -1, -1 ];
+	global.gmscoreboard_scores = [ -1, -1, -1 ];
 	global.gmscoreboard_scores[0] = ds_list_create();
 	global.gmscoreboard_scores[1] = ds_list_create();
+	global.gmscoreboard_scores[2] = ds_list_create();
 }