Commit Graph

244 Commits

Author SHA1 Message Date
YangHua 6e777986de Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 06:14:19 +08:00
YangHua 8c9dd59fb1 同步 2023-09-18 06:14:14 +08:00
康地林 d617f071c6 修改跳转场景的接口 2023-09-18 06:05:51 +08:00
康地林 f3a1aebd16 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 05:34:23 +08:00
康地林 a7b9b97008 提交视距拉近的更改 2023-09-18 05:34:17 +08:00
YangHua cbd5daa7b9 ttt 2023-09-18 05:34:11 +08:00
YangHua e2def4c258 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 05:17:41 +08:00
YangHua 5b78fa471f 修改光伏prefab 2023-09-18 05:17:04 +08:00
康地林 c888f38cdd 提交二十项修改 2023-09-18 05:16:49 +08:00
康地林 3ef7121059 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 03:30:25 +08:00
康地林 23361e6390 提交碰撞器修改 2023-09-18 03:30:19 +08:00
YangHua 2de18d7595 变更接口 2023-09-18 03:27:55 +08:00
YangHua eb10c13929 修改一些问题 2023-09-18 03:17:17 +08:00
康地林 205ca15420 提交修改 2023-09-18 03:14:00 +08:00
康地林 1368b51a80 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 00:06:22 +08:00
YangHua dea01887b4 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 00:05:52 +08:00
YangHua 90f60ff01e 添加收回接口 2023-09-18 00:05:43 +08:00
康地林 0fe5010b1e 提交钳形电流表UI修改 2023-09-18 00:05:23 +08:00
huangjiayu d27a4effd6 123 2023-09-17 23:44:21 +08:00
huangjiayu 45b56f797f buxuyao 2023-09-17 23:43:38 +08:00
康地林 3fc18846cd Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-17 23:41:37 +08:00
康地林 0796fbb89f 修改bug 2023-09-17 23:41:30 +08:00
YangHua 544b3bbf6b 修复tips问题 2023-09-17 23:40:58 +08:00
YangHua ea5d36afc7 添加遮罩 2023-09-17 23:36:55 +08:00
YangHua 6693f3095a 融合 2023-09-17 23:20:05 +08:00
YangHua 98e448f34c 修改jobcard 2023-09-17 23:19:37 +08:00
huangjiayu 0c4b0be22a Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-17 23:18:50 +08:00
huangjiayu 54f43609ff UI Input 2023-09-17 23:18:39 +08:00
YangHua 228070da3f Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-17 21:21:46 +08:00
YangHua f1da03ba63 修改tips 2023-09-17 21:21:36 +08:00
康地林 3ce6cf872e 提交电箱,及剩余判分逻辑 2023-09-17 21:21:03 +08:00
YangHua 18c89e51f5 修改工具 2023-09-17 20:38:06 +08:00
YangHua b5f8d3b593 添加tips 2023-09-17 20:37:05 +08:00
康地林 dce69c296d 提交完成 2023-09-17 20:30:32 +08:00
康地林 70b29a563e 提交修改后的GamneManager 2023-09-17 17:20:17 +08:00
YangHua d90489fd56 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-17 17:06:34 +08:00
YangHua e84e8a46d8 修改高亮 2023-09-17 17:06:30 +08:00
康地林 65ba84e688 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-17 17:05:14 +08:00
康地林 d123ad5a46 提交验电笔 2023-09-17 17:05:07 +08:00
YangHua 1c3078e371 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-17 16:45:23 +08:00
YangHua 1eca210fc0 添加图片 2023-09-17 16:45:17 +08:00
huangjiayu 922dd5c6a1 123 2023-09-17 16:41:20 +08:00
huangjiayu 517e50cac5 修改脚本 2023-09-17 16:40:47 +08:00
康地林 621d6fb702 提交相机修改,修改相位伏安表UI 2023-09-17 16:39:06 +08:00
huangjiayu 5f1c5a01b5 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-17 15:56:22 +08:00
huangjiayu cd5ac9e432 修改 三相_有互感器_无光伏 2023-09-17 15:56:04 +08:00
康地林 072f03087d Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-17 15:54:38 +08:00
康地林 5e9052d137 提交万用表逻辑 2023-09-17 15:54:23 +08:00
huangjiayu 227ca91659 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-17 14:42:18 +08:00
huangjiayu 0e0dec8040 修改Ui 2023-09-17 14:41:57 +08:00