From 8822c0eeb262edf29fcc0b0910f941a0951cef08 Mon Sep 17 00:00:00 2001
From: ABER <1047asd44@gmail.com>
Date: Wed, 29 Nov 2023 06:33:39 +0900
Subject: [PATCH] 2023_11_29

minor bugs fixed
tutorial bug fixed
etc.
---
 Project Wak Beat.resource_order               |  46 +-
 objects/code/Create_0.gml                     |   6 +-
 objects/code/Draw_73.gml                      |  15 +-
 objects/code/Other_10.gml                     |   3 +-
 objects/code/Step_0.gml                       | 436 +++++++++---------
 objects/code/Step_1.gml                       |  22 +-
 objects/obj_album_ui/Alarm_11.gml             |   1 +
 objects/obj_album_ui/Step_1.gml               |   2 +-
 objects/obj_player_left_hp_effect/Step_1.gml  |   4 +-
 objects/obj_stage_clear/Alarm_1.gml           |   7 +-
 objects/obj_stage_clear/Alarm_2.gml           |  11 -
 objects/obj_stage_clear/Other_11.gml          |  41 +-
 objects/obj_stage_clear/Other_12.gml          |  21 +
 objects/obj_stage_clear/Step_0.gml            |   1 -
 objects/obj_stage_clear/Step_1.gml            |  17 +-
 objects/obj_stage_clear/obj_stage_clear.yy    |   2 +-
 .../tutorial_part1_timeline/moment_0.gml      |  11 +-
 .../tutorial_part1_timeline/moment_120.gml    |   2 +-
 .../tutorial_part1_timeline/moment_312.gml    |   2 +-
 .../tutorial_part1_timeline/moment_48.gml     |   2 +-
 .../tutorial_part1_timeline/moment_529.gml    |  19 +-
 .../tutorial_part2_timeline/moment_0.gml      |   7 +-
 .../tutorial_part2_timeline/moment_255.gml    |   2 +-
 .../tutorial_part2_timeline/moment_533.gml    |  19 +-
 .../tutorial_part3_timeline/moment_0.gml      |   2 +
 .../tutorial_part3_timeline/moment_1065.gml   |  19 +-
 .../tutorial_part3_timeline/moment_15.gml     |   1 +
 .../tutorial_part3_timeline/moment_687.gml    |   2 +-
 .../tutorial_part3_timeline.yy                |   1 +
 .../tutorial_part4_timeline/moment_0.gml      |   5 +-
 30 files changed, 407 insertions(+), 322 deletions(-)
 delete mode 100644 objects/obj_stage_clear/Alarm_2.gml
 create mode 100644 objects/obj_stage_clear/Other_12.gml
 create mode 100644 timelines/tutorial_part3_timeline/moment_0.gml

