Commit Graph

6733 Commits

Author SHA1 Message Date
fan
e6f7ade236 调度大赛调整 2020-08-31 09:23:12 +08:00
fan
bf381cb697 调度大赛调整 2020-08-28 18:04:46 +08:00
fan
589513759f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:57:56 +08:00
fan
818010b18f 调度大赛调整 2020-08-28 17:57:42 +08:00
zyy
d2b75185fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:47:30 +08:00
zyy
ae02d527c9 调整福州线路新版操作 2020-08-28 17:47:17 +08:00
sunzhenyu
4668783e72 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:27:00 +08:00
sunzhenyu
ed00bc646b 修复三维驾驶切车后未复位模型 2020-08-28 17:26:51 +08:00
zyy
5dcfee72d6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:22:26 +08:00
zyy
adb62a3209 增加列车右键操作,调整配置 2020-08-28 17:22:12 +08:00
fan
ba505a899e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 16:58:33 +08:00
fan
a28f7a3975 调度大赛调整 2020-08-28 16:58:17 +08:00
joylink_cuiweidong
576c62bf4a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 16:52:33 +08:00
joylink_cuiweidong
d5dabca2c6 代码调整
区段(parentCode)字段处理
2020-08-28 16:52:19 +08:00
fan
56aefdb207 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 15:28:37 +08:00
fan
16a4b0fb84 调度大赛调整 2020-08-28 15:28:24 +08:00
joylink_cuiweidong
b4c5a29026 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 14:43:47 +08:00
joylink_cuiweidong
3ffffffe8d 宁波一号线实训调整
剧本编制代码调整
2020-08-28 14:43:30 +08:00
sunzhenyu
79af11beb6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 14:42:12 +08:00
sunzhenyu
7b6281ab42 修改第三人称观看vr初始视角,修改三维驾驶webworker中解析字符串 2020-08-28 14:42:04 +08:00
zyy
a5180c306c 调整运行图 2020-08-28 14:29:59 +08:00
zyy
a12939ded9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 13:29:57 +08:00
zyy
152c472b69 调整考试流程 2020-08-28 13:29:45 +08:00
fan
4c8e447d59 运行图参数调整 2020-08-28 13:16:14 +08:00
zyy
d991a65517 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 11:31:10 +08:00
zyy
1f8641e3ea 调整运行图 2020-08-28 11:30:55 +08:00
fan
f3e65258d9 行调大赛调整 2020-08-28 11:04:12 +08:00
fan
0adf841597 行调大赛调整 2020-08-28 10:59:44 +08:00
fan
74a5459a32 调度大赛调整 2020-08-27 19:05:15 +08:00
fan
d4118c58a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 19:02:00 +08:00
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