joylink/rts-sim-module
6
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

修改屏蔽门门控箱ecs逻辑引起的bug

Browse Source
This commit is contained in:
thesai 2024-02-19 13:39:24 +08:00
parent aaeb3236a8
commit 7ec4eb44e4
1 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
sys/circuit_sys/psd.go
View File

@ -94,31 +94,56 @@ func (p *PsdSys) Update(world ecs.World) {
// 门控箱按钮驱动继电器 // 门控箱按钮驱动继电器
func mkxBtnDriveRelay(mkx *component.Mkx, pmc *component.PlatformMkxCircuit, psdCircuit *component.PsdCircuit) { func mkxBtnDriveRelay(mkx *component.Mkx, pmc *component.PlatformMkxCircuit, psdCircuit *component.PsdCircuit) {
//PCB //PCB
pcbpl := component.BitStateType.Get(mkx.PCBPL).Val if mkx.PCB != nil {
pcb := component.BitStateType.Get(mkx.PCB).Val pcb := component.BitStateType.Get(mkx.PCB).Val
component.RelayDriveType.Get(pmc.PCBJ).Td = !pcbpl && pcb pcbpl := false
if mkx.PCBPL != nil {
pcbpl = component.BitStateType.Get(mkx.PCBPL).Val
}
component.RelayDriveType.Get(pmc.PCBJ).Td = !pcbpl && pcb
}
//POB //POB
pobpl := component.BitStateType.Get(mkx.POBPL).Val if mkx.POB != nil {
pob := component.BitStateType.Get(mkx.POB).Val pob := component.BitStateType.Get(mkx.POB).Val
component.RelayDriveType.Get(pmc.POBJ).Td = !pobpl && pob pobpl := false
if mkx.POBPL != nil {
pobpl = component.BitStateType.Get(mkx.POBPL).Val
}
component.RelayDriveType.Get(pmc.POBJ).Td = !pobpl && pob
}
//PAB //PAB
pabpl := component.BitStateType.Get(mkx.PABPL).Val if mkx.PAB != nil {
pab := component.BitStateType.Get(mkx.PAB).Val pab := component.BitStateType.Get(mkx.PAB).Val
component.RelayDriveType.Get(pmc.PABJ).Td = !pabpl && pab pabpl := false
if mkx.PABPL != nil {
pabpl = component.BitStateType.Get(mkx.PABPL).Val
}
component.RelayDriveType.Get(pmc.PABJ).Td = !pabpl && pab
}
//WRZF //WRZF
wrzfpl := component.BitStateType.Get(mkx.WRZFPL).Val if mkx.WRZF != nil {
wrzf := component.BitStateType.Get(mkx.WRZF).Val wrzf := component.BitStateType.Get(mkx.WRZF).Val
component.RelayDriveType.Get(pmc.WRZFJ).Td = !wrzfpl && wrzf wrzfpl := false
if mkx.WRZFPL != nil {
wrzfpl = component.BitStateType.Get(mkx.WRZFPL).Val
}
component.RelayDriveType.Get(pmc.WRZFJ).Td = !wrzfpl && wrzf
}
//QKQR //QKQR
qkqrpl := component.BitStateType.Get(mkx.QKQRPL).Val if mkx.QKQR != nil {
qkqr := component.BitStateType.Get(mkx.QKQR).Val qkqr := component.BitStateType.Get(mkx.QKQR).Val
component.RelayDriveType.Get(pmc.QKQRJ).Td = !qkqrpl && qkqr qkqrpl := false
if mkx.QKQRPL != nil {
qkqrpl = component.BitStateType.Get(mkx.QKQRPL).Val
}
component.RelayDriveType.Get(pmc.QKQRJ).Td = !qkqrpl && qkqr
}
//MPL //MPL
if psdCircuit != nil { if psdCircuit != nil && mkx.MPL != nil {
component.RelayDriveType.Get(psdCircuit.MPLJ).Td = component.BitStateType.Get(mkx.MPL).Val component.RelayDriveType.Get(psdCircuit.MPLJ).Td = component.BitStateType.Get(mkx.MPL).Val
} }
//JXTCPL //JXTCPL
if psdCircuit != nil { if psdCircuit != nil && mkx.JXTCPL != nil {
component.RelayDriveType.Get(psdCircuit.JXTCPLJ).Td = component.BitStateType.Get(mkx.JXTCPL).Val component.RelayDriveType.Get(psdCircuit.JXTCPLJ).Td = component.BitStateType.Get(mkx.JXTCPL).Val
} }
} }