2023_12_04

minor bug fixed
editor mode bug fixed
etc.

objects/code/Create_0.gml

@@ -1,6 +1,6 @@
 /// @description Insert description here
 // You can write your code in this editor
-global.version_real = "6.0";
+global.version_real = "6.1";
 global.version = "Beta "+string(global.version_real);
 global.beta_tester = 1
 surf_screen = -4;

objects/hitbox_2/Create_0.gml

@@ -7,6 +7,7 @@ image_speed = 0
 timer = 0
 des = 0
 center_destroy = 0
+des_timer = 0
 event_user(11)
 
 

objects/hitbox_2/Step_0.gml

@@ -21,6 +21,25 @@ if (global.timeline_stop != 1)
 	{
 		speed = 50
 	}
+
+	if (variable_instance_exists(id,"m_data_arg6"))
+	{
+		des_timer++;
+		if (m_data_arg6 == 1 && des_timer%4 == 0)
+		{
+			var effect_ = instance_create_depth(x,y,depth+5,movement_effect)
+			effect_.image_xscale = 0.5/(1024/sprite_width)
+			effect_.image_yscale = 0.5/(1024/sprite_width)
+			effect_.image_blend = global.map_color
+			effect_.sprite_index = spr_circle
+			effect_.image_alpha = 1
+		}
+
+		if (m_data_arg5 != 0 && m_data_arg5 < des_timer)
+		{
+			instance_destroy()
+		}
+	}
 }
 
 
@@ -111,3 +130,4 @@ if (center_destroy == 1)
 
 
 
+

objects/map_edior_ui/Draw_73.gml

@@ -16,7 +16,7 @@ if (global.timeline_stop == 1)
 	draw_set_color(c_white);
 	for(var i = 1; i < 48; i++)
 	{
-		draw_set_alpha(0.1+((i%5 == 0) ? 0.1 : 0))
+		draw_set_alpha(0.07+((i%5 == 0) ? 0.07 : 0))
 		draw_line(xx-48+96*i,yy,xx-48+96*i,yy+yy_h)
 		draw_line(xx,yy-48+96*i,xx+xx_w,yy-48+96*i)
 	}

objects/map_edior_ui/Other_10.gml

@@ -1,6 +1,6 @@
 /// @description 타임라인 온오프
 // You can write your code in this editor
-if (global.show_music_title <= 0)
+if (global.show_music_title >= 200 || global.show_music_title <= 0)
 {
 	global.timeline_stop *= -1;
 	if (global.timeline_stop == 1)

objects/map_edior_ui/Other_22.gml

@@ -29,14 +29,14 @@ var _directory = string(global.custom_map_file_dir[global.n_map_id])+"\\custom_h
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-var tmp_ind1 = 14;
+var tmp_ind1 = 99;
 var _firstFile = file_find_first(string(_directory)+"center_origin\\*.png", fa_none);
 if (string_length(_firstFile) != 0)
 {
 	global.custom_proj_center_spr[tmp_ind1] = sprite_add_ext(string(_directory)+"center_origin\\"+string(_firstFile),0,0,0,true);
 	show_message_log(string(_firstFile));
 
-	tmp_ind1++;
+	tmp_ind1--;
 
 	while(true)
 	{
@@ -50,7 +50,7 @@ if (string_length(_firstFile) != 0)
 			show_message_log(string(_file));
 		    global.custom_proj_center_spr[tmp_ind1] = sprite_add_ext(string(_directory)+"center_origin\\"+string(_file),0,0,0,true);
 			sprite_set_offset(global.custom_proj_center_spr[tmp_ind1],floor(sprite_get_width(global.custom_proj_center_spr[tmp_ind1])/2),floor(sprite_get_height(global.custom_proj_center_spr[tmp_ind1])/2));
-			tmp_ind1++;
+			tmp_ind1--;
 		}
 	}
 }