diff --git a/Project Wak Beat.resource_order b/Project Wak Beat.resource_order
index f45ffd1a..16495bd4 100644
--- a/Project Wak Beat.resource_order	
+++ b/Project Wak Beat.resource_order	
@@ -33,7 +33,7 @@
   ],
   "ResourceOrderSettings": [
     {"name":"spr_circle_cylinder","order":41,"path":"sprites/spr_circle_cylinder/spr_circle_cylinder.yy",},
-    {"name":"tutorial_part4_timeline","order":6,"path":"timelines/tutorial_part4_timeline/tutorial_part4_timeline.yy",},
+    {"name":"tutorial_part4_timeline","order":7,"path":"timelines/tutorial_part4_timeline/tutorial_part4_timeline.yy",},
     {"name":"spr_circle_dot_outline","order":40,"path":"sprites/spr_circle_dot_outline/spr_circle_dot_outline.yy",},
     {"name":"shader","order":1,"path":"shaders/shader/shader.yy",},
     {"name":"lockdown","order":25,"path":"sounds/lockdown/lockdown.yy",},
@@ -56,7 +56,7 @@
     {"name":"draw_text_kl_scale","order":2,"path":"scripts/draw_text_kl_scale/draw_text_kl_scale.yy",},
     {"name":"hitbox_17","order":18,"path":"objects/hitbox_17/hitbox_17.yy",},
     {"name":"create_circle_misile","order":5,"path":"scripts/create_circle_misile/create_circle_misile.yy",},
-    {"name":"lockdown_timeline","order":24,"path":"timelines/lockdown_timeline/lockdown_timeline.yy",},
+    {"name":"lockdown_timeline","order":25,"path":"timelines/lockdown_timeline/lockdown_timeline.yy",},
     {"name":"hitbox_6","order":6,"path":"objects/hitbox_6/hitbox_6.yy",},
     {"name":"ine_hurt","order":2,"path":"sounds/ine_hurt/ine_hurt.yy",},
     {"name":"spr_illustrationCG","order":10,"path":"sprites/spr_illustrationCG/spr_illustrationCG.yy",},
@@ -77,7 +77,7 @@
     {"name":"dead_sfx","order":5,"path":"sounds/dead_sfx/dead_sfx.yy",},
     {"name":"minus_return_zero","order":6,"path":"scripts/minus_return_zero/minus_return_zero.yy",},
     {"name":"spr_triangle_empty","order":34,"path":"sprites/spr_triangle_empty/spr_triangle_empty.yy",},
-    {"name":"rewind_timeline","order":10,"path":"timelines/rewind_timeline/rewind_timeline.yy",},
+    {"name":"rewind_timeline","order":11,"path":"timelines/rewind_timeline/rewind_timeline.yy",},
     {"name":"Yoong","order":14,"path":"sounds/Yoong/Yoong.yy",},
     {"name":"tutorial_part1","order":4,"path":"sounds/tutorial_part1/tutorial_part1.yy",},
     {"name":"spr_level_bar","order":12,"path":"sprites/spr_level_bar/spr_level_bar.yy",},
@@ -91,9 +91,9 @@
     {"name":"common_sfx2","order":12,"path":"sounds/common_sfx2/common_sfx2.yy",},
     {"name":"hex_to_dec","order":3,"path":"scripts/hex_to_dec/hex_to_dec.yy",},
     {"name":"spr_eye1","order":44,"path":"sprites/spr_eye1/spr_eye1.yy",},
-    {"name":"winter_spring_timeline","order":15,"path":"timelines/winter_spring_timeline/winter_spring_timeline.yy",},
-    {"name":"tutorial_part3_timeline","order":5,"path":"timelines/tutorial_part3_timeline/tutorial_part3_timeline.yy",},
-    {"name":"ipad_timeline","order":11,"path":"timelines/ipad_timeline/ipad_timeline.yy",},
+    {"name":"winter_spring_timeline","order":16,"path":"timelines/winter_spring_timeline/winter_spring_timeline.yy",},
+    {"name":"tutorial_part3_timeline","order":6,"path":"timelines/tutorial_part3_timeline/tutorial_part3_timeline.yy",},
+    {"name":"ipad_timeline","order":12,"path":"timelines/ipad_timeline/ipad_timeline.yy",},
     {"name":"hitbox_8","order":8,"path":"objects/hitbox_8/hitbox_8.yy",},
     {"name":"spr_camera_zoom","order":23,"path":"sprites/spr_camera_zoom/spr_camera_zoom.yy",},
     {"name":"square_misile","order":10,"path":"objects/square_misile/square_misile.yy",},
@@ -101,13 +101,13 @@
     {"name":"spr_spike_cylinder","order":42,"path":"sprites/spr_spike_cylinder/spr_spike_cylinder.yy",},
     {"name":"rewinding_sfx","order":4,"path":"sounds/rewinding_sfx/rewinding_sfx.yy",},
     {"name":"create_cylinder","order":9,"path":"scripts/create_cylinder/create_cylinder.yy",},
-    {"name":"shelter_timeline","order":8,"path":"timelines/shelter_timeline/shelter_timeline.yy",},
+    {"name":"shelter_timeline","order":9,"path":"timelines/shelter_timeline/shelter_timeline.yy",},
     {"name":"set_score","order":1,"path":"scripts/set_score/set_score.yy",},
     {"name":"dead_explosion","order":1,"path":"objects/dead_explosion/dead_explosion.yy",},
     {"name":"show_nickname_setting","order":3,"path":"scripts/show_nickname_setting/show_nickname_setting.yy",},
     {"name":"hitbox_camera_zoom","order":25,"path":"objects/hitbox_camera_zoom/hitbox_camera_zoom.yy",},
     {"name":"obj_stage_clear","order":6,"path":"objects/obj_stage_clear/obj_stage_clear.yy",},
-    {"name":"kinmoku_timeline","order":23,"path":"timelines/kinmoku_timeline/kinmoku_timeline.yy",},
+    {"name":"kinmoku_timeline","order":24,"path":"timelines/kinmoku_timeline/kinmoku_timeline.yy",},
     {"name":"load_musicList","order":3,"path":"scripts/load_musicList/load_musicList.yy",},
     {"name":"create_new_custom_map_file","order":6,"path":"scripts/create_new_custom_map_file/create_new_custom_map_file.yy",},
     {"name":"draw_text_k_scale","order":1,"path":"scripts/draw_text_k_scale/draw_text_k_scale.yy",},
@@ -133,12 +133,12 @@
     {"name":"spr_cross_eye","order":45,"path":"sprites/spr_cross_eye/spr_cross_eye.yy",},
     {"name":"obj_shine_ef","order":3,"path":"objects/obj_shine_ef/obj_shine_ef.yy",},
     {"name":"camera_focus_on","order":6,"path":"scripts/camera_focus_on/camera_focus_on.yy",},
-    {"name":"Yoong_timeline","order":13,"path":"timelines/Yoong_timeline/Yoong_timeline.yy",},
+    {"name":"Yoong_timeline","order":14,"path":"timelines/Yoong_timeline/Yoong_timeline.yy",},
     {"name":"shelter","order":9,"path":"sounds/shelter/shelter.yy",},
     {"name":"tutorial_part3","order":6,"path":"sounds/tutorial_part3/tutorial_part3.yy",},
     {"name":"spr_add","order":25,"path":"sprites/spr_add/spr_add.yy",},
     {"name":"load_custom_map_files","order":5,"path":"scripts/load_custom_map_files/load_custom_map_files.yy",},
-    {"name":"tutorial_part2_timeline","order":4,"path":"timelines/tutorial_part2_timeline/tutorial_part2_timeline.yy",},
+    {"name":"tutorial_part2_timeline","order":5,"path":"timelines/tutorial_part2_timeline/tutorial_part2_timeline.yy",},
     {"name":"Sprite5556","order":17,"path":"sprites/Sprite5556/Sprite5556.yy",},
     {"name":"show_guide","order":5,"path":"scripts/show_guide/show_guide.yy",},
     {"name":"spr_spot_light","order":26,"path":"sprites/spr_spot_light/spr_spot_light.yy",},
@@ -153,9 +153,9 @@
     {"name":"ding_dong","order":2,"path":"sounds/ding_dong/ding_dong.yy",},
     {"name":"jururu_hurt","order":5,"path":"sounds/jururu_hurt/jururu_hurt.yy",},
     {"name":"alzar","order":15,"path":"sounds/alzar/alzar.yy",},
-    {"name":"master_remix_timeline","order":18,"path":"timelines/master_remix_timeline/master_remix_timeline.yy",},
-    {"name":"isedolhyang_timeline","order":16,"path":"timelines/isedolhyang_timeline/isedolhyang_timeline.yy",},
-    {"name":"gungsirung_timeline","order":17,"path":"timelines/gungsirung_timeline/gungsirung_timeline.yy",},
+    {"name":"master_remix_timeline","order":19,"path":"timelines/master_remix_timeline/master_remix_timeline.yy",},
+    {"name":"isedolhyang_timeline","order":17,"path":"timelines/isedolhyang_timeline/isedolhyang_timeline.yy",},
+    {"name":"gungsirung_timeline","order":18,"path":"timelines/gungsirung_timeline/gungsirung_timeline.yy",},
     {"name":"spr_yonsei","order":29,"path":"sprites/spr_yonsei/spr_yonsei.yy",},
     {"name":"hitbox_4","order":4,"path":"objects/hitbox_4/hitbox_4.yy",},
     {"name":"Sprite55","order":16,"path":"sprites/Sprite55/Sprite55.yy",},
@@ -172,7 +172,7 @@
     {"name":"view_shake","order":3,"path":"scripts/view_shake/view_shake.yy",},
     {"name":"Sprite67","order":2,"path":"sprites/Sprite67/Sprite67.yy",},
     {"name":"convert_score_to_rank","order":8,"path":"scripts/convert_score_to_rank/convert_score_to_rank.yy",},
-    {"name":"alzar_timeline","order":14,"path":"timelines/alzar_timeline/alzar_timeline.yy",},
+    {"name":"alzar_timeline","order":15,"path":"timelines/alzar_timeline/alzar_timeline.yy",},
     {"name":"create_laser","order":6,"path":"scripts/create_laser/create_laser.yy",},
     {"name":"spr_lock","order":4,"path":"sprites/spr_lock/spr_lock.yy",},
     {"name":"umamusume","order":27,"path":"sounds/umamusume/umamusume.yy",},
@@ -194,7 +194,7 @@
     {"name":"Sprite49","order":11,"path":"sprites/Sprite49/Sprite49.yy",},
     {"name":"kinmoku","order":24,"path":"sounds/kinmoku/kinmoku.yy",},
     {"name":"jing_hurt","order":6,"path":"sounds/jing_hurt/jing_hurt.yy",},
-    {"name":"roki_timeline","order":22,"path":"timelines/roki_timeline/roki_timeline.yy",},
+    {"name":"roki_timeline","order":23,"path":"timelines/roki_timeline/roki_timeline.yy",},
     {"name":"favorite_sfx","order":6,"path":"sounds/favorite_sfx/favorite_sfx.yy",},
     {"name":"changing_bg_color","order":6,"path":"objects/changing_bg_color/changing_bg_color.yy",},
     {"name":"set_hitbox_color","order":12,"path":"scripts/set_hitbox_color/set_hitbox_color.yy",},
@@ -207,19 +207,19 @@
     {"name":"hitbox_10","order":11,"path":"objects/hitbox_10/hitbox_10.yy",},
     {"name":"spr_tmp","order":18,"path":"sprites/spr_tmp/spr_tmp.yy",},
     {"name":"turisumo","order":10,"path":"sounds/turisumo/turisumo.yy",},
-    {"name":"fukurou_timeline","order":7,"path":"timelines/fukurou_timeline/fukurou_timeline.yy",},
+    {"name":"fukurou_timeline","order":8,"path":"timelines/fukurou_timeline/fukurou_timeline.yy",},
     {"name":"gungsirung","order":18,"path":"sounds/gungsirung/gungsirung.yy",},
     {"name":"fix_num","order":9,"path":"scripts/fix_num/fix_num.yy",},
-    {"name":"yuha_timeline","order":21,"path":"timelines/yuha_timeline/yuha_timeline.yy",},
+    {"name":"yuha_timeline","order":22,"path":"timelines/yuha_timeline/yuha_timeline.yy",},
     {"name":"numbers_with_comma","order":10,"path":"scripts/numbers_with_comma/numbers_with_comma.yy",},
     {"name":"hitbox_3","order":3,"path":"objects/hitbox_3/hitbox_3.yy",},
     {"name":"spr_triangle_half","order":36,"path":"sprites/spr_triangle_half/spr_triangle_half.yy",},
     {"name":"code_sever","order":1,"path":"objects/code_sever/code_sever.yy",},
-    {"name":"promise_timeline","order":19,"path":"timelines/promise_timeline/promise_timeline.yy",},
+    {"name":"promise_timeline","order":20,"path":"timelines/promise_timeline/promise_timeline.yy",},
     {"name":"check_under_ten","order":5,"path":"scripts/check_under_ten/check_under_ten.yy",},
     {"name":"create_bounce_ball","order":11,"path":"scripts/create_bounce_ball/create_bounce_ball.yy",},
-    {"name":"gomem_mashup_timeline","order":20,"path":"timelines/gomem_mashup_timeline/gomem_mashup_timeline.yy",},
-    {"name":"turisumo_timeline","order":9,"path":"timelines/turisumo_timeline/turisumo_timeline.yy",},
+    {"name":"gomem_mashup_timeline","order":21,"path":"timelines/gomem_mashup_timeline/gomem_mashup_timeline.yy",},
+    {"name":"turisumo_timeline","order":10,"path":"timelines/turisumo_timeline/turisumo_timeline.yy",},
     {"name":"Sprite69","order":4,"path":"sprites/Sprite69/Sprite69.yy",},
     {"name":"hitbox_bg_color","order":22,"path":"objects/hitbox_bg_color/hitbox_bg_color.yy",},
     {"name":"spr_seoul_univ","order":27,"path":"sprites/spr_seoul_univ/spr_seoul_univ.yy",},
@@ -259,7 +259,7 @@
     {"name":"spr_joystick","order":9,"path":"sprites/spr_joystick/spr_joystick.yy",},
     {"name":"spr_master","order":37,"path":"sprites/spr_master/spr_master.yy",},
     {"name":"hitbox_20","order":21,"path":"objects/hitbox_20/hitbox_20.yy",},
-    {"name":"tutorial_part1_timeline","order":3,"path":"timelines/tutorial_part1_timeline/tutorial_part1_timeline.yy",},
+    {"name":"tutorial_part1_timeline","order":4,"path":"timelines/tutorial_part1_timeline/tutorial_part1_timeline.yy",},
     {"name":"spr_yoongter","order":24,"path":"sprites/spr_yoongter/spr_yoongter.yy",},
     {"name":"hitbox_16","order":17,"path":"objects/hitbox_16/hitbox_16.yy",},
     {"name":"Note2","order":1,"path":"notes/Note2/Note2.yy",},
@@ -270,11 +270,11 @@
     {"name":"obj_button","order":1,"path":"objects/obj_button/obj_button.yy",},
     {"name":"hitbox_13","order":14,"path":"objects/hitbox_13/hitbox_13.yy",},
     {"name":"wakgoodhyang","order":1,"path":"sounds/wakgoodhyang/wakgoodhyang.yy",},
-    {"name":"phony_timeline","order":12,"path":"timelines/phony_timeline/phony_timeline.yy",},
+    {"name":"phony_timeline","order":13,"path":"timelines/phony_timeline/phony_timeline.yy",},
     {"name":"lilpa_hurt","order":3,"path":"sounds/lilpa_hurt/lilpa_hurt.yy",},
     {"name":"spr_circle_outline_light","order":8,"path":"sprites/spr_circle_outline_light/spr_circle_outline_light.yy",},
     {"name":"show_message_log","order":7,"path":"scripts/show_message_log/show_message_log.yy",},
-    {"name":"happysegu_timeline","order":25,"path":"timelines/happysegu_timeline/happysegu_timeline.yy",},
+    {"name":"happysegu_timeline","order":26,"path":"timelines/happysegu_timeline/happysegu_timeline.yy",},
     {"name":"load_stage","order":1,"path":"scripts/load_stage/load_stage.yy",},
     {"name":"sparking_sound","order":10,"path":"sounds/sparking_sound/sparking_sound.yy",},
     {"name":"kidding","order":28,"path":"sounds/kidding/kidding.yy",},
diff --git a/objects/code/Create_0.gml b/objects/code/Create_0.gml
index d9401376..72cebffd 100644
--- a/objects/code/Create_0.gml
+++ b/objects/code/Create_0.gml
@@ -831,15 +831,19 @@ for(var i = 0; i < global.total_map; i++)
 
 	
 global.unlocked_player_skin_name[0] = "우왁굳"
+global.unlocked_player_skin_desc[0] = "대쉬로 피한 탄막 보너스 점수 +50"
 global.unlocked_player_skin_require_type[0] = 0;
 global.unlocked_player_skin_require_num[0] = global.max_artifact_owned[0];
 global.unlocked_player_skin_name[1] = "민수"
+global.unlocked_player_skin_desc[1] = "대쉬로 피한 탄막 보너스 점수 +50"
 global.unlocked_player_skin_require_type[1] = 0;
 global.unlocked_player_skin_require_num[1] = global.max_artifact_owned[0]+3;
 global.unlocked_player_skin_name[2] = "메시두"
+global.unlocked_player_skin_desc[2] = "세이브 포인트에서 부활 시 최대 체력으로 부활"
 global.unlocked_player_skin_require_type[2] = 0;
 global.unlocked_player_skin_require_num[2] = "아무 곡이나 대쉬를 사용하지 않고 S랭크 이상으로 클리어";
 global.unlocked_player_skin_name[3] = "우왁굳 (왁굳향100%)"
+global.unlocked_player_skin_desc[3] = "대쉬로 피한 탄막 보너스 점수 +50"
 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] = "아이네"
