Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung
This commit is contained in:
commit
2874c11658
12 files changed
+146
-6
No files matched your search
@@ -14,7 +14,6 @@ size = Vector3( 0.4, 1, 0.4 )
|
||||
points = PoolVector3Array( -0.0608763, 0.449247, 0.974783, -0.0608763, -0.464612, -0.974783, -0.0608763, 0.449247, -0.974783, 0.974783, -0.464612, -0.0608763, -0.974783, -0.464612, 0.0608763, 0.974783, 0.449247, 0.0608763, 0.0606902, -0.464648, 0.97486, -0.974783, 0.449247, -0.0608763, 0.7071, 0.453517, -0.7071, -0.705748, -0.468, -0.705748, -0.7071, 0.453517, 0.7071, 0.7071, 0.453517, 0.7071, 0.705748, -0.468, 0.705748, -0.705748, -0.468, 0.705748, 0.705748, -0.468, -0.705748, -0.7071, 0.453517, -0.7071, 0.0606902, -0.464648, -0.97486, -0.974783, -0.464612, -0.0608763, 0.974783, -0.464612, 0.0608763, -0.0608763, -0.464612, 0.974783, 0.0606902, 0.449283, 0.97486, 0.0606902, 0.449283, -0.97486, 0.974783, 0.449247, -0.0608763, -0.974783, 0.449247, 0.0608763, -0.642208, -0.46642, 0.73398, -0.642208, -0.46642, -0.73398, 0.578116, -0.464071, -0.760529, 0.578116, -0.464071, 0.760529, 0.760589, -0.464107, 0.577971, -0.760589, -0.464107, 0.577971, -0.760589, -0.464107, -0.577971, 0.760589, -0.464107, -0.577971 )
|
||||
|
||||
[node name="hydroponics_station" type="Spatial"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11.4134, 0, -2.96909 )
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="MeshInstance" type="MeshInstance" parent="."]
|
||||
|
||||
+49
-3
@@ -1,9 +1,11 @@
|
||||
[gd_scene load_steps=5 format=2]
|
||||
[gd_scene load_steps=6 format=2]
|
||||
|
||||
[ext_resource path="res://scripts/Player.gd" type="Script" id=1]
|
||||
[ext_resource path="res://assets/protodungman/DungMan.glb" type="PackedScene" id=2]
|
||||
[ext_resource path="res://assets/icons/stomach.png" type="Texture" id=3]
|
||||
|
||||
[sub_resource type="SphereShape" id=3]
|
||||
[sub_resource type="BoxShape" id=3]
|
||||
extents = Vector3( 0.25, 0.25, 1 )
|
||||
|
||||
[sub_resource type="CapsuleShape" id=2]
|
||||
radius = 0.210213
|
||||
@@ -19,7 +21,7 @@ unique_name_in_owner = true
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.630386 )
|
||||
|
||||
[node name="CollisionShape" type="CollisionShape" parent="DungMan/TriggerVolume"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.168703 )
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.778807, 0.291356 )
|
||||
shape = SubResource( 3 )
|
||||
|
||||
[node name="CollisionShape" type="CollisionShape" parent="."]
|
||||
@@ -31,3 +33,47 @@ transform = Transform( 1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 5.44166,
|
||||
fov = 50.0
|
||||
|
||||
[node name="ItemSpawn" type="Spatial" parent="."]
|
||||
|
||||
[node name="UI" type="CanvasLayer" parent="."]
|
||||
|
||||
[node name="Control" type="Control" parent="UI"]
|
||||
margin_right = 40.0
|
||||
margin_bottom = 40.0
|
||||
|
||||
[node name="MarginContainer" type="MarginContainer" parent="UI/Control"]
|
||||
margin_right = 128.0
|
||||
margin_bottom = 128.0
|
||||
custom_constants/margin_right = 16
|
||||
custom_constants/margin_top = 16
|
||||
custom_constants/margin_left = 16
|
||||
custom_constants/margin_bottom = 16
|
||||
|
||||
[node name="stomachs" type="HBoxContainer" parent="UI/Control/MarginContainer"]
|
||||
unique_name_in_owner = true
|
||||
margin_left = 16.0
|
||||
margin_top = 16.0
|
||||
margin_right = 540.0
|
||||
margin_bottom = 144.0
|
||||
|
||||
[node name="stomach0" type="TextureRect" parent="UI/Control/MarginContainer/stomachs"]
|
||||
margin_right = 128.0
|
||||
margin_bottom = 128.0
|
||||
texture = ExtResource( 3 )
|
||||
|
||||
[node name="stomach1" type="TextureRect" parent="UI/Control/MarginContainer/stomachs"]
|
||||
margin_left = 132.0
|
||||
margin_right = 260.0
|
||||
margin_bottom = 128.0
|
||||
texture = ExtResource( 3 )
|
||||
|
||||
[node name="stomach2" type="TextureRect" parent="UI/Control/MarginContainer/stomachs"]
|
||||
margin_left = 264.0
|
||||
margin_right = 392.0
|
||||
margin_bottom = 128.0
|
||||
texture = ExtResource( 3 )
|
||||
|
||||
[node name="stomach3" type="TextureRect" parent="UI/Control/MarginContainer/stomachs"]
|
||||
margin_left = 396.0
|
||||
margin_right = 524.0
|
||||
margin_bottom = 128.0
|
||||
texture = ExtResource( 3 )
|
||||
Reference in new issue
Block a user