@@ -59,14 +59,14 @@ file_find_close();
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 
-var tmp_ind2 = 3;
+var tmp_ind2 = 99;
 var _firstFile = file_find_first(string(_directory)+"top_origin\\*.png", fa_none);
 if (string_length(_firstFile) != 0)
 {
 	show_message_log(string(_firstFile));
 	global.custom_proj_top_spr[tmp_ind2] = sprite_add_ext(string(_directory)+"top_origin\\"+string(_firstFile),0,0,0,true);
 	sprite_set_offset(global.custom_proj_top_spr[tmp_ind2],floor(sprite_get_width(global.custom_proj_top_spr[tmp_ind2])/2),floor(sprite_get_height(global.custom_proj_top_spr[tmp_ind2])/2));
-	tmp_ind2++;
+	tmp_ind2--;
 
 	while(true)
 	{
@@ -80,7 +80,7 @@ if (string_length(_firstFile) != 0)
 			show_message_log(string(_file));
 		    global.custom_proj_top_spr[tmp_ind2] = sprite_add_ext(string(_directory)+"top_origin\\"+string(_file),0,0,0,true);
 			sprite_set_offset(global.custom_proj_top_spr[tmp_ind2],floor(sprite_get_width(global.custom_proj_top_spr[tmp_ind2])/2),floor(sprite_get_height(global.custom_proj_top_spr[tmp_ind2])/2));
-			tmp_ind2++;
+			tmp_ind2--;
 		}
 	}
 }

objects/map_edior_ui/Step_0.gml

@@ -7,28 +7,30 @@ y = mouse_y;
 scroll_y += (t_scroll_y - scroll_y)*0.1;
 
 
-
-if (global.show_music_title <= 0 && (keyboard_check_pressed(vk_enter) || (global.mb_l == 1 && activated == -1)))
+if (global.show_music_title >= 200 || global.show_music_title <= 0)
 {
-	show_message_log("(우측 상단의 '플레이 버튼'을 통해 일시정지 해제)");
-	audio_play_sound(setting_scroll_sfx,0,false,global.master_volume*global.sfx_volume*32)
-	activated *= -1;
-	if (global.timeline_stop != 1)
+	if (keyboard_check_pressed(vk_enter) || (global.mb_l == 1 && activated == -1))
 	{
-		global.b_n_progress = global.n_progress;
-		global.timeline_stop = 1;
-		instance_destroy(hitbox_parents);
-		audio_stop_sound(global.n_music_id);
-		global.master_remix_effect = 0
-		global.t_bg_color = 0;
-		global.t_bg_color_alpha = 0;
-		global.background_color = c_black;
-		global.map_speed = 0;
-		global.map_speed_y = 0;
-		global.t_map_speed = 0;
-		global.t_map_speed_y = 0;
+		show_message_log("(우측 상단의 '플레이 버튼'을 통해 일시정지 해제)");
+		audio_play_sound(setting_scroll_sfx,0,false,global.master_volume*global.sfx_volume*32)
+		activated *= -1;
+		if (global.timeline_stop != 1)
+		{
+			global.b_n_progress = global.n_progress;
+			global.timeline_stop = 1;
+			instance_destroy(hitbox_parents);
+			audio_stop_sound(global.n_music_id);
+			global.master_remix_effect = 0
+			global.t_bg_color = 0;
+			global.t_bg_color_alpha = 0;
+			global.background_color = c_black;
+			global.map_speed = 0;
+			global.map_speed_y = 0;
+			global.t_map_speed = 0;
+			global.t_map_speed_y = 0;
+		}
+		global.mb_l = 0;
 	}
-	global.mb_l = 0;
 }
 
 t_scroll_y = (activated == 1) ? 0 : -640;
@@ -91,8 +93,8 @@ else if (custom_image_type == 1)
 }
 else
 {
-	sprite_index = spr_player;
-	image_index = global.player_skin+6;
+	sprite_index = spr_bg_color;
+	image_index = 1;
 }
 
 
@@ -104,6 +106,7 @@ switch(global.editor_selected_type)
 	case 0: //이동 탄막
 		global.ed_arg[1] = floor(global.ed_arg[1]);
 		global.ed_arg[2] = floor(global.ed_arg[2]);
+		global.ed_arg[5] = floor(global.ed_arg[5]);
 		image_xscale = global.ed_arg[0];
 		image_yscale = image_xscale;
 		if (selected_projectile_type == 1)