@@ -994,7 +998,7 @@ instance_create_depth(0,0,0,obj_album_ui)
 
 
 //tutorial
-global.n_playing_tutorial = 0
+global.tutorial_now = 0
 global.tutorial_n_stage = 0
 
 
diff --git a/objects/code/Draw_73.gml b/objects/code/Draw_73.gml
index a73ec1df..cbbcbff5 100644
--- a/objects/code/Draw_73.gml
+++ b/objects/code/Draw_73.gml
@@ -34,7 +34,7 @@ else
 
 var font_size = 1//global.camera_sx
 
-if global.n_playing_tutorial != 1 && global.show_rank = 0
+if global.tutorial_now != 1 && global.show_rank = 0
 {
 	//progress bar
 	draw_set_color(global.map_color)
@@ -833,6 +833,19 @@ if (global.blackout_effect_alpha > 0)
 }
 
 
+/////test
+//if (global.dev_mode == 1 && global.tutorial_now == 1)
+//{
+	//draw_set_alpha(1)
+	//draw_set_color(c_blue)
+	//draw_text(xx+32,yy+64,"global.n_music_id : "+string(global.n_music_id)+"\nglobal.tutorial_now : "+string(global.tutorial_now)+"\nglobal.tutorial_n_stage : "+string(global.tutorial_n_stage)+"\ncamera_x : "+string(global.camera_target_x)+"\ncamera_y : "+string(global.camera_target_y))
+	//if (instance_exists(obj_stage_clear))
+	//{
+	//	draw_text(xx+32,yy+32,"touched : "+string(obj_stage_clear.touched));
+	//}
+//}
+
+
 
 //draw_text_k_scale(xx+32,global.c_h-100,string(gamestart)+" / "+string(global.show_music_title),64,-1,1 - global.ui_alpha,c_white,0,-1,normal_font,0.5,0.5,0)
 
diff --git a/objects/code/Other_10.gml b/objects/code/Other_10.gml
index dc247882..633ea0ab 100644
--- a/objects/code/Other_10.gml
+++ b/objects/code/Other_10.gml
@@ -11,9 +11,10 @@ instance_destroy(obj_button);
 global.check_died = 0
 global.tutorial_now = 0
 global.timeline_stop = -1;
+global.show_rank = 0;
 global.random_seed = -4
 global.map_editor = 0;
-global.rewind = 0
+global.rewind = 0;
 global.play_custom_map = 0;
 global.n_camera_zoom = 1;
 global.camera_slow_zoom = 0;
diff --git a/objects/code/Step_0.gml b/objects/code/Step_0.gml
index d5ef6bff..8112029a 100644
--- a/objects/code/Step_0.gml
+++ b/objects/code/Step_0.gml
@@ -117,193 +117,207 @@ if (global.level < 0)
 
 //조이스틱
 global.joystick_alpha += (sign(global.joystick_activated+1) - global.joystick_alpha)*0.15
-	if global.joystick_activated != -1
-	{
-		global.hmove = floor((global.joystick_n_xx - global.joystick_xx)/(global.joystick_size*0.5)*10)/10
-		global.vmove = floor((global.joystick_n_yy - global.joystick_yy)/(global.joystick_size*0.5)*10)/10
-	}
+if global.joystick_activated != -1
+{
+	global.hmove = floor((global.joystick_n_xx - global.joystick_xx)/(global.joystick_size*0.5)*10)/10
+	global.vmove = floor((global.joystick_n_yy - global.joystick_yy)/(global.joystick_size*0.5)*10)/10
+}
 
 
 
