diff --git a/scenes/islands.tscn b/scenes/islands.tscn index 0f1baf6..20c9069 100644 --- a/scenes/islands.tscn +++ b/scenes/islands.tscn @@ -12,12 +12,12 @@ sky_energy_multiplier = 2.0 ground_horizon_color = Color(0.8, 0.669701, 0.629328, 1) ground_curve = 1.00427 -[sub_resource type="Sky" id="Sky_ddrwh"] +[sub_resource type="Sky" id="Sky_iaa40"] sky_material = SubResource("ProceduralSkyMaterial_m1tut") [sub_resource type="Environment" id="Environment_fx5b2"] background_mode = 2 -sky = SubResource("Sky_ddrwh") +sky = SubResource("Sky_iaa40") tonemap_mode = 2 glow_enabled = true diff --git a/scenes/mainmenu-background.tscn b/scenes/mainmenu-background.tscn index 090df21..faafd32 100644 --- a/scenes/mainmenu-background.tscn +++ b/scenes/mainmenu-background.tscn @@ -4,66 +4,63 @@ [ext_resource type="PackedScene" uid="uid://b3l10agcjfgdx" path="res://characters/teddy/model_glb/teddy.glb" id="2_mie3v"] [ext_resource type="PackedScene" uid="uid://cyiyctp6y3n3x" path="res://scenes/mainmenu.tscn" id="3_bj3gc"] [ext_resource type="ArrayMesh" uid="uid://cfsnb4hd7rws7" path="res://characters/Mr. Brown/0_SFusion.obj" id="5_44sv4"] -[ext_resource type="PackedScene" uid="uid://c3g7endqtpddd" path="res://objects/toyland/Toyland.glb" id="5_y7kje"] +[ext_resource type="PackedScene" uid="uid://b02eb46bq4v2s" path="res://scenes/islands-map.tscn" id="5_ep6fx"] -[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_vpngx"] -sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) -ground_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_5ejs4"] +sky_top_color = Color(1, 0.509804, 0.384314, 1) +sky_horizon_color = Color(0.572549, 0.427451, 0.380392, 1) +sky_energy_multiplier = 2.0 +ground_horizon_color = Color(0.8, 0.669701, 0.629328, 1) +ground_curve = 1.00427 -[sub_resource type="Sky" id="Sky_wy734"] -sky_material = SubResource("ProceduralSkyMaterial_vpngx") +[sub_resource type="Sky" id="Sky_ddrwh"] +sky_material = SubResource("ProceduralSkyMaterial_5ejs4") -[sub_resource type="Environment" id="Environment_gyra6"] +[sub_resource type="Environment" id="Environment_84qbp"] background_mode = 2 -sky = SubResource("Sky_wy734") +sky = SubResource("Sky_ddrwh") tonemap_mode = 2 glow_enabled = true [node name="mainmenu-background" type="Node3D"] script = ExtResource("1_nn4qs") -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] -environment = SubResource("Environment_gyra6") - -[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(-0.866025, -0.283203, 0.412063, 0, 0.824126, 0.566406, -0.5, 0.490522, -0.713714, 0, 0, 0) -shadow_enabled = true -directional_shadow_max_distance = 1.0 - [node name="teddy2" parent="." instance=ExtResource("2_mie3v")] -transform = Transform3D(-0.43792, 0, -0.0332195, 0, 0.439179, 0, 0.0332195, 0, -0.43792, -14.1826, 1.52042, -40.4288) +transform = Transform3D(-0.213199, 0, -0.383958, 0, 0.439179, 0, 0.383958, 0, -0.213199, -3.89097, 7.54284, 53.0126) [node name="teddy" parent="." instance=ExtResource("2_mie3v")] -transform = Transform3D(-0.43792, 0, -0.0332195, 0, 0.439179, 0, 0.0332195, 0, -0.43792, -9.99161, 1.52042, -40.4288) - -[node name="teddy3" parent="." instance=ExtResource("2_mie3v")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 1.82283, -0.389118, -40.7763) - -[node name="teddy4" parent="." instance=ExtResource("2_mie3v")] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -25.8932, -0.389118, -40.7763) +transform = Transform3D(-0.213199, 0, -0.383958, 0, 0.439179, 0, 0.383958, 0, -0.213199, -1.31314, 7.5242, 47.2253) [node name="mainmenu" parent="." instance=ExtResource("3_bj3gc")] [node name="Camera3D" type="Camera3D" parent="."] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -12.0958, 3.68495, -48.2933) +transform = Transform3D(-0.550189, 0, -0.83504, 0, 1, 0, 0.83504, 0, -0.550189, -26.8376, 15.6553, 37.7756) + +[node name="Brown" type="MeshInstance3D" parent="."] +transform = Transform3D(0.0225339, 0, 0.0023044, 0, 0.0226514, 0, -0.0023044, 0, 0.0225339, 35.5504, 19.536, 58.6725) +visible = false +mesh = ExtResource("5_44sv4") + +[node name="islands" parent="." instance=ExtResource("5_ep6fx")] + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] +transform = Transform3D(0.553392, -0.0290685, 0.832414, 0, 0.999391, 0.0348995, -0.832921, -0.0193131, 0.553054, 0, 0, 0) +light_color = Color(0.980392, 0.372549, 0.333333, 1) +shadow_enabled = true + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_84qbp") [node name="eye_left" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.7097, 6.76656, -40.1296) +transform = Transform3D(0.198068, 0, 0.980188, 0, 1, 0, -0.980188, 0, 0.198068, 33.7271, 22.9874, 57.5761) visible = false light_color = Color(1, 0, 0, 1) light_energy = 16.0 omni_range = 0.122 [node name="eye_right" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.5191, 6.76656, -40.1296) +transform = Transform3D(0.198068, 0, 0.980188, 0, 1, 0, -0.980188, 0, 0.198068, 33.62, 22.8856, 59.1944) visible = false light_color = Color(1, 0, 0, 1) light_energy = 16.0 omni_range = 0.122 - -[node name="Brown" type="MeshInstance3D" parent="."] -transform = Transform3D(0.00593286, 0, -0.0218607, 0, 0.0226514, 0, 0.0218607, 0, 0.00593286, 4.99475, 6.08866, 2.30322) -visible = false -mesh = ExtResource("5_44sv4") - -[node name="toyland" parent="." instance=ExtResource("5_y7kje")] diff --git a/scenes/mainmenu.tscn b/scenes/mainmenu.tscn index e4e7dd1..428904b 100644 --- a/scenes/mainmenu.tscn +++ b/scenes/mainmenu.tscn @@ -123,7 +123,7 @@ offset_left = 4.0 offset_top = 622.0 offset_right = 94.0 offset_bottom = 648.0 -text = "Version: 20230601" +text = "Version: DEVELOPMENT" [node name="OurTimeIsNowSolo" type="Sprite2D" parent="."] position = Vector2(123, 104) @@ -135,10 +135,11 @@ stream = ExtResource("11_6irkm") [node name="lightButton" type="Button" parent="."] layout_mode = 0 -offset_left = 438.0 -offset_top = 165.0 -offset_right = 450.0 -offset_bottom = 186.0 +offset_left = 571.0 +offset_top = 303.0 +offset_right = 583.0 +offset_bottom = 324.0 +scale = Vector2(1, 0.599999) flat = true [node name="musicPanel" type="Panel" parent="."] diff --git a/scripts/mainmenu-background.gd b/scripts/mainmenu-background.gd index 9bf620f..15cf423 100644 --- a/scripts/mainmenu-background.gd +++ b/scripts/mainmenu-background.gd @@ -12,11 +12,11 @@ func _process(delta): $teddy/AnimationPlayer.play("idle") if $teddy2/AnimationPlayer.is_playing() == false: $teddy2/AnimationPlayer.play("idle") - await get_tree().create_timer(4).timeout - if not ran1: - walk_right_teddy3(delta, 18) - if not ran2: - walk_left_teddy4(delta, 18) +# await get_tree().create_timer(4).timeout +# if not ran1: +# walk_right_teddy3(delta, 18) +# if not ran2: +# walk_left_teddy4(delta, 18) if idle1: if $teddy3/AnimationPlayer.is_playing() == false: $teddy3/AnimationPlayer.play("idle")