Merge branch 'main' of https://gitea.joylink.club/joylink/godot-psd-training

trainings/training1.gd

@@ -8,3 +8,7 @@ extends Node
 func _ready():
 	$TrainingDescDialog.title = trainingName
 	$TrainingDescDialog.updateSceneDesc(trainingDesc)
+
+
+func _on_training_desc_dialog_start_training():
+	pass # Replace with function body.

trainings/training1.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=4 format=3 uid="uid://dvsauaycyah6j"]
+[gd_scene load_steps=3 format=3 uid="uid://dvsauaycyah6j"]
 
 [ext_resource type="Script" path="res://trainings/training1.gd" id="1_71wgx"]
-[ext_resource type="PackedScene" uid="uid://btcksdsburk7t" path="res://sceen/total.tscn" id="1_im1rp"]
 [ext_resource type="PackedScene" uid="uid://qh8b3g6n3k2u" path="res://trainings/training_desc_dialog.tscn" id="2_oc00d"]
 
 [node name="Training1" type="Node"]
@@ -9,7 +8,7 @@ script = ExtResource("1_71wgx")
 trainingName = "站台单档滑动门关门故障处置"
 trainingDesc = "列车关门作业，突发单个站台门未正常关闭。"
 
-[node name="total" parent="." instance=ExtResource("1_im1rp")]
-
 [node name="TrainingDescDialog" parent="." instance=ExtResource("2_oc00d")]
 size = Vector2i(400, 300)
+
+[connection signal="StartTraining" from="TrainingDescDialog" to="." method="_on_training_desc_dialog_start_training"]

trainings/training_desc_dialog.gd

@@ -16,14 +16,13 @@ func updateSceneDesc(desc):
 	update()
 
 func update():
-	$PanelContainer/VBoxContainer/SceneDescription.text = sceneDesc
+	%SceneDescription.text = sceneDesc
 
 
 func _on_start_pressed():
 	StartTraining.emit()
 	hide()
 
-
 func _on_quit_pressed():
 	QuitTraining.emit()
 	hide()

trainings/training_desc_dialog.tscn

@@ -9,13 +9,14 @@
 [node name="TrainingDescDialog" type="Window"]
 title = "实训"
 initial_position = 1
-size = Vector2i(300, 200)
+size = Vector2i(400, 250)
 wrap_controls = true
 unresizable = true
 transparent = true
 theme = ExtResource("1_8qohy")
 theme_override_fonts/title_font = ExtResource("2_s842n")
 script = ExtResource("2_3504l")
+sceneDesc = "场景说明大姐夫卡死了；大家付款啦但是；附近看到拉萨；荆防颗粒的；撒酒疯可怜的；撒酒疯开了多少啊；荆防颗粒；大数据分开了；打撒就开了发；觉得撒开了；"
 
 [node name="PanelContainer" type="PanelContainer" parent="."]
 anchors_preset = 15
@@ -28,13 +29,17 @@ theme_override_styles/panel = SubResource("StyleBoxEmpty_040cp")
 [node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"]
 layout_mode = 2
 
-[node name="SceneDescription" type="Label" parent="PanelContainer/VBoxContainer"]
+[node name="ScrollContainer" type="ScrollContainer" parent="PanelContainer/VBoxContainer"]
-layout_mode = 2
-text = "场景说明"
-
-[node name="Control" type="Control" parent="PanelContainer/VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 3
+horizontal_scroll_mode = 0
+
+[node name="SceneDescription" type="Label" parent="PanelContainer/VBoxContainer/ScrollContainer"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(390, 100)
+layout_mode = 2
+text = "场景说明"
+autowrap_mode = 1
 
 [node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/VBoxContainer"]
 layout_mode = 2