-	if global.mobile_mode = 1 && global.sync_setting = 0
+if global.mobile_mode = 1 && global.sync_setting = 0
+{
+	for(var i = 0; i < 4; i++)
 	{
-		for(var i = 0; i < 4; i++)
+		var is_click = device_mouse_check_button_pressed(i, mb_left);
+		if device_mouse_check_button(i, mb_left)
 		{
-			var is_click = device_mouse_check_button_pressed(i, mb_left);
-			if device_mouse_check_button(i, mb_left)
-			{
-				global.clicking_timer ++
-			}
+			global.clicking_timer ++
+		}
 
-			var xx = camera_get_view_x(view_camera[0])
-			var xx_w = camera_get_view_width(view_camera[0])
+		var xx = camera_get_view_x(view_camera[0])
+		var xx_w = camera_get_view_width(view_camera[0])
 
 
-			if instance_exists(obj_player) && obj_player.image_xscale > 0
+		if instance_exists(obj_player) && obj_player.image_xscale > 0
+		{
+			if global.hp > 0
 			{
-				if global.hp > 0
+				if device_mouse_x(i) < xx+xx_w*0.5
 				{
-					if device_mouse_x(i) < xx+xx_w*0.5
+					if is_click
 					{
-						if is_click
-						{
-							global.joystick_xx = device_mouse_x(i)
-							global.joystick_yy = device_mouse_y(i)
-							global.joystick_activated = i
-						}
+						global.joystick_xx = device_mouse_x(i)
+						global.joystick_yy = device_mouse_y(i)
+						global.joystick_activated = i
 					}
-					else
+				}
+				else
+				{
+					if global.dash_cooltime <= 0 && is_click
 					{
-						if global.dash_cooltime <= 0 && is_click
+						with(obj_player)
 						{
-							with(obj_player)
+							if object_index = obj_player
 							{
-								if object_index = obj_player
-								{
-									event_user(0)
-								}
+								event_user(0)
 							}
 						}
 					}
 				}
 			}
-			else
-			{
-				if (is_click && global.can_change_music_list == 1 && gamestart == 0)
-				{
-					global.joystick_xx = device_mouse_x(i)
-					global.joystick_yy = device_mouse_y(i)
-					global.scroll_activated = i
-				}
-			}
-	
-			if global.clicking_del = 0 && device_mouse_check_button_released(i, mb_left)
-			{
-				global.clicking_del = 1
-				alarm[5] = 1
-			}
-	
-			var is_clicked_joystick = device_mouse_check_button_released(global.joystick_activated, mb_left);
-			var is_clicked_scroll = device_mouse_check_button_released(global.scroll_activated, mb_left);
-			if (is_clicked_joystick || (global.cannot_control == 1 && instance_exists(obj_stage_clear)) || instance_exists(dead_explosion))
-			{
-				global.joystick_activated = -1
-				global.vmove = 0
-				global.hmove = 0
-			}
-		
-			if is_clicked_scroll
+		}
+		else
+		{
+			if (is_click && global.can_change_music_list == 1 && gamestart == 0)
 			{
-				global.t_select_map = round(global.t_select_map)
-				global.scroll_activated = -1
+				global.joystick_xx = device_mouse_x(i)
+				global.joystick_yy = device_mouse_y(i)
+				global.scroll_activated = i
 			}
 		}
-	}
-
-	
-
-
-	//캐릭터 변경
-	if global.b_player_skin != global.player_skin
-	{
-		obj_player.image_index = global.player_skin*7+(5-global.hp)
-		global.player_color = $FF4AB539
-		global.die_sfx = wakgood_hurt
 	
-		if global.player_skin = 1
-		{
-			global.player_color = $FF60006F
-			global.die_sfx = ine_hurt
-		}
-		if global.player_skin = 2
-		{
-			global.player_color = $FF969EA3
-			global.die_sfx = bichan_hurt
-		}
-		if global.player_skin = 3
+		if global.clicking_del = 0 && device_mouse_check_button_released(i, mb_left)
 		{
-			global.player_color = $FFFFC065
-			global.die_sfx = segu_hurt
+			global.clicking_del = 1
+			alarm[5] = 1
 		}
-		if global.player_skin = 4
-		{
-			global.player_color = $FFFF9761
-			global.die_sfx = lilpa_hurt
-		}
-		if global.player_skin = 5
+	
+		var is_clicked_joystick = device_mouse_check_button_released(global.joystick_activated, mb_left);
+		var is_clicked_scroll = device_mouse_check_button_released(global.scroll_activated, mb_left);
+		if (is_clicked_joystick || (global.cannot_control == 1 && instance_exists(obj_stage_clear)) || instance_exists(dead_explosion))
 		{
-			global.player_color = $FF8812D5
-			global.die_sfx = jururu_hurt
+			global.joystick_activated = -1
+			global.vmove = 0
+			global.hmove = 0
 		}
-		if global.player_skin = 6
+		
+		if is_clicked_scroll
 		{
-			global.player_color = $FF62E0F6
-			global.die_sfx = jing_hurt
+			global.t_select_map = round(global.t_select_map)
+			global.scroll_activated = -1
 		}
-		global.b_player_skin = global.player_skin
 	}
+}
 
+	
 
-	global.select_map += (global.t_select_map - global.select_map)*0.13
 
