Commit Graph

233 Commits

Author SHA1 Message Date
YangHua f7764c025b 修改贴图 2023-09-19 10:38:27 +08:00
YangHua 0266651c75 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 15:15:24 +08:00
YangHua bfd932d742 关闭UI 2023-09-18 15:15:15 +08:00
康地林 b0daa8dfa8 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 14:19:04 +08:00
康地林 2876bb1c44 修改工具间滚轮无法使用问题、新增碰撞器 2023-09-18 14:18:54 +08:00
huangjiayu c62ed6b611 123 2023-09-18 14:14:14 +08:00
huangjiayu 649db2aba5 不需要 2023-09-18 14:13:45 +08:00
康地林 e98598bae3 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 13:59:05 +08:00
康地林 7c84684ecd 提交电流接入后台 2023-09-18 13:58:57 +08:00
YangHua 5f0f79ef59 修改工作卡 2023-09-18 11:55:47 +08:00
YangHua 6a2a064934 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 10:59:30 +08:00
YangHua 8b16173c29 修改接口 2023-09-18 10:59:25 +08:00
康地林 1be9e36eab Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 10:58:29 +08:00
康地林 04062f18cf 材质修改 2023-09-18 10:58:15 +08:00
YangHua 9751eb492c 修改文件 2023-09-18 10:34:12 +08:00
YangHua e017acf204 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 09:24:46 +08:00
YangHua 4329de6e01 1 2023-09-18 09:24:36 +08:00
康地林 16547138ca 提交修改逻辑 2023-09-18 09:10:42 +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
康地林 7cf1a6ba2b Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-18 08:42:52 +08:00
康地林 f7c6787aca 提交钳形电流表 2023-09-18 08:42:43 +08:00
huangjiayu d5308e7249 132 2023-09-18 08:08:53 +08:00
huangjiayu 9ffdcfe1b4 buxuyao 2023-09-18 08:08:20 +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 28dfae8927 12121 2023-09-18 06:17:22 +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