Commit Graph

179 Commits

Author SHA1 Message Date
YangHua fedb9cbc57 修改房间判定 2023-11-23 19:53:38 +08:00
YangHua e0a33711d6 修改教师登录加载数据 2023-11-23 16:47:22 +08:00
yulong 9e6937a531 想定编辑 2023-11-23 09:00:10 +08:00
yulong 8530a158b8 接口合并 2023-11-22 20:32:52 +08:00
yulong d2dbdb09b1 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 18:42:12 +08:00
YangHua c2631e5374 rewr 2023-11-22 18:41:51 +08:00
yulong 5a78c56eb8 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 18:37:05 +08:00
YangHua 3ac7c43f30 fdf 2023-11-22 18:36:46 +08:00
yulong 84664e5a40 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 18:15:17 +08:00
YangHua 1a802163c0 ew 2023-11-22 18:14:59 +08:00
yulong 7ee2ffbe00 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 18:07:19 +08:00
YangHua 88fe840255 321 2023-11-22 18:05:42 +08:00
yulong 9c94f7afd9 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 17:41:34 +08:00
YangHua 065e2824b2 2123 2023-11-22 17:41:20 +08:00
yulong f4b6253216 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 17:23:22 +08:00
YangHua bcded4bbfb R 2023-11-22 17:22:04 +08:00
yulong c2d0cb0182 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 17:15:16 +08:00
YangHua a26c485de2 3 2023-11-22 17:15:05 +08:00
YangHua f0b21888a4 33 2023-11-22 17:02:33 +08:00
yulong 6d09d8ef8a Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 16:41:57 +08:00
YangHua 7c9407a02e 333 2023-11-22 16:41:35 +08:00
yulong 15a675a7bc Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 16:33:20 +08:00
YangHua 1820f61d6f 222 2023-11-22 16:33:04 +08:00
yulong 0895ff80c8 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 16:25:28 +08:00
YangHua 20ef229f32 231 2023-11-22 16:25:14 +08:00
yulong 96e26ae960 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 16:15:22 +08:00
YangHua 4dae4b474c 22 2023-11-22 16:15:04 +08:00
yulong 11b7688678 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 16:06:39 +08:00
YangHua e19f99a23c 12 2023-11-22 16:06:23 +08:00
yulong 151f9f4ca5 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 15:44:34 +08:00
YangHua bbf470f621 修改删除user逻辑 2023-11-22 15:43:39 +08:00
yulong 86e8ab9db6 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 15:06:14 +08:00
yulong 7f1a077044 接口优化 2023-11-22 15:05:57 +08:00
YangHua bd50389482 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 15:04:09 +08:00
YangHua 734d3c7cfc 离线和初始化设备 2023-11-22 15:03:51 +08:00
账号名 86b6c637e6 激光同步及接口整理脚本 2023-11-22 14:17:28 +08:00
YangHua 17efb866c7 修改 参数 2023-11-21 14:19:59 +08:00
YangHua bae09e0de0 添加设备数据上传接口 2023-11-21 11:20:14 +08:00
YangHua 1f28b67379 修改接口 2023-11-20 15:49:07 +08:00
YangHua b06b307c11 解决冲突 2023-11-20 15:27:06 +08:00
YangHua 3d496c0184 修改获取设备信息接口 2023-11-20 15:26:25 +08:00
王志勋 af41c74eb8 激光火控提交 2023-11-19 23:27:52 +08:00
yulong 9b546eef9b 添加当前想定ID获取的逻辑 2023-11-19 23:06:03 +08:00
yulong 9be89d97e1 修改指令 2023-11-19 21:39:18 +08:00
yulong 7a54da8e07 融合1 2023-11-19 21:15:15 +08:00
yulong 7982ff82d0 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2023-11-19 19:34:52 +08:00
yulong 3b4177cdb9 融合 2023-11-19 19:34:46 +08:00
王志勋 d3214b5d56 模型功能提交 2023-11-19 19:06:05 +08:00
yulong e52ba870a8 修改prefab 2023-11-18 23:41:56 +08:00
yulong d7f3da2066 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2023-11-18 17:52:22 +08:00
yulong f75b5a1279 融合 2023-11-18 17:52:06 +08:00
YangHua 605523e374 修改 判定逻辑 2023-11-17 22:31:09 +08:00
YangHua fb2d1ef9a5 12 2023-11-17 15:52:07 +08:00
YangHua 6206bec3f6 修改学员席位判定逻辑 2023-11-17 15:02:24 +08:00
YangHua 0eb3599a46 解决 运行报错的问题 2023-11-17 12:35:43 +08:00
yulong cfc37a2afa 提交 2023-11-17 11:13:36 +08:00
yulong 2df54ad3bb 提交 2023-11-17 11:13:12 +08:00
YangHua 615b4cacf6 融合 2023-11-17 11:03:25 +08:00
YangHua c45272143c 修复读取设备数据出现得问题 2023-11-17 11:00:35 +08:00
yulong 2bdddc664b 设备信息 2023-11-16 15:20:38 +08:00
yulong 035b05cb89 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2023-11-16 15:19:18 +08:00
yulong 8b8d6d1a23 设备信息 2023-11-16 15:18:51 +08:00
YangHua bd9960ba12 修改同步交互 2023-11-16 12:23:02 +08:00
YangHua b9d78a159e 同步到其它电脑 2023-11-15 13:12:16 +08:00
YangHua 793e168914 同步 2023-11-14 22:39:23 +08:00
YangHua 2864332f41 修改创建房间得逻辑 2023-11-10 10:24:24 +08:00
YangHua d246865339 添加网络模块 2023-11-10 09:49:21 +08:00
YangHua 8e16b248f3 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-09 17:37:56 +08:00
YangHua 8cb372a3c4 添加席位获取,席位修改,人员获取,人员分配,权限判断。 2023-11-09 17:37:49 +08:00
yulong 59c0c2019c 对象列表 2023-11-09 17:36:05 +08:00
YangHua 222a5948b7 同步 2023-11-06 17:36:51 +08:00
YangHua c3437116bd 制作创建房间 查看房间逻辑 2023-11-06 17:35:13 +08:00
yulong fb2e1daf4d 天气设置 2023-11-06 17:32:24 +08:00
YangHua 47026ad064 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-01 16:24:58 +08:00
YangHua 96322e7b65 添加 UI界面 接受数据 接口逻辑 2023-11-01 16:24:48 +08:00
yulong 8e4c623a48 接收数据 2023-11-01 16:20:13 +08:00
yulong 4ddd97978a 接收数据与解析 2023-10-30 18:18:50 +08:00
yulong b04c7218d9 加了日历 2023-10-23 09:35:58 +08:00
yulong 6c97e51aab 同步 2023-10-20 13:51:32 +08:00