Commit Graph

280 Commits

Author SHA1 Message Date
账号名 5db8b045d9 提交 2023-11-24 09:46:40 +08:00
账号名 f12992418b 提交 2023-11-24 09:16:01 +08:00
账号名 8ddc76956d 无人机群路线及飞行规划 2023-11-23 23:18:14 +08:00
YangHua b9e9c7e5b8 2 2023-11-23 23:01:44 +08:00
YangHua 6324d2547a 1 2023-11-23 22:30:25 +08:00
YangHua 53ad03acd5 1 2023-11-23 22:14:59 +08:00
YangHua 963fba3cde 322 2023-11-23 22:01:40 +08:00
YangHua dfc3c48216 ewqeww 2023-11-23 21:50:27 +08:00
YangHua 2f4c3cc04b 32 2023-11-23 21:35:36 +08:00
YangHua d7f3c80972 ew 2023-11-23 21:19:48 +08:00
YangHua 6548e490e8 121 2023-11-23 20:18:55 +08:00
YangHua f609514d96 12 2023-11-23 20:12:48 +08:00
账号名 8e893f1e42 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-23 19:54:51 +08:00
账号名 8f4ae32685 无人机销毁 2023-11-23 19:54:42 +08:00
YangHua 3aae7026ec Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-23 19:53:51 +08:00
YangHua fedb9cbc57 修改房间判定 2023-11-23 19:53:38 +08:00
账号名 c6d15e3e9a 提交 2023-11-23 17:20:59 +08:00
YangHua 97a09ec9f1 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-23 16:47:27 +08:00
YangHua e0a33711d6 修改教师登录加载数据 2023-11-23 16:47:22 +08:00
账号名 61df6df538 无人机攻击交互 2023-11-23 16:44:37 +08:00
账号名 4e53845d3f 提交 2023-11-23 15:40:43 +08:00
账号名 c6ab90e1ec 数据上传处理 2023-11-23 15:31:35 +08:00
账号名 21b1bd9b66 提交 2023-11-23 14:57:51 +08:00
账号名 28e5546467 攻击目标 2023-11-23 14:54:12 +08:00
账号名 cd148c30b5 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-23 14:27:17 +08:00
账号名 e51bf6a585 qq 2023-11-23 14:27:10 +08:00
YangHua 3b8f911c12 323 2023-11-23 14:25:55 +08:00
YangHua 5922a64aeb rrr 2023-11-23 14:17:27 +08:00
YangHua bd48a25e5b eee 2023-11-23 13:56:00 +08:00
YangHua f528183dc2 2323 2023-11-23 13:48:13 +08:00
账号名 e8ea3bf412 提交 2023-11-23 13:13:34 +08:00
账号名 119465cced 激光位置同步 2023-11-23 11:07:36 +08:00
YangHua 12452e1474 1 2023-11-23 10:53:49 +08:00
YangHua 2241107a4a 12 2023-11-23 10:37:03 +08:00
账号名 34f683fbca 数组越界修改 2023-11-23 10:15:54 +08:00
账号名 d4993858a9 预制体更改 2023-11-23 10:09:13 +08:00
YangHua c66adcaadc q 2023-11-23 10:07:37 +08:00
yulong 2beab906eb 修改组件 2023-11-23 10:00:11 +08:00
YangHua d023081d4b 133 2023-11-23 09:57:28 +08:00
YangHua 615487426b 修改 拖拽问题 2023-11-23 09:16:53 +08:00
YangHua 2c92b0391a Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-23 09:01:54 +08:00
yulong 9e6937a531 想定编辑 2023-11-23 09:00:10 +08:00
yulong 62f29aed0a Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 20:54:55 +08:00
YangHua f019e11856 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 20:54:45 +08:00
账号名 af124fe51d 提交 2023-11-22 20:54:38 +08:00
yulong c09170e118 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 20:42:00 +08:00
YangHua 1a276bb2b9 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 20:41:50 +08:00
账号名 cc4c877559 提交 2023-11-22 20:41:38 +08:00
yulong 35d33f127e Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 20:33:03 +08:00
yulong 8530a158b8 接口合并 2023-11-22 20:32:52 +08:00
YangHua 9526c90cfb Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 20:30:05 +08:00
YangHua 976122ad57 q 2023-11-22 20:29:33 +08:00
账号名 2d4444aadd 提交设备协同 2023-11-22 20:24:03 +08:00
yulong 7969fa9585 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 19:14:19 +08:00
YangHua 443c6ee79c ttt 2023-11-22 19:14:04 +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 1389cab1d9 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-22 17:21:33 +08:00
YangHua 861ecd1ba9 we 2023-11-22 17:21:17 +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 86968b959b 1 2023-11-22 09:20:26 +08:00
YangHua 978b70d201 x1212 2023-11-22 09:19:09 +08:00
账号名 f2b7476009 无人机定位 2023-11-21 21:53:34 +08:00
YangHua 3aafd10937 1212122 2023-11-21 20:33:28 +08:00
账号名 6caee0cc20 提交无人机同步 2023-11-21 20:05:12 +08:00
账号名 50f0a8193e 移动 2023-11-21 19:51:28 +08:00
账号名 ec803964b4 位置实时推送 2023-11-21 19:24:19 +08:00
YangHua 6ad2acd75a 修改点击逻辑 2023-11-21 18:02:07 +08:00
YangHua 8f97498f16 修改model赋值 2023-11-21 17:14:56 +08:00
YangHua dc2e2e349f 添加deviceID和isplayer逻辑 2023-11-21 17:02:54 +08:00
YangHua 1b5d1407b6 去除| 2023-11-21 15:47:05 +08:00
YangHua 015cd95de2 修改json数据格式 2023-11-21 15:21:20 +08:00
YangHua 17efb866c7 修改 参数 2023-11-21 14:19:59 +08:00
YangHua c055e2a0bf 修改添加接口 2023-11-21 11:40:44 +08:00
YangHua bae09e0de0 添加设备数据上传接口 2023-11-21 11:20:14 +08:00
YangHua f74bd50678 修改生成方式 2023-11-21 09:42:14 +08:00
王志勋 8fe23716ee 生成脚本传递 2023-11-20 18:44:16 +08:00
YangHua cddd9c869a 修改数据格式,添加接受逻辑 2023-11-20 18:35:43 +08:00
YangHua bbd6889f3e 修改数据格式 2023-11-20 18:07:33 +08:00
YangHua db33ed6504 修改数据格式 2023-11-20 17:59:24 +08:00
YangHua b6b6b29751 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-20 17:45:14 +08:00
YangHua 1a194fa370 1 2023-11-20 17:45:05 +08:00
王志勋 9345718457 消息位置传递 2023-11-20 17:43:41 +08:00
王志勋 29e4a23181 模型点击演练测试 2023-11-20 16:03:28 +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
王志勋 d28ff6ea5d Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2023-11-19 23:06:53 +08:00
yulong 9b546eef9b 添加当前想定ID获取的逻辑 2023-11-19 23:06:03 +08:00
yulong f23049efb0 修改n 2023-11-19 22:13:33 +08:00
王志勋 16ad17cee4 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2023-11-19 21:58:12 +08:00
yulong 9bcefa0f15 添加无线电拖拽按钮 2023-11-19 21:57:28 +08:00
王志勋 9ee6e72e94 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2023-11-19 21:39:50 +08:00
yulong 9be89d97e1 修改指令 2023-11-19 21:39:18 +08:00
王志勋 ed3f3e25fc 解决冲突 2023-11-19 21:20:02 +08:00
王志勋 961d9153ad 融合 2023-11-19 21:19:09 +08:00
yulong 7a54da8e07 融合1 2023-11-19 21:15:15 +08:00
yulong 308e5d0a29 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2023-11-19 19:49:37 +08:00
王志勋 f1d863f999 Ui更改 2023-11-19 19:46:28 +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
YangHua 2d6bb93cd2 修改加载模型逻辑 2023-11-19 18:38:44 +08:00
YangHua aa5d545d0b 添加 dragmanager 2023-11-19 15:54:45 +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 9ff5c8bde0 修改 预制体 2023-11-18 17:34:46 +08:00
YangHua e5a6757d37 修改 拖拽功能 2023-11-18 17:21:27 +08:00
YangHua 605523e374 修改 判定逻辑 2023-11-17 22:31:09 +08:00
YangHua c3dd3f356e 修改拖拽逻辑 2023-11-17 22:16:26 +08:00
YangHua fb2d1ef9a5 12 2023-11-17 15:52:07 +08:00
YangHua b1c54e7f3f 1 2023-11-17 15:05:30 +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