Merge branch 'develop' into feature/detection_cross
# Conflicts: # addons/dialogic/vesna_style.tres # dialog/NPC_narrative.tres # scenes/Babushka_scene_indoor_vesnas_room.tscn
This commit is contained in:
@@ -98,7 +98,6 @@ _followNode = NodePath("../Vesna/CharacterBody2D")
|
||||
|
||||
[node name="BedInteraction" parent="." instance=ExtResource("8_phqdf")]
|
||||
position = Vector2(-1429, 487)
|
||||
_useOutline = true
|
||||
_useSprite = false
|
||||
_id = 1
|
||||
|
||||
@@ -109,7 +108,6 @@ toStatus = 2
|
||||
|
||||
[node name="DoorInteraction" parent="." instance=ExtResource("8_phqdf")]
|
||||
position = Vector2(777, 201)
|
||||
_useOutline = true
|
||||
_useSprite = false
|
||||
_id = 0
|
||||
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
[gd_scene load_steps=10 format=3 uid="uid://6n3p3psmxovj"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://pqemey80frcq" path="res://scripts/CSharp/Low Code/Variables/VariableListener.cs" id="1_4h3ry"]
|
||||
[ext_resource type="Script" uid="uid://bc6uaaxsx5k5p" path="res://scripts/CSharp/Low Code/Events/EventListener.cs" id="1_w5ykc"]
|
||||
[ext_resource type="Resource" uid="uid://dpnre2bn041jm" path="res://resources/low code/test/var_ColorTestValue.tres" id="2_bj4kf"]
|
||||
[ext_resource type="Script" uid="uid://b5dotkx17gvxg" path="res://scripts/CSharp/Low Code/Events/EventRaiser.cs" id="3_bj4kf"]
|
||||
[ext_resource type="Resource" uid="uid://boijwlxmth68v" path="res://resources/low code/test/event_textLabelClicked.tres" id="5_4h3ry"]
|
||||
[ext_resource type="Script" uid="uid://co1b320qemg1i" path="res://scripts/CSharp/Low Code/Randomizer/VariantRandomizer.cs" id="5_nm8dh"]
|
||||
[ext_resource type="Script" uid="uid://dco37q6ddm8kv" path="res://scripts/CSharp/Low Code/Variables/VariantValueChanger/VariantToString.cs" id="7_nm8dh"]
|
||||
[ext_resource type="Resource" uid="uid://c6iw30ydc0qa0" path="res://resources/low code/test/var_Counter.tres" id="9_44nfx"]
|
||||
[ext_resource type="Script" uid="uid://d1y23ytkt1w2j" path="res://scripts/CSharp/Low Code/Variables/VariantValueChanger/VariantIncrementor.cs" id="10_p6d2q"]
|
||||
|
||||
[node name="EventTest" type="Node2D"]
|
||||
|
||||
[node name="Control" type="Control" parent="."]
|
||||
layout_mode = 3
|
||||
anchors_preset = 0
|
||||
offset_top = -1.0
|
||||
offset_right = 513.0
|
||||
offset_bottom = 329.0
|
||||
|
||||
[node name="ColorRect" type="ColorRect" parent="Control"]
|
||||
layout_mode = 0
|
||||
offset_right = 178.0
|
||||
offset_bottom = 145.0
|
||||
script = ExtResource("1_4h3ry")
|
||||
_variableResources = Array[Object]([ExtResource("2_bj4kf")])
|
||||
|
||||
[node name="ChangeColorButton" type="Button" parent="Control"]
|
||||
layout_mode = 0
|
||||
offset_top = 148.0
|
||||
offset_right = 112.0
|
||||
offset_bottom = 179.0
|
||||
text = "Change Color
|
||||
"
|
||||
script = ExtResource("5_nm8dh")
|
||||
_variableResource = ExtResource("2_bj4kf")
|
||||
|
||||
[node name="LabelTextEventButton" type="Button" parent="Control"]
|
||||
layout_mode = 0
|
||||
offset_left = 194.0
|
||||
offset_top = 148.0
|
||||
offset_right = 351.0
|
||||
offset_bottom = 179.0
|
||||
text = "Show Event Text
|
||||
"
|
||||
script = ExtResource("3_bj4kf")
|
||||
_eventResources = Array[Object]([ExtResource("5_4h3ry")])
|
||||
|
||||
[node name="TestLabel" type="Label" parent="Control"]
|
||||
visible = false
|
||||
layout_mode = 0
|
||||
offset_left = 237.0
|
||||
offset_top = 54.0
|
||||
offset_right = 277.0
|
||||
offset_bottom = 77.0
|
||||
text = "[Dieser Text erscheint,
|
||||
wenn das Event richtig
|
||||
verknüpft ist]"
|
||||
script = ExtResource("1_w5ykc")
|
||||
_eventResources = Array[Object]([ExtResource("5_4h3ry")])
|
||||
|
||||
[node name="LabelTextEventButton2" type="Button" parent="Control"]
|
||||
layout_mode = 0
|
||||
offset_left = 361.0
|
||||
offset_top = 148.0
|
||||
offset_right = 518.0
|
||||
offset_bottom = 179.0
|
||||
text = "get current number
|
||||
"
|
||||
|
||||
[node name="TestLabel2" type="Label" parent="Control"]
|
||||
layout_mode = 0
|
||||
offset_left = 432.0
|
||||
offset_top = 117.0
|
||||
offset_right = 472.0
|
||||
offset_bottom = 166.0
|
||||
text = "0
|
||||
"
|
||||
script = ExtResource("7_nm8dh")
|
||||
_resource = ExtResource("9_44nfx")
|
||||
|
||||
[node name="Camera2D" type="Camera2D" parent="."]
|
||||
position = Vector2(239, 110)
|
||||
zoom = Vector2(3.4, 3.4)
|
||||
|
||||
[node name="Timer" type="Timer" parent="."]
|
||||
wait_time = 0.5
|
||||
autostart = true
|
||||
|
||||
[node name="CountLoop" type="Node" parent="Timer"]
|
||||
script = ExtResource("10_p6d2q")
|
||||
_resource = ExtResource("9_44nfx")
|
||||
|
||||
[connection signal="NewEventPayload" from="Control/ColorRect" to="Control/ColorRect" method="set_color"]
|
||||
[connection signal="pressed" from="Control/ChangeColorButton" to="Control/ChangeColorButton" method="RandomizeEventResource"]
|
||||
[connection signal="pressed" from="Control/LabelTextEventButton" to="Control/LabelTextEventButton" method="RaiseEvents"]
|
||||
[connection signal="EventRaised" from="Control/TestLabel" to="Control/TestLabel" method="show"]
|
||||
[connection signal="pressed" from="Control/LabelTextEventButton2" to="Control/TestLabel2" method="ConvertToString"]
|
||||
[connection signal="PayloadAsString" from="Control/TestLabel2" to="Control/TestLabel2" method="set_text"]
|
||||
[connection signal="timeout" from="Timer" to="Timer/CountLoop" method="Increment"]
|
||||
Reference in New Issue
Block a user