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

修改屏蔽门操作请求

Browse Source
This commit is contained in:
joylink_zhangsai 2024-01-23 18:02:31 +08:00
parent fa7211d7bd
commit 2879914757
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
component/psd.go
View File

@ -65,6 +65,12 @@ type AsdMotorState struct {
var AsdStateType = ecs.NewComponentType[component_proto.AsdState]() var AsdStateType = ecs.NewComponentType[component_proto.AsdState]()
// AsdForceType ture强制开门 false强制关门
var AsdForceType = ecs.NewComponentType[BitState]()
// AsdHasObstacleTag 滑动门有障碍物
var AsdHasObstacleTag = ecs.NewTag()
var PlatformMkxCircuitType = ecs.NewComponentType[PlatformMkxCircuit]() var PlatformMkxCircuitType = ecs.NewComponentType[PlatformMkxCircuit]()
// PlatformMkxCircuit 站台门控箱电路 // PlatformMkxCircuit 站台门控箱电路

2
jl-ecs-go

@ -1 +1 @@
Subproject commit 8a028e6405150dada3caa4c90f34ebf93aef6163 Subproject commit 9c5dde7b2ec28c555488eee7dec81bb1f612c443

7
sys/device_sys/asd.go
View File

@ -51,7 +51,12 @@ func (s *AsdSys) Update(world ecs.World) {
} }
} }
//门关继电器状态 //门关继电器状态
psdMotorState.MG = pos == consts.TwoPosMin if entry.HasComponent(component.AsdForceType) {
force := component.AsdForceType.Get(entry)
psdMotorState.MG = !force.Val
} else {
psdMotorState.MG = pos == consts.TwoPosMin
}
asdState.Mgj = psdMotorState.MG asdState.Mgj = psdMotorState.MG
//滑动门状态 //滑动门状态
if pos == consts.TwoPosMax { if pos == consts.TwoPosMax {