Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022

This commit is contained in:
2022-12-10 04:53:14 +01:00
2 changed files with 39 additions and 14 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=5 format=3 uid="uid://n7w0ff7u25yc"] [gd_scene load_steps=5 format=3 uid="uid://bl1yrgr7g06db"]
[ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_iox18"] [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_iox18"]
@@ -19,35 +19,60 @@ _data = {
} }
point_count = 15 point_count = 15
[node name="Game" type="Node"] [node name="Game" type="Node" node_paths=PackedStringArray("p1", "p2")]
script = ExtResource("1_iox18") script = ExtResource("1_iox18")
p1 = NodePath("HBoxContainer/SubViewportContainer/SubViewport/Player1Path/PathFollow3D")
p2 = NodePath("HBoxContainer/SubViewportContainer2/SubViewport/Player2Path/PathFollow3D")
[node name="Camera3D" type="Camera3D" parent="."] [node name="HBoxContainer" type="HBoxContainer" parent="."]
transform = Transform3D(1, 1.77636e-14, 7.76471e-22, 0, -4.37114e-08, 1, 1.77636e-14, -1, -4.37114e-08, 36.5305, 43.522, 0.295507) offset_right = 40.0
offset_bottom = 40.0
[node name="Player1Path" type="Path3D" parent="."] [node name="SubViewportContainer" type="SubViewportContainer" parent="HBoxContainer"]
layout_mode = 2
[node name="SubViewport" type="SubViewport" parent="HBoxContainer/SubViewportContainer"]
handle_input_locally = false
size = Vector2i(960, 1080)
render_target_update_mode = 4
[node name="Player1Path" type="Path3D" parent="HBoxContainer/SubViewportContainer/SubViewport"]
curve = SubResource("Curve3D_42kdk") curve = SubResource("Curve3D_42kdk")
[node name="PathFollow3D" type="PathFollow3D" parent="Player1Path"] [node name="PathFollow3D" type="PathFollow3D" parent="HBoxContainer/SubViewportContainer/SubViewport/Player1Path"]
transform = Transform3D(-4.37107e-08, 0, 0.999984, 0, 1, 0, -0.999984, 0, -4.37107e-08, 0, 0, -8) transform = Transform3D(-4.37107e-08, 0, 0.999984, 0, 1, 0, -0.999984, 0, -4.37107e-08, 0, 0, -8)
[node name="root" type="Node3D" parent="Player1Path/PathFollow3D"] [node name="root" type="Node3D" parent="HBoxContainer/SubViewportContainer/SubViewport/Player1Path/PathFollow3D"]
[node name="Zug1" type="MeshInstance3D" parent="Player1Path/PathFollow3D/root"] [node name="Zug1" type="MeshInstance3D" parent="HBoxContainer/SubViewportContainer/SubViewport/Player1Path/PathFollow3D/root"]
transform = Transform3D(1, 0, -7.10543e-15, 0, 1, 0, 7.10543e-15, 0, 1, 0, 0, 0) transform = Transform3D(1, 0, -7.10543e-15, 0, 1, 0, 7.10543e-15, 0, 1, 0, 0, 0)
mesh = SubResource("BoxMesh_3vwcb") mesh = SubResource("BoxMesh_3vwcb")
skeleton = NodePath("../..") skeleton = NodePath("../..")
[node name="Player2Path" type="Path3D" parent="."] [node name="Camera3D" type="Camera3D" parent="HBoxContainer/SubViewportContainer/SubViewport/Player1Path/PathFollow3D/root"]
transform = Transform3D(1.00002, 4.37121e-08, 4.37128e-08, -4.37121e-08, -4.37121e-08, 1, 4.37121e-08, -1.00002, -4.37128e-08, 0, 20, 0)
[node name="SubViewportContainer2" type="SubViewportContainer" parent="HBoxContainer"]
layout_mode = 2
[node name="SubViewport" type="SubViewport" parent="HBoxContainer/SubViewportContainer2"]
handle_input_locally = false
size = Vector2i(960, 1080)
render_target_update_mode = 4
[node name="Player2Path" type="Path3D" parent="HBoxContainer/SubViewportContainer2/SubViewport"]
curve = SubResource("Curve3D_ycdkn") curve = SubResource("Curve3D_ycdkn")
[node name="PathFollow3D" type="PathFollow3D" parent="Player2Path"] [node name="PathFollow3D" type="PathFollow3D" parent="HBoxContainer/SubViewportContainer2/SubViewport/Player2Path"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, -16) transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, -16)
[node name="root" type="Node3D" parent="Player2Path/PathFollow3D"] [node name="root" type="Node3D" parent="HBoxContainer/SubViewportContainer2/SubViewport/Player2Path/PathFollow3D"]
transform = Transform3D(-0.0154456, -6.75146e-10, -0.999881, -5.21344e-12, 1, -6.75146e-10, 0.999881, -5.21341e-12, -0.0154456, 0, 0, 0) transform = Transform3D(-0.0154456, -6.75146e-10, -0.999881, -5.21344e-12, 1, -6.75146e-10, 0.999881, -5.21341e-12, -0.0154456, 0, 0, 0)
[node name="Zug1" type="MeshInstance3D" parent="Player2Path/PathFollow3D/root"] [node name="Zug1" type="MeshInstance3D" parent="HBoxContainer/SubViewportContainer2/SubViewport/Player2Path/PathFollow3D/root"]
transform = Transform3D(1, 0, -7.10543e-15, 0, 1, 0, 7.10543e-15, 0, 1, 0, 0, 0) transform = Transform3D(1, 0, -7.10543e-15, 0, 1, 0, 7.10543e-15, 0, 1, 0, 0, 0)
mesh = SubResource("BoxMesh_3vwcb") mesh = SubResource("BoxMesh_3vwcb")
skeleton = NodePath("../..") skeleton = NodePath("../..")
[node name="Camera3D2" type="Camera3D" parent="HBoxContainer/SubViewportContainer2/SubViewport/Player2Path/PathFollow3D/root"]
transform = Transform3D(-0.0154455, -0.99988, -4.43872e-08, -4.43872e-08, -4.37069e-08, 1, -0.99988, 0.0154455, -4.37069e-08, 0, 20, 0)

View File

@@ -8,8 +8,8 @@ var t = 0.0
@onready var tween = create_tween() as Tween @onready var tween = create_tween() as Tween
@onready var p1 = $Player1Path/PathFollow3D @export var p1 : PathFollow3D
@onready var p2 = $Player2Path/PathFollow3D @export var p2 : PathFollow3D
var speed_p1 = 10 var speed_p1 = 10
var speed_p2 = 10 var speed_p2 = 10