From 8eb8e032c2d32685cd64bff6b44b28b9920ecbff Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Mon, 13 May 2024 16:48:48 +0800 Subject: [PATCH] =?UTF-8?q?lcb=E9=92=A5=E5=8C=99=E5=85=B1=E7=94=A8?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E9=83=BD=E6=98=AF=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UI/LCB/lcb.gd | 4 ++-- sceen/total.gd | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/UI/LCB/lcb.gd b/UI/LCB/lcb.gd index b773dec..b2051df 100644 --- a/UI/LCB/lcb.gd +++ b/UI/LCB/lcb.gd @@ -8,11 +8,11 @@ var allowHandle :bool = true var currenScreenDoor:ScreenDoor=null func _on_screen_door_click_lcb_signal(screenDoor: Variant) -> void: + var screenDoorName=String(screenDoor.name) + self.title='LCB'+screenDoorName[screenDoorName.length() - 1] allClickLCBSignal.emit(self.title,$".") if !allowHandle : return - var screenDoorName=String(screenDoor.name) - self.title='LCB'+screenDoorName[screenDoorName.length() - 1] self.show() $"../stationKeys".onShowWindow(StationKeyWindow.WindowType.LCB,screenDoor.lcbKey.keyName) currenScreenDoor=screenDoor diff --git a/sceen/total.gd b/sceen/total.gd index 79849cd..fa39318 100644 --- a/sceen/total.gd +++ b/sceen/total.gd @@ -90,7 +90,7 @@ func checkCurrentClick() -> bool: if trainingMode == Training_Mode.Exam: return true else : - if currentClickNode == currenNeedClickNode: + if currentClickNode == currenNeedClickNode or currentClickNode in ['LCB_Key1','LCB_Key2','LCB_Key3','LCB_Key4']: return true else : return false @@ -101,6 +101,7 @@ func _on_platform_all_click_platform_signal(equipmentName: String,equipmentInfo= currentClickNode = equipmentName var isClickCorrect = checkCurrentClick() currentClickCheckSignal.emit(isClickCorrect) + equipmentInfo.allowHandle = isClickCorrect if isClickCorrect: print('操作正确') else : @@ -108,10 +109,10 @@ func _on_platform_all_click_platform_signal(equipmentName: String,equipmentInfo= ##所有交互操作汇总 const allClickEquipmentInfo = { - "LCB_Key1": "请选择钥匙LCB1", ##钥匙面板 - "LCB_Key2": "请选择钥匙LCB2", - "LCB_Key3": "请选择钥匙LCB3", - "LCB_Key4": "请选择钥匙LCB4", + "LCB_Key1": "请选择LCB钥匙", ##钥匙面板 + "LCB_Key2": "请选择LCB钥匙", + "LCB_Key3": "请选择LCB钥匙", + "LCB_Key4": "请选择LCB钥匙", "JJTC_Key": "请选择钥匙JJTC", "PSL_Key": "请选择钥匙PSL", "HSJC_Key": "请选择钥匙HSJC",