joylink/godot-psd-training
6
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 13 Wiki Activity

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

Browse Source
This commit is contained in:
joylink_fanyuhong 2024-08-02 08:50:19 +08:00
commit 20151047f2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/ShortcutTool/shortcutTool.gd
View File

@ -19,7 +19,7 @@ func _on_escalator_key_pressed() -> void:
if !allowHandle :
return
var currentCamera :LargePassengerFlowScene.Camera_name = $"..".getCurrentCamera()
if currentCamera == LargePassengerFlowScene.Camera_name.BLowerStep :
if currentCamera == LargePassengerFlowScene.Camera_name.BLowerStep or currentCamera == LargePassengerFlowScene.Camera_name.ALowerStep:
ElevatorAtB.useKeyChangeExerciseType()
ElevatorAtA.useKeyChangeExerciseType()
@ -67,7 +67,7 @@ func showSetShortcutToolEntity()-> void:
var currentCamera :LargePassengerFlowScene.Camera_name = $"..".getCurrentCamera()
var camera_to_node_path := {
LargePassengerFlowScene.Camera_name.BUpperStep: 'hoardingAtEscalatorUp',
LargePassengerFlowScene.Camera_name.BLowerStep: 'hoardingAtEscalatorDown',
LargePassengerFlowScene.Camera_name.ALowerStep: 'hoardingAtEscalatorDown',
LargePassengerFlowScene.Camera_name.BGangway: 'picketlineModelAtB',
LargePassengerFlowScene.Camera_name.AGangway: 'picketlineModelAtA',
LargePassengerFlowScene.Camera_name.BInboundGate: 'picketlineModelAtGateB',

2
sceen/totalOfLargePassengerFlow.tscn
View File

@ -249,7 +249,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 80.585
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 57.941, 7, 9.93)
[node name="ALowerStep" type="Camera3D" parent="AllCamera"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 81.971, 2.11, 9.28)
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 10.776, 2.11, 10.945)
[node name="AGangway" type="Camera3D" parent="AllCamera"]
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 57, 7, 7.53)

6
trainings/trainingLargePassengerFlow/trainingLargePassengerFlow.gd
View File

@ -270,7 +270,7 @@ var handleStep = [
"checkVoice": "请走步梯前往站台。"
},
{
"stepName": "启动一级客流控制\n步骤五：待扶梯无乘客时，使用扶梯钥匙将扶梯方向改为上行。",
"stepName": "启动一级客流控制\n步骤五：切换视口到B端扶梯下部",
"stepOperation": ['BLowerStep'],
"doAfterFinisnStepOperation":waitAllPeopleLeaveElevator,
"next": false,
@ -475,7 +475,7 @@ var handleStep = [
},
{
"stepName": "启动三级客流控制\n步骤二：站厅站务员在A口摆放只出不进的宣传告示牌。(A口)",
"stepOperation": ['Back','APassageway','noticeSigns'],
"stepOperation": ['AEntrance','noticeSigns'],
"doAfterFinisnStepOperation":stopGeneratePeopleAtA,
"next": false,
"play": false,
@ -661,7 +661,7 @@ var handleStep = [
},
{
"stepName": "取消三级客流控制\n步骤四：站务员在站台A端扶梯下部设置围挡。",
"stepOperation": ['StaionHallBack','StationHallB','BLowerStep','hoarding'],
"stepOperation": ['ALowerStep','hoarding'],
"next": false,
"play": false,
"playPath": "",