Commit Graph

6853 Commits

Author SHA1 Message Date
fan
f87506dfd9 调度大赛调整 2020-08-27 19:01:50 +08:00
joylink_cuiweidong
ea1f4c4dee 剧本预览代码调整 2020-08-27 18:46:00 +08:00
zyy
4ba9bcdc82 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 18:41:49 +08:00
zyy
ae9f9a962b 调整加载代码 2020-08-27 18:41:33 +08:00
fan
3c016a5c4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:21:13 +08:00
fan
869981f606 调度大赛调整 2020-08-27 17:21:01 +08:00
sunzhenyu
70cf60d9a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:13:42 +08:00
sunzhenyu
0a9c9737d2 修改通号第三人称视角人物移动,vr行车过程增加列车声音 2020-08-27 17:13:35 +08:00
zyy
a34d3eb9ef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:04:47 +08:00
zyy
47a9d56d3b 删除配置 2020-08-27 17:04:21 +08:00
joylink_cuiweidong
6ac28534ea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:03:24 +08:00
joylink_cuiweidong
c2989a1548 剧本代码调整 2020-08-27 17:03:10 +08:00
fan
deded7ed6e 宁波三号线菜单调整 2020-08-27 16:48:03 +08:00
zyy
dde1f6e1a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 16:43:51 +08:00
zyy
ad29ed8890 调整考试系统加载流程 2020-08-27 16:43:37 +08:00
joylink_cuiweidong
1e844407c0 仿真目录结构调整 2020-08-27 14:02:27 +08:00
zyy
06699507e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 13:13:29 +08:00
zyy
8a3287ca22 删除多余代码注释 2020-08-27 13:13:15 +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
fan
9dc290a550 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 10:45:54 +08:00
fan
f2469920fe 菜单配置调整 2020-08-27 10:45:43 +08:00
fan
a01267abe1 区段切除报错调整 2020-08-27 10:45:06 +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
fan
7a7ae9591a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 18:24:58 +08:00
fan
f3e6291582 区段切除报错调整 2020-08-26 18:24:14 +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
fan
154ec2767a 调整会话窗口按demoButton层级问题 2020-08-26 17:27:02 +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
fan
0c97289ff1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 16:00:22 +08:00
fan
1ac01f4900 项目登录虚拟ibp调整 2020-08-26 16:00:05 +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
8605503321 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 14:11:46 +08:00
fan
7ebbadca81 merge 2020-08-26 14:10:11 +08:00
fan
8d35c1353f 调度实训平台问题调整 2020-08-26 14:08:50 +08:00
sunzhenyu
c73fe7f3c6 修改资源地址 2020-08-26 14:06:57 +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