sunzhenyu
|
22fa381707
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:54:55 +08:00 |
|
sunzhenyu
|
1a76506f9b
|
增加列车驾驶其他车辆，增加综合演练第三人称观看视角，修改三维编辑器部分区段生成bug
|
2020-08-26 13:54:44 +08:00 |
|
fan
|
c1f139e9a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:34:08 +08:00 |
|
joylink_cuiweidong
|
e1390a8670
|
代码调整
|
2020-08-26 13:26:21 +08:00 |
|
fan
|
a702740f48
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:25:45 +08:00 |
|
fan
|
8f0f93f75d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:25:33 +08:00 |
|
fan
|
731c532989
|
调度实训平台
|
2020-08-26 13:25:22 +08:00 |
|
joylink_cuiweidong
|
cf50463b5e
|
代码调整
|
2020-08-26 13:23:25 +08:00 |
|
joylink_cuiweidong
|
b652897678
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:22:02 +08:00 |
|
joylink_cuiweidong
|
2fad6e8306
|
调度实训竞赛代码调整
|
2020-08-26 13:21:47 +08:00 |
|
fan
|
9fcb1cd9bb
|
代码调整
|
2020-08-25 18:50:42 +08:00 |
|
fan
|
932360dd88
|
merge
|
2020-08-25 17:10:08 +08:00 |
|
fan
|
f611f5057d
|
西安二菜单调整
|
2020-08-25 17:02:48 +08:00 |
|
joylink_cuiweidong
|
367b947a94
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-25 16:54:31 +08:00 |
|
joylink_cuiweidong
|
a9fd33c413
|
哈尔滨线路实训操作调整
|
2020-08-25 16:54:16 +08:00 |
|
zyy
|
4de5947d34
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-25 16:53:12 +08:00 |
|
zyy
|
ccc57042a7
|
调整地图绘制弹窗加载
|
2020-08-25 16:52:52 +08:00 |
|
joylink_cuiweidong
|
1668b25337
|
哈尔滨线路实训操作代码调整
|
2020-08-25 16:38:08 +08:00 |
|
joylink_cuiweidong
|
f2957c370c
|
哈尔滨线路实训操作代码调整
|
2020-08-25 15:09:04 +08:00 |
|
joylink_cuiweidong
|
2dad56ac07
|
哈尔滨线路实训操作调整
|
2020-08-25 15:01:47 +08:00 |
|
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 |
|