Commit Graph

1562 Commits

Author SHA1 Message Date
joylink_cuiweidong
1e844407c0 仿真目录结构调整 2020-08-27 14:02:27 +08:00
joylink_cuiweidong
d33b645c69 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 13:12:54 +08:00
joylink_cuiweidong
92219adba0 剧本录制预览代码调整 2020-08-27 13:12:36 +08:00
fan
0a90249b37 调度大赛调整 2020-08-27 11:33:37 +08:00
zyy
c2f549523a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 09:56:15 +08:00
zyy
699053f46f 调整西安运行图流程 2020-08-27 09:56:00 +08:00
joylink_cuiweidong
7e80bb0ccb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 18:42:17 +08:00
joylink_cuiweidong
df2f5705c4 剧本提示代码调整 2020-08-26 18:42:00 +08:00
zyy
bbae7bfb1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 17:44:17 +08:00
zyy
fc14cc41a7 调整发布地图导出,调整大屏流程 2020-08-26 17:44:01 +08:00
fan
242840f244 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 17:43:45 +08:00
fan
e43d91cad1 调整ibp盘显示位置 2020-08-26 17:43:34 +08:00
joylink_cuiweidong
f2df9fb453 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 17:25:43 +08:00
joylink_cuiweidong
43fe4d728a 剧本提示代码调整 2020-08-26 17:25:18 +08:00
fan
08a33ae6aa 项目登录虚拟ibp调整 2020-08-26 17:09:55 +08:00
joylink_cuiweidong
fe5dd8861a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 15:28:46 +08:00
joylink_cuiweidong
c2a868714d 剧本提示代码调整 2020-08-26 15:28:32 +08:00
fan
73c3bd7a78 调整菜单样式 2020-08-26 15:16:47 +08:00
fan
0bac7098d3 调度大赛项目退出时清理仿真 2020-08-26 14:41:24 +08:00
fan
7ebbadca81 merge 2020-08-26 14:10:11 +08:00
fan
8d35c1353f 调度实训平台问题调整 2020-08-26 14:08:50 +08:00
sunzhenyu
22fa381707 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 13:54:55 +08:00
sunzhenyu
1a76506f9b 增加列车驾驶其他车辆,增加综合演练第三人称观看视角,修改三维编辑器部分区段生成bug 2020-08-26 13:54:44 +08:00
joylink_cuiweidong
e1390a8670 代码调整 2020-08-26 13:26:21 +08:00
joylink_cuiweidong
cf50463b5e 代码调整 2020-08-26 13:23:25 +08:00
joylink_cuiweidong
2fad6e8306 调度实训竞赛代码调整 2020-08-26 13:21:47 +08:00
joylink_cuiweidong
367b947a94 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 16:54:31 +08:00
joylink_cuiweidong
a9fd33c413 哈尔滨线路实训操作调整 2020-08-25 16:54:16 +08:00
zyy
ccc57042a7 调整地图绘制弹窗加载 2020-08-25 16:52:52 +08:00
joylink_cuiweidong
2320ae42a9 剧本预览代码调整 2020-08-25 14:17:04 +08:00
joylink_cuiweidong
17d3be79cf 剧本编制代码调整 2020-08-25 13:44:18 +08:00
joylink_cuiweidong
65a10b26af 哈尔滨线路 实训操作调整
剧本录制页面聊天代码调整
2020-08-25 13:15:32 +08:00
joylink_cuiweidong
e4a13de455 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 16:11:50 +08:00
joylink_cuiweidong
e6193e3469 哈尔滨线路实训操作代码调整 2020-08-24 16:11:31 +08:00
zyy
b262288524 增加西安二号线折返策略配置,增加联锁配置 2020-08-24 11:30:57 +08:00
zyy
f8d3ffa91d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-21 16:38:35 +08:00
zyy
e86c0b9c45 调整发布地图导入流程 2020-08-21 16:38:22 +08:00
joylink_cuiweidong
c3675a0bd4 剧本仿真代码调整 2020-08-21 15:41:46 +08:00
joylink_cuiweidong
43207730bf 剧本仿真代码调整 2020-08-21 14:55:28 +08:00
joylink_cuiweidong
e699efc06f 剧本录制预览代码调整 2020-08-21 14:16:44 +08:00
joylink_cuiweidong
5dcf14c81f 代码调整 2020-08-20 20:39:38 +08:00
joylink_cuiweidong
66587a17fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-20 20:28:12 +08:00
joylink_cuiweidong
171353a4d3 仿真 剧本代码调整 2020-08-20 20:27:19 +08:00
fan
a44132056c 地图绘制添加防淹门 2020-08-20 13:17:58 +08:00
fan
1afb1f3a09 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 16:39:19 +08:00
zyy
2e6d45baab 调整宁波三号线配置 2020-08-19 15:50:33 +08:00
fan
d92a86f146 代码调整 2020-08-19 14:11:58 +08:00
joylink_cuiweidong
5e5f322c3b 剧本预览 剧本编制代码调整 2020-08-18 18:37:38 +08:00
joylink_cuiweidong
74d7b6695c 剧本预览代码优化 2020-08-18 16:29:23 +08:00
joylink_cuiweidong
cb916647c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-17 18:48:46 +08:00