diff --git a/scenes/arena/candy_survival.tscn b/scenes/arena/candy_survival.tscn index aab8b25..98a9ee6 100644 --- a/scenes/arena/candy_survival.tscn +++ b/scenes/arena/candy_survival.tscn @@ -1,6 +1,6 @@ -[gd_scene format=3] +[gd_scene format=3 uid="uid://dmkx71ms3cfc"] -[ext_resource type="PackedScene" path="res://assets/models/arena/candy_survival/candy_survival_terrain.gltf" id="1_86fyc"] +[ext_resource type="PackedScene" uid="uid://h84tka1n1alg" path="res://assets/models/arena/candy_survival/candy_survival_terrain.gltf" id="1_86fyc"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_floor"] albedo_color = Color(0.2, 0.2, 0.2, 1) @@ -32,14 +32,6 @@ albedo_color = Color(1, 0, 1, 0.5) material = SubResource("StandardMaterial3D_q8eld") size = Vector3(1, 0.05, 1) -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_l6h1c"] -transparency = 1 -albedo_color = Color(1, 0, 1, 0.5) - -[sub_resource type="BoxMesh" id="BoxMesh_66qef"] -material = SubResource("StandardMaterial3D_l6h1c") -size = Vector3(1, 0.05, 1) - [node name="Candy Survival" type="Node3D" unique_id=1063002869] [node name="PlaceholderFloor" type="MeshInstance3D" parent="." unique_id=932640085] @@ -52,7 +44,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.5, 0.5, 9.5) visible = false mesh = SubResource("BoxMesh_cannon") -[node name="Candy Survival terrain" type="Node3D" parent="." unique_id=193457353 instance=ExtResource("1_86fyc")] +[node name="Candy Survival terrain" parent="." unique_id=193457353 instance=ExtResource("1_86fyc")] [node name="MeshInstance3D" type="MeshInstance3D" parent="." unique_id=1749367969] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.192932, 0, 9.441385) @@ -60,8 +52,5 @@ mesh = SubResource("PlaneMesh_ugtui") [node name="EditorTileReference" type="MeshInstance3D" parent="." unique_id=1116403213] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0) +visible = false mesh = SubResource("BoxMesh_l6h1c") - -[node name="@MeshInstance3D@4" type="MeshInstance3D" parent="." unique_id=298246230] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0) -mesh = SubResource("BoxMesh_66qef") diff --git a/scenes/arena/freemode.tscn b/scenes/arena/freemode.tscn index d469443..426e9f8 100644 --- a/scenes/arena/freemode.tscn +++ b/scenes/arena/freemode.tscn @@ -1,15 +1,15 @@ -[gd_scene format=4] +[gd_scene format=4 uid="uid://bdg3v7atgxc1i"] -[ext_resource type="Texture2D" path="res://assets/models/arena/free_mode/river_decoration_3_tex.png" id="1_c6je8"] -[ext_resource type="Texture2D" path="res://assets/models/arena/free_mode/river_decoration_1_tex.png" id="2_1o174"] -[ext_resource type="Material" path="res://assets/models/arena/free_mode/water_shader.tres" id="2_bw67x"] -[ext_resource type="Texture2D" path="res://assets/models/arena/free_mode/sky_sea_01.png" id="3_8esiu"] -[ext_resource type="Texture2D" path="res://assets/models/arena/free_mode/river_flower_1_tex.png" id="3_b3dsj"] -[ext_resource type="Texture2D" path="res://assets/models/arena/free_mode/stone_arch_1_tex.png" id="4_wto06"] -[ext_resource type="PackedScene" path="res://assets/characters/tektons/tekton_fishing_animation.glb" id="4_xj13a"] -[ext_resource type="Texture2D" path="res://assets/models/arena/free_mode/totem_stone_tex.png" id="5_2mpye"] -[ext_resource type="Script" path="res://scripts/tekton_fishing_autoplay.gd" id="5_fish"] -[ext_resource type="Texture2D" path="res://assets/models/arena/free_mode/river_boat_tex.png" id="6_yxfuw"] +[ext_resource type="Texture2D" uid="uid://dvgyv04f08v3q" path="res://assets/models/arena/free_mode/river_decoration_3_tex.png" id="1_c6je8"] +[ext_resource type="Texture2D" uid="uid://c2wpbdg11iqsa" path="res://assets/models/arena/free_mode/river_decoration_1_tex.png" id="2_1o174"] +[ext_resource type="Material" uid="uid://xifgjdr8285d" path="res://assets/models/arena/free_mode/water_shader.tres" id="2_bw67x"] +[ext_resource type="Texture2D" uid="uid://dep1ng3aqb2jw" path="res://assets/models/arena/free_mode/sky_sea_01.png" id="3_8esiu"] +[ext_resource type="Texture2D" uid="uid://drhycvc6qmm1a" path="res://assets/models/arena/free_mode/river_flower_1_tex.png" id="3_b3dsj"] +[ext_resource type="Texture2D" uid="uid://btt267mvogm6k" path="res://assets/models/arena/free_mode/stone_arch_1_tex.png" id="4_wto06"] +[ext_resource type="PackedScene" uid="uid://cuporokvsp4ml" path="res://assets/characters/tektons/tekton_fishing_animation.glb" id="4_xj13a"] +[ext_resource type="Texture2D" uid="uid://cgr5hfccinmlh" path="res://assets/models/arena/free_mode/totem_stone_tex.png" id="5_2mpye"] +[ext_resource type="Script" uid="uid://dcnuf06soevte" path="res://scripts/tekton_fishing_autoplay.gd" id="5_fish"] +[ext_resource type="Texture2D" uid="uid://bgq2k6khfe051" path="res://assets/models/arena/free_mode/river_boat_tex.png" id="6_yxfuw"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_c6je8"] transparency = 1 @@ -4631,22 +4631,15 @@ ambient_light_color = Color(1, 1, 1, 1) ambient_light_sky_contribution = 0.5 reflected_light_source = 2 -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_b3dsj"] -transparency = 1 -albedo_color = Color(1, 0, 1, 0.5) - -[sub_resource type="BoxMesh" id="BoxMesh_wto06"] -material = SubResource("StandardMaterial3D_b3dsj") -size = Vector3(1, 0.05, 1) - [node name="Freemode" type="Node3D" unique_id=355029811] [node name="EditorTileReference" type="MeshInstance3D" parent="." unique_id=1796024900] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0) +visible = false mesh = SubResource("BoxMesh_1o174") [node name="ArenaMeshes" type="Node3D" parent="." unique_id=1386522804] -transform = Transform3D(100, 0, 0, 0, 100, 0, 0, 0, 100, 10.565, -0.57, 8.139) +transform = Transform3D(100, 0, 0, 0, 100, 0, 0, 0, 100, 10.565, -0.05, 8.139) [node name="Terrainv2" type="Node3D" parent="ArenaMeshes" unique_id=1519605696] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.00698278, 0) @@ -5230,18 +5223,14 @@ shadow_normal_bias = 5.0 [node name="WorldEnvironment" type="WorldEnvironment" parent="ArenaMeshes" unique_id=936572897] environment = SubResource("Environment_8v6kw") -[node name="tekton_fishing_animation1" type="Node3D" parent="ArenaMeshes" unique_id=1803834250 instance=ExtResource("4_xj13a")] +[node name="tekton_fishing_animation1" parent="ArenaMeshes" unique_id=1803834250 instance=ExtResource("4_xj13a")] transform = Transform3D(-0.0012733411, 0, 0.0015422717, 0, 0.002, 0, -0.0015422717, 0, -0.0012733411, 0.04044947, 0.023021752, -0.05992417) script = ExtResource("5_fish") -[node name="tekton_fishing_animation2" type="Node3D" parent="ArenaMeshes" unique_id=376449997 instance=ExtResource("4_xj13a")] +[node name="tekton_fishing_animation2" parent="ArenaMeshes" unique_id=376449997 instance=ExtResource("4_xj13a")] transform = Transform3D(-0.0017457078, 0, 0.0009759627, 0, 0.0019999999, 0, -0.0009759627, 0, -0.0017457078, -0.117699884, -0.00031990372, 0.039631918) script = ExtResource("5_fish") -[node name="tekton_fishing_animation3" type="Node3D" parent="ArenaMeshes" unique_id=1696737351 instance=ExtResource("4_xj13a")] +[node name="tekton_fishing_animation3" parent="ArenaMeshes" unique_id=1696737351 instance=ExtResource("4_xj13a")] transform = Transform3D(-0.0012249037, 0, 0.0015810153, 0, 0.002, 0, -0.0015810153, 0, -0.0012249037, 0.035826474, 0.0017311363, 0.0059019253) script = ExtResource("5_fish") - -[node name="@MeshInstance3D@2" type="MeshInstance3D" parent="." unique_id=1541054787] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0) -mesh = SubResource("BoxMesh_wto06") diff --git a/scenes/arena/stop_n_go.scn b/scenes/arena/stop_n_go.scn index 4332a49..2ed51d8 100644 Binary files a/scenes/arena/stop_n_go.scn and b/scenes/arena/stop_n_go.scn differ