-	if (global.n_music_title == "왁트모르즈비")
+//캐릭터 변경
+if global.b_player_skin != global.player_skin
+{
+	obj_player.image_index = global.player_skin*7+(5-global.hp)
+	global.player_color = $FF4AB539
+	global.die_sfx = wakgood_hurt
+	
+	if global.player_skin = 1
 	{
-		global.n_playing_tutorial = 1
+		global.player_color = $FF60006F
+		global.die_sfx = ine_hurt
 	}
-	else
+	if global.player_skin = 2
 	{
-		global.checkpoint_text = "중간 사베(save) 도착!"
+		global.player_color = $FF969EA3
+		global.die_sfx = bichan_hurt
 	}
+	if global.player_skin = 3
+	{
+		global.player_color = $FFFFC065
+		global.die_sfx = segu_hurt
+	}
+	if global.player_skin = 4
+	{
+		global.player_color = $FFFF9761
+		global.die_sfx = lilpa_hurt
+	}
+	if global.player_skin = 5
+	{
+		global.player_color = $FF8812D5
+		global.die_sfx = jururu_hurt
+	}
+	if global.player_skin = 6
+	{
+		global.player_color = $FF62E0F6
+		global.die_sfx = jing_hurt
+	}
+	global.b_player_skin = global.player_skin
+}
 
 
-	if (global.show_music_title > 0 && global.paused == 0)
-	{
-		global.show_music_title ++
+global.select_map += (global.t_select_map - global.select_map)*0.13
 
-		if global.show_music_title < 180
-		{
-			music_title_alpha += (1 - music_title_alpha)*0.1
+if (global.n_music_title == "왁트모르즈비")
+{
+	global.tutorial_now = 1
+}
+else
+{
+	global.checkpoint_text = "중간 사베(save) 도착!"
+}
+
+
+if (global.show_music_title > 0 && global.paused == 0)
+{
+	global.show_music_title ++
+
+	if global.show_music_title < 180
+	{
+		music_title_alpha += (1 - music_title_alpha)*0.1
 			
-			if (global.t_selected_difficulty != 0 && global.random_seed == -4)
-			{
-				global.random_seed = 0;
-			}
-		}
-		else
+		if (global.t_selected_difficulty != 0 && global.random_seed == -4)
 		{
-			music_title_alpha += (-0.01 - music_title_alpha)*0.1
+			global.random_seed = 0;
 		}
+	}
+	else
+	{
+		music_title_alpha += (-0.01 - music_title_alpha)*0.1
+	}
 	
-		if global.show_music_title > 30
-		{
-			global.show_progress_bar = 1
-		}
+	if global.show_music_title > 30
+	{
+		global.show_progress_bar = 1
+	}
 	
-		if global.show_music_title > 500
-		{
-			global.show_music_title = 0
-		}
+	if global.show_music_title > 500
+	{
+		global.show_music_title = 0
 	}
+}
 
-	if global.show_progress_bar = 1
+if (global.show_progress_bar == 1 || global.tutorial_now == 1)
+{
+	progress_icon_alpha += (1 - progress_icon_alpha)*0.1
+	if progress_icon_alpha > 0.98
 	{
-		progress_icon_alpha += (1 - progress_icon_alpha)*0.1
-		if progress_icon_alpha > 0.98
-		{
-			progress_alpha += (1 - progress_alpha)*0.1
-		}
+		progress_alpha += (1 - progress_alpha)*0.1
+	}
 	
-		if progress_alpha > 0.6
-		{
-			progress_alpha_sec += (1 - progress_alpha_sec)*0.1
-		}
+	if progress_alpha > 0.6
+	{
+		progress_alpha_sec += (1 - progress_alpha_sec)*0.1
+	}
 	
-		if (global.tutorial_played >= 0)
+	if (global.tutorial_played >= 0 || global.tutorial_now == 1)
+	{
+		if (global.show_music_title > 240 || (global.tutorial_now == 1 && global.tutorial_n_stage > 0))
 		{
-			if (global.show_music_title > 240)
+			if (global.n_music_id == -4 && (global.n_progress == 0 || global.tutorial_now == 1))
 			{
-				if global.n_music_id = -4 && global.n_progress = 0
+				if (global.tutorial_played != 1 && global.tutorial_n_stage == 0)
+				{
+					//튜토리얼
+					if !instance_exists(obj_stage_clear)
+					{
+						instance_create_depth(global.c_w+128,irandom_range(global.c_y,global.c_h),obj_player.depth-1,obj_stage_clear)
+					}
+				}
+				else
 				{
+					if (global.tutorial_n_stage == 0)
+					{
+						global.tutorial_n_stage = 1;
+					}
 					saved_n_stage = n_stage+2
 					global.start_point = 0
 					global.cannot_control = 0
@@ -320,7 +334,7 @@ global.joystick_alpha += (sign(global.joystick_activated+1) - global.joystick_al
 						timeline_position = 0
 						timeline_loop = false
 						var time__ = floor(global.music_sync_offset*3*60)
-						if time__ > 0 && global.tutorial_now = 0
+						if (time__ > 0 && global.tutorial_now == 0)
 						{
 							alarm[7] = time__
 						}
@@ -362,118 +376,110 @@ global.joystick_alpha += (sign(global.joystick_activated+1) - global.joystick_al
 							ini_close();
 						}
 					}
-				}
+				}	
 			}
-			else
+		}
+		else
+		{
+			if (global.map_editor == 1)
 			{
-				if (global.map_editor == 1)
-				{
-					global.show_music_title = 240;
-				}
+				global.show_music_title = 240;
 			}
+		}
 	
-			if (global.n_progress < global.music_duration)
+		if (global.n_progress < global.music_duration)
+		{
+			if (global.timeline_stop == -1 && global.paused == 0 && (audio_is_playing(global.n_music_id) || global.n_progress > 2000) && global.hp > 0)
 			{
-				if (global.timeline_stop == -1 && global.paused == 0 && (audio_is_playing(global.n_music_id) || global.n_progress > 2000) && global.hp > 0)
-				{
-					global.n_progress ++;
-					audio_sound_gain(global.n_music_instance,global.custom_map_volume_control*0.5*global.master_volume*global.bgm_volume*(global.mobile_mode*0.5+1)*global.map_end_volumedown,0)
-				}
+				global.n_progress ++;
+				audio_sound_gain(global.n_music_instance,global.custom_map_volume_control*0.5*global.master_volume*global.bgm_volume*(global.mobile_mode*0.5+1)*global.map_end_volumedown,0)
 			}
-			else
-			{
-				global.n_progress = global.music_duration;
+		}
+		else
+		{
+			global.n_progress = global.music_duration;
 			
-				if (global.n_music_title != "왁트모르즈비")
-				{
-					timeline_running = false;
-				}
+			if (global.n_music_title != "왁트모르즈비")
+			{
+				timeline_running = false;
+			}
 	
 	
-				if (global.timeline_stop != 1 && !instance_exists(obj_savepoint) && !instance_exists(obj_stage_clear))
-				{
-					if abs(global.map_speed_y) > 0
-					{
-						var save_ = instance_create_depth(0,0,obj_player.depth+1,obj_savepoint)
-						save_.n_savepoint_position = 99999
-						save_.n_color = c_black
-						save_.image_angle = 90
-					}
-					else
-					{
-						var save_ = instance_create_depth(room_width,0,obj_player.depth+1,obj_savepoint)
-						save_.n_savepoint_position = 99999
-						save_.n_color = c_black
-					}
-				}
-			}
-		}
-		else //첫 튜토리얼 안 했을경우
-		{
-			if (!instance_exists(obj_stage_clear) && global.paused == 0)
+			if (global.timeline_stop != 1 && !instance_exists(obj_savepoint) && !instance_exists(obj_stage_clear))
 			{
-				instance_create_depth(global.c_w+128,room_height*0.5,obj_player.depth-1,obj_stage_clear)
-				if global.mobile_mode = 1
+				if abs(global.map_speed_y) > 0
 				{
-					global.checkpoint_text = "왼쪽 화면을 터치해 조이스틱으로 이동하기"
+					var save_ = instance_create_depth(0,0,obj_player.depth+1,obj_savepoint)
+					save_.n_savepoint_position = 99999
+					save_.n_color = c_black
+					save_.image_angle = 90
 				}
 				else
 				{
-					global.checkpoint_text = "방향키를 눌러 이동하기"
+					var save_ = instance_create_depth(room_width,0,obj_player.depth+1,obj_savepoint)
+					save_.n_savepoint_position = 99999
+					save_.n_color = c_black
 				}
-				global.t_bg_color = 1;
-				global.t_bg_color_alpha = 1;
-				global.artifact_type = 0;
-				global.tutorial_now = 1;
-				global.savepoint_text_t_alpha = 1;
 			}
 		}
 	}
-	else
+	else //첫 튜토리얼 안 했을경우
 	{
-		progress_icon_alpha += (-0.01 - progress_icon_alpha)*0.1
-		progress_alpha += (-0.01 - progress_alpha)*0.1
-		progress_alpha_sec += (-0.01 - progress_alpha_sec)*0.1
+		if (!instance_exists(obj_stage_clear) && global.paused == 0)
+		{
+			instance_create_depth(global.c_w+128,room_height*0.5,obj_player.depth-1,obj_stage_clear)
+			global.t_bg_color = 1;
+			global.t_bg_color_alpha = 1;
+			global.artifact_type = 0;
+			global.savepoint_text_t_alpha = 1;
+		}
 	}
+}
+else
+{
+	progress_icon_alpha += (-0.01 - progress_icon_alpha)*0.1
+	progress_alpha += (-0.01 - progress_alpha)*0.1
+	progress_alpha_sec += (-0.01 - progress_alpha_sec)*0.1
+}
 
 
 
