Commit Graph

7085 Commits

Author SHA1 Message Date
joylink_cuiweidong
5549b7bc9f 哈尔滨线路实训操作代码调整 2020-08-25 14:49:19 +08:00
joylink_cuiweidong
92ba51a548 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 14:17:44 +08:00
joylink_cuiweidong
2320ae42a9 剧本预览代码调整 2020-08-25 14:17:04 +08:00
zyy
69f7b9deca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 13:51:42 +08:00
zyy
13160dfc91 增加西安二号线列车右键菜单 2020-08-25 13:51:27 +08:00
joylink_cuiweidong
17d3be79cf 剧本编制代码调整 2020-08-25 13:44:18 +08:00
joylink_cuiweidong
9fc8948bba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 13:15:47 +08:00
joylink_cuiweidong
65a10b26af 哈尔滨线路 实训操作调整
剧本录制页面聊天代码调整
2020-08-25 13:15:32 +08:00
zyy
54720bc848 处理西安二号线列车冲突代码 2020-08-25 09:33:20 +08:00
zyy
1112ee8322 删除西安二号线列车多余菜单样式 2020-08-25 09:31:07 +08:00
fan
664e174fcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 09:25:50 +08:00
fan
6a268fa095 宁波三菜单调整 2020-08-25 09:25:36 +08:00
joylink_cuiweidong
b1380e5e45 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 19:18:31 +08:00
joylink_cuiweidong
8db06da732 哈尔滨线路操作代码调整 2020-08-24 19:18:12 +08:00
fan
009d911a75 merge 2020-08-24 18:27:09 +08:00
fan
44791d3d54 宁波三号线菜单调整 2020-08-24 18:25:07 +08:00
zyy
19b6f7fb6e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 18:17:30 +08:00
zyy
50c185671f 调整西安二号线列车操作 2020-08-24 18:17:17 +08:00
joylink_cuiweidong
f8a842b518 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 18:16:20 +08:00
joylink_cuiweidong
15ba67c43a 西安二号线折返策略代码调整 2020-08-24 18:15:55 +08:00
sunzhenyu
04e94035be Merge branch'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 18:12:08 +08:00
sunzhenyu
58e9862729 三维通号vr列车车门对齐站台,修改列车门动画赋值bug 2020-08-24 18:12:04 +08:00
joylink_cuiweidong
5410cb037c 西安二号线折返策略代码调整 2020-08-24 17:52:27 +08:00
sunzhenyu
5e9a3220c3 修改vr车站模型 2020-08-24 17:49:46 +08:00
sunzhenyu
31734a1b32 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 17:48:07 +08:00
sunzhenyu
9290dc6b47 修改三维vr乘车报站,修改哈尔滨静态贴图 2020-08-24 17:47:55 +08:00
zyy
23b024dff4 调整折返策略状态显示 2020-08-24 17:21:12 +08:00
zyy
18235dc096 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 16:44:19 +08:00
zyy
b1d42694fd 调整西安二号线列车右键菜单操作 2020-08-24 16:44:04 +08:00
joylink_cuiweidong
ea1955cf34 哈尔滨线路 站台实训调整 2020-08-24 16:42:05 +08:00
joylink_cuiweidong
e4a13de455 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 16:11:50 +08:00
joylink_cuiweidong
e6193e3469 哈尔滨线路实训操作代码调整 2020-08-24 16:11:31 +08:00
zyy
59a3fbb082 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 16:00:15 +08:00
zyy
6afae4e1bc 调整西安二号线排列进路操作 2020-08-24 16:00:00 +08:00
fan
0e26ab9d6f 西安二列车操作调整 2020-08-24 15:01:47 +08:00
fan
b83673146e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 13:48:35 +08:00
fan
94f7fd7698 宁波三菜单调整 2020-08-24 13:48:19 +08:00
zyy
7942f339ac 调整折返模式 状态显示 2020-08-24 13:31:47 +08:00
zyy
b262288524 增加西安二号线折返策略配置,增加联锁配置 2020-08-24 11:30:57 +08:00
zyy
f8d3ffa91d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-21 16:38:35 +08:00
zyy
e86c0b9c45 调整发布地图导入流程 2020-08-21 16:38:22 +08:00
joylink_cuiweidong
c1a9fed683 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-21 15:42:49 +08:00
joylink_cuiweidong
c3675a0bd4 剧本仿真代码调整 2020-08-21 15:41:46 +08:00
fan
b495f542e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-21 15:31:51 +08:00
fan
cfed1c5c4a 取消和利时登录页面基于开发字样 2020-08-21 15:30:51 +08:00
joylink_cuiweidong
43207730bf 剧本仿真代码调整 2020-08-21 14:55:28 +08:00
joylink_cuiweidong
72ca8ed962 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-21 14:17:16 +08:00
joylink_cuiweidong
e699efc06f 剧本录制预览代码调整 2020-08-21 14:16:44 +08:00
fan
5df9b4aa6f 宁波三号线进路样式调整 2020-08-21 14:14:26 +08:00
fan
ea2d1b9dd1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-21 08:51:43 +08:00