From 3c1f9d9ff51e4aa6e7d801b4ba6c3ac82e623b4a Mon Sep 17 00:00:00 2001 From: ABER1047 <78880883+ABER1047@users.noreply.github.com> Date: Sat, 17 Dec 2022 08:45:16 +0900 Subject: [PATCH] 2022_12_17 fixed nickname bug fixed networking system bug etc --- Arena_of_Woowakgood.yyp | 2 +- objects/charging_attack/Step_0.gml | 21 ------------- objects/code/Other_68.gml | 5 ---- objects/effect/Step_0.gml | 17 ----------- objects/effect/effect.yy | 18 +++++------ objects/effect_attack1/Step_0.gml | 17 ----------- objects/effect_attack1/effect_attack1.yy | 18 +++++------ objects/effect_attack2/Step_0.gml | 18 ----------- objects/effect_attack2/effect_attack2.yy | 18 +++++------ objects/effect_attack3/Step_0.gml | 20 ------------- objects/effect_attack3/effect_attack3.yy | 18 +++++------ objects/effect_attack4/Step_0.gml | 20 ------------- objects/effect_attack4_attacked/Step_0.gml | 20 ------------- .../effect_attack4_non_attacked/Step_0.gml | 21 ------------- objects/obj_namebar/KeyPress_13.gml | 4 +-- objects/obj_namebar/Step_0.gml | 3 -- objects/obj_namebar/obj_namebar.yy | 30 +++++++++---------- objects/player/Draw_0.gml | 7 +++++ objects/player/Step_0.gml | 11 ++++--- 19 files changed, 68 insertions(+), 220 deletions(-) diff --git a/Arena_of_Woowakgood.yyp b/Arena_of_Woowakgood.yyp index c1fbd29..5153487 100644 --- a/Arena_of_Woowakgood.yyp +++ b/Arena_of_Woowakgood.yyp @@ -465,6 +465,6 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"example.txt","CopyToMask":202375362,"filePath":"datafiles",}, ], "MetaData": { - "IDEVersion": "2022.11.0.54", + "IDEVersion": "2022.11.1.56", }, } \ No newline at end of file diff --git a/objects/charging_attack/Step_0.gml b/objects/charging_attack/Step_0.gml index cd28edc..367913e 100644 --- a/objects/charging_attack/Step_0.gml +++ b/objects/charging_attack/Step_0.gml @@ -7,24 +7,3 @@ if image_alpha <= 0 instance_destroy() } - -if cre_effect = 0 -{ - if place_meeting(x,y,charging_attack_attacked) - { - cre_effect = 1 - sfx_for_multiplayer(guard,0,0.05) - - var _my_p = get_my_player() - var random_dir = _my_p.image_xscale - if _my_p != -4 && instance_exists(_my_p) - { - repeat(2) - { - var _ef = instance_create_depth(_my_p.x-image_xscale*4,_my_p.y+irandom_range(-13,0),_my_p.depth-1,effect_spark) - _ef.hspeed = irandom_range(5,20)*random_dir - _ef.vspeed = irandom_range(-4,2) - } - } - } -} \ No newline at end of file diff --git a/objects/code/Other_68.gml b/objects/code/Other_68.gml index 1bce89f..dc267e0 100644 --- a/objects/code/Other_68.gml +++ b/objects/code/Other_68.gml @@ -690,7 +690,6 @@ else if (type == network_type_data) var _kw_ = buffer_read(buffer, buffer_string); var _s_sword_ = buffer_read(buffer, buffer_string); var _m_hp = buffer_read(buffer, buffer_string); - var _on_platform = buffer_read(buffer, buffer_string); if global.nickname != _check_who_send { with(player) @@ -712,10 +711,6 @@ else if (type == network_type_data) n_sword_ = real(string(_s_sword_))/100; returned_id = real(_real_id_); - if is_real(_on_platform) - { - on_platform = real(string(_on_platform)); - } } } } diff --git a/objects/effect/Step_0.gml b/objects/effect/Step_0.gml index b1d378c..ab8cd38 100644 --- a/objects/effect/Step_0.gml +++ b/objects/effect/Step_0.gml @@ -8,20 +8,3 @@ if image_alpha <= 0 instance_destroy(); }; -if cre_effect = 0 -{ - if place_meeting(x,y,effect_attacked) - { - cre_effect = 1 - sfx_for_multiplayer(guard,0,0.05) - - var _my_p = get_my_player() - var random_dir = _my_p.image_xscale - repeat(2) - { - var _ef = instance_create_depth(_my_p.x-image_xscale*4,_my_p.y+irandom_range(-13,0),_my_p.depth-1,effect_spark) - _ef.hspeed = irandom_range(5,20)*random_dir - _ef.vspeed = irandom_range(-4,2) - } - } -} \ No newline at end of file diff --git a/objects/effect/effect.yy b/objects/effect/effect.yy index 6a97629..cae27c5 100644 --- a/objects/effect/effect.yy +++ b/objects/effect/effect.yy @@ -1,10 +1,14 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "effect", "spriteId": { "name": "pl_move_skeleton_spin_attack1_1", "path": "sprites/pl_move_skeleton_spin_attack1_1/pl_move_skeleton_spin_attack1_1.yy", }, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": null, @@ -21,11 +25,11 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":12,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":1,"eventType":2,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":12,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":1,"eventType":2,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -33,8 +37,4 @@ "name": "객체", "path": "folders/객체.yy", }, - "resourceVersion": "1.0", - "name": "effect", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/effect_attack1/Step_0.gml b/objects/effect_attack1/Step_0.gml index 85cf85f..5dbf005 100644 --- a/objects/effect_attack1/Step_0.gml +++ b/objects/effect_attack1/Step_0.gml @@ -8,20 +8,3 @@ instance_destroy() } -if cre_effect = 0 -{ - if place_meeting(x,y,effect_attack1_attacked) - { - cre_effect = 1 - sfx_for_multiplayer(guard,0,0.05) - - var _my_p = get_my_player() - var random_dir = _my_p.image_xscale - repeat(2) - { - var _ef = instance_create_depth(_my_p.x-image_xscale*4,_my_p.y+irandom_range(-13,0),_my_p.depth-1,effect_spark) - _ef.hspeed = irandom_range(5,20)*random_dir - _ef.vspeed = irandom_range(-4,2) - } - } -} \ No newline at end of file diff --git a/objects/effect_attack1/effect_attack1.yy b/objects/effect_attack1/effect_attack1.yy index 35fddd2..60d53bf 100644 --- a/objects/effect_attack1/effect_attack1.yy +++ b/objects/effect_attack1/effect_attack1.yy @@ -1,10 +1,14 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "effect_attack1", "spriteId": { "name": "pl_move_skeleton_attack1", "path": "sprites/pl_move_skeleton_attack1/pl_move_skeleton_attack1.yy", }, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": null, @@ -21,11 +25,11 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":12,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":1,"eventType":2,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":12,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":1,"eventType":2,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -33,8 +37,4 @@ "name": "객체", "path": "folders/객체.yy", }, - "resourceVersion": "1.0", - "name": "effect_attack1", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/effect_attack2/Step_0.gml b/objects/effect_attack2/Step_0.gml index c3617b2..b40d259 100644 --- a/objects/effect_attack2/Step_0.gml +++ b/objects/effect_attack2/Step_0.gml @@ -6,21 +6,3 @@ if image_alpha <= 0 { instance_destroy() } - -if cre_effect = 0 -{ - if place_meeting(x,y,effect_attack2_attacked) - { - cre_effect = 1 - sfx_for_multiplayer(guard,0,0.05) - - var _my_p = get_my_player() - var random_dir = _my_p.image_xscale - repeat(2) - { - var _ef = instance_create_depth(_my_p.x-image_xscale*4,_my_p.y+irandom_range(-13,0),_my_p.depth-1,effect_spark) - _ef.hspeed = irandom_range(5,20)*random_dir - _ef.vspeed = irandom_range(-4,2) - } - } -} \ No newline at end of file diff --git a/objects/effect_attack2/effect_attack2.yy b/objects/effect_attack2/effect_attack2.yy index 6db3633..d980ad1 100644 --- a/objects/effect_attack2/effect_attack2.yy +++ b/objects/effect_attack2/effect_attack2.yy @@ -1,10 +1,14 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "effect_attack2", "spriteId": { "name": "pl_move_skeleton_attack1_1", "path": "sprites/pl_move_skeleton_attack1_1/pl_move_skeleton_attack1_1.yy", }, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": null, @@ -21,11 +25,11 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":12,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":1,"eventType":2,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":12,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":1,"eventType":2,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -33,8 +37,4 @@ "name": "객체", "path": "folders/객체.yy", }, - "resourceVersion": "1.0", - "name": "effect_attack2", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/effect_attack3/Step_0.gml b/objects/effect_attack3/Step_0.gml index 325bcde..5dbf005 100644 --- a/objects/effect_attack3/Step_0.gml +++ b/objects/effect_attack3/Step_0.gml @@ -8,23 +8,3 @@ instance_destroy() } -if cre_effect = 0 -{ - if place_meeting(x,y,effect_attack3_attacked) - { - cre_effect = 1 - sfx_for_multiplayer(guard,0,0.05) - - var _my_p = get_my_player() - var random_dir = _my_p.image_xscale - if _my_p != -4 && instance_exists(_my_p) - { - repeat(2) - { - var _ef = instance_create_depth(_my_p.x-image_xscale*4,_my_p.y+irandom_range(-13,0),_my_p.depth-1,effect_spark) - _ef.hspeed = irandom_range(5,20)*random_dir - _ef.vspeed = irandom_range(-4,2) - } - } - } -} \ No newline at end of file diff --git a/objects/effect_attack3/effect_attack3.yy b/objects/effect_attack3/effect_attack3.yy index e380aae..d07b875 100644 --- a/objects/effect_attack3/effect_attack3.yy +++ b/objects/effect_attack3/effect_attack3.yy @@ -1,10 +1,14 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "effect_attack3", "spriteId": { "name": "pl_move_skeleton_attack1", "path": "sprites/pl_move_skeleton_attack1/pl_move_skeleton_attack1.yy", }, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": null, @@ -21,11 +25,11 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":12,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":1,"eventType":2,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":12,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":1,"eventType":2,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -33,8 +37,4 @@ "name": "객체", "path": "folders/객체.yy", }, - "resourceVersion": "1.0", - "name": "effect_attack3", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/effect_attack4/Step_0.gml b/objects/effect_attack4/Step_0.gml index 325bcde..5dbf005 100644 --- a/objects/effect_attack4/Step_0.gml +++ b/objects/effect_attack4/Step_0.gml @@ -8,23 +8,3 @@ instance_destroy() } -if cre_effect = 0 -{ - if place_meeting(x,y,effect_attack3_attacked) - { - cre_effect = 1 - sfx_for_multiplayer(guard,0,0.05) - - var _my_p = get_my_player() - var random_dir = _my_p.image_xscale - if _my_p != -4 && instance_exists(_my_p) - { - repeat(2) - { - var _ef = instance_create_depth(_my_p.x-image_xscale*4,_my_p.y+irandom_range(-13,0),_my_p.depth-1,effect_spark) - _ef.hspeed = irandom_range(5,20)*random_dir - _ef.vspeed = irandom_range(-4,2) - } - } - } -} \ No newline at end of file diff --git a/objects/effect_attack4_attacked/Step_0.gml b/objects/effect_attack4_attacked/Step_0.gml index 325bcde..5dbf005 100644 --- a/objects/effect_attack4_attacked/Step_0.gml +++ b/objects/effect_attack4_attacked/Step_0.gml @@ -8,23 +8,3 @@ instance_destroy() } -if cre_effect = 0 -{ - if place_meeting(x,y,effect_attack3_attacked) - { - cre_effect = 1 - sfx_for_multiplayer(guard,0,0.05) - - var _my_p = get_my_player() - var random_dir = _my_p.image_xscale - if _my_p != -4 && instance_exists(_my_p) - { - repeat(2) - { - var _ef = instance_create_depth(_my_p.x-image_xscale*4,_my_p.y+irandom_range(-13,0),_my_p.depth-1,effect_spark) - _ef.hspeed = irandom_range(5,20)*random_dir - _ef.vspeed = irandom_range(-4,2) - } - } - } -} \ No newline at end of file diff --git a/objects/effect_attack4_non_attacked/Step_0.gml b/objects/effect_attack4_non_attacked/Step_0.gml index 325bcde..367913e 100644 --- a/objects/effect_attack4_non_attacked/Step_0.gml +++ b/objects/effect_attack4_non_attacked/Step_0.gml @@ -7,24 +7,3 @@ if image_alpha <= 0 instance_destroy() } - -if cre_effect = 0 -{ - if place_meeting(x,y,effect_attack3_attacked) - { - cre_effect = 1 - sfx_for_multiplayer(guard,0,0.05) - - var _my_p = get_my_player() - var random_dir = _my_p.image_xscale - if _my_p != -4 && instance_exists(_my_p) - { - repeat(2) - { - var _ef = instance_create_depth(_my_p.x-image_xscale*4,_my_p.y+irandom_range(-13,0),_my_p.depth-1,effect_spark) - _ef.hspeed = irandom_range(5,20)*random_dir - _ef.vspeed = irandom_range(-4,2) - } - } - } -} \ No newline at end of file diff --git a/objects/obj_namebar/KeyPress_13.gml b/objects/obj_namebar/KeyPress_13.gml index e0070dd..ed01c4e 100644 --- a/objects/obj_namebar/KeyPress_13.gml +++ b/objects/obj_namebar/KeyPress_13.gml @@ -2,7 +2,7 @@ // You can write your code in this editor if start = 1 { - if string_length(global.nickname) < 2 || global.nickname = "아버" + if string_length(global.nickname) < 2// || global.nickname = "아버" { cannot_select_name = 1 } @@ -30,7 +30,7 @@ if start = 1 if start = 0 { - if string_length(global.nickname) < 2 || global.nickname = "아버" + if string_length(global.nickname) < 2 //|| global.nickname = "아버" { cannot_select_name = 1 } diff --git a/objects/obj_namebar/Step_0.gml b/objects/obj_namebar/Step_0.gml index 1f00a2f..c07a24e 100644 --- a/objects/obj_namebar/Step_0.gml +++ b/objects/obj_namebar/Step_0.gml @@ -87,9 +87,6 @@ if activate = 1 } global.nickname = keyboard_string; - -keyboard_string = string_replace(keyboard_string," ",""); -global.nickname = string_replace(global.nickname," ",""); } cannot_select_name -= 0.08 diff --git a/objects/obj_namebar/obj_namebar.yy b/objects/obj_namebar/obj_namebar.yy index 79d6dcf..61fcb17 100644 --- a/objects/obj_namebar/obj_namebar.yy +++ b/objects/obj_namebar/obj_namebar.yy @@ -1,7 +1,11 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_namebar", "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": null, @@ -18,17 +22,17 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":53,"eventType":6,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":13,"eventType":9,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":117,"eventType":10,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":1,"eventType":2,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":2,"eventType":2,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":37,"eventType":9,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":1,"eventType":6,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":39,"eventType":9,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":53,"eventType":6,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":13,"eventType":9,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":117,"eventType":10,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":1,"eventType":2,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":2,"eventType":2,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":37,"eventType":9,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":1,"eventType":6,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":39,"eventType":9,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -36,8 +40,4 @@ "name": "객체", "path": "folders/객체.yy", }, - "resourceVersion": "1.0", - "name": "obj_namebar", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/objects/player/Draw_0.gml b/objects/player/Draw_0.gml index 8fcda9a..44647af 100644 --- a/objects/player/Draw_0.gml +++ b/objects/player/Draw_0.gml @@ -106,6 +106,13 @@ if image_alpha > 0 && global.hp > 0 draw_sprite_ext(item_sword,global.n_sword,x-image_xscale*2,y-64,0.75,0.75,0,c_white,show_my_sword) } } + else + { + if hurt > 0 + { + draw_text_kl_scale(x,y-120,"(Space키를 눌러 일어나기)",v_x*64,-1,show_my_sword,c_white,0,0,font0,v_x*0.35,v_x*0.35,0); + } + } //체력바 hp_bar_alpha += (1 - hp_bar_alpha)*0.1 diff --git a/objects/player/Step_0.gml b/objects/player/Step_0.gml index be4f955..a5e05dd 100644 --- a/objects/player/Step_0.gml +++ b/objects/player/Step_0.gml @@ -1854,7 +1854,7 @@ w_alpha += (-0.01 - w_alpha)*0.1 } } - if keyboard_check_pressed(vk_up) && gravity = 0 && vspeed = 0 && global.hp > 0 + if keyboard_check_pressed(vk_up) && gravity = 0 && vspeed = 0 && global.hp > 0 && hurt > 2 { hurt = 0 hurt_cooltime = 0 @@ -1883,7 +1883,7 @@ w_alpha += (-0.01 - w_alpha)*0.1 w_alpha = 1 } - if keyboard_check_pressed(vk_down) && gravity = 0 && vspeed = 0 && global.hp > 0 + if keyboard_check_pressed(vk_down) && gravity = 0 && vspeed = 0 && global.hp > 0 && hurt > 2 { hurt = 0 hurt_cooltime = 0 @@ -1901,7 +1901,7 @@ w_alpha += (-0.01 - w_alpha)*0.1 w_alpha = 1 } - if keyboard_check_pressed(vk_space) && gravity = 0 && vspeed = 0 && global.hp > 0 + if keyboard_check_pressed(vk_space) && gravity = 0 && vspeed = 0 && global.hp > 0 && hurt > 2 { hurt = 0 hurt_cooltime = 0 @@ -5442,7 +5442,10 @@ if abs(self_movement_speed) > 10 dust.image_xscale = -image_xscale n_dir_speed = sign(image_xscale) - global.movement_speed += 15*sign(global.movement_speed) + if (global.nickname == name) && just_come_check = 0 + { + global.movement_speed += 15*sign(global.movement_speed) + } } } else