-	//discord presence
-	if discord_presence_update > 0
+//discord presence
+if discord_presence_update > 0
+{
+	if discord_presence_update%60 = 0 && global.n_progress < global.music_duration
 	{
-		if discord_presence_update%60 = 0 && global.n_progress < global.music_duration
+		np_update();
+		var time_sec = floor(global.stage_map_duration[global.n_map_id]/60)
+		var n_time_sec = floor(global.n_progress/60)
+		var album_id = "album"+string(global.n_map_id+1)
+		if (global.n_map_id+1 > sprite_get_number(spr_album)-2)
 		{
-			np_update();
-			var time_sec = floor(global.stage_map_duration[global.n_map_id]/60)
-			var n_time_sec = floor(global.n_progress/60)
-			var album_id = "album"+string(global.n_map_id+1)
-			if (global.n_map_id+1 > sprite_get_number(spr_album)-2)
-			{
-				album_id = "album0"
-			}
+			album_id = "album0"
+		}
 		
-			if (global.n_map_list == 2)
-			{
-				album_id = "custom_album"
-			}
-	
-			np_setpresence_more("","", false);
-			if (global.paused == 0 && global.timeline_stop == 0)
-			{
-				np_setpresence("["+string(convert_sec_to_clocktime(n_time_sec))+"/"+string(convert_sec_to_clocktime(time_sec))+"]",string(global.stage_map_name[global.n_map_id]), string(album_id), "type"+string(global.artifact_type));
-			}
-			else
-			{
-				np_setpresence("[Paused]",string(global.stage_map_name[global.n_map_id]), string(album_id), "type"+string(global.artifact_type));
-			}
+		if (global.n_map_list == 2)
+		{
+			album_id = "custom_album"
 		}
-		discord_presence_update ++
 	
-		if global.n_progress >= global.music_duration+floor(global.music_sync_offset*3*60)
+		np_setpresence_more("","", false);
+		if (global.paused == 0 && global.timeline_stop == 0)
+		{
+			np_setpresence("["+string(convert_sec_to_clocktime(n_time_sec))+"/"+string(convert_sec_to_clocktime(time_sec))+"]",string(global.stage_map_name[global.n_map_id]), string(album_id), "type"+string(global.artifact_type));
+		}
+		else
 		{
-			discord_presence_update = 0
+			np_setpresence("[Paused]",string(global.stage_map_name[global.n_map_id]), string(album_id), "type"+string(global.artifact_type));
 		}
 	}
+	discord_presence_update ++
+	
+	if global.n_progress >= global.music_duration+floor(global.music_sync_offset*3*60)
+	{
+		discord_presence_update = 0
+	}
+}
 
 global.b_alpha += (global.t_b_alpha - global.b_alpha)*0.1
 global.w_alpha += (global.t_w_alpha - global.w_alpha)*0.1
diff --git a/objects/code/Step_1.gml b/objects/code/Step_1.gml
index 3088622b..8520c29d 100644
--- a/objects/code/Step_1.gml
+++ b/objects/code/Step_1.gml
@@ -1,6 +1,24 @@
 /// @description Insert description here
 // You can write your code in this editor
 
+if (global.n_music_title == "왁트모르즈비")
+{
+	global.tutorial_now = 1;
+	
+	if (global.tutorial_n_stage == 0)
+	{
+		if (global.mobile_mode == 1)
+		{
+			global.checkpoint_text = "왼쪽 화면을 터치해 조이스틱으로 이동하기";
+		}
+		else
+		{
+			global.checkpoint_text = "방향키를 눌러 이동하기";
+		}
+	}
+}
+
+
 //커스텀 유저 맵 재생
 if (global.timeline_stop != 1 && global.play_custom_map == 1 && audio_is_playing(global.n_music_instance) && global.paused != 1)
 {
@@ -50,7 +68,7 @@ if (instance_exists(obj_album_ui))
 //개발자 모드이면 튜토리얼 자동 스킵
 if (global.dev_mode == 1)
 {
-	global.tutorial_played = 1;
+	//global.tutorial_played = 1;
 }
 
 //장애물 회피 점수가 최대치를 못넘도록 설정
@@ -677,7 +695,7 @@ global.rank_display_b_alpha += (0 - global.rank_display_b_alpha)*0.1
 				global.t_bg_color_alpha = 1
 				global.n_music_id = -4
 				global.n_progress = 0
-				global.n_playing_tutorial = 0
+				global.tutorial_now = 0
 				global.hmove = 0
 				global.vmove = 0
 	
diff --git a/objects/obj_album_ui/Alarm_11.gml b/objects/obj_album_ui/Alarm_11.gml
index 0bbf1ef5..6326a51f 100644
--- a/objects/obj_album_ui/Alarm_11.gml
+++ b/objects/obj_album_ui/Alarm_11.gml
@@ -5,6 +5,7 @@
 event_user(1)
 global.b_t_select_map = code.n_stage+2
 global.t_select_map = code.n_stage+2
+global.tutorial_played = 0;
 
 var n_stage = code.n_stage
 load_stage(global.stage_map_name[n_stage],global.stage_map_artist[n_stage],global.stage_map_audio_name[n_stage],global.stage_map_color[n_stage],global.stage_map_duration[n_stage],global.stage_bpm[n_stage])
diff --git a/objects/obj_album_ui/Step_1.gml b/objects/obj_album_ui/Step_1.gml
index 1edf1f69..df4de929 100644
--- a/objects/obj_album_ui/Step_1.gml
+++ b/objects/obj_album_ui/Step_1.gml
@@ -14,7 +14,7 @@ if (keyboard_check(vk_anykey) || global.touch_to_skip == 1)
 			credit_text_alpha4 = 1;
 			global.show_credit = 0;
 			alarm[8] = 80;
-			alarm[11] = 35;
+			alarm[11] = 1;
 		}
 	}
 	else
diff --git a/objects/obj_player_left_hp_effect/Step_1.gml b/objects/obj_player_left_hp_effect/Step_1.gml
index 3b4ef0f9..c4641d5b 100644
--- a/objects/obj_player_left_hp_effect/Step_1.gml
+++ b/objects/obj_player_left_hp_effect/Step_1.gml
@@ -1,9 +1,9 @@
 /// @description Insert description here
 // You can write your code in this editor
 
-if (global.show_music_title < 240 && timeline_running == false)
+if (timeline_running == false)
 {
-	image_alpha = 10;
+	image_alpha += (10 - image_alpha)*0.03;
 }
 
 if (obj_player.image_xscale <= 0 || global.hp <= 0 || global.hp <= my_id)
diff --git a/objects/obj_stage_clear/Alarm_1.gml b/objects/obj_stage_clear/Alarm_1.gml
index dbfe8c6f..b3ed078f 100644
--- a/objects/obj_stage_clear/Alarm_1.gml
+++ b/objects/obj_stage_clear/Alarm_1.gml
@@ -1,8 +1,3 @@
 /// @description Insert description here
 // You can write your code in this editor
-global.w_alpha = 1
-if (global.tutorial_now <= 0)
-{
-	global.t_w_alpha = 0
-}
-event_user(1)
\ No newline at end of file
+event_user(2);
\ No newline at end of file
diff --git a/objects/obj_stage_clear/Alarm_2.gml b/objects/obj_stage_clear/Alarm_2.gml
deleted file mode 100644
index 7218936d..00000000
--- a/objects/obj_stage_clear/Alarm_2.gml
+++ /dev/null
@@ -1,11 +0,0 @@
-/// @description Insert description here
-// You can write your code in this editor
-
-
-
-
-if (global.tutorial_played >= 0)
-{
-	global.tutorial_n_stage++;
-	instance_destroy(hitbox_parents);
-}
\ No newline at end of file
diff --git a/objects/obj_stage_clear/Other_11.gml b/objects/obj_stage_clear/Other_11.gml
index 83dd5fe1..62aba3aa 100644
--- a/objects/obj_stage_clear/Other_11.gml
+++ b/objects/obj_stage_clear/Other_11.gml
@@ -1,45 +1,18 @@
 /// @description Insert description here
 // You can write your code in this editor
-global.hp = 5;
-global.show_rank = 0;
-audio_play_sound(result_sfx,0,false,global.master_volume*global.sfx_volume)
 
+global.t_w_alpha = 0;
 if (global.tutorial_now <= 0)
 {
-	global.t_w_alpha = 0;
-	global.cannot_control = 0;
+	global.hp = 5;
+	global.show_rank = 0;
+
+	audio_play_sound(result_sfx,0,false,global.master_volume*global.sfx_volume)
 	global.back_to_game = 9999;
 }
-else
-{
-	if (global.tutorial_n_stage == 0)
-	{
-		global.t_w_alpha = 0;
-		global.cannot_control = 0;
-		global.tutorial_played = 0;
-	}
-	else if (global.tutorial_n_stage == 1)
-	{
-		global.background_color = $FF161510;
-		audio_play_sound(cleared_sfx,0,false,global.master_volume*global.sfx_volume*4);
-	}
-	else if (global.tutorial_n_stage == 2)
-	{
-		global.background_color = $FF331800;
-		audio_play_sound(cleared_sfx,0,false,global.master_volume*global.sfx_volume*4);
-	}
-	else if (global.tutorial_n_stage == 3)
-	{
-		global.background_color = $FF1E2620;
-		audio_play_sound(cleared_sfx,0,false,global.master_volume*global.sfx_volume*4);
-	}
-	else
-	{
-		global.tutorial_played = 1;
-		global.back_to_game = 9999;
-	}
-}
 
 
+global.cannot_control = 0;
+
 
 instance_destroy();
