Commit Graph

261 Commits

Author SHA1 Message Date
YangHua b23c788ecd 212 2024-01-23 13:52:06 +08:00
YangHua a4392b7793 w 2024-01-23 13:39:36 +08:00
YangHua 17e8dc1c37 q 2024-01-23 13:08:09 +08:00
账号名 ffbfe77965 1 2024-01-23 09:33:35 +08:00
yulong 1776c1c238 提交 2024-01-22 17:46:16 +08:00
YangHua 6b854ffbe4 21 2024-01-22 15:05:50 +08:00
yulong b468d289e4 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-22 14:47:47 +08:00
yulong eb55cac44a 4565 2024-01-22 14:47:41 +08:00
YangHua 7b68226606 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-22 10:53:53 +08:00
账号名 456459788b 1 2024-01-21 19:47:34 +08:00
YangHua ddf7998761 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-21 16:33:12 +08:00
账号名 414700473b 1 2024-01-21 16:32:42 +08:00
YangHua 1454004586 wq 2024-01-21 15:34:47 +08:00
YangHua 1cc4dbc19c ww 2024-01-21 15:34:03 +08:00
账号名 29c7be9849 1 2024-01-21 15:33:48 +08:00
YangHua 9d2b9ae836 qw 2024-01-21 14:57:27 +08:00
YangHua 87ed2d2d12 ew 2024-01-21 14:56:40 +08:00
账号名 494cb4b9a7 1 2024-01-21 14:56:10 +08:00
YangHua a496515b0d Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-21 13:14:46 +08:00
YangHua 184a763763 qq 2024-01-21 13:14:42 +08:00
账号名 2c00ef06a2 1 2024-01-21 13:13:55 +08:00
YangHua a306bcad2c e 2024-01-21 12:56:36 +08:00
YangHua 5c5edadceb 添加子弹移动 2024-01-20 20:49:24 +08:00
YangHua cbafa8479e d 2024-01-20 18:08:30 +08:00
YangHua 50da5df718 添加光学无人机发射激光逻辑 2024-01-20 18:04:29 +08:00
YangHua 0edfd0e766 添加无人机提示,修复bug 2024-01-20 16:03:37 +08:00
YangHua 24512a33c2 修改无人机动态设置攻击目标 2024-01-19 16:49:41 +08:00
YangHua e9267fd043 d 2024-01-19 15:31:24 +08:00
YangHua 8f07e6c5d6 去除debug 2024-01-19 15:24:19 +08:00
YangHua 31a35c99a1 添加无人机型号判定 2024-01-19 14:29:11 +08:00
YangHua 6aba495fb9 添加 是否是palyer得逻辑 2024-01-19 11:24:52 +08:00
YangHua 0fd0f87d8c e 2024-01-19 10:56:31 +08:00
YangHua 70ed165471 eeee 2024-01-19 09:48:57 +08:00
YangHua cddd86a5ad 修改驱离和迫降逻辑 2024-01-18 15:50:23 +08:00
YangHua a2728310db 添加无人机型号同步 2024-01-17 23:00:03 +08:00
YangHua 6eeddc3cd8 1 2024-01-17 17:06:58 +08:00
YangHua de255738a9 修改无人机属性 2024-01-17 16:06:45 +08:00
yulong eaba517950 相机修改 2024-01-13 09:49:41 +08:00
yulong 03dd7103e0 设备功能微调 2024-01-12 13:20:41 +08:00
yulong d3423d07e2 频率修改 2024-01-05 09:32:03 +08:00
yulong d083d913b7 频率 2024-01-04 17:37:43 +08:00
yulong 7ad6d1b3c1 修改小地图 2023-12-29 15:18:11 +08:00
yulong 320f3c5183 小地图功能 2023-12-29 14:50:53 +08:00
yulong 07660aa843 无线电设备 2023-12-28 09:44:45 +08:00
yulong 3376a4d3d0 无线电调节频率 2023-12-27 13:23:38 +08:00
yulong 4a4a35c9c7 添加设备和修改 2023-12-25 17:47:18 +08:00
yulong 17aa410687 红蓝双方 2023-12-13 10:50:45 +08:00
yulong c870ec36e9 场景修改 2023-12-12 17:46:10 +08:00
yulong 5fe1857fc0 最终 2023-12-11 13:43:15 +08:00
yulong 8509f8a246 提交 2023-11-30 09:08:40 +08:00
账号名 2ce0c2d3c7 提交 2023-11-27 20:01:27 +08:00
账号名 698654da2d 提交 2023-11-27 17:28:45 +08:00
账号名 300a4b54b3 新增设备 2023-11-27 14:43:24 +08:00
账号名 1b3c6cb821 提交 2023-11-27 11:15:48 +08:00
YangHua a635a91f55 修改连接接口 2023-11-25 11:35:35 +08:00
YangHua d76edf8495 修改态势显示员登录逻辑,修改获取所有player的信息逻辑 2023-11-24 19:25:15 +08:00
YangHua 8f1e97b70b 23 2023-11-24 17:32:39 +08:00
YangHua ededc3f236 re 2023-11-24 17:25:29 +08:00
yulong 84cb3d4a98 时态 2023-11-24 16:01:31 +08:00
YangHua d8e6bad2e4 ew 2023-11-24 15:03:46 +08:00
账号名 d19cf2fead 提交 2023-11-24 13:36:37 +08:00
账号名 dd19d54dd0 视角切换,路线规划 2023-11-24 13:16:25 +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 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
账号名 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 bd48a25e5b eee 2023-11-23 13:56:00 +08:00
YangHua f528183dc2 2323 2023-11-23 13:48:13 +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
YangHua c66adcaadc q 2023-11-23 10:07:37 +08:00
YangHua d023081d4b 133 2023-11-23 09:57:28 +08:00
YangHua 615487426b 修改 拖拽问题 2023-11-23 09:16:53 +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
YangHua 443c6ee79c ttt 2023-11-22 19:14:04 +08:00
YangHua c2631e5374 rewr 2023-11-22 18:41:51 +08:00
YangHua 3ac7c43f30 fdf 2023-11-22 18:36:46 +08:00
YangHua 1a802163c0 ew 2023-11-22 18:14:59 +08:00
YangHua 88fe840255 321 2023-11-22 18:05:42 +08:00
YangHua 065e2824b2 2123 2023-11-22 17:41:20 +08:00
YangHua 861ecd1ba9 we 2023-11-22 17:21:17 +08:00
YangHua a26c485de2 3 2023-11-22 17:15:05 +08:00
YangHua 1820f61d6f 222 2023-11-22 16:33:04 +08:00
YangHua 20ef229f32 231 2023-11-22 16:25:14 +08:00
YangHua 4dae4b474c 22 2023-11-22 16:15:04 +08:00
YangHua e19f99a23c 12 2023-11-22 16:06:23 +08:00
YangHua bbf470f621 修改删除user逻辑 2023-11-22 15:43:39 +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 bae09e0de0 添加设备数据上传接口 2023-11-21 11:20:14 +08:00
YangHua f74bd50678 修改生成方式 2023-11-21 09:42:14 +08:00
YangHua cddd9c869a 修改数据格式,添加接受逻辑 2023-11-20 18:35:43 +08:00
YangHua 1a194fa370 1 2023-11-20 17:45:05 +08:00
王志勋 29e4a23181 模型点击演练测试 2023-11-20 16:03:28 +08:00
YangHua 1f28b67379 修改接口 2023-11-20 15:49:07 +08:00
YangHua 3d496c0184 修改获取设备信息接口 2023-11-20 15:26:25 +08:00
yulong 9b546eef9b 添加当前想定ID获取的逻辑 2023-11-19 23:06:03 +08:00
yulong 9bcefa0f15 添加无线电拖拽按钮 2023-11-19 21:57:28 +08:00
yulong 7a54da8e07 融合1 2023-11-19 21:15:15 +08:00
王志勋 d3214b5d56 模型功能提交 2023-11-19 19:06:05 +08:00
YangHua 2d6bb93cd2 修改加载模型逻辑 2023-11-19 18:38:44 +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
YangHua 615b4cacf6 融合 2023-11-17 11:03:25 +08:00
YangHua c45272143c 修复读取设备数据出现得问题 2023-11-17 11:00:35 +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 62895a4045 加入新场景 2023-11-16 14:31:44 +08:00
YangHua bd9960ba12 修改同步交互 2023-11-16 12:23:02 +08:00
YangHua a693359e96 修复上线逻辑 2023-11-15 15:33:57 +08:00
YangHua c9ca72068f 修改上线逻辑 2023-11-15 15:28:37 +08:00
YangHua 618673c1c6 发送上线信息 2023-11-15 15:21:35 +08:00