Merge cont

This commit is contained in:
2023-07-17 13:10:38 -07:00
parent 86b8ddc3f0
commit f15e1031bd
6 changed files with 77 additions and 5 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=15 format=3 uid="uid://bcsgd8vxy43g2"]
[gd_scene load_steps=18 format=3 uid="uid://bcsgd8vxy43g2"]
[ext_resource type="Script" path="res://Scripts/Player.cs" id="1_8dc05"]
[ext_resource type="PackedScene" uid="uid://d20uxkpid4ynd" path="res://Models/vivi1.gltf" id="1_mqt2m"]
@@ -8,7 +8,7 @@
[ext_resource type="PackedScene" uid="uid://c13g5orvyhy1p" path="res://Models/moogle.gltf" id="4_dckjs"]
[ext_resource type="Script" path="res://Scripts/NPCFollow.cs" id="4_o5mpp"]
[ext_resource type="Script" path="res://Scripts/DebugText.cs" id="8_ksx3s"]
[ext_resource type="ArrayMesh" uid="uid://35saq7eyk446" path="res://Models/Cookie.obj" id="8_8xb3w"]
[ext_resource type="ArrayMesh" uid="uid://35saq7eyk446" path="res://Models/Cookie.obj" id="8_p45nj"]
[sub_resource type="BoxShape3D" id="BoxShape3D_8verc"]
size = Vector3(100, 2, 100)
@@ -122,7 +122,7 @@ collision_mask = 16
[node name="Cookie" type="MeshInstance3D" parent="CharacterBody3D"]
transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -8.04457, -0.130408, -1.66095)
mesh = ExtResource("8_8xb3w")
mesh = ExtResource("8_p45nj")
skeleton = NodePath("../..")
[node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D"]