\ No newline at end of file
diff --git a/objects/obj_stage_clear/Other_12.gml b/objects/obj_stage_clear/Other_12.gml
new file mode 100644
index 00000000..e407ef97
--- /dev/null
+++ b/objects/obj_stage_clear/Other_12.gml
@@ -0,0 +1,21 @@
+/// @description Insert description here
+// You can write your code in this editor
+
+global.w_alpha = 10
+if (global.tutorial_now <= 0 || (global.tutorial_now > 0 && !audio_is_playing(global.n_music_instance)) || global.tutorial_n_stage == 1)
+{
+	if (global.tutorial_now > 0)
+	{
+		global.show_music_title = 241;
+	}
+	
+	global.show_rank = 0;
+	global.t_w_alpha = 0;
+	event_user(1);
+}
+else
+{
+	alarm[1] = 1;
+}
+
+
diff --git a/objects/obj_stage_clear/Step_0.gml b/objects/obj_stage_clear/Step_0.gml
index 02c9aa93..fde8a123 100644
--- a/objects/obj_stage_clear/Step_0.gml
+++ b/objects/obj_stage_clear/Step_0.gml
@@ -105,7 +105,6 @@ if (touched == 0 && global.hp > 0 && place_meeting(x,y,obj_player))
 		vspeed = -32
 	}
 	image_angle = 0
-	alarm[2] = 120
 
 	obj_camera.x += room_width*0.5-obj_player.x;
 	obj_camera.y += room_height*0.5-obj_player.y;
diff --git a/objects/obj_stage_clear/Step_1.gml b/objects/obj_stage_clear/Step_1.gml
index 0252e057..b137f382 100644
--- a/objects/obj_stage_clear/Step_1.gml
+++ b/objects/obj_stage_clear/Step_1.gml
@@ -338,7 +338,22 @@ if (can_play_animation == 1)
 			effect_.image_blend = color_sec
 		}
 		
-		global.t_w_alpha = 5000
+		if (global.tutorial_now > 0)
+		{
+			global.tutorial_n_stage++;
+			if (global.tutorial_n_stage == 1)
+			{
+				global.tutorial_played = 0;
+				global.show_music_title = 1;
+			}
+			else if (global.tutorial_n_stage >= 5)
+			{
+				global.tutorial_played = 1;
+				global.back_to_game = 9999;
+			}
+		}
+		
+		global.t_w_alpha = 5000;
 		w_alpha = 10
 		touched = 3
 		alarm[1] = 30
