Commit Graph

706 Commits

Author SHA1 Message Date
YangHua 962bcc3205 zxz 2024-02-22 11:45:58 +08:00
YangHua f3eaa58269 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-22 01:12:47 +08:00
YangHua 4d8a06266b 添加编队逻辑 2024-02-22 00:46:37 +08:00
王志勋 dcec03025c Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-21 18:05:40 +08:00
王志勋 42dd810654 1 2024-02-21 18:05:18 +08:00
yulong d66d034a6f 提交 2024-02-21 17:51:27 +08:00
YangHua 834b89fdd6 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-21 11:13:45 +08:00
yulong 49f3df6e06 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-21 10:43:04 +08:00
yulong 4b9c71d9d2 提交 2024-02-21 10:42:16 +08:00
王志勋 d8ea7d1a9b Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-21 09:36:37 +08:00
王志勋 712161be56 1 2024-02-21 09:36:08 +08:00
yulong 0571fcc29f 提交 2024-02-21 09:28:49 +08:00
YangHua 907d284537 qweq 2024-02-21 00:19:07 +08:00
YangHua f2877ee0ee 添加组代码 2024-02-20 23:58:42 +08:00
yulong a358598095 提交 2024-02-20 17:56:47 +08:00
王志勋 449c1914a4 1 2024-02-20 10:20:19 +08:00
yulong 92163cadb5 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-20 09:37:06 +08:00
yulong a85f35943c 想定 2024-02-20 09:34:43 +08:00
王志勋 19c52cae93 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-20 09:33:41 +08:00
王志勋 ee340b47fb 1 2024-02-20 09:33:27 +08:00
YangHua db416cbfd5 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-19 17:50:42 +08:00
YangHua 2690ae1cfb 121 2024-02-19 17:50:32 +08:00
陈向学 e23b558a22 dadas 2024-02-18 16:46:44 +08:00
陈向学 25359a1e65 ascacsac 2024-02-18 16:23:38 +08:00
陈向学 50c7cf2033 改配置 2024-02-18 16:08:59 +08:00
YangHua d06b7f36a6 修改多窗口 打开 逻辑 2024-02-06 17:54:56 +08:00
YangHua 31c8629b05 融合 2024-02-06 14:56:34 +08:00
YangHua 465d55cbe6 ewewe 2024-02-06 14:55:24 +08:00
yulong 5256a1448b 设备数量 2024-02-05 17:54:34 +08:00
王志勋 e47d967348 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-04 17:17:09 +08:00
王志勋 3c45c15d84 1 2024-02-04 17:16:59 +08:00
YangHua 9afdd9b4f5 取代wzx登出逻辑 2024-02-04 16:44:53 +08:00
YangHua 3ef0b0d112 修复登出逻辑 2024-02-04 16:37:40 +08:00
王志勋 4ec85ab30e Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-04 14:03:21 +08:00
王志勋 f796579305 1 2024-02-04 14:03:09 +08:00
yulong bdc8c8bbe8 想定 2024-02-04 13:54:23 +08:00
yulong 1c4687d832 1 2024-02-04 10:37:52 +08:00
yulong 5ac22b1c48 想定编辑 2024-02-04 10:00:46 +08:00
yulong 439ea9c48b Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-02 17:12:48 +08:00
yulong 7ddc2b9250 1 2024-02-02 17:12:31 +08:00
王志勋 d3fabeb5ef 1 2024-02-02 17:11:06 +08:00
王志勋 c095484b0a 1 2024-02-02 17:08:26 +08:00
YangHua 1445fb76e0 添加态势画面 移动 缩放功能 2024-02-02 13:33:43 +08:00
YangHua 66274c1bc0 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-02 12:13:20 +08:00
YangHua 12e0809d4d 添加放大缩小逻辑 2024-02-02 12:13:15 +08:00
yulong 442758cd05 雷达盲区和车辆名字 2024-02-01 14:17:30 +08:00
yulong 0656d005df Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-01 13:44:27 +08:00
yulong fced58f6ee 2 2024-02-01 13:44:17 +08:00
王志勋 2eb28ee5af 1 2024-02-01 11:16:10 +08:00
yulong e70b5eab69 11 2024-02-01 11:00:34 +08:00
yulong 1c16df548a 提交 2024-02-01 10:58:11 +08:00
王志勋 83ff5aa777 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-01 09:43:18 +08:00
王志勋 ff3b5e2769 1 2024-02-01 09:43:10 +08:00
YangHua 9dd7c20e5d 添加loading 2024-02-01 09:19:13 +08:00
yulong cc1d1a5348 1 2024-01-30 20:06:08 +08:00
yulong b679f840b2 1 2024-01-30 19:33:37 +08:00
yulong b266249130 1 2024-01-30 18:23:05 +08:00
YangHua 1b04f8000b Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-30 17:38:14 +08:00
YangHua 721c030834 weewe 2024-01-30 17:38:03 +08:00
账号名 a3e5d273f7 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-30 17:03:00 +08:00
账号名 40f569d2c2 1 2024-01-30 17:02:41 +08:00
YangHua ed4fc75cad 4112 2024-01-30 16:09:54 +08:00
YangHua 7fbed65272 rerer 2024-01-30 16:08:03 +08:00
账号名 429f2bb1a7 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-30 15:47:01 +08:00
账号名 564bda3dd5 1 2024-01-30 15:46:44 +08:00
yulong ae19fb8ff9 1 2024-01-30 15:45:34 +08:00
账号名 22b6ed5cef 1 2024-01-29 22:29:42 +08:00
账号名 a1898229d8 1 2024-01-29 22:15:31 +08:00
账号名 d64d5a8e3d 1 2024-01-29 22:04:37 +08:00
账号名 b1379f43f4 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 21:50:52 +08:00
账号名 646dad2213 1 2024-01-29 21:50:34 +08:00
YangHua ec8e3dad6c rewr 2024-01-29 19:01:11 +08:00
YangHua a26d9ee922 ewew 2024-01-29 18:52:18 +08:00
YangHua d7e88405ad wqewe 2024-01-29 18:06:57 +08:00
账号名 425d5a8ab3 1 2024-01-29 17:43:02 +08:00
账号名 2f341e93d8 1 2024-01-29 16:01:45 +08:00
账号名 2e4373b2d2 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 15:46:24 +08:00
账号名 9f074ec875 1 2024-01-29 15:46:15 +08:00
YangHua e5c6733f60 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 15:45:14 +08:00
YangHua dbea88a61d wewe 2024-01-29 15:44:59 +08:00
yulong 280475be0c Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 15:06:30 +08:00
yulong 2b6815c369 1 2024-01-29 15:06:21 +08:00
账号名 640bb4f529 1 2024-01-29 15:04:05 +08:00
账号名 845a7ca740 1 2024-01-29 14:43:43 +08:00
账号名 9c17e11cf8 1 2024-01-29 14:30:20 +08:00
账号名 be6067fdac 1 2024-01-29 14:11:54 +08:00
账号名 66d6a79fd8 1 2024-01-29 14:03:01 +08:00
yulong f01a5b0f3f Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 13:44:07 +08:00
yulong 483fa93058 1 2024-01-29 13:43:57 +08:00
YangHua 2da0c9d838 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 11:47:50 +08:00
YangHua 0e62083e80 ewew 2024-01-29 11:47:44 +08:00
yulong 50a0800366 1 2024-01-29 11:36:11 +08:00
yulong 4327751b70 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 11:28:40 +08:00
yulong efa7f0fe20 1 2024-01-29 11:28:34 +08:00
YangHua f429f9c2a2 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 11:28:10 +08:00
YangHua be99e74bec ewew 2024-01-29 11:28:07 +08:00
账号名 9004c0fef7 1 2024-01-29 11:27:25 +08:00
yulong 938bc95dfd 3 2024-01-29 11:10:31 +08:00
yulong 605d283742 2 2024-01-29 11:05:19 +08:00
YangHua 0f1960a41a Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 11:03:15 +08:00
YangHua e9cd6195c0 ewewe 2024-01-29 11:03:07 +08:00
yulong aa36b1cff0 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 11:00:04 +08:00
yulong 3ada8e274b 1 2024-01-29 10:59:54 +08:00
账号名 4bc25c4c02 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 10:58:21 +08:00
账号名 4c8183c7e2 1 2024-01-29 10:58:14 +08:00
yulong c87f9a53d6 模型 2024-01-29 10:57:44 +08:00
yulong 03419b2d06 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 10:51:24 +08:00
yulong 844153578b 预设体 2024-01-29 10:51:13 +08:00
YangHua 3c4dba9959 werer 2024-01-29 10:47:43 +08:00
YangHua 795eb05dd8 dsd 2024-01-29 10:30:53 +08:00
YangHua ac20a2451b Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 10:25:00 +08:00
YangHua b861ac2372 eweweq 2024-01-29 10:24:52 +08:00
yulong 378161ebec Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 09:58:08 +08:00
yulong a664bce204 材质 2024-01-29 09:57:54 +08:00
账号名 bbaec15d7c 1 2024-01-29 09:55:42 +08:00
YangHua 06a9408fac er 2024-01-28 18:50:03 +08:00
YangHua e6f5f9bebd dsd 2024-01-28 18:47:59 +08:00
YangHua 3f30b3c849 weed 2024-01-28 18:41:45 +08:00
YangHua 8dbbc60083 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-28 17:27:19 +08:00
YangHua 98f2297cb8 eq 2024-01-28 17:27:16 +08:00
账号名 9f95bbadf3 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-28 17:26:03 +08:00
账号名 dabbcc0ebf 1 2024-01-28 17:25:54 +08:00
yulong 85bcdb333b 2 2024-01-28 17:23:53 +08:00
YangHua eeb9868254 ewq 2024-01-28 17:13:46 +08:00
YangHua a30d997487 w 2024-01-28 17:03:02 +08:00
账号名 59f07e23a5 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-28 17:02:17 +08:00
账号名 861a9b1b38 1 2024-01-28 17:01:33 +08:00
YangHua 53b2e38ff5 eww 2024-01-28 16:57:32 +08:00
yulong b2ca4b4d3d 1 2024-01-28 16:38:52 +08:00
yulong d6a1a18c96 1 2024-01-28 16:18:23 +08:00
yulong f1bbea6787 1 2024-01-28 16:16:40 +08:00
账号名 912a282421 1 2024-01-28 16:15:20 +08:00
账号名 373f859ec1 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-28 15:31:00 +08:00
账号名 18dd84bf8b 1 2024-01-28 15:30:53 +08:00
YangHua d07e9a6e37 ew 2024-01-28 15:07:22 +08:00
YangHua a3ff52df1d Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-28 15:05:30 +08:00
YangHua 14bb009f8b 添加wrjUI弹出消失逻辑 2024-01-28 15:05:09 +08:00
yulong a7f29ce501 1 2024-01-28 15:03:18 +08:00
账号名 85b2e78159 1 2024-01-28 14:33:02 +08:00
账号名 2922a2fc67 1 2024-01-28 14:17:16 +08:00
账号名 008ace5b6b 1 2024-01-28 14:07:52 +08:00
yulong 933b37c37c 提交 2024-01-28 13:58:19 +08:00
账号名 0f2615cb75 1 2024-01-28 10:15:43 +08:00
账号名 27c1944e78 1 2024-01-27 18:08:12 +08:00
yulong b6272794b1 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-27 16:30:55 +08:00
yulong c26236e7e3 2024-01-27 16:30:44 +08:00
账号名 bd9202641f 1 2024-01-27 16:29:50 +08:00
yulong f415a0a032 2024-01-27 16:28:22 +08:00
yulong 6d89f365d3 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-27 15:36:15 +08:00
yulong c306533ca1 频谱 2024-01-27 15:36:05 +08:00