Commit Graph

6231 Commits

Author SHA1 Message Date
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
sunzhenyu
ac0efbd97b 修改三维编辑器模型配置,修改三维的沙盘,驾驶,cctv,单体设备,通号维修模型加载,贴图加载的问题 2020-07-20 17:32:16 +08:00
fan
88253207d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 17:19:21 +08:00
fan
a1895d4e7f 参数名称修改 2020-07-20 17:19:05 +08:00
joylink_cuiweidong
aba0055974 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 17:14:15 +08:00
joylink_cuiweidong
95a9d18ccd 地图绘图代码调整 2020-07-20 17:13:56 +08:00
fan
ceb0d0803d 参数名称修改 2020-07-20 17:04:36 +08:00
fan
7b92d4775a 设备配置调整 2020-07-20 17:00:59 +08:00
fan
3d357ba515 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 16:54:19 +08:00
fan
60ca3e7376 设备配置调整 2020-07-20 16:54:10 +08:00
joylink_cuiweidong
b1821d8274 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 16:46:55 +08:00
joylink_cuiweidong
f809d514a1 地图绘制代码调整 2020-07-20 16:46:38 +08:00
fan
a5961f5651 设备配置title调整 2020-07-20 16:04:43 +08:00
fan
0403b249a1 设备配置调整 2020-07-20 16:00:27 +08:00
fan
072fe55b4f heb取消无法登录提示 2020-07-20 15:22:20 +08:00
fan
1fb660d9e7 heb取消无法登录提示 2020-07-20 15:20:48 +08:00
fan
025b1595c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 15:19:33 +08:00
fan
00608f2cb2 heb取消无法登录提示&会话、设备代码调整 2020-07-20 15:19:11 +08:00
joylink_cuiweidong
e2e66074af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 15:11:17 +08:00
joylink_cuiweidong
2dc14c9374 地图绘制代码调整 2020-07-20 15:10:57 +08:00
fan
01174384ff 设备配置添加显示条件 2020-07-20 14:00:47 +08:00
fan
29c89cf4a7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 13:39:11 +08:00
fan
23885760f3 会话调整 2020-07-20 13:38:54 +08:00