Commit Graph

231 Commits

Author SHA1 Message Date
joylink_cuiweidong
fe38c3dfb1 代码调整 2019-08-09 10:33:11 +08:00
joylink_cuiweidong
bf9a92d6b7 代码调整 2019-08-08 18:41:44 +08:00
joylink_cuiweidong
ee136f8867 获取剧本的地图定位并设置 2019-08-08 17:32:38 +08:00
fan
a504f3cd90 调整:剧本加载页面位置跳转 2019-08-08 17:06:18 +08:00
joylink_cuiweidong
73a7780118 更新定位 2019-08-08 16:56:34 +08:00
zyy
40ab6b247b Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/theme/beijing_01/menus/index.vue
2019-08-08 16:48:06 +08:00
zyy
6c5469ec90 修改代码格式 2019-08-08 16:47:34 +08:00
fan
b7679a6337 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 16:26:54 +08:00
fan
e379696f46 调整:位置跳转测试 2019-08-08 16:26:34 +08:00
zyy
ff101dd603 删除debugger 2019-08-08 16:02:58 +08:00
zyy
4068555199 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 15:57:42 +08:00
zyy
c3f600b015 优化代码 2019-08-08 15:57:36 +08:00
joylink_cuiweidong
66c0939e6c 代码调整 2019-08-08 15:48:43 +08:00
fan
289bffb435 调整:代码迁移(暂时注释掉位置跳转) 2019-08-08 14:36:57 +08:00
fan
6b21fefaeb Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 13:47:39 +08:00
fan
bcf73c78c2 调整:代码迁移+列车调整 2019-08-08 13:47:30 +08:00
joylink_cuiweidong
b166dbd769 剧本 任务录制模块提交 2019-08-08 10:31:46 +08:00
sunzhenyu
7edaf938c7 Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient 2019-08-06 17:28:17 +08:00
sunzhenyu
c27aed050f 挂载threejs,添加静态文件插件 2019-08-06 14:10:21 +08:00
zyy
98a0533b20 修改代码格式 2019-08-06 10:11:32 +08:00
zyy
a010f71252 调整运行图加载, eventbus代码调整 2019-08-02 10:58:28 +08:00
zyy
04e13a7a73 调整代码 2019-08-02 10:36:17 +08:00
zyy
ff9e69585d desc: 调整剧本加载,删除城市注释 2019-08-01 15:19:24 +08:00
ival
276f68e7bc 修改优化代码 2019-07-30 16:47:11 +08:00
ival
9152b6a55e 增加 Line 和 Text 设备移植,以及调试代码 2019-07-30 12:37:31 +08:00
ival
ce82f25422 修改代码 2019-07-30 09:48:14 +08:00
ival
cdccd7b41f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-29 16:03:27 +08:00
ival
05c90f1079 修改代码 2019-07-29 16:03:14 +08:00
zyy
00dc541830 调整配置代码 2019-07-29 15:23:55 +08:00
ival
4dec6ac93d 调试仿真 2019-07-26 15:52:50 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00