diff --git a/sceen/platform/screenDoor.gd b/sceen/platform/screenDoor.gd index eae35f6..d497ba1 100644 --- a/sceen/platform/screenDoor.gd +++ b/sceen/platform/screenDoor.gd @@ -46,7 +46,6 @@ enum ScreenDoor_State{ func openScreenDoor (isUseLCBKey=false)-> void: if screenDoorState == ScreenDoor_State.close and (screenDoorFaultState != ScreenDoor_Fault_State.openFault or isUseLCBKey): screenDoorState=ScreenDoor_State.opening - $Timer.connect('timeout', _on_timer_timeout) $Timer.start(0.3) @@ -56,7 +55,6 @@ func closeScreenDoor (isUseLCBKey=false)-> void: mtd_fault_material.set_shader_parameter('is_dark', false) if screenDoorState == ScreenDoor_State.open and (screenDoorFaultState != ScreenDoor_Fault_State.closeFault or isUseLCBKey): screenDoorState=ScreenDoor_State.closeing - $Timer.connect('timeout', _on_timer_timeout) $Timer.start(0.3) @@ -72,6 +70,8 @@ func _on_left_animation_player_animation_finished(anim_name: StringName) -> void $Timer.stop() is_dark = true _set_mtd(is_dark) + if screenDoorFaultState == ScreenDoor_Fault_State.closeFault: + $SpotLight3D.show() ## 屏蔽门的故障枚举 @@ -92,7 +92,6 @@ enum ScreenDoor_Fault_State{ ##设置故障 func setScreenDoorFault (faultType:ScreenDoor_Fault_State)-> void: screenDoorFaultState = faultType - print(screenDoorFaultState, faultType, 'ppp') if faultType == ScreenDoor_Fault_State.glassBreakage : $leftDoor_broken.visible = true $leftDoor_broken/AudioStreamPlayer.play() @@ -126,8 +125,8 @@ signal clicksScreenDoorSignal(screenDoor,mousePosition) var is_dark = true func _on_timer_timeout(): - is_dark = !is_dark - _set_mtd(is_dark) + is_dark = !is_dark + _set_mtd(is_dark) func _set_mtd(dark): if is_dark: @@ -139,4 +138,5 @@ func _set_mtd(dark): func _ready(): $MTD.material_override = mtd_material + $Timer.connect('timeout', _on_timer_timeout) _set_mtd(is_dark) diff --git a/trainings/trainingCloseDoorFault/trainingCloseDoorFault.gd b/trainings/trainingCloseDoorFault/trainingCloseDoorFault.gd index f703162..881d7e2 100644 --- a/trainings/trainingCloseDoorFault/trainingCloseDoorFault.gd +++ b/trainings/trainingCloseDoorFault/trainingCloseDoorFault.gd @@ -13,3 +13,11 @@ func _ready(): func _on_training_desc_dialog_start_training(): $total.trainComeAndOpenScreenDoor() $total.setAssignScreenDoorsCloseFault([TotalScene.ScreenDoor_name.screenDoor2]) + $DepartTimer.wait_time = 30 + $DepartTimer.one_shot = true + $DepartTimer.connect("timeout", depart) + $DepartTimer.start() + +func depart(): + $total.closeScreenDoor() + diff --git a/trainings/trainingCloseDoorFault/trainingCloseDoorFault.tscn b/trainings/trainingCloseDoorFault/trainingCloseDoorFault.tscn index d55d71f..11c94b0 100644 --- a/trainings/trainingCloseDoorFault/trainingCloseDoorFault.tscn +++ b/trainings/trainingCloseDoorFault/trainingCloseDoorFault.tscn @@ -13,4 +13,6 @@ sceneDesc = "上行门头灯亮关门故障" [node name="total" parent="." instance=ExtResource("2_ykkar")] +[node name="DepartTimer" type="Timer" parent="."] + [connection signal="StartTraining" from="TrainingDescDialog" to="." method="_on_training_desc_dialog_start_training"]