Skip to content

Commit 5b0a51a

Browse files
ABER1047ABER1047
committed
2024_01_20
parameter value bug of projectile on editor fixed pause button added on mobile version etc.
1 parent 513aca2 commit 5b0a51a

32 files changed

+390
-171
lines changed

‎Project Wak Beat.resource_order

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
{"name":"spr_spot_light","order":26,"path":"sprites/spr_spot_light/spr_spot_light.yy",},
157157
{"name":"show_rank_sfx","order":13,"path":"sounds/show_rank_sfx/show_rank_sfx.yy",},
158158
{"name":"obj_message_log","order":2,"path":"objects/obj_message_log/obj_message_log.yy",},
159+
{"name":"spr_pause","order":29,"path":"sprites/spr_pause/spr_pause.yy",},
159160
{"name":"automaticLoadPlayerRanking","order":2,"path":"scripts/automaticLoadPlayerRanking/automaticLoadPlayerRanking.yy",},
160161
{"name":"hitbox_18","order":19,"path":"objects/hitbox_18/hitbox_18.yy",},
161162
{"name":"create_arrow_laser","order":10,"path":"scripts/create_arrow_laser/create_arrow_laser.yy",},

‎Project Wak Beat.yyp

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎objects/code/Create_0.gml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// @description Insert description here
22
// You can write your code in this editor
3-
global.version_real = 1.06;
3+
global.version_real = 1.07;
44
global.version = "Release "+string(global.version_real);
55
global.beta_tester = 0;
66
global.streamer = 0;
@@ -49,6 +49,7 @@ for(var i = 0; i < 7; i++)
4949
{
5050
global.ed_arg[i] = 0.1;
5151
global.ed_arg_modifying[i] = "";
52+
global.ed_arg_modifed[i] = 0;
5253
global.ed_arg_name[i] = "";
5354
global.ed_arg_min_val[i] = 0;
5455
global.ed_arg_max_val[i] = 0;
@@ -1124,6 +1125,8 @@ event_user(7)
11241125
//모바일용 조이스틱
11251126
global.joystick_xx = -4
11261127
global.joystick_yy = -4
1128+
global.joystick_width = -4;
1129+
global.joystick_height = -4;
11271130
global.joystick_n_xx = -4
11281131
global.joystick_n_yy = -4
11291132
global.scroll_n_m_xx = -1

‎objects/code/Draw_73.gml

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ if (instance_exists(obj_player) && obj_player.image_xscale > 0)
7171

7272
draw_sprite_ext(spr_W,global.obtainable_type[global.n_map_id],xx+xx_w*0.3+progress_icon_alpha*1433*global.converted_view_ratio,yy+global.converted_view_ratio*81*progress_icon_alpha,0.13*global.converted_view_ratio,0.13*global.converted_view_ratio,0,c_white,progress_icon_alpha)
7373
}
74+
75+
if (progress_icon_alpha > 0 && global.mobile_mode == 1)
76+
{
77+
draw_sprite_ext(spr_pause,0,xx+xx_w*0.966,yy+yy_h*0.063,0.6*global.converted_view_ratio*global.font_ratio_resolution_xx,0.6*global.converted_view_ratio,0,c_white,progress_icon_alpha*0.8);
78+
}
7479
}
7580

7681

