zyy
|
2884d0f02c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 15:37:53 +08:00 |
|
zyy
|
901fa60bc4
|
调整道岔生成流程
|
2020-12-18 15:37:35 +08:00 |
|
sunzhenyu
|
ad462cfc70
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 15:26:12 +08:00 |
|
sunzhenyu
|
6351d966a1
|
修改三维客流车站乘客上错站台bug，修改三维编辑器
|
2020-12-18 15:26:02 +08:00 |
|
fan
|
31954a545d
|
哈尔滨操作调整
|
2020-12-18 14:10:25 +08:00 |
|
fan
|
941e0a791a
|
留言板调整
|
2020-12-18 13:38:13 +08:00 |
|
fan
|
2ddc94f7aa
|
南京二号线皮肤调整
|
2020-12-18 13:10:55 +08:00 |
|
joylink_cuiweidong
|
0594529577
|
代码调整
|
2020-12-18 09:35:43 +08:00 |
|
joylink_cuiweidong
|
213d14b212
|
新增南京二号线 线路配置文件
|
2020-12-18 09:30:18 +08:00 |
|
joylink_fanyuhong
|
e534232f2d
|
留言板调整
(cherry picked from commit 0dbc19027a)
|
2020-12-18 09:18:43 +08:00 |
|
fan
|
8941e18f69
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 09:18:11 +08:00 |
|
fan
|
5740b863b3
|
text、line、outFrame添加参数&报错提示调整
|
2020-12-18 09:17:18 +08:00 |
|
joylink_fanyuhong
|
0dbc19027a
|
留言板调整
|
2020-12-17 22:46:09 +08:00 |
|
joylink_fanyuhong
|
1e9bc8adb5
|
Merge remote-tracking branch 'origin/test'
|
2020-12-17 20:56:05 +08:00 |
|
sunzhenyu
|
2d52f15296
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 17:49:32 +08:00 |
|
sunzhenyu
|
bfa396be54
|
修改三维驾驶根据列车节数动态更新位置
|
2020-12-17 17:49:25 +08:00 |
|
joylink_cuiweidong
|
acd8c46a65
|
代码调整
|
2020-12-17 16:37:10 +08:00 |
|
joylink_cuiweidong
|
dd1783405e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 16:25:02 +08:00 |
|
joylink_cuiweidong
|
d6b58f5ffb
|
哈尔滨线路日志功能添加
|
2020-12-17 16:24:29 +08:00 |
|
sunzhenyu
|
3534abb5ff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 15:23:32 +08:00 |
|
sunzhenyu
|
c4d96ec386
|
修改三维驾驶列车号更新和显示，修改佛山加载三维通号设备间贴图问题
|
2020-12-17 15:23:25 +08:00 |
|
zyy
|
f22ee14ab2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 13:59:20 +08:00 |
|
zyy
|
54cf4b3f97
|
调整哈尔滨鼠标事件
|
2020-12-17 13:59:08 +08:00 |
|
fan
|
ca8da79986
|
merge
|
2020-12-17 13:20:47 +08:00 |
|
fan
|
855295ca75
|
通用ibp&留言板管理&贵装备课程发布调整
|
2020-12-17 13:19:12 +08:00 |
|
joylink_cuiweidong
|
3b5ed0b399
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 10:00:03 +08:00 |
|
joylink_cuiweidong
|
fdfd54f452
|
北交大客流项目 代码调整
|
2020-12-17 09:59:06 +08:00 |
|
zyy
|
f7703476e8
|
Merge branch 'test'
|
2020-12-16 18:23:21 +08:00 |
|
joylink_cuiweidong
|
98603f09a8
|
代码调整
|
2020-12-16 18:22:37 +08:00 |
|
zyy
|
3ec50678c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 16:22:38 +08:00 |
|
zyy
|
24b95e3811
|
调整成都一报错
|
2020-12-16 16:22:24 +08:00 |
|
fan
|
68a0eadf9b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 16:05:55 +08:00 |
|
fan
|
7eec38fe65
|
车次窗前端状态重建后保留
|
2020-12-16 16:05:33 +08:00 |
|
zyy
|
34bff76eb5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 15:37:22 +08:00 |
|
zyy
|
c2f6c3461b
|
调整宁波三，增加字段
|
2020-12-16 15:37:09 +08:00 |
|
joylink_cuiweidong
|
90f0b4e918
|
运行图编制代码调整
|
2020-12-16 14:51:59 +08:00 |
|
fan
|
3aadd5d682
|
Merge remote-tracking branch 'origin/test'
|
2020-12-16 14:00:49 +08:00 |
|
fan
|
b604fdbe43
|
暂提
|
2020-12-16 13:59:31 +08:00 |
|
sunzhenyu
|
d08be87108
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 13:54:26 +08:00 |
|
sunzhenyu
|
4dfe892f18
|
修改三维客流初始化仿真重置数据
|
2020-12-16 13:54:08 +08:00 |
|
fan
|
c9dbe2701c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 13:26:17 +08:00 |
|
fan
|
bd0aac34fe
|
综合演练现地显示调整
|
2020-12-16 13:25:55 +08:00 |
|
joylink_cuiweidong
|
4eb8d4e5be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 11:15:29 +08:00 |
|
joylink_cuiweidong
|
5a5193cde5
|
北交大客流 运行图代码调整
|
2020-12-16 11:14:35 +08:00 |
|
fan
|
d5b0508467
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 10:55:25 +08:00 |
|
fan
|
eebb034208
|
现地增加ibp& 现地切换值班员角色调整
|
2020-12-16 10:54:55 +08:00 |
|
joylink_cuiweidong
|
1715dcad32
|
北交大 客流数据代码调整
|
2020-12-16 10:18:58 +08:00 |
|
joylink_cuiweidong
|
525fc25469
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 09:42:15 +08:00 |
|
joylink_cuiweidong
|
0a5eb83904
|
代码调整
|
2020-12-16 09:41:53 +08:00 |
|
joylink_cuiweidong
|
3f7d5da3b1
|
代码调整
|
2020-12-16 09:40:37 +08:00 |
|