@@ -117,6 +120,7 @@ switch(global.editor_selected_type)
 		global.ed_arg_name[0] = "크기";
 		global.ed_arg_name[1] = "각도";
 		global.ed_arg_name[2] = "속력";
+		global.ed_arg_name[5] = "지속시간 (60프레임 = 1초, 0프레임 = 무한 지속)";
 		global.ed_arg_name[6] = "이펙트 활성화";
 	break;
 
@@ -156,7 +160,7 @@ switch(global.editor_selected_type)
 		global.ed_arg_name[1] = "각도";
 		global.ed_arg_name[2] = "활성화 이후 회전 속력";
 		global.ed_arg_name[3] = "n프레임 이후 활성화 (60프레임 = 1초)";
-		global.ed_arg_name[5] = "지속시간 (60프레임 = 1초";
+		global.ed_arg_name[5] = "지속시간 (60프레임 = 1초)";
 	break;
 
 	case 3: //눈꽃 탄막
@@ -178,7 +182,7 @@ switch(global.editor_selected_type)
 		global.ed_arg_name[2] = "좌우 반복 움직임 속력 (각도에 따라 이동이 다름)";
 		global.ed_arg_name[3] = "n프레임 이후 활성화 (60프레임 = 1초)";
 		global.ed_arg_name[4] = "중력";
-		global.ed_arg_name[5] = "지속시간 (60프레임 = 1초";
+		global.ed_arg_name[5] = "지속시간 (60프레임 = 1초)";
 	break;
 
 	case 4: //지렁이 탄막
@@ -245,7 +249,7 @@ switch(global.editor_selected_type)
 		global.ed_arg_name[0] = "크기";
 		global.ed_arg_name[1] = "각도";
 		global.ed_arg_name[3] = "n프레임 이후 활성화 (60프레임 = 1초)";
-		global.ed_arg_name[5] = "지속시간 (60프레임 = 1초";
+		global.ed_arg_name[5] = "지속시간 (60프레임 = 1초)";
 	break;
 
 	case 7: //맵 밖에서 튀어나오는 탄막

objects/map_edior_ui/Step_2.gml

@@ -38,33 +38,45 @@ if (global.timeline_stop == 1)
 
 	if (keyboard_check(ord("A")))
 	{
-		if (keep_pressing == 0 || (keep_pressing > 40 && keep_pressing%3 == 0))
+		if (global.n_progress > 0)
 		{
-			global.n_progress -= 1;
+			if (keep_pressing == 0 || (keep_pressing > 40 && keep_pressing%3 == 0))
+			{
+				global.n_progress -= 1;
+			}
 		}
 		keep_pressing ++;
 	}
 	else if (keyboard_check(ord("D")))
 	{
-		if (keep_pressing == 0 || (keep_pressing > 40 && keep_pressing%3 == 0))
+		if (global.n_progress < global.music_duration)
 		{
-			global.n_progress += 1;
+			if (keep_pressing == 0 || (keep_pressing > 40 && keep_pressing%3 == 0))
+			{
+				global.n_progress += 1;
+			}
 		}
 		keep_pressing ++;
 	}
 	else if (keyboard_check(ord("Q")))
 	{
-		if (keep_pressing == 0 || (keep_pressing > 40 && keep_pressing%3 == 0))
+		if (global.n_progress > 0)
 		{
-			global.n_progress -= 60;
+			if (keep_pressing == 0 || (keep_pressing > 40 && keep_pressing%3 == 0))
+			{
+				global.n_progress -= 60;
+			}
 		}
 		keep_pressing ++;
 	}
 	else if (keyboard_check(ord("E")))
 	{
-		if (keep_pressing == 0 || (keep_pressing > 40 && keep_pressing%3 == 0))
+		if (global.n_progress < global.music_duration)
 		{
-			global.n_progress += 60;
+			if (keep_pressing == 0 || (keep_pressing > 40 && keep_pressing%3 == 0))
+			{
+				global.n_progress += 60;
+			}
 		}
 		keep_pressing ++;
 	}