@@ -450,14 +455,14 @@ if (global.select_map != 0 && instance_exists(obj_player) && abs(obj_player.imag
450455
global.t_select_map --
451456
}
452457

453-
if global.t_select_map <= 1
458+
if (global.t_select_map <= 1)
454459
{
455-
global.t_select_map = global.total_map+1
460+
global.t_select_map = global.total_map+1;
456461
}
457462

458-
if global.t_select_map > global.total_map+1
463+
if (global.t_select_map > global.total_map+1)
459464
{
460-
global.t_select_map = 2
465+
global.t_select_map = 2;
461466
}
462467
}
463468
else
@@ -855,32 +860,34 @@ else
855860
//조이스틱
856861
if (global.joystick_alpha > 0.01)
857862
{
858-
var joystick_size_real = global.joystick_size*global.converted_view_ratio
859-
var joystick_size__ = joystick_size_real/512
860-
draw_sprite_ext(spr_joystick,0,global.joystick_xx,global.joystick_yy,joystick_size__*global.font_ratio_resolution_xx,joystick_size__,0,c_white,global.joystick_alpha*0.1)
863+
var joystick_size_real = global.joystick_size*global.converted_view_ratio*global.n_camera_zoom;
864+
var joystick_size__ = joystick_size_real/512;
865+
var tmp_xx_joy = (global.c_x+camera_get_view_width(view_camera[0])*0.5)+(global.joystick_width/global.n_camera_zoom);
866+
var tmp_yy_joy = (global.c_y+camera_get_view_height(view_camera[0])*0.5)+(global.joystick_height/global.n_camera_zoom);
867+
draw_sprite_ext(spr_joystick,0,tmp_xx_joy,tmp_yy_joy,joystick_size__*global.font_ratio_resolution_xx*global.n_camera_zoom,joystick_size__*global.n_camera_zoom,0,c_white,global.joystick_alpha*0.1);
861868

862869

863-
if global.joystick_activated != -1
870+
if (global.joystick_activated != -1)
864871
{
865-
var rad__ = joystick_size_real*0.5
866-
global.joystick_n_xx = device_mouse_x(global.joystick_activated)
867-
global.joystick_n_yy = device_mouse_y(global.joystick_activated)
872+
var rad__ = joystick_size_real*0.5;
873+
global.joystick_n_xx = device_mouse_x(global.joystick_activated);
874+
global.joystick_n_yy = device_mouse_y(global.joystick_activated);
868875

869-
global.joystick_dir = point_direction(global.joystick_xx,global.joystick_yy,global.joystick_n_xx,global.joystick_n_yy)
870-
if point_distance(global.joystick_xx,global.joystick_yy,global.joystick_n_xx,global.joystick_n_yy) > rad__
876+
global.joystick_dir = point_direction(tmp_xx_joy,tmp_yy_joy,global.joystick_n_xx,global.joystick_n_yy);
877+
if (point_distance(tmp_xx_joy,tmp_yy_joy,global.joystick_n_xx,global.joystick_n_yy) > rad__)
871878
{
872-
global.joystick_n_xx = global.joystick_xx+lengthdir_x(rad__,global.joystick_dir)
873-
global.joystick_n_yy = global.joystick_yy+lengthdir_y(rad__,global.joystick_dir)
879+
global.joystick_n_xx = tmp_xx_joy+lengthdir_x(rad__,global.joystick_dir);
880+
global.joystick_n_yy = tmp_yy_joy+lengthdir_y(rad__,global.joystick_dir);
874881
}
875882
}
876883
else
877884
{
878-
global.joystick_n_xx += (global.joystick_xx - global.joystick_n_xx)*0.2
879-
global.joystick_n_yy += (global.joystick_yy - global.joystick_n_yy)*0.2
885+
global.joystick_n_xx += (tmp_xx_joy - global.joystick_n_xx)*0.2;
886+
global.joystick_n_yy += (tmp_yy_joy - global.joystick_n_yy)*0.2;
880887
}
881888

882889

883-
draw_sprite_ext(spr_circle,0,global.joystick_n_xx,global.joystick_n_yy,joystick_size__*0.35*global.font_ratio_resolution_xx*0.5,joystick_size__*0.35*0.5,0,c_white,global.joystick_alpha*0.15)
890+
draw_sprite_ext(spr_circle,0,global.joystick_n_xx,global.joystick_n_yy,joystick_size__*0.35*global.font_ratio_resolution_xx*0.5,joystick_size__*0.35*0.5,0,c_white,global.joystick_alpha*0.15);
884891
}
885892

886893

