fan
|
d1a5669999
|
运行图预览初始化调整
|
2020-08-03 10:02:12 +08:00 |
|
zyy
|
b1fb2a12dc
|
调整样式
|
2020-08-03 09:53:34 +08:00 |
|
joylink_cuiweidong
|
f8c542354c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-03 09:19:01 +08:00 |
|
joylink_cuiweidong
|
d397f437fd
|
剧本录制文件位置调整
|
2020-08-03 09:18:27 +08:00 |
|
fan
|
517270b2f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-07-31 18:57:46 +08:00 |
|
fan
|
3215bec260
|
运行图调整
|
2020-07-31 18:57:27 +08:00 |
|
zyy
|
176de3219f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 18:49:51 +08:00 |
|
zyy
|
fb9e8f0325
|
调整地图样式及加载逻辑
|
2020-07-31 18:49:35 +08:00 |
|
joylink_cuiweidong
|
88b03d240b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 17:30:43 +08:00 |
|
joylink_cuiweidong
|
5bb59c855e
|
佛山控制权转移代码调整
|
2020-07-31 17:30:26 +08:00 |
|
sunzhenyu
|
988f38fbb3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 16:42:34 +08:00 |
|
sunzhenyu
|
44710199b7
|
修改三维行车初始绑定列车
|
2020-07-31 16:42:25 +08:00 |
|
zyy
|
e2c32f2e68
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 16:22:43 +08:00 |
|
zyy
|
70114a0014
|
调整宁波线路操作
|
2020-07-31 16:22:29 +08:00 |
|
joylink_cuiweidong
|
350bfab719
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 16:20:30 +08:00 |
|
joylink_cuiweidong
|
cb6d891d2b
|
代码调整
|
2020-07-31 16:20:07 +08:00 |
|
fan
|
b82f701e67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-07-31 16:15:33 +08:00 |
|
fan
|
7be510605f
|
取消综合仿真观众暂不关闭三维驾驶
|
2020-07-31 16:14:33 +08:00 |
|
joylink_cuiweidong
|
48cd28bd88
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 16:03:48 +08:00 |
|
joylink_cuiweidong
|
ff912ff0f5
|
宁波一号线 运行图预览加点选
|
2020-07-31 16:03:32 +08:00 |
|
sunzhenyu
|
764a6139ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 15:58:38 +08:00 |
|
sunzhenyu
|
7b3ff46cff
|
修改三维驾驶关车门判断
|
2020-07-31 15:58:33 +08:00 |
|
fan
|
06ed0a6f76
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-07-31 15:53:36 +08:00 |
|
fan
|
deb60acd14
|
绘图调整兼容数据&综合仿真观众咱不关闭三维驾驶&设备配置规整
|
2020-07-31 15:53:25 +08:00 |
|
sunzhenyu
|
3ca561a6cd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 15:48:13 +08:00 |
|
sunzhenyu
|
d5c73e9331
|
修改三维驾驶hmi数据更新，修改驾驶面板绑定列车
|
2020-07-31 15:48:04 +08:00 |
|
zyy
|
a011ab03f8
|
增加宁波指令
|
2020-07-31 15:27:37 +08:00 |
|
zyy
|
e480de2dc3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 15:24:58 +08:00 |
|
zyy
|
d15328de57
|
调整地图绘制流程
|
2020-07-31 15:24:44 +08:00 |
|
fan
|
65d25678db
|
plc网关配置调整&考试试卷问题调整
|
2020-07-31 10:37:50 +08:00 |
|
joylink_cuiweidong
|
35dba1b27b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 19:00:24 +08:00 |
|
joylink_cuiweidong
|
329b3efef3
|
宁波一号线 站遥控 控制权转移代码调整
|
2020-07-30 18:59:48 +08:00 |
|
zyy
|
ea333e6c6d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 18:42:54 +08:00 |
|
zyy
|
f1d72d0968
|
调整综合演练流程
|
2020-07-30 18:42:41 +08:00 |
|
sunzhenyu
|
85e1c63a8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 18:25:40 +08:00 |
|
sunzhenyu
|
d95b41adef
|
修改三维vr案例站台模型
|
2020-07-30 18:25:28 +08:00 |
|
zyy
|
a7144dd4da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 17:49:34 +08:00 |
|
zyy
|
e4c20b1bf8
|
调整老版地图绘制文件位置
|
2020-07-30 17:49:20 +08:00 |
|
sunzhenyu
|
f333d7367d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 16:57:26 +08:00 |
|
sunzhenyu
|
e721fe80a3
|
修改三维vr转辙机案例模型贴图gui面板
|
2020-07-30 16:57:18 +08:00 |
|
joylink_cuiweidong
|
8663a4fba0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 16:45:22 +08:00 |
|
joylink_cuiweidong
|
c2c3fc0b22
|
运行图加载根据车次号 运行图颜色代码调整
|
2020-07-30 16:44:41 +08:00 |
|
fan
|
0a7d3d97bd
|
调整剧本会话@
|
2020-07-30 16:33:08 +08:00 |
|
fan
|
71d3ff5d87
|
调整驾驶终端进入跳转
|
2020-07-30 15:58:28 +08:00 |
|
joylink_cuiweidong
|
50f4b1a0f7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 15:38:47 +08:00 |
|
joylink_cuiweidong
|
0da1fc09e8
|
运行图加载根据车次号 运行图颜色代码调整
|
2020-07-30 15:37:49 +08:00 |
|
zyy
|
c85139fe48
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 15:32:54 +08:00 |
|
zyy
|
48491044ce
|
调整列表样式
|
2020-07-30 15:32:39 +08:00 |
|
sunzhenyu
|
3990b41cf3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 15:12:23 +08:00 |
|
zyy
|
1ed90362c0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 15:10:26 +08:00 |
|