2023_07_27

fixed minor bugs etc.
Just-Wak-Beat · Jul 27, 2023 · 1367f14 · 1367f14
1 parent 6f26b4f
commit 1367f14
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 48 deletions.
diff --git a/objects/code/Create_0.gml b/objects/code/Create_0.gml
@@ -1,9 +1,9 @@
 /// @description Insert description here
 // You can write your code in this editor
-global.version_real = "3.2";
+global.version_real = "4.0";
 global.version = "Beta "+string(global.version_real);
 global.low_graphics = false;
-global.dev_mode = 1
+global.dev_mode = 0
 global.mobile_mode = (os_type == 0) ? 0 : 1;
 global.font_ratio_resolution_xx = 1
 global.custom_map_directory = string(program_directory)+"\\Custom map files\\";

diff --git a/objects/obj_album_ui/Alarm_1.gml b/objects/obj_album_ui/Alarm_1.gml
@@ -0,0 +1,9 @@
+/// @description Insert description here
+// You can write your code in this editor
+
+
+
+
+LootLockerSetPlayerName(string(rank_temp_val1));
+LootLockerSubmitScore("Most_played_map",real(rank_temp_val2));
+LootLockerSetPlayerName(string(rank_temp_val1));
diff --git a/objects/obj_album_ui/Alarm_10.gml b/objects/obj_album_ui/Alarm_10.gml
@@ -1,4 +1,4 @@
-/// @description Insert description here
+/// @description 처음 알림 메시지
 // You can write your code in this editor
 global.title_menu_animation1++
 
@@ -9,51 +9,22 @@ if (global.title_menu_animation1 >= 3)
 	global.title_menu_animation1 = -1
 
 
-	global.notice_title = "Just Wak & Beats 테스터 참여 감사합니다!";
+	global.notice_title = "조작법 가이드";
 	global.show_new_songs = 1;
 
 	var check_new_song = 0
 
 	//공지사항 메시지
-	global.unlocked_music_name_new_list[check_new_song] = "피드백 해주실 내용은 다음과 같습니다"
-	global.unlocked_music_name_new_list_color[check_new_song] = #c54a3d;
-	check_new_song ++
-
-
-	global.unlocked_music_name_new_list[check_new_song] = "- 버그"
+	global.unlocked_music_name_new_list[check_new_song] = (global.mobile_mode == 0) ? "키보드 방향키 - 선택" : "화면 스크롤 - 선택"
 	global.unlocked_music_name_new_list_color[check_new_song] = c_white;
 	check_new_song ++
 
-
-	global.unlocked_music_name_new_list[check_new_song] = "- 게임 랙 (혹시 랙이 있다면 PC/모바일 중 어떤건지 말씀해주세요)"
-	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_white;
-	check_new_song ++
-
-
-	global.unlocked_music_name_new_list[check_new_song] = "- 가장 재미있었던 맵 / 가장 지루했던 맵 (여러개 중복 가능해요!)"
+	global.unlocked_music_name_new_list[check_new_song] = (global.mobile_mode == 0) ? "Enter혹은 Space - 확인" : "화면 터치 - 확인"
 	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_white;
-	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] = "모든 피드백은 DM으로 주세요!"
-	global.unlocked_music_name_new_list_color[check_new_song] = #5595ff;
-	check_new_song ++
-
 
 	global.new_unlocked_map_num = check_new_song;
 }

diff --git a/objects/obj_album_ui/Create_0.gml b/objects/obj_album_ui/Create_0.gml
@@ -12,7 +12,7 @@ w_alpha = 0
 global.tutorial_n_stage = 0
 angle_moving = 0
 angle_moving_timer = 0
-
+//global.story_mode = 1
 n_shake_power = 0
 clicked_ = 0
 w_alpha_bg = 0
@@ -46,4 +46,10 @@ global.open_ranking = 0
 
 holding_now = 0
 
-keyboard_input_display = 0
+keyboard_input_display = 0
+
+
+
+//ranking
+rank_temp_val1 = 0
+rank_temp_val2 = 0
diff --git a/objects/obj_album_ui/Draw_73.gml b/objects/obj_album_ui/Draw_73.gml
@@ -90,7 +90,7 @@ if (global.n_map_list != 2)
 	draw_sprite_ext(spr_heart,global.player_skin,global.c_x+100,global.c_y+910+16,0.17*global.font_ratio_resolution_xx,0.17,0,c_black,0.3*ui_alpha__cal)
 	draw_sprite_ext(spr_heart,global.player_skin,global.c_x+100,global.c_y+910,0.17*global.font_ratio_resolution_xx,0.17,0,c_white,ui_alpha__cal)
 
