From c2f5359d0c19028b6f478cfc3d04a1025f29f444 Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Fri, 15 Aug 2025 17:03:18 +0200 Subject: [PATCH] changes after develop merge --- .../.idea/AndroidProjectSystem.xml | 6 ------ prefabs/UI/Inventory/Inventory.tscn | 2 +- prefabs/UI/Quest/QuestListItem.tscn | 2 +- prefabs/characters/Player2D.tscn | 20 ++++++++++++++++--- prefabs/characters/Yeli.tscn | 2 +- project.godot | 4 ++-- scenes/Babushka_scene_farm_outside_2d.tscn | 2 -- .../SceneTransitionThreaded.cs | 1 - scripts/CSharp/Common/SceneTransition.cs | 2 +- 9 files changed, 23 insertions(+), 18 deletions(-) delete mode 100644 .idea/.idea.Babushka/.idea/AndroidProjectSystem.xml diff --git a/.idea/.idea.Babushka/.idea/AndroidProjectSystem.xml b/.idea/.idea.Babushka/.idea/AndroidProjectSystem.xml deleted file mode 100644 index e82600c..0000000 --- a/.idea/.idea.Babushka/.idea/AndroidProjectSystem.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/prefabs/UI/Inventory/Inventory.tscn b/prefabs/UI/Inventory/Inventory.tscn index 780c512..6f30c83 100644 --- a/prefabs/UI/Inventory/Inventory.tscn +++ b/prefabs/UI/Inventory/Inventory.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=11 format=3 uid="uid://cgjc4wurbgimy"] [ext_resource type="Script" uid="uid://hg7jay2kt441" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"] -[ext_resource type="Script" path="res://scripts/GdScript/dialogic_toggle.gd" id="1_l3npx"] +[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="1_l3npx"] [ext_resource type="Texture2D" uid="uid://3ln8aleyxgp1" path="res://art/ui/UI/UI_bag_export_01.png" id="3_vvo7l"] [ext_resource type="Texture2D" uid="uid://u0dku75l17re" path="res://art/ui/UI/UI_bag_export_highlight_01.png" id="5_df8i8"] [ext_resource type="PackedScene" uid="uid://c0kmdjeqkqrwv" path="res://prefabs/UI/Inventory/Slot.tscn" id="5_u7kje"] diff --git a/prefabs/UI/Quest/QuestListItem.tscn b/prefabs/UI/Quest/QuestListItem.tscn index a69c45c..203ba0f 100644 --- a/prefabs/UI/Quest/QuestListItem.tscn +++ b/prefabs/UI/Quest/QuestListItem.tscn @@ -50,7 +50,7 @@ size_flags_horizontal = 3 size_flags_vertical = 1 theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_font_sizes/font_size = 17 -text = "Switch to Unity" +text = "[ Hier könnte ihre Werbung stehen]" vertical_alignment = 1 autowrap_mode = 2 diff --git a/prefabs/characters/Player2D.tscn b/prefabs/characters/Player2D.tscn index 4b40bba..6092ccf 100644 --- a/prefabs/characters/Player2D.tscn +++ b/prefabs/characters/Player2D.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=477 format=3 uid="uid://c25udixd5m6l0"] +[gd_scene load_steps=480 format=3 uid="uid://c25udixd5m6l0"] [ext_resource type="Script" uid="uid://b05uyj001ehwi" path="res://scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs" id="1_yd5ep"] [ext_resource type="Script" uid="uid://cjbclkxesh3hc" path="res://scripts/CSharp/Common/CharacterControls/PlayerMovement.cs" id="2_1vqmv"] @@ -280,6 +280,7 @@ [ext_resource type="Texture2D" uid="uid://blh0t2ofqj2uq" path="res://art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0016.png" id="472_wdxsr"] [ext_resource type="Texture2D" uid="uid://l5ym7gi82l1b" path="res://art/ui/UI/Watercan-ui/Tropfen-ui-6.png" id="473_g32y8"] [ext_resource type="Texture2D" uid="uid://3t1m2xi4ks75" path="res://art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0018.png" id="474_tu801"] +[ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer.cs" id="475_nxglm"] [ext_resource type="Texture2D" uid="uid://drtgi1qyq7fji" path="res://art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0020.png" id="476_g4jjd"] [ext_resource type="Texture2D" uid="uid://d3rdsclnqbx7" path="res://art/animation/Vesna2D/Vesna Anims Sequences/F02-Walk/0001.png" id="477_qko58"] [ext_resource type="Texture2D" uid="uid://dqubvx1a08kn4" path="res://art/animation/Vesna2D/Vesna Anims Sequences/F02-Walk/0002.png" id="478_5myrm"] @@ -473,7 +474,7 @@ [ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="816_1a3c1"] [ext_resource type="Script" uid="uid://bcskt5ckh3rqa" path="res://scripts/CSharp/Common/Farming/FarmingControls2D.cs" id="817_6nrw3"] [ext_resource type="PackedScene" uid="uid://b1d2e7ely6hyw" path="res://prefabs/farm/tomato_field.tscn" id="818_16w6h"] -[ext_resource type="Script" path="res://scripts/GdScript/dialogic_toggle.gd" id="819_4na52"] +[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="819_4na52"] [sub_resource type="CircleShape2D" id="CircleShape2D_ssqtd"] radius = 110.018 @@ -2066,6 +2067,12 @@ animations = [{ "speed": 16.0 }] +[sub_resource type="AudioStream" id="AudioStream_8fyd7"] + +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_dnm27"] +streams_count = 1 +stream_0/stream = SubResource("AudioStream_8fyd7") + [node name="Vesna" type="Node2D" node_paths=PackedStringArray("_farmingControls", "_player2d", "_vesnaAnimations")] y_sort_enabled = true script = ExtResource("1_yd5ep") @@ -2097,7 +2104,8 @@ _wateringParticles = NodePath("../../pouring water vfx") position = Vector2(0, 450) sprite_frames = SubResource("SpriteFrames_4yiyq") animation = &"side walking wateringcan" -frame_progress = 0.130831 +frame = 7 +frame_progress = 0.229832 offset = Vector2(0, -450) [node name="Hoe" type="Sprite2D" parent="CharacterBody2D/visuals"] @@ -2202,6 +2210,12 @@ scale = Vector2(0.7, 0.7) script = ExtResource("819_4na52") itemToToggle = NodePath("../CharacterBody2D/visuals/Animated Sprites") +[node name="SFX" type="Node" parent="."] + +[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="SFX"] +stream = SubResource("AudioStreamRandomizer_dnm27") +script = ExtResource("475_nxglm") + [connection signal="FilledWateringCan" from="." to="CharacterBody2D/WateringCanUI" method="Refill"] [connection signal="InventorySelectionChanged" from="." to="CharacterBody2D/WateringCanUI" method="IsWateringCanActive"] [connection signal="PickedUpTool" from="." to="CharacterBody2D" method="ActivateTool"] diff --git a/prefabs/characters/Yeli.tscn b/prefabs/characters/Yeli.tscn index 798496a..262a78b 100644 --- a/prefabs/characters/Yeli.tscn +++ b/prefabs/characters/Yeli.tscn @@ -43,7 +43,7 @@ [ext_resource type="Texture2D" uid="uid://droj8w1mbm5k3" path="res://art/animation/Yeli2D/F02-Yeli_Talk/0019.png" id="39_vg7xi"] [ext_resource type="Texture2D" uid="uid://by5vtadhdwwag" path="res://art/animation/Yeli2D/F02-Yeli_Talk/0020.png" id="40_ipyxb"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="42_ahrat"] -[ext_resource type="Script" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_aqu1t"] +[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_aqu1t"] [sub_resource type="CircleShape2D" id="CircleShape2D_at1n1"] resource_local_to_scene = true diff --git a/project.godot b/project.godot index 8c08406..fb6a7bd 100644 --- a/project.godot +++ b/project.godot @@ -28,10 +28,10 @@ buses/default_bus_layout="uid://b6dwkmkyb0axk" SceneTransition="*res://scenes/SceneTransition.tscn" Dialogic="*res://addons/dialogic/Core/DialogicGameHandler.gd" InventoryManager="*res://scripts/CSharp/Common/Inventory/InventoryManager.cs" +Signal_Debugger="*res://addons/SignalVisualizer/Debugger/SignalDebugger.gd" +QuestManager="*res://prefabs/quests/quest_manager_autoload.tscn" FightManagerAutoload="*res://prefabs/fight/fight_manager_autoload.tscn" InputService="*res://scripts/CSharp/Common/Services/InputService.cs" -QuestManager="*res://prefabs/quests/quest_manager_autoload.tscn" -Signal_Debugger="*res://addons/SignalVisualizer/Debugger/SignalDebugger.gd" [dialogic] diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 64a27a3..f0ae0bf 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -1044,7 +1044,6 @@ y_sort_enabled = true [node name="Yeli" parent="YSorted" instance=ExtResource("24_wtdui")] position = Vector2(6403, 3362) _timelinesToPlay = PackedStringArray("yeli_quest_select") -_retriggerSameTimeline = true [node name="Vesna" parent="YSorted" node_paths=PackedStringArray("_fieldParent") instance=ExtResource("1_7wfwe")] z_index = 1 @@ -2381,7 +2380,6 @@ script = ExtResource("40_w3jkj") script = ExtResource("66_2065p") questResource = ExtResource("67_tm0yg") toStatus = 1 -makeActive = true [node name="ToolsCollectedTrigger" type="Node" parent="SpeicialQuestTrigger"] script = ExtResource("68_hux6i") diff --git a/scripts/CSharp/Common/SceneManagement/SceneTransitionThreaded.cs b/scripts/CSharp/Common/SceneManagement/SceneTransitionThreaded.cs index eeaff47..556bc3e 100644 --- a/scripts/CSharp/Common/SceneManagement/SceneTransitionThreaded.cs +++ b/scripts/CSharp/Common/SceneManagement/SceneTransitionThreaded.cs @@ -48,7 +48,6 @@ public partial class SceneTransitionThreaded : CanvasLayer public async void ChangeSceneToFile(string scenePath) { animationPlayer.Play("fadeIn"); - //yield(animationPlayer, "animation_finished"); await ToSignal(animationPlayer, "animation_finished"); GetTree().ChangeSceneToFile(scenePath); animationPlayer.Play("fadeOut"); diff --git a/scripts/CSharp/Common/SceneTransition.cs b/scripts/CSharp/Common/SceneTransition.cs index 7649041..e6c5426 100644 --- a/scripts/CSharp/Common/SceneTransition.cs +++ b/scripts/CSharp/Common/SceneTransition.cs @@ -17,7 +17,7 @@ public partial class SceneTransition : Node public void LoadSceneAtIndex(int index) { string sceneName = _sceneNamesToLoad[index]; - SceneTransitionThreaded.Instance.ChangeSceneToFile(sceneName); + SceneTransitionThreaded.Instance.ChangeSceneToFileThreaded(sceneName); UnloadAfterDelay(); }