diff --git a/objects/obj_stage_clear/obj_stage_clear.yy b/objects/obj_stage_clear/obj_stage_clear.yy
index 11b508d3..67c01f5e 100644
--- a/objects/obj_stage_clear/obj_stage_clear.yy
+++ b/objects/obj_stage_clear/obj_stage_clear.yy
@@ -12,7 +12,7 @@
     {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":1,"eventType":3,"isDnD":false,},
     {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":1,"eventType":2,"isDnD":false,},
     {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":2,"eventType":3,"isDnD":false,},
-    {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":2,"eventType":2,"isDnD":false,},
+    {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":12,"eventType":7,"isDnD":false,},
   ],
   "managed": true,
   "overriddenProperties": [],
diff --git a/timelines/tutorial_part1_timeline/moment_0.gml b/timelines/tutorial_part1_timeline/moment_0.gml
index a949d0a0..f6236a53 100644
--- a/timelines/tutorial_part1_timeline/moment_0.gml
+++ b/timelines/tutorial_part1_timeline/moment_0.gml
@@ -5,16 +5,25 @@ if (!instance_exists(obj_stage_clear))
 	global.checkpoint_text = "리듬에 맞춰 등장하는 탄막을 피하기"
 }
 
+
+global.t_w_alpha = 0;
 global.t_bg_color = 1
 global.t_bg_color_alpha = 1
 global.artifact_type = 0
 global.tutorial_now = 1
+camera_focus_on(-4,-4,1)
 
 
 if (!instance_exists(obj_stage_clear))
 {
 	obj_player.x = room_width*0.3
 	global.t_w_alpha = 0;
-	global.w_alpha = 1
+	global.w_alpha = 10;
 	global.cannot_control = 0;
+	
+	with(obj_player_left_hp_effect)
+	{
+		x = obj_player.x
+		y = obj_player.y
+	}
 }
\ No newline at end of file
diff --git a/timelines/tutorial_part1_timeline/moment_120.gml b/timelines/tutorial_part1_timeline/moment_120.gml
index 5058b356..9cce43df 100644
--- a/timelines/tutorial_part1_timeline/moment_120.gml
+++ b/timelines/tutorial_part1_timeline/moment_120.gml
@@ -1,4 +1,4 @@
-
+global.t_w_alpha = 0;
 var attack_ef = instance_create_depth(global.c_w,irandom_range(global.c_y,global.c_h),depth+1,hitbox_2)
 attack_ef.direction = 180
 attack_ef.speed = 20
diff --git a/timelines/tutorial_part1_timeline/moment_312.gml b/timelines/tutorial_part1_timeline/moment_312.gml
index 1df10c58..048e7bc3 100644
--- a/timelines/tutorial_part1_timeline/moment_312.gml
+++ b/timelines/tutorial_part1_timeline/moment_312.gml
@@ -7,7 +7,7 @@ attack_ef.image_xscale = 0.4
 attack_ef.image_yscale = 0.4
 attack_ef.w_alpha = 10
 
-if !instance_exists(obj_stage_clear) && global.tutorial_n_stage = 0
+if (!instance_exists(obj_stage_clear) && global.tutorial_n_stage == 1)
 {
 	instance_create_depth(global.c_w+128,room_height*0.5,obj_player.depth-1,obj_stage_clear)
 
diff --git a/timelines/tutorial_part1_timeline/moment_48.gml b/timelines/tutorial_part1_timeline/moment_48.gml
index 5058b356..9cce43df 100644
--- a/timelines/tutorial_part1_timeline/moment_48.gml
+++ b/timelines/tutorial_part1_timeline/moment_48.gml
@@ -1,4 +1,4 @@
-
+global.t_w_alpha = 0;
 var attack_ef = instance_create_depth(global.c_w,irandom_range(global.c_y,global.c_h),depth+1,hitbox_2)
 attack_ef.direction = 180
 attack_ef.speed = 20
diff --git a/timelines/tutorial_part1_timeline/moment_529.gml b/timelines/tutorial_part1_timeline/moment_529.gml
index 8c96695c..7174a1ca 100644
--- a/timelines/tutorial_part1_timeline/moment_529.gml
+++ b/timelines/tutorial_part1_timeline/moment_529.gml
@@ -5,16 +5,27 @@ global.n_progress = 0
 global.n_music_instance = -4
 
 timeline_running = false
-if global.tutorial_n_stage = 1
+if (global.tutorial_n_stage == 2)
 {
+	load_stage("왁트모르즈비","영바이브 (아버 편곡)","tutorial_part2",$FFFFA232,5411,60)
 	obj_player.x = room_width*0.3
+	with(obj_player_left_hp_effect)
+	{
+		x = obj_player.x
+		y = obj_player.y
+	}
+		
 	global.t_w_alpha = 0;
 	global.cannot_control = 0;
-	global.w_alpha = 1
-	load_stage("왁트모르즈비","영바이브 (아버 편곡)","tutorial_part2",$FFFFA232,5411,60)
+	global.w_alpha = 10;
+	audio_play_sound(cleared_sfx,0,false,global.master_volume*global.sfx_volume*4);
+	
+	with(obj_stage_clear)
+	{
+		event_user(2);
+	}
 }
 else
 {
 	timeline_position = 0
-	global.tutorial_now = 0
 }
\ No newline at end of file
diff --git a/timelines/tutorial_part2_timeline/moment_0.gml b/timelines/tutorial_part2_timeline/moment_0.gml
index d7d32192..656e0429 100644
--- a/timelines/tutorial_part2_timeline/moment_0.gml
+++ b/timelines/tutorial_part2_timeline/moment_0.gml
@@ -1,11 +1,14 @@
 create_laser(irandom_range(global.c_x,global.c_w),global.c_y,27,20,4,2,2,180)
 
 global.savepoint_text_t_alpha = 1
-
+global.t_w_alpha = 0;
 global.t_bg_color = 1
 global.t_bg_color_alpha = 1
+set_bg_color_with_effect($FF161510,obj_player.x,obj_player.y,1);
+camera_focus_on(-4,-4,1)
 
 if (global.mobile_mode == 0)
 {
 	global.checkpoint_text = "ESC를 눌러 환경설정 열기"
-}
\ No newline at end of file
+}
+
diff --git a/timelines/tutorial_part2_timeline/moment_255.gml b/timelines/tutorial_part2_timeline/moment_255.gml
index 0e21f32f..8035962f 100644
--- a/timelines/tutorial_part2_timeline/moment_255.gml
+++ b/timelines/tutorial_part2_timeline/moment_255.gml
@@ -7,7 +7,7 @@ attack_ef.image_xscale = 0.4
 attack_ef.image_yscale = 0.4
 attack_ef.w_alpha = 10
 
-if !instance_exists(obj_stage_clear) && global.tutorial_n_stage = 1
+if (!instance_exists(obj_stage_clear) && global.tutorial_n_stage == 2)
 {
 	instance_create_depth(global.c_w+128,room_height*0.5,obj_player.depth-1,obj_stage_clear)
 }
\ No newline at end of file
diff --git a/timelines/tutorial_part2_timeline/moment_533.gml b/timelines/tutorial_part2_timeline/moment_533.gml
index f1a23edf..718a0d09 100644
--- a/timelines/tutorial_part2_timeline/moment_533.gml
+++ b/timelines/tutorial_part2_timeline/moment_533.gml
@@ -3,16 +3,27 @@ audio_stop_sound(global.n_music_instance)
 global.n_music_id = -4
 global.n_progress = 0
 timeline_running = false
-if global.tutorial_n_stage = 2
+if (global.tutorial_n_stage == 3)
 {
+	load_stage("왁트모르즈비","영바이브 (아버 편곡)","tutorial_part3",$FFFFA232,5411,60)
 	obj_player.x = room_width*0.3
+	with(obj_player_left_hp_effect)
+	{
+		x = obj_player.x
+		y = obj_player.y
+	}
+	
 	global.t_w_alpha = 0;
 	global.cannot_control = 0;
-	global.w_alpha = 1
-	load_stage("왁트모르즈비","영바이브 (아버 편곡)","tutorial_part3",$FFFFA232,5411,60)
+	global.w_alpha = 10;
+	audio_play_sound(cleared_sfx,0,false,global.master_volume*global.sfx_volume*4);
+	
+	with(obj_stage_clear)
+	{
+		event_user(2);
+	}
 }
 else
 {
 	timeline_position = 0
-	global.tutorial_now = 0
 }
diff --git a/timelines/tutorial_part3_timeline/moment_0.gml b/timelines/tutorial_part3_timeline/moment_0.gml
new file mode 100644
index 00000000..c8c8a0a5
--- /dev/null
+++ b/timelines/tutorial_part3_timeline/moment_0.gml
@@ -0,0 +1,2 @@
+set_bg_color_with_effect($FF331800,obj_player.x,obj_player.y,1);
+global.t_w_alpha = 0;
diff --git a/timelines/tutorial_part3_timeline/moment_1065.gml b/timelines/tutorial_part3_timeline/moment_1065.gml
index 81778129..a5b26387 100644
--- a/timelines/tutorial_part3_timeline/moment_1065.gml
+++ b/timelines/tutorial_part3_timeline/moment_1065.gml
@@ -5,16 +5,27 @@ global.n_progress = 0
 global.n_music_instance = -4
 
 timeline_running = false
-if global.tutorial_n_stage = 3
+if (global.tutorial_n_stage == 4)
 {
+	load_stage("왁트모르즈비","영바이브 (아버 편곡)","tutorial_part4",$FFFFA232,5411,60)
 	obj_player.x = room_width*0.3
+	with(obj_player_left_hp_effect)
+	{
+		x = obj_player.x
+		y = obj_player.y
+	}
+	
 	global.t_w_alpha = 0;
 	global.cannot_control = 0;
-	global.w_alpha = 1
-	load_stage("왁트모르즈비","영바이브 (아버 편곡)","tutorial_part4",$FFFFA232,5411,60)
+	global.w_alpha = 10;
+	audio_play_sound(cleared_sfx,0,false,global.master_volume*global.sfx_volume*4);
+	
+	with(obj_stage_clear)
+	{
+		event_user(2);
+	}
 }
 else
 {
 	timeline_position = 0
-	global.tutorial_now = 0
 }
\ No newline at end of file
diff --git a/timelines/tutorial_part3_timeline/moment_15.gml b/timelines/tutorial_part3_timeline/moment_15.gml
index 00f1ae42..d783de39 100644
--- a/timelines/tutorial_part3_timeline/moment_15.gml
+++ b/timelines/tutorial_part3_timeline/moment_15.gml
@@ -1,4 +1,5 @@
 global.savepoint_text_t_alpha = 1
+camera_focus_on(-4,-4,1)
 
 if global.mobile_mode = 1
 {
diff --git a/timelines/tutorial_part3_timeline/moment_687.gml b/timelines/tutorial_part3_timeline/moment_687.gml
index 2ae6ae45..54d4c3ed 100644
--- a/timelines/tutorial_part3_timeline/moment_687.gml
+++ b/timelines/tutorial_part3_timeline/moment_687.gml
@@ -10,7 +10,7 @@ for(var i = 0; i < 32; i++)
 	create_explo_circle(global.c_x+i*320,global.c_h-160,60+i*5,15,0,0,0.3,0,0,0,0)
 }
 
-if !instance_exists(obj_stage_clear) && global.tutorial_n_stage = 2
+if (!instance_exists(obj_stage_clear) && global.tutorial_n_stage == 3)
 {
 	instance_create_depth(global.c_w+128,room_height*0.5,obj_player.depth-1,obj_stage_clear)
 }
\ No newline at end of file
diff --git a/timelines/tutorial_part3_timeline/tutorial_part3_timeline.yy b/timelines/tutorial_part3_timeline/tutorial_part3_timeline.yy
index c8a0fc2b..4c8b03a0 100644
--- a/timelines/tutorial_part3_timeline/tutorial_part3_timeline.yy
+++ b/timelines/tutorial_part3_timeline/tutorial_part3_timeline.yy
@@ -3,6 +3,7 @@
   "resourceVersion": "1.0",
   "name": "tutorial_part3_timeline",
   "momentList": [
+    {"resourceType":"GMMoment","resourceVersion":"1.0","name":"","evnt":{"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,},"moment":0,},
     {"resourceType":"GMMoment","resourceVersion":"1.0","name":"","evnt":{"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":15,"eventType":0,"isDnD":false,},"moment":15,},
     {"resourceType":"GMMoment","resourceVersion":"1.0","name":"","evnt":{"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":30,"eventType":0,"isDnD":false,},"moment":30,},
     {"resourceType":"GMMoment","resourceVersion":"1.0","name":"","evnt":{"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":154,"eventType":0,"isDnD":false,},"moment":154,},
diff --git a/timelines/tutorial_part4_timeline/moment_0.gml b/timelines/tutorial_part4_timeline/moment_0.gml
index d3d7ad12..770af5fc 100644
--- a/timelines/tutorial_part4_timeline/moment_0.gml
+++ b/timelines/tutorial_part4_timeline/moment_0.gml
@@ -1,5 +1,6 @@
 global.savepoint_text_t_alpha = 0
 global.checkpoint_text = ""
-
-
+camera_focus_on(-4,-4,1)
+set_bg_color_with_effect($FF1E2620,obj_player.x,obj_player.y,1);
+global.t_w_alpha = 0;
 create_spike_circle(global.c_x+320,room_height*0.5,global.c_x+320,room_height*0.5,55,0,0,0.35)
\ No newline at end of file