-	if (global.real_stage_map_difficulty[global.n_map_id] != "Tutorial")
+	if (global.n_map_id >= 0 && global.real_stage_map_difficulty[global.n_map_id] != "Tutorial")
 	{
 		draw_text_k_scale(global.c_x+104,global.c_y+1210,"Ranking"+((global.mobile_mode == 1) ? "" : "\n[Tab]"),80,-1,ui_alpha__cal,c_white,0,0,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0)
 		draw_sprite_ext(spr_star,global.player_skin,global.c_x+100,global.c_y+1170+16,0.17*global.font_ratio_resolution_xx,0.17,0,c_black,0.3*ui_alpha__cal)
@@ -679,7 +679,7 @@ if instance_exists(code)
 					global.t_selected_difficulty = 1
 				}
 
-				if (string_pos("(Hardcore)", global.stage_map_difficulty[code.n_stage]) != 0)
+				if (code.n_stage >= 0 && string_pos("(Hardcore)", global.stage_map_difficulty[code.n_stage]) != 0)
 				{
 					global.t_selected_difficulty = 0
 				}
@@ -693,7 +693,7 @@ if instance_exists(code)
 					draw_line_width(global.c_x,yy+yy_h*0.55,global.c_x+global.c_w*(holding_now/180),yy+yy_h*0.55,15)
 				}
 
-				if (keyboard_check_pressed(vk_escape))
+				if (keyboard_check_pressed(vk_escape) || (global.mobile_mode == 1 && keyboard_check_pressed(vk_backspace)))
 				{
 					global.t_b_alpha = -0.02
 					code.gamestart = 5
@@ -731,14 +731,14 @@ if instance_exists(code)
 
 						if (global.mobile_mode == 1 && (keyboard_string == "\n" || keyboard_string == "\r"))
 						{
-							global.nickname = string_delete(global.nickname,string_length(global.nickname)-1,1);
+							global.nickname = string_delete(global.nickname,string_length(global.nickname),1);
 							keyboard_input_display = 999
 							keyboard_virtual_hide()
 						}
 
 						if (keyboard_string == "\b")
 						{
-							global.nickname = string_delete(global.nickname,string_length(global.nickname)-1,1);
+							global.nickname = string_delete(global.nickname,string_length(global.nickname),1);
 						}
 
 						keyboard_string = "";
@@ -763,7 +763,6 @@ if instance_exists(code)
 					global.t_b_alpha = -0.02
 					code.gamestart = 5
 					alarm[4] = 30
-					global.nickname = keyboard_string;
 					holding_now = -1
 				}
 			}

diff --git a/objects/obj_album_ui/Other_11.gml b/objects/obj_album_ui/Other_11.gml
@@ -55,7 +55,7 @@ if (global.nickname != "")
 	{
 		temp_nickname = temp_nickname+"[*_ABER]1";
 	}
-	LootLockerSetPlayerName(string(temp_nickname));
-	LootLockerSubmitScore("Most_played_map",real(most_played_index));
-	LootLockerSetPlayerName(string(temp_nickname));
+	rank_temp_val1 = temp_nickname
+	rank_temp_val2 = most_played_index
+	alarm[1] = 600
 }
diff --git a/objects/obj_album_ui/obj_album_ui.yy b/objects/obj_album_ui/obj_album_ui.yy
diff --git a/objects/obj_stage_clear/Step_0.gml b/objects/obj_stage_clear/Step_0.gml
@@ -110,6 +110,7 @@ var yy_h__ = camera_get_view_height(view_camera[0])
 				image_angle = 360*choose(-1,1)
 				t_speed = 10
 				w_alpha = 1
+
 				if (point_distance(x,y,room_width*0.5,room_height*0.5) > 200)
 				{
 					var tmp = point_direction(x,y,room_width*0.5,room_height*0.5);

diff --git a/objects/obj_stage_clear/Step_1.gml b/objects/obj_stage_clear/Step_1.gml
@@ -67,6 +67,8 @@
 		if (image_angle > 300)
 		{
 			global.t_w_alpha += 0.01;
+			w_alpha += 0.1;
+			obj_player.w_alpha += 0.1;
 		}
 
 

diff --git a/...es/tutorial_part4_timeline/moment_954.gml → ...es/tutorial_part4_timeline/moment_894.gml b/...es/tutorial_part4_timeline/moment_954.gml → ...es/tutorial_part4_timeline/moment_894.gml
diff --git a/...s/tutorial_part4_timeline/moment_1021.gml → ...es/tutorial_part4_timeline/moment_961.gml b/...s/tutorial_part4_timeline/moment_1021.gml → ...es/tutorial_part4_timeline/moment_961.gml
diff --git a/timelines/tutorial_part4_timeline/tutorial_part4_timeline.yy b/timelines/tutorial_part4_timeline/tutorial_part4_timeline.yy