bug fixes
This commit is contained in:
parent
51803d0406
commit
e80ace000d
@ -146,9 +146,7 @@ animations = [{
|
|||||||
}]
|
}]
|
||||||
|
|
||||||
[node name="CharacterBody2D" type="CharacterBody2D" unique_id=44928680]
|
[node name="CharacterBody2D" type="CharacterBody2D" unique_id=44928680]
|
||||||
position = Vector2(-33, 19)
|
|
||||||
script = ExtResource("1_j5628")
|
script = ExtResource("1_j5628")
|
||||||
metadata/_edit_group_ = true
|
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=547069058]
|
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=547069058]
|
||||||
shape = SubResource("CapsuleShape2D_80nbo")
|
shape = SubResource("CapsuleShape2D_80nbo")
|
||||||
@ -167,8 +165,7 @@ position = Vector2(-20, -8)
|
|||||||
|
|
||||||
[node name="player graphic" type="AnimatedSprite2D" parent="." unique_id=1007399411]
|
[node name="player graphic" type="AnimatedSprite2D" parent="." unique_id=1007399411]
|
||||||
texture_filter = 1
|
texture_filter = 1
|
||||||
position = Vector2(2, -26)
|
position = Vector2(2, -1)
|
||||||
scale = Vector2(2.5208335, 2.3541667)
|
|
||||||
sprite_frames = SubResource("SpriteFrames_mu2pl")
|
sprite_frames = SubResource("SpriteFrames_mu2pl")
|
||||||
animation = &"run"
|
animation = &"run"
|
||||||
autoplay = "idle"
|
autoplay = "idle"
|
||||||
|
|||||||
@ -2,14 +2,12 @@
|
|||||||
|
|
||||||
[ext_resource type="Script" uid="uid://bsqvllp6h53jr" path="res://scripts/cube.gd" id="1_jbd7x"]
|
[ext_resource type="Script" uid="uid://bsqvllp6h53jr" path="res://scripts/cube.gd" id="1_jbd7x"]
|
||||||
|
|
||||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_80nbo"]
|
[sub_resource type="RectangleShape2D" id="RectangleShape2D_7j3e2"]
|
||||||
size = Vector2(129, 132)
|
|
||||||
|
|
||||||
[node name="cube" type="RigidBody2D" unique_id=1851497894 groups=["fragile"]]
|
[node name="cube" type="RigidBody2D" unique_id=1851497894 groups=["fragile"]]
|
||||||
script = ExtResource("1_jbd7x")
|
script = ExtResource("1_jbd7x")
|
||||||
metadata/_edit_group_ = true
|
metadata/_edit_group_ = true
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=250973730]
|
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=250973730]
|
||||||
position = Vector2(54.5, 56)
|
shape = SubResource("RectangleShape2D_7j3e2")
|
||||||
shape = SubResource("RectangleShape2D_80nbo")
|
|
||||||
debug_color = Color(0.15505362, 0.53664047, 0.94464076, 0.41960785)
|
debug_color = Color(0.15505362, 0.53664047, 0.94464076, 0.41960785)
|
||||||
@ -1,12 +1,11 @@
|
|||||||
[gd_scene format=3 uid="uid://btxq5hrirovod"]
|
[gd_scene format=3 uid="uid://btxq5hrirovod"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://cebn6t5n1cwib" path="res://scripts/platform.gd" id="1_e2o6t"]
|
[ext_resource type="Script" uid="uid://jsnpm50wknk2" path="res://scripts/game.gd" id="1_qpk70"]
|
||||||
[ext_resource type="Script" uid="uid://jsnpm50wknk2" path="res://scripts/game.gd" id="1_fc0e3"]
|
[ext_resource type="Script" uid="uid://cxlpex21vgnla" path="res://scripts/scenemanager.gd" id="2_ll5lq"]
|
||||||
[ext_resource type="Script" uid="uid://cxlpex21vgnla" path="res://scripts/scenemanager.gd" id="2_ryrav"]
|
[ext_resource type="Script" uid="uid://cebn6t5n1cwib" path="res://scripts/platform.gd" id="3_17rxn"]
|
||||||
[ext_resource type="PackedScene" uid="uid://d0wbtenf13iol" path="res://cube.tscn" id="3_7jktm"]
|
[ext_resource type="Script" uid="uid://cdxh14mtlvhl6" path="res://scripts/trigger_circle.gd" id="4_yq8tf"]
|
||||||
[ext_resource type="Script" uid="uid://cdxh14mtlvhl6" path="res://scripts/trigger_circle.gd" id="3_feb5d"]
|
[ext_resource type="PackedScene" uid="uid://d0wbtenf13iol" path="res://scene/cube.tscn" id="5_ym5sv"]
|
||||||
[ext_resource type="PackedScene" uid="uid://d4nnj62h6fjcq" path="res://scene/character_body_2d.tscn" id="4_ryrav"]
|
[ext_resource type="PackedScene" uid="uid://d4nnj62h6fjcq" path="res://scene/character_body_2d.tscn" id="6_sng2h"]
|
||||||
[ext_resource type="PackedScene" uid="uid://c5mayb1i4ypqm" path="res://grenade.tscn" id="7_eow3j"]
|
|
||||||
|
|
||||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_mwb40"]
|
[sub_resource type="RectangleShape2D" id="RectangleShape2D_mwb40"]
|
||||||
size = Vector2(368.333, 64.236694)
|
size = Vector2(368.333, 64.236694)
|
||||||
@ -17,18 +16,17 @@ size = Vector2(368.333, 64.236694)
|
|||||||
radius = 153.83757
|
radius = 153.83757
|
||||||
|
|
||||||
[node name="Game" type="Node2D" unique_id=1249397989]
|
[node name="Game" type="Node2D" unique_id=1249397989]
|
||||||
script = ExtResource("1_fc0e3")
|
script = ExtResource("1_qpk70")
|
||||||
|
|
||||||
[node name="SceneManager" type="Node2D" parent="." unique_id=1165789663]
|
[node name="SceneManager" type="Node2D" parent="." unique_id=1165789663]
|
||||||
unique_name_in_owner = true
|
unique_name_in_owner = true
|
||||||
position = Vector2(661, 24)
|
position = Vector2(661, 24)
|
||||||
scale = Vector2(0.97016877, 1.0195743)
|
scale = Vector2(0.97016877, 1.0195743)
|
||||||
script = ExtResource("2_ryrav")
|
script = ExtResource("2_ll5lq")
|
||||||
|
|
||||||
[node name="platform" type="StaticBody2D" parent="." unique_id=817692358]
|
[node name="platform" type="StaticBody2D" parent="." unique_id=817692358]
|
||||||
position = Vector2(421, 536.99994)
|
position = Vector2(421, 536.99994)
|
||||||
script = ExtResource("1_e2o6t")
|
script = ExtResource("3_17rxn")
|
||||||
metadata/_edit_group_ = true
|
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="platform" unique_id=469432658]
|
[node name="CollisionShape2D" type="CollisionShape2D" parent="platform" unique_id=469432658]
|
||||||
shape = SubResource("RectangleShape2D_mwb40")
|
shape = SubResource("RectangleShape2D_mwb40")
|
||||||
@ -36,7 +34,7 @@ shape = SubResource("RectangleShape2D_mwb40")
|
|||||||
[node name="left wall" type="StaticBody2D" parent="." unique_id=1287017623]
|
[node name="left wall" type="StaticBody2D" parent="." unique_id=1287017623]
|
||||||
position = Vector2(-143, 215)
|
position = Vector2(-143, 215)
|
||||||
rotation = 1.4884713
|
rotation = 1.4884713
|
||||||
script = ExtResource("1_e2o6t")
|
script = ExtResource("3_17rxn")
|
||||||
metadata/_edit_group_ = true
|
metadata/_edit_group_ = true
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="left wall" unique_id=1720529410]
|
[node name="CollisionShape2D" type="CollisionShape2D" parent="left wall" unique_id=1720529410]
|
||||||
@ -45,7 +43,7 @@ shape = SubResource("RectangleShape2D_mwb40")
|
|||||||
[node name="right wall" type="StaticBody2D" parent="." unique_id=820553779]
|
[node name="right wall" type="StaticBody2D" parent="." unique_id=820553779]
|
||||||
position = Vector2(-483, 92)
|
position = Vector2(-483, 92)
|
||||||
rotation = -1.6017642
|
rotation = -1.6017642
|
||||||
script = ExtResource("1_e2o6t")
|
script = ExtResource("3_17rxn")
|
||||||
metadata/_edit_group_ = true
|
metadata/_edit_group_ = true
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="right wall" unique_id=22403495]
|
[node name="CollisionShape2D" type="CollisionShape2D" parent="right wall" unique_id=22403495]
|
||||||
@ -72,7 +70,7 @@ shape = SubResource("WorldBoundaryShape2D_mwb40")
|
|||||||
|
|
||||||
[node name="Area2D" type="Area2D" parent="." unique_id=733267557]
|
[node name="Area2D" type="Area2D" parent="." unique_id=733267557]
|
||||||
position = Vector2(945, 535)
|
position = Vector2(945, 535)
|
||||||
script = ExtResource("3_feb5d")
|
script = ExtResource("4_yq8tf")
|
||||||
metadata/_edit_group_ = true
|
metadata/_edit_group_ = true
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D" unique_id=762446279]
|
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D" unique_id=762446279]
|
||||||
@ -80,23 +78,20 @@ shape = SubResource("CircleShape2D_e2o6t")
|
|||||||
|
|
||||||
[node name="cube container" type="Node2D" parent="." unique_id=22976120]
|
[node name="cube container" type="Node2D" parent="." unique_id=22976120]
|
||||||
|
|
||||||
[node name="cube" parent="cube container" unique_id=1851497894 instance=ExtResource("3_7jktm")]
|
[node name="cube" parent="cube container" unique_id=1851497894 instance=ExtResource("5_ym5sv")]
|
||||||
position = Vector2(429.00003, 372)
|
position = Vector2(429.00003, 372)
|
||||||
scale = Vector2(0.97196096, 1.0195743)
|
scale = Vector2(0.97196096, 1.0195743)
|
||||||
|
|
||||||
[node name="cube2" parent="cube container" unique_id=1345370216 instance=ExtResource("3_7jktm")]
|
[node name="cube2" parent="cube container" unique_id=1345370216 instance=ExtResource("5_ym5sv")]
|
||||||
position = Vector2(921, -508.99997)
|
position = Vector2(921, -508.99997)
|
||||||
scale = Vector2(0.97196096, 1.0195743)
|
scale = Vector2(0.97196096, 1.0195743)
|
||||||
|
|
||||||
[node name="cube3" parent="cube container" unique_id=321996969 instance=ExtResource("3_7jktm")]
|
[node name="cube3" parent="cube container" unique_id=321996969 instance=ExtResource("5_ym5sv")]
|
||||||
position = Vector2(978.99994, -294)
|
position = Vector2(978.99994, -294)
|
||||||
scale = Vector2(0.97196096, 1.0195743)
|
scale = Vector2(0.97196096, 1.0195743)
|
||||||
|
|
||||||
[node name="CharacterBody2D" parent="." unique_id=44928680 instance=ExtResource("4_ryrav")]
|
[node name="CharacterBody2D" parent="." unique_id=44928680 instance=ExtResource("6_sng2h")]
|
||||||
position = Vector2(263, 481)
|
position = Vector2(263, 481)
|
||||||
|
|
||||||
[node name="grenade" parent="." unique_id=1844025628 instance=ExtResource("7_eow3j")]
|
|
||||||
position = Vector2(-37, 236)
|
|
||||||
|
|
||||||
[connection signal="body_entered" from="Area2D" to="Area2D" method="_on_body_entered"]
|
[connection signal="body_entered" from="Area2D" to="Area2D" method="_on_body_entered"]
|
||||||
[connection signal="triggerActiveSignal" from="Area2D" to="." method="on_trigger"]
|
[connection signal="triggerActiveSignal" from="Area2D" to="." method="on_trigger"]
|
||||||
@ -1,6 +1,6 @@
|
|||||||
class_name SM extends Node2D
|
class_name SM extends Node2D
|
||||||
|
|
||||||
var grenade = preload("res://grenade.tscn")
|
var grenade = preload("res://scene/grenade.tscn")
|
||||||
@onready var game: Node2D = $".."
|
@onready var game: Node2D = $".."
|
||||||
@onready var cube_container: Node2D = $"../cube container"
|
@onready var cube_container: Node2D = $"../cube container"
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user