Commit Graph

734 Commits

Author SHA1 Message Date
YangHua 14a80ed1bd 12 2024-01-23 15:33:28 +08:00
账号名 73bbaddb4c 1 2024-01-23 14:23:20 +08:00
YangHua b23c788ecd 212 2024-01-23 13:52:06 +08:00
YangHua 4a171571f3 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-23 13:40:23 +08:00
YangHua a4392b7793 w 2024-01-23 13:39:36 +08:00
账号名 6c9c44dabc Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-23 13:15:41 +08:00
账号名 d8dae166d9 1 2024-01-23 13:15:32 +08:00
YangHua af6c663b98 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-23 13:08:13 +08:00
YangHua 17e8dc1c37 q 2024-01-23 13:08:09 +08:00
账号名 226d47fbb5 1 2024-01-23 11:09:23 +08:00
账号名 e3837ac960 1 2024-01-23 10:58:13 +08:00
账号名 e6567cccf2 1 2024-01-23 10:19:54 +08:00
账号名 ffbfe77965 1 2024-01-23 09:33:35 +08:00
账号名 102138cfc6 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-22 21:31:03 +08:00
账号名 f06c386195 1 2024-01-22 21:30:16 +08:00
YangHua 2ebb5e59c9 ew 2024-01-22 21:29:39 +08:00
账号名 a5d16b57ff Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-22 21:10:50 +08:00
账号名 d6ff57f040 1 2024-01-22 21:10:43 +08:00
yulong c101565f8a Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-22 18:15:09 +08:00
yulong 9c22a1294a 提交 2024-01-22 18:14:57 +08:00
账号名 c982031369 1 2024-01-22 18:14:09 +08:00
yulong 1776c1c238 提交 2024-01-22 17:46:16 +08:00
yulong 06b89ba4dc Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-22 15:27:08 +08:00
YangHua f32f4f10b5 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-22 15:26:22 +08:00
YangHua 9a628283b4 wwe 2024-01-22 15:26:03 +08:00
yulong da1ef7b35d 修改 2024-01-22 15:26:01 +08:00
账号名 1a8a7de718 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-22 15:06:55 +08:00
账号名 b3ad76c664 1 2024-01-22 15:06:47 +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
账号名 2d2ea76870 1 2024-01-22 10:34:09 +08:00
账号名 456459788b 1 2024-01-21 19:47:34 +08:00
YangHua a8804af72e Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-21 17:05:32 +08:00
账号名 6b8725f0f8 1 2024-01-21 17:05:14 +08:00
YangHua 3db4f21d46 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-21 16:45:32 +08:00
账号名 531c745b73 1 2024-01-21 16:45:16 +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 6b6583770f Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-21 16:22:17 +08:00
账号名 ab43740c90 1 2024-01-21 16:21:36 +08:00
YangHua 46cca7cade Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-21 15:59:15 +08:00
账号名 271977ab25 1 2024-01-21 15:58:28 +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 c2227efeed Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-21 13:25:03 +08:00
账号名 38fbae20bf 1 2024-01-21 13:24:32 +08:00
yulong 5175e57e85 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-21 13:17:56 +08:00
yulong 25fd301205 提交 2024-01-21 13:17:46 +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 3f091f7590 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-20 16:04:09 +08:00
YangHua 0edfd0e766 添加无人机提示,修复bug 2024-01-20 16:03:37 +08:00
yulong 7906c03f0d 1 2024-01-20 15:22:18 +08:00
YangHua 24512a33c2 修改无人机动态设置攻击目标 2024-01-19 16:49:41 +08:00
账号名 f16afb084b Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-19 16:38:34 +08:00
账号名 9e808c51c3 提交 2024-01-19 16:38:27 +08:00
YangHua 71f609d599 e 2024-01-19 16:35:32 +08:00
YangHua 30f13a8e8e w 2024-01-19 16:18:57 +08:00
YangHua 81be1e7b84 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-19 16:18:18 +08:00
YangHua ff95a85b05 rr 2024-01-19 16:18:00 +08:00
yulong e2fcd7b6a7 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-19 16:01:51 +08:00
yulong 2d60b58a55 设备 2024-01-19 15:48:35 +08:00
账号名 4ff4d87b90 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-19 15:34:33 +08:00
账号名 3ca1fa323d 模型 2024-01-19 15:34:11 +08:00
YangHua e9267fd043 d 2024-01-19 15:31:24 +08:00
YangHua 8f07e6c5d6 去除debug 2024-01-19 15:24:19 +08:00
yulong af1f1e48b3 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-19 15:07:13 +08:00
YangHua 87fcfeb2e5 d 2024-01-19 15:02:16 +08:00
yulong d77afc8e5b Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-19 14:35:27 +08:00
YangHua 31a35c99a1 添加无人机型号判定 2024-01-19 14:29:11 +08:00
YangHua 6aba495fb9 添加 是否是palyer得逻辑 2024-01-19 11:24:52 +08:00
yulong 48a4c44185 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-19 10:57:25 +08:00
YangHua 0fd0f87d8c e 2024-01-19 10:56:31 +08:00
yulong bd6691b341 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-19 10:45:19 +08:00
YangHua f203a84fb2 rerer 2024-01-19 09:50:28 +08:00
YangHua 70ed165471 eeee 2024-01-19 09:48:57 +08:00
账号名 935442e7d1 ppp 2024-01-19 09:45:05 +08:00
账号名 860b8bee36 1 2024-01-19 09:18:30 +08:00
账号名 de097df8af 1 2024-01-19 09:17:57 +08:00
yulong 53a9859966 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-18 17:07:03 +08:00
yulong 8fc4766bae 融合 2024-01-18 16:59:34 +08:00
yulong d911387140 提交 2024-01-18 16:52:22 +08:00
YangHua 446def5122 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-18 16:50:47 +08:00
YangHua b5a888998c re 2024-01-18 16:50:37 +08:00
yulong aaeffc4578 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-18 16:00:55 +08:00
yulong 79b6304635 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-18 15:57:07 +08:00
yulong f97495d712 修改 2024-01-18 15:55:41 +08:00
YangHua e53c14a301 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-18 15:54:13 +08:00
YangHua cddd86a5ad 修改驱离和迫降逻辑 2024-01-18 15:50:23 +08:00
账号名 c758e6e8c4 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-18 14:46:23 +08:00
账号名 65796c8a22 1 2024-01-18 14:43:53 +08:00
YangHua a2728310db 添加无人机型号同步 2024-01-17 23:00:03 +08:00
YangHua 139a1f2646 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-17 17:07:01 +08:00
YangHua 6eeddc3cd8 1 2024-01-17 17:06:58 +08:00
yulong 616cd2b9c5 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-17 17:06:18 +08:00
账号名 443139d785 1 2024-01-17 16:57:41 +08:00
yulong dcc4d12825 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-17 16:38:50 +08:00
账号名 37263081db 1 2024-01-17 16:38:10 +08:00
yulong 4139cd26da Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-17 16:20:57 +08:00
YangHua b742070f23 修改bootstrap 2024-01-17 16:20:10 +08:00
yulong 2b121438ac 232 2024-01-17 16:14:26 +08:00
yulong 929915aefa 1 2024-01-17 16:12:43 +08:00
YangHua 618b5cf5d5 融合 2024-01-17 16:09:43 +08:00
YangHua 72f846932b 212 2024-01-17 16:08:56 +08:00
yulong f05ec30476 提交 2024-01-17 16:07:08 +08:00
YangHua de255738a9 修改无人机属性 2024-01-17 16:06:45 +08:00
账号名 b4a207b2e5 1 2024-01-17 14:55:48 +08:00
yulong e23c88ebea 修改微波设备 2024-01-15 15:46:23 +08:00
yulong 4030e6ea11 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-15 10:12:19 +08:00
yulong 04c7431319 后两个设备代码 2024-01-15 10:11:54 +08:00
YangHua da8a13cf40 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-14 22:16:06 +08:00
YangHua 24ff2b59a0 添加无人机 类型 2024-01-14 22:15:54 +08:00
yulong eaba517950 相机修改 2024-01-13 09:49:41 +08:00
YangHua 8f7834a79a Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-12 17:45:48 +08:00
YangHua 3cfdc09c27 12 2024-01-12 17:45:30 +08:00
yulong 03dd7103e0 设备功能微调 2024-01-12 13:20:41 +08:00
yulong 2e62ccf66e 激光大修改 2024-01-11 10:47:03 +08:00
yulong 5f41effd6e 概率命中 2024-01-08 17:04:01 +08:00
yulong bbe0b64adc 十字准星修改 2024-01-08 16:36:51 +08:00
yulong 36d8db289d Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-08 16:24:56 +08:00
yulong 801f841c47 十字准星架 2024-01-08 16:24:39 +08:00
YangHua bd633a2f00 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-08 11:20:53 +08:00
yulong ac0f762b43 频率修改 2024-01-05 09:50:22 +08:00
yulong d3423d07e2 频率修改 2024-01-05 09:32:03 +08:00
yulong d083d913b7 频率 2024-01-04 17:37:43 +08:00
YangHua a638adf37f Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-04 13:50:38 +08:00
YangHua bb09f848ca 111 2024-01-04 13:50:30 +08:00
yulong 705ce05d79 删除音频 2024-01-04 11:29:07 +08:00
yulong 122fbc2d5e 修改摄像机 2024-01-04 11:18:15 +08:00
yulong 56d9c97e70 摄像机 2024-01-04 10:44:53 +08:00
yulong 24f0ab95d0 修改 2024-01-04 10:17:59 +08:00
yulong b16b36ba44 小地图修改 2024-01-03 17:09:40 +08:00
yulong a514562eb6 小地图修改 2024-01-03 14:22:40 +08:00
yulong 60e4dacb83 无线电 2024-01-03 11:03:03 +08:00
yulong 3dc9610498 修改无线电 2024-01-03 10:09:51 +08:00
YangHua 09f2d8a639 1 2024-01-02 14:33:55 +08:00
yulong af05ae030f 飞机预设体 2023-12-29 15:29:07 +08:00
yulong 7ad6d1b3c1 修改小地图 2023-12-29 15:18:11 +08:00
yulong 320f3c5183 小地图功能 2023-12-29 14:50:53 +08:00
yulong a68d819522 代码 2023-12-28 14:01:09 +08:00
yulong 07660aa843 无线电设备 2023-12-28 09:44:45 +08:00
yulong aaae693ceb 设备功能 2023-12-27 18:08:03 +08:00
yulong 3376a4d3d0 无线电调节频率 2023-12-27 13:23:38 +08:00
yulong d2e982c8c2 位置 2023-12-25 18:03:04 +08:00
yulong 4a4a35c9c7 添加设备和修改 2023-12-25 17:47:18 +08:00
yulong 4ed7305a6f 修改 2023-12-22 18:04:30 +08:00
yulong a7caee6b99 修改1 2023-12-22 17:37:06 +08:00
yulong 7625f60c91 修改 2023-12-22 17:26:24 +08:00
yulong e5b693125a 添加设备 2023-12-21 16:55:11 +08:00
yulong a4ff70aa6a 111 2023-12-20 20:43:51 +08:00
yulong 4198b40e19 IP 2023-12-20 20:30:53 +08:00
yulong 0cf4af5364 ip 2023-12-20 16:12:47 +08:00
yulong b1e7696d78 无线电功能 2023-12-20 15:30:51 +08:00
yulong 3b13b574df 环境模型 2023-12-18 14:09:51 +08:00
yulong 5c748f2d46 保存 2023-12-15 20:24:40 +08:00
yulong 15286af0bf 无线电 2023-12-14 14:44:24 +08:00
yulong 3ab059e9b2 修改 2023-12-13 14:37:14 +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
账号名 f62b672ff1 提交 2023-11-27 20:17:49 +08:00
yulong afc66feb0a 提交 2023-11-27 20:12:34 +08:00
账号名 2ce0c2d3c7 提交 2023-11-27 20:01:27 +08:00
yulong 79c7dd0edb 预设体 2023-11-27 19:57:18 +08:00
账号名 a3c7156ac7 交互逻辑 2023-11-27 19:31:40 +08:00
yulong 6767c1dd20 提交 2023-11-27 18:08:07 +08:00
账号名 ef1645c56a 提交 2023-11-27 17:56:14 +08:00
账号名 698654da2d 提交 2023-11-27 17:28:45 +08:00
账号名 09d0f968b0 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-27 15:05:24 +08:00
账号名 94cd75b6cb 主场景 2023-11-27 15:05:08 +08:00
yulong 8243530f98 修改 2023-11-27 15:03:36 +08:00
账号名 fcdae05dfe Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-27 14:43:34 +08:00
账号名 300a4b54b3 新增设备 2023-11-27 14:43:24 +08:00
yulong 25cbc94861 提交 2023-11-27 14:35:02 +08:00
账号名 1b3c6cb821 提交 2023-11-27 11:15:48 +08:00
账号名 cee0f3d5cb 提交 2023-11-25 12:34:35 +08:00
YangHua a635a91f55 修改连接接口 2023-11-25 11:35:35 +08:00
YangHua d76edf8495 修改态势显示员登录逻辑,修改获取所有player的信息逻辑 2023-11-24 19:25:15 +08:00
YangHua 43eae296c8 qqw 2023-11-24 17:57:05 +08:00
YangHua 8f1e97b70b 23 2023-11-24 17:32:39 +08:00
YangHua ededc3f236 re 2023-11-24 17:25:29 +08:00
账号名 67ffe69bc8 提交 2023-11-24 16:44:55 +08:00
yulong 84cb3d4a98 时态 2023-11-24 16:01:31 +08:00
账号名 154d3d1c30 提交 2023-11-24 15:45:44 +08:00
YangHua d8e6bad2e4 ew 2023-11-24 15:03:46 +08:00
账号名 ea2b35a030 删除设备接口调试 2023-11-24 14:57:05 +08:00
账号名 2d0f6cd10d Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-24 13:48:54 +08:00
yulong b64404a781 优化 2023-11-24 13:47:48 +08:00
账号名 acb5d28826 bug 2023-11-24 13:44:35 +08:00
账号名 d19cf2fead 提交 2023-11-24 13:36:37 +08:00
账号名 dd19d54dd0 视角切换,路线规划 2023-11-24 13:16:25 +08:00
账号名 34dfaf90b3 提交 2023-11-24 09:48:40 +08:00
账号名 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
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
YangHua 19e7957bd2 同步数据 2023-11-15 15:18:08 +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 e585f6b8b3 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2023-11-06 17:54:12 +08:00
yulong 421b658981 环境设置 2023-11-06 17:51:59 +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 88b3acfed1 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2023-10-30 18:19:35 +08:00
yulong 4ddd97978a 接收数据与解析 2023-10-30 18:18:50 +08:00
YangHua fa6f792072 添加指挥所 2023-10-23 09:52:39 +08:00
yulong 5dd955ec30 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2023-10-23 09:36:36 +08:00
yulong b04c7218d9 加了日历 2023-10-23 09:35:58 +08:00
YangHua e08cb72d38 1、无人机右键菜单攻击目标功能补全,应该为点击攻击目标,然后选择敌方目标,飞行至目标附近进行打机。与设置航线为两个功能
2、激光火炮打机多个目标程序异常
3、子弹射速加快。
4、添加无人机弹药数为30
2023-10-22 16:58:10 +08:00
yulong 6c97e51aab 同步 2023-10-20 13:51:32 +08:00