2023_11_29

minor bugs fixed
tutorial bug fixed
etc.

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,23 +91,23 @@
     {"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",},
     {"name":"promise","order":20,"path":"sounds/promise/promise.yy",},
     {"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",},

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
 
 

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)
 

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;