From 9cd8f115dd0df0c8961e02d398277695ec5370f1 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Tue, 13 Aug 2024 17:37:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E5=8F=B0=E9=97=A8=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=AD=A5=E9=AA=A4=E5=90=8E=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E7=BD=AE=E7=A9=BA=EF=BC=88=E4=B8=8E=E5=A4=A7=E5=AE=A2=E6=B5=81?= =?UTF-8?q?=E4=B8=80=E8=87=B4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trainingCloseDoorFault.gd | 3 +++ .../trainingGlassBreakageFault.gd | 3 +++ .../trainingManyCloseDoorFault.gd | 4 ++++ .../trainingManyOpenDoorFault.gd | 4 ++++ .../trainingOpenDoorFault.gd | 8 +++++-- .../trainingPinchPeopleFault.gd | 9 +++++--- .../trainingTotalCloseDoorFault.gd | 23 +++++++++++-------- .../trainingTotalOpenDoorFault.gd | 4 ++++ .../trainingTotalPlatformDoorFault.gd | 4 ++++ 9 files changed, 47 insertions(+), 15 deletions(-) diff --git a/trainings/trainingCloseDoorFault/trainingCloseDoorFault.gd b/trainings/trainingCloseDoorFault/trainingCloseDoorFault.gd index 4e95e8c..24f3a15 100644 --- a/trainings/trainingCloseDoorFault/trainingCloseDoorFault.gd +++ b/trainings/trainingCloseDoorFault/trainingCloseDoorFault.gd @@ -158,6 +158,7 @@ func nextStep(): $StepTimer.start() if step.checkVoice: ## 如果步骤有需检查语音 await voiceCommunication.speech_record_check(step.checkVoice) + $StepTip.updateOperationTip('') nextStep() if step.play: ## 如果步骤有需播放语音 var sound = load(step.playPath) @@ -188,6 +189,7 @@ func _on_total_current_click_check_signal(isCorrect): if stepOperationIndex < stepOperation.size(): setOperationNodeAndTip() else: + $StepTip.updateOperationTip('') $TrainTip.setTrainingTip('') nextStep() else: @@ -212,4 +214,5 @@ func _on_step_tip_click_next_step() -> void: var step = handleStep[stepIndex-1] if step.checkVoice: voiceCommunication._reset_record_state() + $StepTip.updateOperationTip('') nextStep() diff --git a/trainings/trainingGlassBreakageFault/trainingGlassBreakageFault.gd b/trainings/trainingGlassBreakageFault/trainingGlassBreakageFault.gd index 18b9fd5..ebafbcb 100644 --- a/trainings/trainingGlassBreakageFault/trainingGlassBreakageFault.gd +++ b/trainings/trainingGlassBreakageFault/trainingGlassBreakageFault.gd @@ -239,6 +239,7 @@ func nextStep(): $StepTimer.start() if step.checkVoice: await voiceCommunication.speech_record_check(step.checkVoice) + $StepTip.updateOperationTip('') nextStep() if step.play: var sound = load(step.playPath) @@ -269,6 +270,7 @@ func _on_total_current_click_check_signal(isCorrect): else : setOperationNodeAndTip() else: + $StepTip.updateOperationTip('') $TrainTip.setTrainingTip('') if handleStepIndex != 7 and handleStepIndex != 14: nextStep() @@ -300,4 +302,5 @@ func _on_step_tip_click_next_step() -> void: var step = handleStep[handleStepIndex-1] if step.checkVoice: voiceCommunication._reset_record_state() + $StepTip.updateOperationTip('') nextStep() diff --git a/trainings/trainingManyCloseDoorFault/trainingManyCloseDoorFault.gd b/trainings/trainingManyCloseDoorFault/trainingManyCloseDoorFault.gd index bb6516f..da94064 100644 --- a/trainings/trainingManyCloseDoorFault/trainingManyCloseDoorFault.gd +++ b/trainings/trainingManyCloseDoorFault/trainingManyCloseDoorFault.gd @@ -197,6 +197,7 @@ func nextStep(): $StepTimer.start() if step.checkVoice: await voiceCommunication.speech_record_check(step.checkVoice) + $StepTip.updateOperationTip('') if step.stepName != "步骤八：确认故障门关闭。站务员口呼：关门成功。": nextStep() else : @@ -229,9 +230,11 @@ func _on_total_current_click_check_signal(isCorrect): if stepOperationIndex < stepOperation.size(): setOperationNodeAndTip() elif $total.currentClickNode != 'LCB3RightRotate' : + $StepTip.updateOperationTip('') $TrainTip.setTrainingTip('') nextStep() else : + $StepTip.updateOperationTip('') $TrainTip.setTrainingTip('') else: if $total.trainingMode != TotalScene.Training_Mode.Exam: @@ -275,6 +278,7 @@ func _on_step_tip_click_next_step() -> void: var step = handleStep[handleStepIndex-1] if step.checkVoice: voiceCommunication._reset_record_state() + $StepTip.updateOperationTip('') if step.stepName != "步骤八：确认故障门关闭。站务员口呼：关门成功。": nextStep() else : diff --git a/trainings/trainingManyOpenDoorFault/trainingManyOpenDoorFault.gd b/trainings/trainingManyOpenDoorFault/trainingManyOpenDoorFault.gd index dd2a0a0..64d9bc8 100644 --- a/trainings/trainingManyOpenDoorFault/trainingManyOpenDoorFault.gd +++ b/trainings/trainingManyOpenDoorFault/trainingManyOpenDoorFault.gd @@ -197,6 +197,7 @@ func nextStep(): $StepTimer.start() if step.checkVoice: await voiceCommunication.speech_record_check(step.checkVoice) + $StepTip.updateOperationTip('') if step.stepName != "步骤四：站务员回复：收到。": nextStep() else : @@ -232,9 +233,11 @@ func _on_total_current_click_check_signal(isCorrect): if stepOperationIndex < stepOperation.size(): setOperationNodeAndTip() elif $total.currentClickNode != 'removeHSJCKeyOfWindowPsl' : + $StepTip.updateOperationTip('') $TrainTip.setTrainingTip('') nextStep() else : + $StepTip.updateOperationTip('') $TrainTip.setTrainingTip('') else: if $total.trainingMode != TotalScene.Training_Mode.Exam: @@ -283,6 +286,7 @@ func _on_step_tip_click_next_step() -> void: var step = handleStep[handleStepIndex-1] if step.checkVoice: voiceCommunication._reset_record_state() + $StepTip.updateOperationTip('') if step.stepName != "步骤四：站务员回复：收到。": nextStep() else : diff --git a/trainings/trainingOpenDoorFault/trainingOpenDoorFault.gd b/trainings/trainingOpenDoorFault/trainingOpenDoorFault.gd index 9dabad6..383a87a 100644 --- a/trainings/trainingOpenDoorFault/trainingOpenDoorFault.gd +++ b/trainings/trainingOpenDoorFault/trainingOpenDoorFault.gd @@ -144,6 +144,7 @@ func nextStep(): $StepTimer.start() if step.checkVoice: await voiceCommunication.speech_record_check(step.checkVoice) + $StepTip.updateOperationTip('') if step.stepName != "步骤四：站台门打开后，站务员口呼：请有序下车。": nextStep() if step.play: @@ -164,14 +165,16 @@ func initStepOperation(): ##与站台交互点击信号 func _on_total_current_click_check_signal(isCorrect): if isCorrect: - if $total.currentClickNode == 'removeKeyOfWindowLCB3' : - nextStep() stepOperationIndex = stepOperationIndex + 1 $StepJudgment.hideError() if stepOperationIndex < stepOperation.size(): setOperationNodeAndTip() else: + $StepTip.updateOperationTip('') $TrainTip.setTrainingTip('') + if $total.currentClickNode == 'removeKeyOfWindowLCB3' : + nextStep() + else: if $total.trainingMode != TotalScene.Training_Mode.Exam: $StepJudgment.showError() @@ -225,5 +228,6 @@ func _on_step_tip_click_next_step() -> void: var step = handleStep[handleStepIndex-1] if step.checkVoice: voiceCommunication._reset_record_state() + $StepTip.updateOperationTip('') if step.stepName != "步骤四：站台门打开后，站务员口呼：请有序下车。": nextStep() diff --git a/trainings/trainingPinchPeopleFault/trainingPinchPeopleFault.gd b/trainings/trainingPinchPeopleFault/trainingPinchPeopleFault.gd index fad3f82..8225790 100644 --- a/trainings/trainingPinchPeopleFault/trainingPinchPeopleFault.gd +++ b/trainings/trainingPinchPeopleFault/trainingPinchPeopleFault.gd @@ -170,6 +170,7 @@ func nextStep(): $StepTimer.start() if step.checkVoice: await voiceCommunication.speech_record_check(step.checkVoice) + $StepTip.updateOperationTip('') nextStep() if step.play: var sound = load(step.playPath) @@ -191,9 +192,7 @@ func initStepOperation(): ##与站台交互点击信号 func _on_total_current_click_check_signal(isCorrect): if isCorrect: - if $total.currentClickNode == 'JJTCLeftRotate' : - nextStep() - elif $total.currentClickNode == 'interconnectedOpenButton' : + if $total.currentClickNode == 'interconnectedOpenButton' : $total.removeAssignScreenDoorsFault([TotalScene.ScreenDoor_name.screenDoor2]) screenDoor2.peopleWalkToPlatform() clickInterconnectedOpenButton = true @@ -206,7 +205,10 @@ func _on_total_current_click_check_signal(isCorrect): if stepOperationIndex < stepOperation.size(): setOperationNodeAndTip() else: + $StepTip.updateOperationTip('') $TrainTip.setTrainingTip('') + if $total.currentClickNode == 'JJTCLeftRotate' : + nextStep() else: if $total.trainingMode != TotalScene.Training_Mode.Exam: $StepJudgment.showError() @@ -253,4 +255,5 @@ func _on_step_tip_click_next_step() -> void: var step = handleStep[handleStepIndex-1] if step.checkVoice: voiceCommunication._reset_record_state() + $StepTip.updateOperationTip('') nextStep() diff --git a/trainings/trainingTotalCloseDoorFault/trainingTotalCloseDoorFault.gd b/trainings/trainingTotalCloseDoorFault/trainingTotalCloseDoorFault.gd index 397a1be..c17db16 100644 --- a/trainings/trainingTotalCloseDoorFault/trainingTotalCloseDoorFault.gd +++ b/trainings/trainingTotalCloseDoorFault/trainingTotalCloseDoorFault.gd @@ -207,6 +207,7 @@ func nextStep(): $StepTimer.start() if step.checkVoice: await voiceCommunication.speech_record_check(step.checkVoice) + $StepTip.updateOperationTip('') nextStep() if step.stepName == "步骤十二：口呼：故障门处置完毕。" : $total.removeAssignScreenDoorsFault(allScreenDoor) @@ -231,22 +232,23 @@ func initStepOperation(): ##与站台交互点击信号 func _on_total_current_click_check_signal(isCorrect): if isCorrect: - if $total.currentClickNode == 'InterlockReleaseSwitchRightRotate' and handleStepIndex<9 : - $total.trainLeave(true) - nextStep() - elif $total.currentClickNode == 'InterlockReleaseSwitchRightRotate' : - $total.trainComeAndOpenScreenDoor() - $playOpenDoorMusicTimer.start() - elif $total.currentClickNode == 'removeHSJCKeyOfWindowPsl' and handleStepIndex<9 : - nextStep() - elif $total.currentClickNode == 'removeHSJCKeyOfWindowPsl' : - $maintainerTimer.start() stepOperationIndex = stepOperationIndex + 1 $StepJudgment.hideError() if stepOperationIndex < stepOperation.size(): setOperationNodeAndTip() else : + $StepTip.updateOperationTip('') $TrainTip.setTrainingTip('') + if $total.currentClickNode == 'InterlockReleaseSwitchRightRotate' and handleStepIndex<9 : + $total.trainLeave(true) + nextStep() + elif $total.currentClickNode == 'InterlockReleaseSwitchRightRotate' : + $total.trainComeAndOpenScreenDoor() + $playOpenDoorMusicTimer.start() + elif $total.currentClickNode == 'removeHSJCKeyOfWindowPsl' and handleStepIndex<9 : + nextStep() + elif $total.currentClickNode == 'removeHSJCKeyOfWindowPsl' : + $maintainerTimer.start() else: if $total.trainingMode != TotalScene.Training_Mode.Exam: $StepJudgment.showError() @@ -301,6 +303,7 @@ func _on_step_tip_click_next_step() -> void: var step = handleStep[handleStepIndex-1] if step.checkVoice: voiceCommunication._reset_record_state() + $StepTip.updateOperationTip('') nextStep() if step.stepName == "步骤十二：口呼：故障门处置完毕。" : $total.removeAssignScreenDoorsFault(allScreenDoor) diff --git a/trainings/trainingTotalOpenDoorFault/trainingTotalOpenDoorFault.gd b/trainings/trainingTotalOpenDoorFault/trainingTotalOpenDoorFault.gd index e4eb4e7..85986db 100644 --- a/trainings/trainingTotalOpenDoorFault/trainingTotalOpenDoorFault.gd +++ b/trainings/trainingTotalOpenDoorFault/trainingTotalOpenDoorFault.gd @@ -190,6 +190,7 @@ func nextStep(): $StepTimer.start() if step.checkVoice: await voiceCommunication.speech_record_check(step.checkVoice) + $StepTip.updateOperationTip('') if step.stepName != "步骤四：站台门打开后，口呼：请您抓紧在此门上下车。" : nextStep() elif step.stepName == "步骤四：站台门打开后，口呼：请您抓紧在此门上下车。" : @@ -222,9 +223,11 @@ func _on_total_current_click_check_signal(isCorrect): if stepOperationIndex < stepOperation.size(): setOperationNodeAndTip() elif $total.currentClickNode != 'LCB2RightRotate' and $total.currentClickNode != 'LCB2LeftRotate': + $StepTip.updateOperationTip('') $TrainTip.setTrainingTip('') nextStep() else : + $StepTip.updateOperationTip('') $TrainTip.setTrainingTip('') else: if $total.trainingMode != TotalScene.Training_Mode.Exam: @@ -285,6 +288,7 @@ func _on_step_tip_click_next_step() -> void: var step = handleStep[handleStepIndex-1] if step.checkVoice: voiceCommunication._reset_record_state() + $StepTip.updateOperationTip('') if step.stepName != "步骤四：站台门打开后，口呼：请您抓紧在此门上下车。" : nextStep() elif step.stepName == "步骤四：站台门打开后，口呼：请您抓紧在此门上下车。" : diff --git a/trainings/trainingTotalPlatformDoorFault/trainingTotalPlatformDoorFault.gd b/trainings/trainingTotalPlatformDoorFault/trainingTotalPlatformDoorFault.gd index d6a81b2..b178476 100644 --- a/trainings/trainingTotalPlatformDoorFault/trainingTotalPlatformDoorFault.gd +++ b/trainings/trainingTotalPlatformDoorFault/trainingTotalPlatformDoorFault.gd @@ -245,6 +245,7 @@ func nextStep(): canCloseScreenDoor = true if step.checkVoice: await voiceCommunication.speech_record_check(step.checkVoice) + $StepTip.updateOperationTip('') nextStep() if step.play: var sound = load(step.playPath) @@ -279,9 +280,11 @@ func _on_total_current_click_check_signal(isCorrect): if stepOperationIndex < stepOperation.size(): setOperationNodeAndTip() elif $total.currentClickNode != 'interconnectedCloseButton' and $total.currentClickNode != 'removeHSJCKeyOfWindowPsl' : + $StepTip.updateOperationTip('') $TrainTip.setTrainingTip('') nextStep() else : + $StepTip.updateOperationTip('') $TrainTip.setTrainingTip('') else: if $total.trainingMode != TotalScene.Training_Mode.Exam: @@ -332,4 +335,5 @@ func _on_step_tip_click_next_step() -> void: var step = handleStep[handleStepIndex-1] if step.checkVoice: voiceCommunication._reset_record_state() + $StepTip.updateOperationTip('') nextStep()