‎objects/code/Gesture_64.gml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/// @description Insert description here
2+
// You can write your code in this editor
3+
4+
if (global.paused != 1 && progress_icon_alpha > 0 && global.mobile_mode == 1)
5+
{
6+
var xx = camera_get_view_x(view_camera[0]);
7+
var yy = camera_get_view_y(view_camera[0]);
8+
9+
var xx_w = camera_get_view_width(view_camera[0]);
10+
var yy_h = camera_get_view_height(view_camera[0]);
11+
if (point_distance(mouse_x,mouse_y,xx+xx_w*0.966,yy+yy_h*0.063) < 48)
12+
{
13+
event_user(2);
14+
}
15+
}
16+
17+
18+
19+
20+
21+
22+
23+
24+
25+

‎objects/code/Mouse_55.gml renamed to ‎objects/code/Mouse_53.gml

File renamed without changes.

‎objects/code/Other_10.gml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,11 @@ global.joystick_yy = -4
7272

7373
instance_destroy(hitbox_parents);
7474

75-
75+
for(var ii = 0; ii <= 5; ii++)
76+
{
77+
global.savepoint_position[ii] = -4;
78+
global.savepoint_color[ii] = -4;
79+
}
7680

7781

7882

‎objects/code/Other_21.gml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
/// @description 현재 타임라인에 존재하는 탄막 불러오기
22
// You can write your code in this editor
3-
4-
global.tmp_str_map_data = global.c_map_param[fix_to_zero(floor(global.n_progress)-floor(global.music_sync_offset*3*60))];
5-
while(string_length(global.tmp_str_map_data) >= 2)
3+
if (global.play_custom_map == 1 || timeline_running == false)
64
{
7-
var tmp_input = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
8-
for(var i = 0; i < 12; i++)
5+
global.tmp_str_map_data = global.c_map_param[fix_num_inside(floor(global.n_progress)-floor(global.music_sync_offset*3*60),1,global.music_duration)];
6+
while(string_length(global.tmp_str_map_data) >= 2)
97
{
10-
var tmp_space_pos = string_pos(",",string(global.tmp_str_map_data));
11-
//show_debug_message("data str : "+string(global.tmp_str_map_data)+" / length : "+string(tmp_space_pos));
12-
tmp_input[i] = real(string_copy(global.tmp_str_map_data,0,tmp_space_pos));
13-
global.tmp_str_map_data = string_delete(global.tmp_str_map_data,1,tmp_space_pos);
14-
}
8+
var tmp_input = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ];
9+
for(var i = 0; i < 12; i++)
10+
{
11+
var tmp_space_pos = string_pos(",",string(global.tmp_str_map_data));
12+
//show_debug_message("data str : "+string(global.tmp_str_map_data)+" / length : "+string(tmp_space_pos));
13+
tmp_input[i] = real(string_copy(global.tmp_str_map_data,0,tmp_space_pos));
14+
global.tmp_str_map_data = string_delete(global.tmp_str_map_data,1,tmp_space_pos);
15+
}
1516

1617

17-
//탄막 타입 기준으로 탄막 생성
18-
editor_mode_create_projectile(tmp_input[0],tmp_input[1],tmp_input[2],tmp_input[3],tmp_input[4],tmp_input[5],tmp_input[6],tmp_input[7],tmp_input[8],tmp_input[9],tmp_input[10],tmp_input[11]);
18+
//탄막 타입 기준으로 탄막 생성
19+
editor_mode_create_projectile(tmp_input[0],tmp_input[1],tmp_input[2],tmp_input[3],tmp_input[4],tmp_input[5],tmp_input[6],tmp_input[7],tmp_input[8],tmp_input[9],tmp_input[10],tmp_input[11]);
1920

20-
//show_debug_message("data str : "+string(global.tmp_str_map_data));
21+
//show_debug_message("data str : "+string(global.tmp_str_map_data));
22+
}
2123
}

0 commit comments

Comments
 (0)