Commit Graph

146 Commits

Author SHA1 Message Date
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
王志勋 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 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 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