Commit Graph

7468 Commits

Author SHA1 Message Date
sunzhenyu
9c5cc2e9ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 09:15:28 +08:00
joylink_cuiweidong
c14814890f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 18:41:56 +08:00
joylink_cuiweidong
4fa37b7c60 竞赛场景列表代码调整 2020-10-23 18:40:24 +08:00
lVAL
74ebd8153e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 18:11:30 +08:00
lVAL
8869608082 修改配置参数 2020-10-23 18:11:19 +08:00
zyy
8f9e05ad75 调整打包 2020-10-23 18:07:58 +08:00
sunzhenyu
85a1546535 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 18:07:26 +08:00
sunzhenyu
83e99df71e 修改三维cctv注释 2020-10-23 18:06:24 +08:00
fan
4f0f85c60c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 18:06:05 +08:00
fan
e2dbbb5f0b 删除旧版仿真 2020-10-23 18:05:55 +08:00
lVAL
d345e5dcc2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 17:54:32 +08:00
lVAL
a7764ce7c4 修改代码 2020-10-23 17:54:16 +08:00
joylink_cuiweidong
dbf50b4324 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 17:49:24 +08:00
lVAL
b081587002 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 17:48:40 +08:00
joylink_cuiweidong
35df9b43ec 剧本编制代码调整
会话代码调整
2020-10-23 17:48:40 +08:00
lVAL
0516f856ef 优化代码 2020-10-23 17:48:31 +08:00
fan
c5a4dd68f3 添加设置计划车、设置头码车、设置人工车 2020-10-23 17:23:09 +08:00
fan
d529837e03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 16:35:38 +08:00
fan
6210911b2a 皮肤显示调整 2020-10-23 16:35:27 +08:00
lVAL
a32030695a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 16:15:51 +08:00
lVAL
5bc8be961d 优化代码 2020-10-23 16:15:39 +08:00
fan
a952ebeafe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 15:13:32 +08:00
fan
2e0c08089c 理论题导入调整&&福州一新版调整&&国赛添加取消限速操作 2020-10-23 15:13:18 +08:00
zyy
e9a5039c43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 15:09:33 +08:00
zyy
c3d3adbc3e 调整福州综合监控逻辑 2020-10-23 15:09:20 +08:00
lVAL
a870debe70 优化拖动的问题 2020-10-23 10:15:36 +08:00
lVAL
b34e347ab1 修改代码 2020-10-23 09:21:42 +08:00
lVAL
6489d67e67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 09:03:14 +08:00
lVAL
b49c1c29d1 修改运行时间校验错误的问题 2020-10-23 09:03:05 +08:00
zyy
f9d38a4efc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 18:33:51 +08:00
zyy
1163d9def9 调整新建地图流程 2020-10-22 18:33:28 +08:00
joylink_cuiweidong
f8e1c29642 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 18:30:51 +08:00
joylink_cuiweidong
683f73c005 运行图 展示界面 车次号调整 2020-10-22 18:30:02 +08:00
lVAL
fdeaabb699 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 18:20:40 +08:00
lVAL
439e9194c6 修改AUSTool功能 2020-10-22 18:20:29 +08:00
joylink_cuiweidong
50620f9447 代码调整 2020-10-22 17:34:49 +08:00
joylink_cuiweidong
9af669f708 运行图绘制代码调整 2020-10-22 17:30:56 +08:00
lVAL
a7011888b4 修改文件大小写 2020-10-22 16:49:58 +08:00
lVAL
5184721b62 删除错误带小写文件 2020-10-22 16:49:29 +08:00
fan
1fce4cb363 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:47:29 +08:00
fan
dc7cf80222 国赛皮肤调整 2020-10-22 16:47:18 +08:00
joylink_cuiweidong
3d3fc84041 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:39:55 +08:00
joylink_cuiweidong
751ebe5a16 竞赛线路 列车样式调整 2020-10-22 16:39:34 +08:00
lVAL
08e3d6aa90 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:34:27 +08:00
lVAL
77d83cfaf7 增加,AUSTool施工区域编辑功能 2020-10-22 16:34:15 +08:00
fan
90390462a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:26:15 +08:00
fan
700a37d312 国赛皮肤调整&接触网调整 2020-10-22 16:26:03 +08:00
sunzhenyu
bd6fc3b077 修改三维设备点击道岔bug 2020-10-22 15:42:57 +08:00
sunzhenyu
9e93958224 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 15:22:53 +08:00
sunzhenyu
5e4f341ff9 修改三维cctv代码结构,剔除不必要代码,优化判断 2020-10-22 15:22:40 +08:00