Commit Graph

204 Commits

Author SHA1 Message Date
YangHua 4329de6e01 1 2023-09-18 09:24:36 +08:00
YangHua f72a96b357 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 08:56:44 +08:00
YangHua 8c9978e99f 添加17 2023-09-18 08:56:39 +08:00
康地林 1274c3f4ed 修改验电 2023-09-18 08:55:49 +08:00
YangHua 25975cac72 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 08:50:30 +08:00
YangHua 5d8a6e6333 添加图片 2023-09-18 08:50:26 +08:00
康地林 e2c004fce1 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 08:49:12 +08:00
康地林 bb1964d4c9 给门加碰撞器 2023-09-18 08:49:03 +08:00
YangHua 5198abdd62 融合 2023-09-18 08:44:48 +08:00
YangHua 25661ad46f Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 08:43:38 +08:00
YangHua 1b77b238f7 tttt 2023-09-18 08:43:08 +08:00
康地林 f7c6787aca 提交钳形电流表 2023-09-18 08:42:43 +08:00
YangHua 8e8edbc041 融合 2023-09-18 07:09:25 +08:00
YangHua 093c7ff34d 修改场景 2023-09-18 07:09:02 +08:00
康地林 e67477d2b2 修改预设外部配置电流电压 2023-09-18 07:08:04 +08:00
康地林 715f341761 修复农家乐场景跳转报错问题 2023-09-18 06:21:30 +08:00
康地林 46c5b47239 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 06:18:07 +08:00
康地林 c09c540e0a 提交修改 2023-09-18 06:18:02 +08:00
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
康地林 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