Commit Graph

6153 Commits

Author SHA1 Message Date
sunzhenyu
735a22b7da 修改驾驶行车转弯 2020-07-21 16:33:17 +08:00
sunzhenyu
786c5a3082 修改单体设备三维全屏 2020-07-21 16:32:47 +08:00
program-walker
9ab295ade1 Merge remote-tracking branch 'origin/test' into test 2020-07-21 16:19:14 +08:00
program-walker
102dad20f6 改文件夹名称model->MODEL 2020-07-21 16:18:27 +08:00
zyy
8715ce2f97 调整哈尔滨列车操作 2020-07-21 16:17:04 +08:00
zyy
37d539b715 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 16:01:13 +08:00
zyy
85203bfbe1 增加哈尔滨线路故障操作 2020-07-21 16:00:41 +08:00
fan
4addc342f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 15:54:41 +08:00
fan
64466ff7d6 综合演练初始化清除activeTrainList 2020-07-21 15:54:35 +08:00
sunzhenyu
654351c4f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 15:50:34 +08:00
sunzhenyu
b8c60e8069 修改三维设备nvidia扩展屏幕下拉伸 2020-07-21 15:50:25 +08:00
fan
450eded4ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 15:39:09 +08:00
fan
d518ae9907 成员列表报错调整 2020-07-21 15:38:47 +08:00
sunzhenyu
23974b1c5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 15:33:28 +08:00
sunzhenyu
c07a57ed1c 修改哈尔滨路径 2020-07-21 15:32:51 +08:00
joylink_cuiweidong
1038063860 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 15:23:23 +08:00
joylink_cuiweidong
54b838a46b 剧本预览代码调整
聊天会话代码优化
2020-07-21 15:15:28 +08:00
sunzhenyu
62a9562f3e 修改三维cctv obj路径 2020-07-21 15:13:29 +08:00
zyy
d0697bd94a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 15:11:49 +08:00
zyy
ed9815393a 调整线路列车右键操作 2020-07-21 15:11:33 +08:00
sunzhenyu
5c18430ff2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 15:10:08 +08:00
fan
dcc36af6cc 成员列表报错调整 2020-07-21 15:09:43 +08:00
sunzhenyu
8ce7e33c5e 删除三维无用console,修改cctv寻路obj路径 2020-07-21 14:59:17 +08:00
fan
cf81f7521a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 14:57:05 +08:00
fan
b51b8680c2 会话调整 2020-07-21 14:56:46 +08:00
fan
ebeda7eb0d 会话调整 2020-07-21 13:57:45 +08:00
zyy
47513d1d50 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 13:56:26 +08:00
zyy
b518b81cce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 13:55:51 +08:00
zyy
1d2bf7693f 调整哈尔滨操作禁用配置 2020-07-21 13:55:35 +08:00
fan
1ea1583874 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 13:51:29 +08:00
fan
9ffd832562 会话调整 2020-07-21 13:51:13 +08:00
zyy
7498e7c844 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 13:38:13 +08:00
zyy
4bb41700bc 列车提示信息调整,哈尔滨线路操作 2020-07-21 13:37:59 +08:00
fan
337a2c127d 会话调整 2020-07-21 13:36:03 +08:00
fan
39afe867a4 会话调整 2020-07-21 13:32:43 +08:00
fan
acd929239b 会话调整 2020-07-21 13:22:58 +08:00
fan
d55d6a851b 北京皮肤调整 2020-07-21 13:16:10 +08:00
fan
bd841bde35 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 11:20:16 +08:00
fan
c97291e225 北京皮肤调整 2020-07-21 11:20:05 +08:00
fan
bbadc59bf1 宁波皮肤调整 2020-07-21 11:19:06 +08:00
sunzhenyu
7e8aa6e72c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 11:01:16 +08:00
sunzhenyu
179cce5b26 修改三维websocket 2020-07-21 11:01:02 +08:00
joylink_cuiweidong
d270f3ba59 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 10:49:30 +08:00
joylink_cuiweidong
57ffa85451 剧本预览代码调整 2020-07-21 10:49:01 +08:00
fan
48d44ea15e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 10:03:25 +08:00
fan
5a716b335f ibp设备配置调整 2020-07-21 10:03:13 +08:00
fan
0c08e93ba1 websocket调整&ibp设备配置调整 2020-07-21 10:01:19 +08:00
sunzhenyu
a82d3e65e3 修改三维静态资源目录 2020-07-20 18:32:07 +08:00
sunzhenyu
bb1dd69def 增加哈尔滨项目静态三维资源 2020-07-20 18:29:48 +08:00
sunzhenyu
24794006f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 17:32:28 +08:00