diff --git a/Project Wak Beat.resource_order b/Project Wak Beat.resource_order index f5caeaa1..a4ec0f26 100644 --- a/Project Wak Beat.resource_order +++ b/Project Wak Beat.resource_order @@ -16,7 +16,7 @@ {"name":"UI&Camera","order":3,"path":"folders/스크립트/UI&Camera.yy",}, {"name":"UserData_Load","order":1,"path":"folders/스크립트/UserData_Load.yy",}, {"name":"hitbox_shapes","order":2,"path":"folders/스프라이트/hitbox_shapes.yy",}, - {"name":"effects","order":48,"path":"folders/스프라이트/hitbox_shapes/effects.yy",}, + {"name":"effects","order":49,"path":"folders/스프라이트/hitbox_shapes/effects.yy",}, {"name":"ui","order":1,"path":"folders/스프라이트/ui.yy",}, {"name":"시퀀스","order":10,"path":"folders/시퀀스.yy",}, {"name":"애니메이션 곡선","order":11,"path":"folders/애니메이션 곡선.yy",}, @@ -127,10 +127,11 @@ {"name":"spr_end","order":4,"path":"sprites/spr_end/spr_end.yy",}, {"name":"spr_circle_outline","order":10,"path":"sprites/spr_circle_outline/spr_circle_outline.yy",}, {"name":"create_worm","order":7,"path":"scripts/create_worm/create_worm.yy",}, - {"name":"spr_spuare_outline_full_mask","order":47,"path":"sprites/spr_spuare_outline_full_mask/spr_spuare_outline_full_mask.yy",}, + {"name":"spr_spuare_outline_full_mask","order":48,"path":"sprites/spr_spuare_outline_full_mask/spr_spuare_outline_full_mask.yy",}, {"name":"hitbox_vaious_effects","order":27,"path":"objects/hitbox_vaious_effects/hitbox_vaious_effects.yy",}, {"name":"spr_player_icon","order":11,"path":"sprites/spr_player_icon/spr_player_icon.yy",}, {"name":"obj_player_left_hp_effect","order":8,"path":"objects/obj_player_left_hp_effect/obj_player_left_hp_effect.yy",}, + {"name":"reset_custom_map_info","order":9,"path":"scripts/reset_custom_map_info/reset_custom_map_info.yy",}, {"name":"spr_jururu","order":11,"path":"sprites/spr_jururu/spr_jururu.yy",}, {"name":"get_unlocked_list_num","order":6,"path":"scripts/get_unlocked_list_num/get_unlocked_list_num.yy",}, {"name":"percentage_k","order":1,"path":"scripts/percentage_k/percentage_k.yy",}, @@ -185,6 +186,7 @@ {"name":"spr_hitbox_color","order":23,"path":"sprites/spr_hitbox_color/spr_hitbox_color.yy",}, {"name":"hitbox_19","order":20,"path":"objects/hitbox_19/hitbox_19.yy",}, {"name":"hitbox_2","order":2,"path":"objects/hitbox_2/hitbox_2.yy",}, + {"name":"spr_trash","order":27,"path":"sprites/spr_trash/spr_trash.yy",}, {"name":"spr_circle_spike","order":6,"path":"sprites/spr_circle_spike/spr_circle_spike.yy",}, {"name":"line_effect","order":7,"path":"objects/line_effect/line_effect.yy",}, {"name":"spr_gear","order":14,"path":"sprites/spr_gear/spr_gear.yy",}, @@ -250,6 +252,7 @@ {"name":"get_fav_list_num","order":4,"path":"scripts/get_fav_list_num/get_fav_list_num.yy",}, {"name":"result_sfx","order":14,"path":"sounds/result_sfx/result_sfx.yy",}, {"name":"create_explo_square","order":3,"path":"scripts/create_explo_square/create_explo_square.yy",}, + {"name":"spr_X","order":47,"path":"sprites/spr_X/spr_X.yy",}, {"name":"hitbox_12","order":13,"path":"objects/hitbox_12/hitbox_12.yy",}, {"name":"happysegu","order":26,"path":"sounds/happysegu/happysegu.yy",}, {"name":"Sprite68","order":3,"path":"sprites/Sprite68/Sprite68.yy",}, diff --git a/Project Wak Beat.yyp b/Project Wak Beat.yyp index c256fdfe..2ab57f6e 100644 --- a/Project Wak Beat.yyp +++ b/Project Wak Beat.yyp @@ -161,6 +161,7 @@ {"id":{"name":"spr_player_icon","path":"sprites/spr_player_icon/spr_player_icon.yy",},}, {"id":{"name":"obj_player_left_hp_effect","path":"objects/obj_player_left_hp_effect/obj_player_left_hp_effect.yy",},}, {"id":{"name":"bichan_hurt","path":"sounds/bichan_hurt/bichan_hurt.yy",},}, + {"id":{"name":"reset_custom_map_info","path":"scripts/reset_custom_map_info/reset_custom_map_info.yy",},}, {"id":{"name":"spr_jururu","path":"sprites/spr_jururu/spr_jururu.yy",},}, {"id":{"name":"get_unlocked_list_num","path":"scripts/get_unlocked_list_num/get_unlocked_list_num.yy",},}, {"id":{"name":"percentage_k","path":"scripts/percentage_k/percentage_k.yy",},}, @@ -219,6 +220,7 @@ {"id":{"name":"hitbox_19","path":"objects/hitbox_19/hitbox_19.yy",},}, {"id":{"name":"hitbox_2","path":"objects/hitbox_2/hitbox_2.yy",},}, {"id":{"name":"get_scores","path":"scripts/get_scores/get_scores.yy",},}, + {"id":{"name":"spr_trash","path":"sprites/spr_trash/spr_trash.yy",},}, {"id":{"name":"spr_circle_spike","path":"sprites/spr_circle_spike/spr_circle_spike.yy",},}, {"id":{"name":"line_effect","path":"objects/line_effect/line_effect.yy",},}, {"id":{"name":"spr_gear","path":"sprites/spr_gear/spr_gear.yy",},}, @@ -288,6 +290,7 @@ {"id":{"name":"get_fav_list_num","path":"scripts/get_fav_list_num/get_fav_list_num.yy",},}, {"id":{"name":"result_sfx","path":"sounds/result_sfx/result_sfx.yy",},}, {"id":{"name":"create_explo_square","path":"scripts/create_explo_square/create_explo_square.yy",},}, + {"id":{"name":"spr_X","path":"sprites/spr_X/spr_X.yy",},}, {"id":{"name":"hitbox_12","path":"objects/hitbox_12/hitbox_12.yy",},}, {"id":{"name":"happysegu","path":"sounds/happysegu/happysegu.yy",},}, {"id":{"name":"Sprite68","path":"sprites/Sprite68/Sprite68.yy",},}, diff --git a/objects/code/Create_0.gml b/objects/code/Create_0.gml index a4db2a4f..6a2ccca8 100644 --- a/objects/code/Create_0.gml +++ b/objects/code/Create_0.gml @@ -4,9 +4,9 @@ global.version_real = "7.01"; global.version = "Beta "+string(global.version_real); global.beta_tester = 1; global.streamer = 0; +global.custom_mapper = 0; global.dev_mode = 0; devmode_activate = 0; -global.custom_mapper = 0; surf_screen = -4; music_title_alpha = 0 global.blackout_alpha = 0; @@ -27,7 +27,6 @@ global.overtime_highlight_song = 1; global.automatic_load_ranking = 0; global.cannot_connect = 0; global.show_credit = 1; -global.beta_tester = 0; var file_name = (global.dev_mode == 1) ? "PWB_Beta.ini" : "PWB_OpenBeta.ini" ini_open_protect(file_name) var tmp = ini_read_real("tutorial_played","none",0) @@ -261,7 +260,7 @@ for(var i = 0; i <= 11; i++) global.guide_showed[i] = 0; } -global.custom_map_file_dir = array_create(999,""); + global.custom_map_num = 0; @@ -294,12 +293,14 @@ automatic_reload_leaderboard = 0; //곡 정보 - for(var i = 0; i < 99; i++) + for(var i = 0; i < 255; i++) { //좋아요 한 곡 global.fav_map_id[i] = -4; - //해금된 곡 - global.unlocked_map_id[i] = -4; + //해당 곡의 원래 오리지널 id값 + global.map_id_origin[i] = -4; + + //새로운 곡 표시에 포함될 곡 (커스텀 곡은 제외) @@ -378,6 +379,7 @@ automatic_reload_leaderboard = 0; global.custom_stage_album[i] = -4; global.custom_audio_asset[i] = -4; global.custom_stage_mapper[i] = -4; + global.custom_map_file_dir[i] = ""; } @@ -540,6 +542,9 @@ master_movement_timer = 0 global.master_remix_effect5 = 0 +//곡 필터링 - 우왁굳 +global.filter_song_wakgood = [ 0, 8 ]; + //후쿠로우 global.real_stage_map_name[9] = "부엉이 (Cover by 아이네 INE)"; global.real_stage_map_artist[9] = "Original by KOKIA / Inst by Kupon"; @@ -824,7 +829,8 @@ global.real_detailed_difficulty[25] = 1.5; global.real_obtainable_type[25] = 99; global.real_requirement_level[25] = 9999; - +//곡 필터링 - 이세돌 +global.filter_song_isedol = [ 9 , 25 ]; diff --git a/objects/code/Draw_73.gml b/objects/code/Draw_73.gml index cd818c6b..42d99932 100644 --- a/objects/code/Draw_73.gml +++ b/objects/code/Draw_73.gml @@ -373,15 +373,15 @@ if global.select_map != 0 && abs(obj_player.image_xscale) < 0.1 if (global.obtainable_type[i] != 99) { draw_sprite_ext(spr_lock,0,xx_+96*dis_real,yy_,global.font_ratio_resolution_xx*0.25*dis_real,0.25*dis_real,0,c_white,global.ui_alpha*dis_real) - draw_text_k_scale(xx_+246*dis_real,yy_-64*dis_real,"해금 조건",64,-1,dis_alpha,global.map_color,0,-1,normal_font,0.5*dis_real*global.font_ratio_resolution_xx,0.5*dis_real,0) + draw_text_kl_scale(xx_+246*dis_real,yy_-64*dis_real,"해금 조건",64,-1,dis_alpha,global.map_color,0,-1,normal_font,0.5*dis_real*global.font_ratio_resolution_xx,0.5*dis_real,0) draw_sprite_ext(spr_lock,0,xx_+276*dis_real,yy_+32*dis_real,global.font_ratio_resolution_xx*0.15*dis_real,0.15*dis_real,20,c_white,global.ui_alpha*dis_real) - draw_text_k_scale(xx_+320*dis_real,yy_,string(global.requirement_level[i])+"레벨 이상",64,-1,dis_alpha,c_white,0,-1,normal_font,dis_real*0.5*global.font_ratio_resolution_xx,dis_real*0.5,0) + draw_text_kl_scale(xx_+320*dis_real,yy_,string(global.requirement_level[i])+"레벨 이상",64,-1,dis_alpha,c_white,0,-1,normal_font,dis_real*0.5*global.font_ratio_resolution_xx,dis_real*0.5,0) } else { draw_sprite_ext(spr_lock,0,xx_+96*dis_real,yy_,global.font_ratio_resolution_xx*0.25*dis_real,0.25*dis_real,0,c_white,global.ui_alpha*dis_real) - draw_text_k_scale(xx_+246*dis_real,yy_-64*dis_real,"개발 예정...",64,-1,dis_alpha,global.map_color,0,-1,normal_font,0.5*dis_real*global.font_ratio_resolution_xx,0.5*dis_real,0) + draw_text_kl_scale(xx_+246*dis_real,yy_-64*dis_real,"개발 예정...",64,-1,dis_alpha,global.map_color,0,-1,normal_font,0.5*dis_real*global.font_ratio_resolution_xx,0.5*dis_real,0) } } else @@ -389,15 +389,15 @@ if global.select_map != 0 && abs(obj_player.image_xscale) < 0.1 if (global.obtainable_type[i] != 99) { draw_sprite_ext(spr_lock,0,xx_+1080,yy_,global.font_ratio_resolution_xx*0.25*dis_real,0.25*dis_real,0,c_white,global.ui_alpha*dis_real) - draw_text_k_scale(xx_+1156,yy_-64,"해금 조건",64,-1,dis_alpha,c_white,0,-1,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0) + draw_text_kl_scale(xx_+1156,yy_-64,"해금 조건",64,-1,dis_alpha,c_white,0,-1,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0) //draw_sprite_ext(spr_W,global.obtainable_type[i],xx_+1236,yy_+32,global.font_ratio_resolution_xx*0.15,0.15,20,c_white,global.ui_alpha*dis_real) - draw_text_k_scale(xx_+1200,yy_,string(global.requirement_level[i])+"레벨 이상",64,-1,dis_alpha,c_white,0,-1,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0) + draw_text_kl_scale(xx_+1200,yy_,string(global.requirement_level[i])+"레벨 이상",64,-1,dis_alpha,c_white,0,-1,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0) } else { draw_sprite_ext(spr_lock,0,xx_+1080,yy_,global.font_ratio_resolution_xx*0.25*dis_real,0.25*dis_real,0,c_white,global.ui_alpha*dis_real) - draw_text_k_scale(xx_+1156,yy_-64,"개발 예정...",64,-1,dis_alpha,c_white,0,-1,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0) + draw_text_kl_scale(xx_+1156,yy_-64,"개발 예정...",64,-1,dis_alpha,c_white,0,-1,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0) } } } @@ -464,7 +464,10 @@ if global.select_map != 0 && abs(obj_player.image_xscale) < 0.1 if global.scroll_activated != -1 { global.scroll_n_m_xx = device_mouse_x(global.scroll_activated) - global.scroll_n_m_yy = device_mouse_y(global.scroll_activated) + if (global.scroll_n_m_xx >= room_width*0.5) + { + global.scroll_n_m_yy = device_mouse_y(global.scroll_activated) + } global.t_select_map += (global.joystick_yy - global.scroll_n_m_yy)/1080 global.reload_n_map_list_value = (global.joystick_xx - global.scroll_n_m_xx)/512 diff --git a/objects/code/KeyPress_45.gml b/objects/code/KeyPress_45.gml index 3b7a2241..91d033b5 100644 --- a/objects/code/KeyPress_45.gml +++ b/objects/code/KeyPress_45.gml @@ -2,12 +2,14 @@ // You can write your code in this editor - -devmode_activate += 0.08; -if (devmode_activate > 1) +if (global.map_editor != 1) { - global.dev_mode = 1; - show_message_log("개발자 모드가 활성화 되었습니다!"); - global.default_directory = working_directory; - global.custom_map_directory = string(global.default_directory)+"\\Custom map files\\"; + devmode_activate += 0.08; + if (devmode_activate > 1) + { + global.dev_mode = 1; + show_message_log("개발자 모드가 활성화 되었습니다!"); + global.default_directory = working_directory; + global.custom_map_directory = string(global.default_directory)+"\\Custom map files\\"; + } } \ No newline at end of file diff --git a/objects/code/Other_10.gml b/objects/code/Other_10.gml index 333757fa..fda0a536 100644 --- a/objects/code/Other_10.gml +++ b/objects/code/Other_10.gml @@ -2,8 +2,31 @@ // You can write your code in this editor camera_focus_on(-4,-4,1) +var tmp_str = "모든 곡"; +if (global.n_map_list == 1) +{ + tmp_str = "좋아요 한 곡"; +} +else if (global.n_map_list == 2) +{ + tmp_str = "유저 제작 커스텀 곡"; +} +else if (global.n_map_list == 3) +{ + tmp_str = "해금 된 곡"; +} +else if (global.n_map_list == 4) +{ + tmp_str = "[곡 필터링] 우왁굳"; +} +else if (global.n_map_list == 5) +{ + tmp_str = "[곡 필터링] 이세계아이돌"; +} + + np_setpresence_more("", "메인 매뉴", false); -np_setpresence("메인 매뉴", "", "type0", ""); +np_setpresence(string(tmp_str), "메인 매뉴", "type0", ""); automatic_loading_cancel = 0 window_set_cursor(cr_default) instance_destroy(map_edior_ui); diff --git a/objects/code/Other_11.gml b/objects/code/Other_11.gml index e6d77316..6a589456 100644 --- a/objects/code/Other_11.gml +++ b/objects/code/Other_11.gml @@ -27,14 +27,15 @@ if (global.title_menu_animation1 == -1) } } - if global.n_map_list < 0 + var tmp_max_list = 5; + if (global.n_map_list < 0) { - global.n_map_list = 3 + global.n_map_list = tmp_max_list; } - if global.n_map_list > 3 + if (global.n_map_list > tmp_max_list) { - global.n_map_list = 0 + global.n_map_list = 0; } diff --git a/objects/code/Step_0.gml b/objects/code/Step_0.gml index 9e4f2238..fe07bdf2 100644 --- a/objects/code/Step_0.gml +++ b/objects/code/Step_0.gml @@ -171,7 +171,7 @@ if global.joystick_activated != -1 if global.mobile_mode = 1 && global.sync_setting = 0 { - for(var i = 0; i < 4; i++) + for(var i = 0; i < 6; i++) { var is_click = device_mouse_check_button_pressed(i, mb_left); if device_mouse_check_button(i, mb_left) @@ -236,7 +236,7 @@ if global.mobile_mode = 1 && global.sync_setting = 0 global.hmove = 0 } - if is_clicked_scroll + if (is_clicked_scroll) { global.t_select_map = round(global.t_select_map) global.scroll_activated = -1 diff --git a/objects/code/Step_1.gml b/objects/code/Step_1.gml index 96552625..cb982aee 100644 --- a/objects/code/Step_1.gml +++ b/objects/code/Step_1.gml @@ -515,18 +515,19 @@ global.rank_display_b_alpha += (0 - global.rank_display_b_alpha)*0.1 { global.n_map_id = n_stage } - if global.n_map_list = 1 + else if global.n_map_list = 1 { global.n_map_id = global.fav_map_id[n_stage] } - if global.n_map_list = 2 + else if global.n_map_list = 2 { global.n_map_id = n_stage } - if global.n_map_list = 3 + else if (global.n_map_list == 3 || global.n_map_list == 4 || global.n_map_list == 5) { - global.n_map_id = global.unlocked_map_id[n_stage] + global.n_map_id = global.map_id_origin[n_stage] } + if keyboard_check_pressed(vk_anykey) { diff --git a/objects/hitbox_15/Draw_73.gml b/objects/hitbox_15/Draw_73.gml index fa5c19ea..e6f330b9 100644 --- a/objects/hitbox_15/Draw_73.gml +++ b/objects/hitbox_15/Draw_73.gml @@ -15,6 +15,6 @@ if (global.timeline_stop == 1 && my_id == 0) draw_line_width(x,y,x+lengthdir_x(320,direction),y+lengthdir_y(320,direction),3); var fontsize2 = (0.45*(1+global.mobile_mode*0.3))*global.converted_view_ratio; - draw_text_k_scale(x,y+64,"Size : "+string(image_xscale*sprite_get_width(sprite_index))+"px"+"\nx : "+string(floor(x))+"\ny : "+string(floor(y))+"\n몸통 갯수 : "+string(body_num)+"\n좌우 회전 속도 : "+string(auto_shake),64,-1,1,c_white,0,0,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0) + draw_text_k_scale(x,y+64,"Size : "+string(floor(image_xscale*sprite_get_width(sprite_index)))+"px"+"\nx : "+string(floor(x))+"\ny : "+string(floor(y))+"\n몸통 갯수 : "+string(body_num)+"\n좌우 회전 속도 : "+string(auto_shake),64,-1,1,c_white,0,0,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0) } } \ No newline at end of file diff --git a/objects/hitbox_15/Step_0.gml b/objects/hitbox_15/Step_0.gml index c41863c4..d1921881 100644 --- a/objects/hitbox_15/Step_0.gml +++ b/objects/hitbox_15/Step_0.gml @@ -4,6 +4,7 @@ w_alpha += (0 - w_alpha)*0.3 if (global.timeline_stop != 1) { + image_alpha = 1; if (my_id != 0) { var target = parent_id.id_num[my_id-1]; @@ -40,5 +41,14 @@ if (global.timeline_stop != 1) des_time += (image_xscale/sprite_width)/5 } } - - +else +{ + if (my_id == 0) + { + image_alpha = 0.5; + } + else + { + image_alpha = 0; + } +} diff --git a/objects/map_edior_ui/Alarm_1.gml b/objects/map_edior_ui/Alarm_1.gml index b4e6aa6f..dcf81e11 100644 --- a/objects/map_edior_ui/Alarm_1.gml +++ b/objects/map_edior_ui/Alarm_1.gml @@ -16,11 +16,14 @@ if (global.n_setting_button == -4 && global.timeline_stop == 1) } else { - //탄막 타입 기준으로 탄막 생성 - editor_mode_create_projectile(global.editor_selected_type,t_m_x,t_m_y,global.ed_arg[0],(global.editor_selected_type == 11) ? 1 : global.ed_arg[1],global.ed_arg[2],global.ed_arg[3],global.ed_arg[4],global.ed_arg[5],global.ed_arg[6],custom_image_type,custom_image_ind); - with(code) + if (is_real(global.editor_selected_type) && global.editor_selected_type >= 0) { - event_user(10); + //탄막 타입 기준으로 탄막 생성 + editor_mode_create_projectile(global.editor_selected_type,t_m_x,t_m_y,global.ed_arg[0],(global.editor_selected_type == 11) ? 1 : global.ed_arg[1],global.ed_arg[2],global.ed_arg[3],global.ed_arg[4],global.ed_arg[5],global.ed_arg[6],custom_image_type,custom_image_ind); + with(code) + { + event_user(10); + } } } } diff --git a/objects/map_edior_ui/Create_0.gml b/objects/map_edior_ui/Create_0.gml index d984ad56..3049ba86 100644 --- a/objects/map_edior_ui/Create_0.gml +++ b/objects/map_edior_ui/Create_0.gml @@ -15,6 +15,8 @@ keep_pressing = 0 custom_image_type = 2; custom_image_ind = 0; selected_projectile_type = 0; +del_current_timeline = 0 +del_all_timeline = 0 global.tiny_value_scrolling_now = 0; for(var i = 0; i < 7; i++) { diff --git a/objects/map_edior_ui/Draw_73.gml b/objects/map_edior_ui/Draw_73.gml index caa369a6..7509ee59 100644 --- a/objects/map_edior_ui/Draw_73.gml +++ b/objects/map_edior_ui/Draw_73.gml @@ -32,7 +32,7 @@ if (global.timeline_stop == 1) { draw_text_k_scale(xx+xx_w*0.02,yy+yy_h*(0.35-global.mobile_mode*0.03),"- 단축키",fontsize2*256,-1,tmp_alpha_,c_white,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0) var plus_str = (custom_image_type != 2) ? "\n탄막 이미지 변경 [좌/우 방향키]" : ""; - draw_text_k_scale(xx+xx_w*0.02,yy+yy_h*(0.4-global.mobile_mode*0.03),"눈금선 위로 고정 [Shift]\n세밀한 값 조절 [Shift+스크롤 바 좌클릭]\n배치된 탄막 선택/수정 [마우스 가운데 휠 버튼]\n선택된 탄막 삭제 [Delete]\n에디터 창 열기/닫기 [Space / Enter]"+string(plus_str),fontsize2*256,-1,tmp_alpha_,c_white,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0) + draw_text_k_scale(xx+xx_w*0.02,yy+yy_h*(0.4-global.mobile_mode*0.03),"눈금선 위로 고정 [Shift]\n세밀한 값 조절 [Shift+스크롤 바 좌클릭]\n배치된 탄막 선택/수정 [마우스 가운데 휠 버튼]\n선택된 탄막 삭제 [Delete]\n에디터 창 열기/닫기 [Space / Enter]\n현재 타임라인 삭제 [Ctrl + Del]\n전체 타임라인 삭제 [Alt + Del]"+string(plus_str),fontsize2*256,-1,tmp_alpha_,c_white,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0) @@ -44,7 +44,7 @@ if (global.timeline_stop == 1) } - var tmp_name = [ "이동 탄막", "스파이크 폭발 탄막", "레이저 탄막", "눈꽃 탄막", "지렁이 탄막", "화살표 레이저 탄막", "원형 폭발 탄막", "맵 밖에서 튀어나오는 탄막", "탄막색 변경" , "배경색 변경" , "미사일 탄막" , "세이브 포인트 지정", "바운스 탄막", "카메라 효과", "배경 투명도 변화", "회전하는 탄막 자동 생성기", "물 이펙트 탄막", "카메라 지진 효과", "맵 이동 효과", "지정 위치 이동 탄막", "이펙트 탄막", "화면 플래시 효과", "비 효과", "특수 카메라 효과", "Unknown", "Unknown", "Unknown", "배치된 탄막 수정 ['마우스 가운데 휠 버튼'으로 바로 선택 가능]", "타임라인 플레이/일시정지" ]; + var tmp_name = [ "이동 탄막 - 이동하는 탄막을 생성합니다", "스파이크 폭발 탄막 - 멀리서 날아와 폭발하는 탄막을 생성합니다", "레이저 탄막 - 레이저를 생성합니다", "눈꽃 탄막 - '겨울봄 (Winter Spring)'에 등장한 눈꽃 탄막을 생성합니다", "지렁이 탄막 - '매스터 리믹스 (Orchestral Edit)'에 등장한 지렁이 탄막을 생성합니다", "화살표 레이저 탄막 - 'Happy Gosegu Sencho!'에 등장한 화살표 방향으로 날아가는 탄막을 생성합니다", "원형 폭발 탄막 - 시간이 지난 뒤 등장하는 탄막을 생성합니다", "맵 밖에서 튀어나오는 탄막 - '고멤가요제 MASHUP (아이네 INE)'에 등장한 막대기 모양의 탄막을 생성합니다", "탄막색 변경 - 탄막색을 변경합니다" , "배경색 변경 - 배경색을 변경합니다" , "미사일 탄막 - '밤가이!!'에 등장한 날아가면서 탄막을 생성하는 탄막을 생성합니다" , "세이브 포인트 지정 - 현재 타임라인에 세이브 포인트를 지정합니다", "바운스 탄막 - 'Happy Gosegu Sencho!'에 등장한 맵 바깥에서 튕기며 폭발하는 탄막을 생성합니다", "카메라 효과 - 카메라 줌 정도를 조절합니다", "배경 투명도 변화 - 배경의 투명도를 조절합니다", "회전하는 탄막 자동 생성기 - 지속 시간 동안 계속 '이동 탄막'을 생성합니다", "물 이펙트 탄막 - '아이패드'에 등장한 물이 튀기는 듯한 모양의 탄막을 생성합니다", "카메라 지진 효과 - 카메라를 시점을 흔드는 효과를 줍니다", "맵 이동 효과 - '밤가이!!'에 등장한 맵이 이동하는 효과를 줍니다", "지정 위치 이동 탄막 - 특정 좌표로 이동하는 탄막을 생성합니다", "이펙트 탄막 - 피격판정이 없는 탄막을 생성합니다", "화면 플래시 효과 - 화면이 번쩍거리는 효과를 줍니다", "비 효과 - '매스터 리믹스 (Orchestral Edit)'에 등장한 비 내리는 효과를 줍니다", "특수 카메라 효과 - 몇몇 특수한 카메라 효과를 줍니다", "Unknown", "Unknown", "Unknown", "배치된 탄막 수정 ['마우스 가운데 휠 버튼'으로 바로 선택 가능]", "타임라인 플레이/일시정지" ]; if (global.editor_selected_type >= 0) { draw_text_k_scale(xx+64,yy+yy_h*0.88+32-scroll_y,string(tmp_name[global.editor_selected_type]),64,-1,1,c_white,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0) @@ -53,7 +53,7 @@ if (global.timeline_stop == 1) { draw_text_k_scale(xx+64,yy+yy_h*0.88+32-scroll_y,"[하단의 이미지를 클릭하여 배치할 탄막을 선택]",64,-1,1,c_white,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0) } -} + //else //{ //draw_text_k_scale(t_m_x+32,t_m_y-64,"camera zoom : "+string(global.n_camera_zoom)+"\ncamera_slow_zoom : "+string(global.camera_slow_zoom),64,-1,1,c_red,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0) @@ -61,148 +61,144 @@ if (global.timeline_stop == 1) -for(var i = 0; i <= 28; i++) //탄막이 새로 추가되면 수정해야됨 -{ - if ((global.editor_hitbox == -1 && (i <= 23 || i > 27)) || (global.editor_hitbox == 1 && ((instance_exists(n_selected) && i == 0) || i > 27))) + for(var i = 0; i <= 28; i++) //탄막이 새로 추가되면 수정해야됨 { - var tmp_xx = xx+(96+i*120)*global.converted_view_ratio; - var tmp_yy = yy+yy_h*0.88+(160-scroll_y)*global.converted_view_ratio; - if (mouse_check_button_released(mb_left) && point_distance(mouse_x,mouse_y,tmp_xx,tmp_yy) <= 48*global.converted_view_ratio) + if (i <= 23 || i > 27) { - selected_projectile_type = 1; - audio_play_sound(common_sfx1,0,false,0.2*global.master_volume*global.sfx_volume); - global.ed_arg_name[0] = ""; - global.ed_arg_name[1] = ""; - global.ed_arg_name[2] = ""; - global.ed_arg_name[3] = ""; - global.ed_arg_name[4] = ""; - global.ed_arg_name[5] = ""; - global.ed_arg_name[6] = ""; - image_blend = global.map_color; - image_angle = 0; - image_xscale = 1; - image_yscale = 1; - image_alpha = 1; + var tmp_xx = xx+(96+i*120)*global.converted_view_ratio; + var tmp_yy = yy+yy_h*0.88+(160-scroll_y)*global.converted_view_ratio; + if (mouse_check_button_released(mb_left) && point_distance(mouse_x,mouse_y,tmp_xx,tmp_yy) <= 48*global.converted_view_ratio) + { + selected_projectile_type = 1; + audio_play_sound(common_sfx1,0,false,0.2*global.master_volume*global.sfx_volume); + global.ed_arg_name[0] = ""; + global.ed_arg_name[1] = ""; + global.ed_arg_name[2] = ""; + global.ed_arg_name[3] = ""; + global.ed_arg_name[4] = ""; + global.ed_arg_name[5] = ""; + global.ed_arg_name[6] = ""; + global.editor_hitbox = -1; + image_blend = global.map_color; + image_angle = 0; + image_xscale = 1; + image_yscale = 1; + image_alpha = 1; - with(obj_button) - { - if (button_id >= 100) + with(obj_button) { - instance_destroy(); + if (button_id >= 100) + { + instance_destroy(); + } } - } - - if (i == 28) //탄막이 새로 추가되면 수정해야됨 - { - event_user(0); - } - else if (instance_exists(n_selected) && i == 0) - { - event_user(2); - } - else - { - global.editor_selected_type = i; - } - if (i == 20) - { - global.editor_hitbox *= -1; - show_message_log("점선으로 이루어진 원을 클릭해 탄막 선택"); - } + if (i == 28) //탄막이 새로 추가되면 수정해야됨 + { + event_user(0); + } + else if (instance_exists(n_selected) && i == 0) + { + event_user(2); + } + else + { + global.editor_selected_type = i; + } - with(code) - { - event_user(14); + with(code) + { + event_user(14); + } } - } - var tmp_img_ind = i+1; - if (i == 28) //탄막이 새로 추가되면 수정해야됨 - { - if (global.timeline_stop == 1) + var tmp_img_ind = i+1; + if (i == 28) //탄막이 새로 추가되면 수정해야됨 { - tmp_img_ind = 29; //탄막이 새로 추가되면 수정해야됨 + if (global.timeline_stop == 1) + { + tmp_img_ind = 29; //탄막이 새로 추가되면 수정해야됨 + } + else + { + tmp_img_ind = 30; //탄막이 새로 추가되면 수정해야됨 + } } - else + else if (instance_exists(n_selected) && i == 0 && global.editor_hitbox == 1) { - tmp_img_ind = 30; //탄막이 새로 추가되면 수정해야됨 + tmp_img_ind = 28; //탄막이 새로 추가되면 수정해야됨 } - } - else if (instance_exists(n_selected) && i == 0 && global.editor_hitbox == 1) - { - tmp_img_ind = 28; //탄막이 새로 추가되면 수정해야됨 - } - draw_sprite_ext(spr_editor_button,tmp_img_ind,tmp_xx,tmp_yy,global.converted_view_ratio/1.333333333,global.converted_view_ratio/1.333333333,0,c_white,1) - if (global.editor_selected_type == i) - { - draw_sprite_ext(spr_editor_button,0,tmp_xx,tmp_yy,global.converted_view_ratio/1.333333333,global.converted_view_ratio/1.333333333,0,c_white,1) + draw_sprite_ext(spr_editor_button,tmp_img_ind,tmp_xx,tmp_yy,global.converted_view_ratio/1.333333333,global.converted_view_ratio/1.333333333,0,c_white,1) + if (global.editor_selected_type == i) + { + draw_sprite_ext(spr_editor_button,0,tmp_xx,tmp_yy,global.converted_view_ratio/1.333333333,global.converted_view_ratio/1.333333333,0,c_white,1) + } + //draw_text(tmp_xx+32,tmp_yy+32,i); } - //draw_text(tmp_xx+32,tmp_yy+32,i); } -} -if (global.editor_selected_type == 0) -{ - draw_set_color(c_white); - draw_set_alpha(1); - draw_line_width(t_m_x+lengthdir_x(320,image_angle),t_m_y+lengthdir_y(320,image_angle),t_m_x,t_m_y,3); -} -else if (global.editor_selected_type == 1) -{ - draw_set_color(c_white); - draw_set_alpha(1); - draw_line_width(t_m_x+(global.ed_arg[1]-180)*50,t_m_y+(global.ed_arg[2]-128)*50,t_m_x,t_m_y,3); -} -else if (global.editor_selected_type == 4) -{ - draw_set_color(c_white); - draw_set_alpha(1); - draw_line_width(t_m_x+lengthdir_x(320,image_angle-270),t_m_y+lengthdir_y(320,image_angle-270),t_m_x,t_m_y,3); -} -else if (global.editor_selected_type == 7) -{ - var tmp_val_ang = floor((global.ed_arg[5]/1200)*359) - draw_set_color(c_white); - draw_set_alpha(1); - draw_line_width(t_m_x+lengthdir_x(320,tmp_val_ang),t_m_y+lengthdir_y(320,tmp_val_ang),t_m_x,t_m_y,3); -} -else if (global.editor_selected_type == 10) -{ - var tmp_val_ang = floor(image_angle) - draw_set_color(c_white); - draw_set_alpha(1); - draw_line_width(t_m_x+lengthdir_x(320,tmp_val_ang),t_m_y+lengthdir_y(320,tmp_val_ang),t_m_x,t_m_y,3); -} -else if (global.editor_selected_type == 12) -{ - var tmp_val_ang = floor(image_angle) - draw_set_color(c_white); - draw_set_alpha(1); - draw_line_width(t_m_x+lengthdir_x(320,tmp_val_ang),t_m_y+lengthdir_y(320,tmp_val_ang),t_m_x,t_m_y,3); -} -else if (global.editor_selected_type == 15) -{ - var tmp_val_ang = floor(global.ed_arg[1]) - draw_set_color(c_white); - draw_set_alpha(1); - draw_line_width(t_m_x+lengthdir_x(320,180+tmp_val_ang),t_m_y+lengthdir_y(320,180+tmp_val_ang),t_m_x,t_m_y,3); -} -else if (global.editor_selected_type == 16) -{ - var tmp_ang = image_angle; - for(var i = -global.ed_arg[3]; i <= global.ed_arg[3]; i++) + if (global.editor_selected_type == 0) + { + draw_set_color(c_white); + draw_set_alpha(1); + draw_line_width(t_m_x+lengthdir_x(320,image_angle),t_m_y+lengthdir_y(320,image_angle),t_m_x,t_m_y,3); + } + else if (global.editor_selected_type == 1) { - draw_sprite_ext(spr_circle_cylinder,0,x+lengthdir_x(image_xscale*160*i,image_angle),y+lengthdir_y(image_xscale*160*i,image_angle),image_xscale,image_xscale,tmp_ang,global.map_color,0.4); + draw_set_color(c_white); + draw_set_alpha(1); + draw_line_width(t_m_x+(global.ed_arg[1]-180)*50,t_m_y+(global.ed_arg[2]-128)*50,t_m_x,t_m_y,3); } - - if (global.ed_arg[6] != 1) + else if (global.editor_selected_type == 4) { draw_set_color(c_white); draw_set_alpha(1); - draw_line_width(t_m_x+lengthdir_x((global.ed_arg[2]/60)*64,tmp_ang+90),t_m_y+lengthdir_y((global.ed_arg[2]/60)*64,tmp_ang+90),t_m_x,t_m_y,3); + draw_line_width(t_m_x+lengthdir_x(320,image_angle-270),t_m_y+lengthdir_y(320,image_angle-270),t_m_x,t_m_y,3); + } + else if (global.editor_selected_type == 7) + { + var tmp_val_ang = floor((global.ed_arg[5]/1200)*359) + draw_set_color(c_white); + draw_set_alpha(1); + draw_line_width(t_m_x+lengthdir_x(320,tmp_val_ang),t_m_y+lengthdir_y(320,tmp_val_ang),t_m_x,t_m_y,3); + } + else if (global.editor_selected_type == 10) + { + var tmp_val_ang = floor(image_angle) + draw_set_color(c_white); + draw_set_alpha(1); + draw_line_width(t_m_x+lengthdir_x(320,tmp_val_ang),t_m_y+lengthdir_y(320,tmp_val_ang),t_m_x,t_m_y,3); + } + else if (global.editor_selected_type == 12) + { + var tmp_val_ang = floor(image_angle) + draw_set_color(c_white); + draw_set_alpha(1); + draw_line_width(t_m_x+lengthdir_x(320,tmp_val_ang),t_m_y+lengthdir_y(320,tmp_val_ang),t_m_x,t_m_y,3); + } + else if (global.editor_selected_type == 15) + { + var tmp_val_ang = floor(global.ed_arg[1]) + draw_set_color(c_white); + draw_set_alpha(1); + draw_line_width(t_m_x+lengthdir_x(320,180+tmp_val_ang),t_m_y+lengthdir_y(320,180+tmp_val_ang),t_m_x,t_m_y,3); + } + else if (global.editor_selected_type == 16) + { + var tmp_ang = image_angle; + for(var i = -global.ed_arg[3]; i <= global.ed_arg[3]; i++) + { + draw_sprite_ext(spr_circle_cylinder,0,x+lengthdir_x(image_xscale*160*i,image_angle),y+lengthdir_y(image_xscale*160*i,image_angle),image_xscale,image_xscale,tmp_ang,global.map_color,0.4); + } + + if (global.ed_arg[6] != 1) + { + draw_set_color(c_white); + draw_set_alpha(1); + draw_line_width(t_m_x+lengthdir_x((global.ed_arg[2]/60)*64,tmp_ang+90),t_m_y+lengthdir_y((global.ed_arg[2]/60)*64,tmp_ang+90),t_m_x,t_m_y,3); + } } } diff --git a/objects/map_edior_ui/Keyboard_17.gml b/objects/map_edior_ui/Keyboard_17.gml new file mode 100644 index 00000000..b342e324 --- /dev/null +++ b/objects/map_edior_ui/Keyboard_17.gml @@ -0,0 +1,25 @@ +/// @description Insert description here +// You can write your code in this editor + + +if (keyboard_check_pressed(vk_delete) || keyboard_check_pressed(vk_insert)) +{ + clean_message_log(); + del_current_timeline += 1; + + if (del_current_timeline > 1) + { + show_message_log("('현재 타임라인'이 삭제되었습니다)"); + instance_destroy(hitbox_parents); + with(code) + { + event_user(10); + } + + del_current_timeline = 0; + } + else + { + show_message_log("('현재 타임라인'을 지우시려면 한 번 더 눌러주세요)"); + } +} diff --git a/objects/map_edior_ui/Keyboard_18.gml b/objects/map_edior_ui/Keyboard_18.gml new file mode 100644 index 00000000..77ad3057 --- /dev/null +++ b/objects/map_edior_ui/Keyboard_18.gml @@ -0,0 +1,34 @@ +/// @description Insert description here +// You can write your code in this editor + +if (keyboard_check_pressed(vk_delete) || keyboard_check_pressed(vk_insert)) +{ + clean_message_log(); + del_all_timeline += 1; + + if (del_all_timeline > 1) + { + show_message_log("('전체 타임라인'이 삭제되었습니다)"); + var tmp_directory = string(global.custom_map_file_dir[global.n_map_id])+"\\map_data.ini"; + file_delete(tmp_directory); + + for(var i = 0; i < array_length(global.c_map_param); i++) + { + global.c_map_param[i] = ""; + } + + instance_destroy(hitbox_parents); + with(code) + { + event_user(10); + } + + del_all_timeline = 0; + } + else + { + show_message_log("('전체 타임라인'을 지우시려면 한 번 더 눌러주세요)"); + } +} + + diff --git a/objects/map_edior_ui/Other_11.gml b/objects/map_edior_ui/Other_11.gml index 16eb7c40..2a66b158 100644 --- a/objects/map_edior_ui/Other_11.gml +++ b/objects/map_edior_ui/Other_11.gml @@ -22,6 +22,7 @@ if (instance_exists(ins_) && point_distance(mouse_x,mouse_y,ins_.x,ins_.y) < 48) global.selected_animation = 0; ins_.editor_selected = 1; n_selected = ins_; + clean_message_log(); show_message_log("선택된 탄막은 [Delete]키를 눌러 삭제 가능"); } else diff --git a/objects/map_edior_ui/Other_12.gml b/objects/map_edior_ui/Other_12.gml index e4b8f04d..0f409c86 100644 --- a/objects/map_edior_ui/Other_12.gml +++ b/objects/map_edior_ui/Other_12.gml @@ -3,7 +3,6 @@ global.editor_hitbox = -1; -global.editor_selected_type = 20; if (n_selected.object_index == hitbox_15) //지렁이 탄막 지우기 { for(var i = 1; i < n_selected.body_num; i++) diff --git a/objects/map_edior_ui/Step_1.gml b/objects/map_edior_ui/Step_1.gml index bbd26c08..10aeae13 100644 --- a/objects/map_edior_ui/Step_1.gml +++ b/objects/map_edior_ui/Step_1.gml @@ -1,7 +1,15 @@ /// @description Insert description here // You can write your code in this editor +if (del_current_timeline > 0) +{ + del_current_timeline -= 0.01; +} +if (del_all_timeline > 0) +{ + del_all_timeline -= 0.01; +} /*if (global.dev_mode == 1) diff --git a/objects/map_edior_ui/map_edior_ui.yy b/objects/map_edior_ui/map_edior_ui.yy index 14fef7a5..8c5bd9d6 100644 --- a/objects/map_edior_ui/map_edior_ui.yy +++ b/objects/map_edior_ui/map_edior_ui.yy @@ -17,6 +17,8 @@ {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":46,"eventType":9,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"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":17,"eventType":5,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":18,"eventType":5,"isDnD":false,}, ], "managed": true, "overriddenProperties": [], diff --git a/objects/obj_album_ui/Create_0.gml b/objects/obj_album_ui/Create_0.gml index d136891b..3c1ced1f 100644 --- a/objects/obj_album_ui/Create_0.gml +++ b/objects/obj_album_ui/Create_0.gml @@ -11,6 +11,7 @@ timer = 0 w_alpha = 0 global.touch_to_skip = 0; global.tutorial_n_stage = 0 +delete_current_map = 0; //custom map album global.b_n_map_id = -99; diff --git a/objects/obj_album_ui/Draw_73.gml b/objects/obj_album_ui/Draw_73.gml index 80ff9dc9..c6f9f0ec 100644 --- a/objects/obj_album_ui/Draw_73.gml +++ b/objects/obj_album_ui/Draw_73.gml @@ -133,15 +133,19 @@ if (global.n_map_list != 2) else { //버튼 - draw_sprite_ext(spr_gear,0,global.c_x+85,global.c_y+1430+16,0.17*global.font_ratio_resolution_xx*0.85,0.17*0.85,0,c_black,0.3*ui_alpha__cal) - draw_sprite_ext(spr_gear,0,global.c_x+130,global.c_y+1450+16,0.1*global.font_ratio_resolution_xx*0.85,0.1*0.85,0,c_black,0.3*ui_alpha__cal) - draw_sprite_ext(spr_gear,0,global.c_x+85,global.c_y+1430,0.17*global.font_ratio_resolution_xx*0.85,0.17*0.85,0,c_white,ui_alpha__cal) - draw_sprite_ext(spr_gear,0,global.c_x+130,global.c_y+1450,0.1*global.font_ratio_resolution_xx*0.85,0.1*0.85,0,c_white,ui_alpha__cal) - draw_text_k_scale(global.c_x+104,global.c_y+1470,"커스텀 맵\n편집"+((global.mobile_mode == 1) ? "" : "\n[M]"),80,-1,ui_alpha__cal,c_white,0,0,normal_font,0.47*global.font_ratio_resolution_xx,0.47,0) + draw_sprite_ext(spr_gear,0,global.c_x+85,global.c_y+1180+16,0.17*global.font_ratio_resolution_xx*0.85,0.17*0.85,0,c_black,0.3*ui_alpha__cal) + draw_sprite_ext(spr_gear,0,global.c_x+130,global.c_y+1200+16,0.1*global.font_ratio_resolution_xx*0.85,0.1*0.85,0,c_black,0.3*ui_alpha__cal) + draw_sprite_ext(spr_gear,0,global.c_x+85,global.c_y+1180,0.17*global.font_ratio_resolution_xx*0.85,0.17*0.85,0,c_white,ui_alpha__cal) + draw_sprite_ext(spr_gear,0,global.c_x+130,global.c_y+1200,0.1*global.font_ratio_resolution_xx*0.85,0.1*0.85,0,c_white,ui_alpha__cal) + draw_text_k_scale(global.c_x+104,global.c_y+1220,"커스텀 맵\n편집"+((global.mobile_mode == 1) ? "" : "\n[M]"),80,-1,ui_alpha__cal,c_white,0,0,normal_font,0.47*global.font_ratio_resolution_xx,0.47,0) - draw_sprite_ext(spr_add,0,global.c_x+312,global.c_y+1430+16,global.font_ratio_resolution_xx*0.85,0.85,0,c_black,0.3*ui_alpha__cal) - draw_sprite_ext(spr_add,0,global.c_x+312,global.c_y+1430,global.font_ratio_resolution_xx*0.85,0.85,0,c_white,ui_alpha__cal) - draw_text_k_scale(global.c_x+312,global.c_y+1470,"새로운\n커스텀 맵\n생성"+((global.mobile_mode == 1) ? "" : "\n[N]"),80,-1,ui_alpha__cal,c_white,0,0,normal_font,0.47*global.font_ratio_resolution_xx,0.47,0) + draw_sprite_ext(spr_add,0,global.c_x+312,global.c_y+1180+16,global.font_ratio_resolution_xx*0.85,0.85,0,c_black,0.3*ui_alpha__cal) + draw_sprite_ext(spr_add,0,global.c_x+312,global.c_y+1180,global.font_ratio_resolution_xx*0.85,0.85,0,c_white,ui_alpha__cal) + draw_text_k_scale(global.c_x+312,global.c_y+1220,"새로운\n커스텀 맵\n생성"+((global.mobile_mode == 1) ? "" : "\n[N]"),80,-1,ui_alpha__cal,c_white,0,0,normal_font,0.47*global.font_ratio_resolution_xx,0.47,0) + + draw_sprite_ext(spr_trash,0,global.c_x+104,global.c_y+1470+16,global.font_ratio_resolution_xx*0.85,0.85,0,c_black,0.3*ui_alpha__cal) + draw_sprite_ext(spr_trash,0,global.c_x+104,global.c_y+1470,global.font_ratio_resolution_xx*0.85,0.85,0,c_white,ui_alpha__cal) + draw_text_k_scale(global.c_x+104,global.c_y+1510,"커스텀 맵\n삭제"+((global.mobile_mode == 1) ? "" : "\n[Alt + Del]"),80,-1,ui_alpha__cal,c_white,0,0,normal_font,0.47*global.font_ratio_resolution_xx,0.47,0) } @@ -180,26 +184,36 @@ draw_sprite_ext(spr_triangle,0,__xx,_____yy2+640+(cal____yy2),0.1*global.font_ra -if global.n_map_list = 0 +if (global.n_map_list == 0) { draw_sprite_ext(spr_music,0,__xx-75,______yy+52,0.2*0.85,0.2*0.85,-15,#171628,ui_alpha__cal*(1-abs(__mobile__movement))) draw_text_k_scale(__xx+25,______yy+24,"모든 곡",64,-1,ui_alpha__cal*(1-abs(__mobile__movement)),#171628,0,0,normal_font,0.52*global.font_ratio_resolution_xx,0.52,0) } -if global.n_map_list = 1 +else if (global.n_map_list == 1) { draw_sprite_ext(spr_heart,0,__xx-108,______yy+58,0.1*0.85,0.1*0.85,0,#171628,ui_alpha__cal*(1-abs(__mobile__movement))) draw_text_k_scale(__xx+25,______yy+24,"좋아요 한 곡",64,-1,ui_alpha__cal*(1-abs(__mobile__movement)),#171628,0,0,normal_font,0.52*global.font_ratio_resolution_xx,0.52,0) } -if global.n_map_list = 2 +else if (global.n_map_list == 2) { draw_sprite_ext(spr_triangle_empty_bold,0,__xx-180,______yy+58,0.12*0.85,0.12*0.85,15,#171628,ui_alpha__cal*(1-abs(__mobile__movement))) draw_text_k_scale(__xx+25,______yy+24,"유저 제작 커스텀 곡",64,-1,ui_alpha__cal*(1-abs(__mobile__movement)),#171628,0,0,normal_font,0.52*global.font_ratio_resolution_xx,0.52,0) } -if global.n_map_list = 3 +else if (global.n_map_list == 3) { draw_sprite_ext(spr_lock,1,__xx-108,______yy+60,0.1*0.85,0.1*0.85,0,#171628,ui_alpha__cal*(1-abs(__mobile__movement))) draw_text_k_scale(__xx+25,______yy+24,"해금 된 곡",64,-1,ui_alpha__cal*(1-abs(__mobile__movement)),#171628,0,0,normal_font,0.52*global.font_ratio_resolution_xx,0.52,0) } +else if (global.n_map_list == 4) +{ + draw_sprite_ext(spr_W,0,__xx-170,______yy+60,0.12,0.12,0,#171628,ui_alpha__cal*(1-abs(__mobile__movement))) + draw_text_k_scale(__xx+25,______yy+24,"[곡 필터링] 우왁굳",64,-1,ui_alpha__cal*(1-abs(__mobile__movement)),#171628,0,0,normal_font,0.52*global.font_ratio_resolution_xx,0.52,0) +} +else if (global.n_map_list == 5) +{ + draw_sprite_ext(spr_W,8,__xx-210,______yy+60,0.15,0.15,0,#171628,ui_alpha__cal*(1-abs(__mobile__movement))) + draw_text_k_scale(__xx+25,______yy+24,"[곡 필터링] 이세계아이돌",64,-1,ui_alpha__cal*(1-abs(__mobile__movement)),#171628,0,0,normal_font,0.52*global.font_ratio_resolution_xx,0.52,0) +} draw_text_k_scale(global.c_x+27+128*1.15*global.font_ratio_resolution_xx-(1 - ui_alpha__cal)*1880,global.c_y,"Artifacts",64,-1,ui_alpha__cal,#171628,0,-1,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0) @@ -1085,7 +1099,16 @@ if instance_exists(code) draw_text_k_scale(global.c_x+104+320*(global.show_new_songs/100),global.c_y+700+64*(global.show_new_songs/100),"파트너"+((global.mobile_mode == 1) ? "" : "\n[Q]"),80,-1,ui_alpha__cal,c_white,0,0,normal_font,0.5*global.font_ratio_resolution_xx*(global.show_new_songs/50),0.5*(global.show_new_songs/50),0) } - + else if (global.saved_notice_title == "주의! - 커스텀 유저 맵") + { + draw_sprite_ext(spr_X,0,global.c_w-160,global.c_h-196,0.4,0.4,0,c_white,ui_alpha__cal) + draw_text_k_scale(global.c_w-160,global.c_h-148,"다시 보지 않기\n[X]",80,-1,ui_alpha__cal,c_white,0,0,normal_font,0.5,0.5,0) + + if (keyboard_check_pressed(ord("X"))) + { + global.guide_showed[3] = 1; + } + } } else { diff --git a/objects/obj_album_ui/Other_10.gml b/objects/obj_album_ui/Other_10.gml index ae04c00f..c70dc458 100644 --- a/objects/obj_album_ui/Other_10.gml +++ b/objects/obj_album_ui/Other_10.gml @@ -1,17 +1,24 @@ /// @description 스킨 선택 완료 // You can write your code in this editor - -if (!global.unlocked_player_skin[global.t_n_select_skin] == 0) +if (global.streamer == 1) { - global.n_player_skin = global.t_n_select_skin; - global.player_skin = floor(global.t_n_select_skin/4) + clean_message_log(); + show_message_log("연말공모전 규정에 따라, 스트리머는 사용할 수 없는 기능입니다!"); } - -with(code) +else { - if object_index = code + if (!global.unlocked_player_skin[global.t_n_select_skin] == 0) + { + global.n_player_skin = global.t_n_select_skin; + global.player_skin = floor(global.t_n_select_skin/4) + } + + with(code) { - event_user(3) + if object_index = code + { + event_user(3) + } } } \ No newline at end of file diff --git a/objects/obj_album_ui/Step_0.gml b/objects/obj_album_ui/Step_0.gml index c968fd49..23f0a410 100644 --- a/objects/obj_album_ui/Step_0.gml +++ b/objects/obj_album_ui/Step_0.gml @@ -5,7 +5,7 @@ var yy_h = camera_get_view_height(view_camera[0]) -if global.n_map_list != 2 +if (global.n_map_list != 2) { if (sprite_index != spr_album) { diff --git a/objects/obj_album_ui/Step_1.gml b/objects/obj_album_ui/Step_1.gml index df4de929..b1889072 100644 --- a/objects/obj_album_ui/Step_1.gml +++ b/objects/obj_album_ui/Step_1.gml @@ -1,6 +1,9 @@ /// @description Insert description here // You can write your code in this editor - +if (delete_current_map > 0) +{ + delete_current_map -= 0.01; +} if (keyboard_check(vk_anykey) || global.touch_to_skip == 1) diff --git a/objects/obj_album_ui/Step_2.gml b/objects/obj_album_ui/Step_2.gml index a59deaa8..5ac33150 100644 --- a/objects/obj_album_ui/Step_2.gml +++ b/objects/obj_album_ui/Step_2.gml @@ -22,11 +22,19 @@ if (global.select_difficulty == 0 && global.show_new_songs <= 0 && global.unlock } else if (global.sync_setting <= 0 && ((mouse_check_button_released(mb_left) && point_distance(mouse_x,mouse_y,global.c_x+104,global.c_y+660) < 80) || keyboard_check_pressed(ord("W")))) { - with(code) + if (global.streamer == 1) { - if object_index = code + clean_message_log(); + show_message_log("연말공모전 규정에 따라, 스트리머는 사용할 수 없는 기능입니다!"); + } + else + { + with(code) { - event_user(3) + if object_index = code + { + event_user(3) + } } } } @@ -92,6 +100,26 @@ if (global.select_difficulty == 0 && global.show_new_songs <= 0 && global.unlock global.map_editor = 1; code.gamestart = 1; } + else if (global.show_new_songs <= 0 && global.sync_setting != 1 && global.character_setting != 1 && ((mouse_check_button_released(mb_left) && point_distance(mouse_x,mouse_y,global.c_x+104,global.c_y+1430) < 80) || (keyboard_check(vk_alt)) && keyboard_check_pressed(vk_delete))) + { + clean_message_log(); + delete_current_map ++; + if (delete_current_map > 1) + { + var tmp_dir = global.custom_map_file_dir[global.n_map_id]; + file_delete(string(tmp_dir)+"\\map_info.ini"); + load_custom_map_files(); + ini_open(string(tmp_dir)+"\\삭제된 커스텀 유저맵.txt") + ini_write_string("삭제된 커스텀 맵 파일 복구 방법","map_info.ini 파일을 생성하여 기존의 값을 다시 적어주면 복구 가능",""); + ini_close(); + //show_message_log(string(tmp_dir)+"\\map_info.ini"); + load_musicList(global.n_map_list); + } + else + { + show_message_log("해당 맵을 지우려면 한 번 더 눌러주세요 ("+string(global.custom_stage_map_name[global.n_map_id])+")"); + } + } else if (global.n_map_id >= 0 && global.show_new_songs <= 0 && global.sync_setting != 1 && global.character_setting != 1 && ((mouse_check_button_released(mb_left) && point_distance(mouse_x,mouse_y,global.c_x+104,global.c_y+910) < 80) || keyboard_check_pressed(ord("Q")))) { if (global.nickname == "") diff --git a/objects/obj_stage_clear/Create_0.gml b/objects/obj_stage_clear/Create_0.gml index c82dfbb6..efd2ae71 100644 --- a/objects/obj_stage_clear/Create_0.gml +++ b/objects/obj_stage_clear/Create_0.gml @@ -54,7 +54,7 @@ if (global.n_artifact[global.n_map_id] != "완료" || global.selected_difficulty //파트너 해금 var player_unlocked = 0; -if (global.tutorial_now != 1) +if (global.streamer != 1 && global.tutorial_now != 1) { for(var i = 0; i < sprite_get_number(spr_illustrationCG); i++) { diff --git a/scripts/create_new_custom_map_file/create_new_custom_map_file.gml b/scripts/create_new_custom_map_file/create_new_custom_map_file.gml index e606edc6..544e499d 100644 --- a/scripts/create_new_custom_map_file/create_new_custom_map_file.gml +++ b/scripts/create_new_custom_map_file/create_new_custom_map_file.gml @@ -2,7 +2,9 @@ // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information function create_new_custom_map_file() { - var map_dir = string(global.custom_map_directory)+"user_custom_map\\custom_map_file_"+string(get_custom_map_num()+1); + var date_time = date_current_datetime(); + var str_current_date = string(date_get_year(date_time))+"_"+string(date_get_month(date_time))+"_"+string(date_get_day(date_time))+"_"+string(date_get_hour(date_time))+"_"+string(date_get_minute(date_time))+"_"+string(date_get_second(date_time)); + var map_dir = string(global.custom_map_directory)+"user_custom_map\\custom_map_file "+string(str_current_date); ini_open(string(global.custom_map_directory)+"user_custom_map\\system.ini") ini_write_real("dummy_data","dummy_data",0); diff --git a/scripts/directory_list/directory_list.gml b/scripts/directory_list/directory_list.gml index 1deb85c4..60b4b1f1 100644 --- a/scripts/directory_list/directory_list.gml +++ b/scripts/directory_list/directory_list.gml @@ -15,7 +15,7 @@ function directory_list() return 0; } - if directory_exists(string(_directory)+string(_firstFile)) + if file_exists(string(_directory)+string(_firstFile)+"\\map_info.ini") { global.custom_map_file_dir[tmp_ind] = string(_directory)+string(_firstFile); tmp_ind++; @@ -32,7 +32,7 @@ function directory_list() else { var _fullPath = string(_directory)+string(_file); - if directory_exists(_fullPath) + if file_exists(string(_fullPath)+"\\map_info.ini") { global.custom_map_file_dir[tmp_ind] = string(_directory)+string(_firstFile); tmp_ind++; diff --git a/scripts/find_file/find_file.gml b/scripts/find_file/find_file.gml index 3a42a0b7..18ed4458 100644 --- a/scripts/find_file/find_file.gml +++ b/scripts/find_file/find_file.gml @@ -11,7 +11,7 @@ function find_file(argument0,argument1,argument2,argument3,argument4) var _firstFile = file_find_first(string(argument0)+"\\*."+string(argument1), fa_none); if (_firstFile != "") { - return (string(argument0)+"\\"+string(_firstFile)+"."+string(argument1)); + return (string(argument0)+"\\"+string(_firstFile)); } file_find_close(); @@ -20,7 +20,7 @@ function find_file(argument0,argument1,argument2,argument3,argument4) var _firstFile = file_find_first(string(argument0)+"\\*."+string(argument2), fa_none); if (_firstFile != "") { - return (string(argument0)+"\\"+string(_firstFile)+"."+string(argument1)); + return (string(argument0)+"\\"+string(_firstFile)); } file_find_close(); } @@ -30,7 +30,7 @@ function find_file(argument0,argument1,argument2,argument3,argument4) var _firstFile = file_find_first(string(argument0)+"\\*."+string(argument3), fa_none); if (_firstFile != "") { - return (string(argument0)+"\\"+string(_firstFile)+"."+string(argument1)); + return (string(argument0)+"\\"+string(_firstFile)); } file_find_close(); } @@ -40,10 +40,11 @@ function find_file(argument0,argument1,argument2,argument3,argument4) var _firstFile = file_find_first(string(argument0)+"\\*."+string(argument4), fa_none); if (_firstFile != "") { - return (string(argument0)+"\\"+string(_firstFile)+"."+string(argument1)); + return (string(argument0)+"\\"+string(_firstFile)); } file_find_close(); } + return ""; } \ No newline at end of file diff --git a/scripts/get_custom_map_num/get_custom_map_num.gml b/scripts/get_custom_map_num/get_custom_map_num.gml index 41abc69e..52e87033 100644 --- a/scripts/get_custom_map_num/get_custom_map_num.gml +++ b/scripts/get_custom_map_num/get_custom_map_num.gml @@ -17,7 +17,11 @@ function get_custom_map_num() } else { - global.custom_map_file_dir[tmp_ind] = string(_directory)+string(_firstFile); + var _fullPath = string(_directory)+string(_firstFile); + if file_exists(string(_fullPath)+"\\map_info.ini") + { + global.custom_map_file_dir[tmp_ind] = string(_directory)+string(_firstFile); + } tmp_ind++; } @@ -31,7 +35,7 @@ function get_custom_map_num() else { var _fullPath = string(_directory)+string(_file); - if directory_exists(_fullPath) + if file_exists(string(_fullPath)+"\\map_info.ini") { global.custom_map_file_dir[tmp_ind] = string(_fullPath); tmp_ind++; diff --git a/scripts/load_custom_map_files/load_custom_map_files.gml b/scripts/load_custom_map_files/load_custom_map_files.gml index b4e56700..a825c788 100644 --- a/scripts/load_custom_map_files/load_custom_map_files.gml +++ b/scripts/load_custom_map_files/load_custom_map_files.gml @@ -2,6 +2,7 @@ // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information function load_custom_map_files() { + reset_custom_map_info(); global.custom_map_num = get_custom_map_num(); for(var i = 0; i < global.custom_map_num; i++) { diff --git a/scripts/load_musicList/load_musicList.gml b/scripts/load_musicList/load_musicList.gml index bc69cf6e..57229aa8 100644 --- a/scripts/load_musicList/load_musicList.gml +++ b/scripts/load_musicList/load_musicList.gml @@ -90,17 +90,33 @@ function load_musicList(argument0) global.requirement_level[i] = global.custom_requirement_level[i]; } } - else if (argument0 == 3) + else if (argument0 == 3 || argument0 == 4 || argument0 == 5) { var correction = 0, total_num = 0; for(var k = 0; k < global.origin_total_map; k++) { - if (global.level >= global.real_requirement_level[k]) + var tmp_cond = 0; + if (argument0 == 3 && global.level >= global.real_requirement_level[k]) + { + tmp_cond = 1; + } + + if (argument0 == 4 && k >= global.filter_song_wakgood[0] && k <= global.filter_song_wakgood[1]) + { + tmp_cond = 1; + } + + if (argument0 == 5 && k >= global.filter_song_isedol[0] && k <= global.filter_song_isedol[1]) + { + tmp_cond = 1; + } + + if (tmp_cond == 1) { var kk = k-correction; - global.unlocked_map_id[kk] = k + global.map_id_origin[kk] = k //기존 모든 곡 항목에서 좋아하는 곡 목록으로 데이터 복사 global.stage_map_name[kk] = global.real_stage_map_name[k]; global.stage_map_artist[kk] = global.real_stage_map_artist[k]; @@ -127,12 +143,38 @@ function load_musicList(argument0) correction++; } } - global.total_map = total_num + global.total_map = total_num; } + if (global.b_map_list != global.n_map_list) { + var tmp_str = "모든 곡"; + if (global.n_map_list == 1) + { + tmp_str = "좋아요 한 곡"; + } + else if (global.n_map_list == 2) + { + tmp_str = "유저 제작 커스텀 곡"; + } + else if (global.n_map_list == 3) + { + tmp_str = "해금 된 곡"; + } + else if (global.n_map_list == 4) + { + tmp_str = "[곡 필터링] 우왁굳"; + } + else if (global.n_map_list == 5) + { + tmp_str = "[곡 필터링] 이세계아이돌"; + } + + np_setpresence_more("", "메인 매뉴", false); + np_setpresence(string(tmp_str), "메인 매뉴", "type0", ""); + n_stage = 0 saved_n_stage = 2 global.n_map_id = 0 @@ -151,7 +193,7 @@ function load_musicList(argument0) //커스텀 유저맵 가이드라인 - if (global.n_map_list == 2) + if (global.n_map_list == 2 && global.guide_showed[3] != 1) { show_guide("주의! - 커스텀 유저 맵"); } diff --git a/scripts/load_none_cleared_list/load_none_cleared_list.gml b/scripts/load_none_cleared_list/load_none_cleared_list.gml index 6c6b4feb..60b90e22 100644 --- a/scripts/load_none_cleared_list/load_none_cleared_list.gml +++ b/scripts/load_none_cleared_list/load_none_cleared_list.gml @@ -7,7 +7,7 @@ function load_none_cleared_list() { if (global.level >= global.real_requirement_level[i]) { - global.unlocked_map_id[i-correction] = i; + global.map_id_origin[i-correction] = i; correction = 0 cal ++ } diff --git a/scripts/load_unlocked_list/load_unlocked_list.gml b/scripts/load_unlocked_list/load_unlocked_list.gml index c7ce934b..6629b089 100644 --- a/scripts/load_unlocked_list/load_unlocked_list.gml +++ b/scripts/load_unlocked_list/load_unlocked_list.gml @@ -7,7 +7,7 @@ var cal = 0, correction = 0; { if (global.level >= global.real_requirement_level[i]) { - global.unlocked_map_id[i-correction] = i; + global.map_id_origin[i-correction] = i; correction = 0 cal ++ } diff --git a/scripts/reset_custom_map_info/reset_custom_map_info.gml b/scripts/reset_custom_map_info/reset_custom_map_info.gml new file mode 100644 index 00000000..3e34a684 --- /dev/null +++ b/scripts/reset_custom_map_info/reset_custom_map_info.gml @@ -0,0 +1,28 @@ +// Script assets have changed for v2.3.0 see +// https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information +function reset_custom_map_info() +{ + for(var i = 0; i < 99; i++) + { + //커스텀 곡 정보 + global.custom_stage_map_name[i] = ""; + global.custom_stage_map_artist[i] = -4; + global.custom_stage_map_difficulty[i] = -4; + global.custom_map_duration[i] = -4; + global.custom_stage_map_color[i] = -4; + global.custom_stage_bpm[i] = -4; + global.custom_stage_map_highlight_part[i] = -4; + global.custom_n_rank[i] = "--"; + global.custom_n_rank_hardcore[i] = "--"; + global.custom_n_score[i] = "--"; + global.custom_n_score_hardcore[i] = "--"; + global.custom_n_artifact[i] = "X"; + global.custom_detailed_difficulty[i] = -4; + global.custom_obtainable_type[i] = -4; + global.custom_requirement_level[i] = -4; + global.custom_stage_album[i] = -4; + global.custom_audio_asset[i] = -4; + global.custom_stage_mapper[i] = -4; + global.custom_map_file_dir[i] = ""; + } +} \ No newline at end of file diff --git a/scripts/reset_custom_map_info/reset_custom_map_info.yy b/scripts/reset_custom_map_info/reset_custom_map_info.yy new file mode 100644 index 00000000..c8b3c06e --- /dev/null +++ b/scripts/reset_custom_map_info/reset_custom_map_info.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "reset_custom_map_info", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "UserData_Load", + "path": "folders/스크립트/UserData_Load.yy", + }, +} \ No newline at end of file diff --git a/scripts/save_and_load_data/save_and_load_data.gml b/scripts/save_and_load_data/save_and_load_data.gml index e166e4ae..5b52479a 100644 --- a/scripts/save_and_load_data/save_and_load_data.gml +++ b/scripts/save_and_load_data/save_and_load_data.gml @@ -35,7 +35,7 @@ function save_and_load_data(argument0,argument1) ini_write_real("n_favorite",string(i),global.real_n_favorite[i]); ini_write_real("fav_map_id",string(i),global.fav_map_id[i]); - ini_write_real("unlocked_map_id",string(i),global.unlocked_map_id[i]); + ini_write_real("unlocked_map_id",string(i),global.map_id_origin[i]); ini_write_real("real_stage_playtime",string(i),global.real_stage_playtime[i]); } @@ -99,7 +99,7 @@ function save_and_load_data(argument0,argument1) global.real_n_artifact[i] = ini_read_string("n_artifact",string(i),"X"); global.real_n_favorite[i] = ini_read_real("n_favorite",string(i),-1); global.fav_map_id[i] = ini_read_real("fav_map_id",string(i),-4); - global.unlocked_map_id[i] = ini_read_real("unlocked_map_id",string(i),-4); + global.map_id_origin[i] = ini_read_real("unlocked_map_id",string(i),-4); global.unlocked_music_name[i] = ini_read_string("unlocked_music_name",string(i),""); global.b_unlocked_music_name[i] = ini_read_string("b_unlocked_music_name",string(i),""); @@ -141,7 +141,20 @@ function save_and_load_data(argument0,argument1) global.nickname = ini_read_string("nickname","none",""); decode_nametag(global.nickname); //베타테스터 - global.beta_tester = ini_read_real("beta_tester","none",0); + if (global.beta_tester != 1) + { + global.beta_tester = ini_read_real("beta_tester","none",0); + } + //스트리머 + if (global.streamer != 1) + { + global.streamer = ini_read_real("streamer","none",0); + } + //맵 에디터 + if (global.custom_mapper != 1) + { + global.custom_mapper = ini_read_real("custom_mapper","none",0); + } global.force_wipe_nickname = ini_read_real("force_wipe_nickname","none",1); global.tutorial_played = ini_read_real("tutorial_played","none",0); } diff --git a/sprites/spr_X/01ac77e0-9edf-401f-9e03-c9faa5a592dd.png b/sprites/spr_X/01ac77e0-9edf-401f-9e03-c9faa5a592dd.png new file mode 100644 index 00000000..27683663 Binary files /dev/null and b/sprites/spr_X/01ac77e0-9edf-401f-9e03-c9faa5a592dd.png differ diff --git a/sprites/spr_X/layers/01ac77e0-9edf-401f-9e03-c9faa5a592dd/694d45c5-7919-4e20-8f80-4de802895560.png b/sprites/spr_X/layers/01ac77e0-9edf-401f-9e03-c9faa5a592dd/694d45c5-7919-4e20-8f80-4de802895560.png new file mode 100644 index 00000000..27683663 Binary files /dev/null and b/sprites/spr_X/layers/01ac77e0-9edf-401f-9e03-c9faa5a592dd/694d45c5-7919-4e20-8f80-4de802895560.png differ diff --git a/sprites/spr_X/spr_X.yy b/sprites/spr_X/spr_X.yy new file mode 100644 index 00000000..b930f36b --- /dev/null +++ b/sprites/spr_X/spr_X.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_X", + "bbox_bottom": 223, + "bbox_left": 32, + "bbox_right": 223, + "bbox_top": 32, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"01ac77e0-9edf-401f-9e03-c9faa5a592dd",}, + ], + "gridX": 0, + "gridY": 0, + "height": 256, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"694d45c5-7919-4e20-8f80-4de802895560","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 4, + "parent": { + "name": "hitbox_shapes", + "path": "folders/스프라이트/hitbox_shapes.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_X", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"01ac77e0-9edf-401f-9e03-c9faa5a592dd","path":"sprites/spr_X/spr_X.yy",},},},"Disabled":false,"id":"08656de1-1519-4ae9-996b-946b1efb6156","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 128, + "yorigin": 128, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "hitbox_shapes", + "path": "texturegroups/hitbox_shapes", + }, + "type": 0, + "VTile": false, + "width": 256, +} \ No newline at end of file diff --git a/sprites/spr_trash/7a149e26-5c65-4f81-967f-c3f7fe00f269.png b/sprites/spr_trash/7a149e26-5c65-4f81-967f-c3f7fe00f269.png new file mode 100644 index 00000000..dca5a4a3 Binary files /dev/null and b/sprites/spr_trash/7a149e26-5c65-4f81-967f-c3f7fe00f269.png differ diff --git a/sprites/spr_trash/layers/7a149e26-5c65-4f81-967f-c3f7fe00f269/4a811474-0151-434b-bff2-ecefbbbda534.png b/sprites/spr_trash/layers/7a149e26-5c65-4f81-967f-c3f7fe00f269/4a811474-0151-434b-bff2-ecefbbbda534.png new file mode 100644 index 00000000..dca5a4a3 Binary files /dev/null and b/sprites/spr_trash/layers/7a149e26-5c65-4f81-967f-c3f7fe00f269/4a811474-0151-434b-bff2-ecefbbbda534.png differ diff --git a/sprites/spr_trash/spr_trash.yy b/sprites/spr_trash/spr_trash.yy new file mode 100644 index 00000000..f5851cb5 --- /dev/null +++ b/sprites/spr_trash/spr_trash.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_trash", + "bbox_bottom": 112, + "bbox_left": 27, + "bbox_right": 100, + "bbox_top": 15, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7a149e26-5c65-4f81-967f-c3f7fe00f269",}, + ], + "gridX": 0, + "gridY": 0, + "height": 128, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4a811474-0151-434b-bff2-ecefbbbda534","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 4, + "parent": { + "name": "ui", + "path": "folders/스프라이트/ui.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_trash", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7a149e26-5c65-4f81-967f-c3f7fe00f269","path":"sprites/spr_trash/spr_trash.yy",},},},"Disabled":false,"id":"21e347b9-b57f-4bc4-9f42-45ac22e6b994","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 64, + "yorigin": 64, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 128, +} \ No newline at end of file