 YangHua
|
737acb5a7b
|
修改工作卡
|
2023-09-17 14:40:06 +08:00 |
 康地林
|
58df5fb8e6
|
提交预设修改
|
2023-09-17 14:31:50 +08:00 |
 huangjiayu
|
7f1dc553a1
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-17 12:21:13 +08:00 |
|
huangjiayu
|
2952b9d61a
|
buxuyao
|
2023-09-17 12:21:06 +08:00 |
|
康地林
|
5df2cdb664
|
提交电箱预设
|
2023-09-17 12:19:04 +08:00 |
|
康地林
|
218cfa3de9
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-17 12:02:39 +08:00 |
|
康地林
|
7d0cf17ddc
|
提交电流表预设
|
2023-09-17 12:02:26 +08:00 |
|
huangjiayu
|
013d7eb842
|
上传
|
2023-09-17 12:01:32 +08:00 |
|
huangjiayu
|
13d1868784
|
修改铭牌弹窗
|
2023-09-17 11:49:18 +08:00 |
|
huangjiayu
|
b041c3bd5f
|
改铭牌
|
2023-09-17 11:37:00 +08:00 |
|
huangjiayu
|
437cc64ce8
|
融合
|
2023-09-17 11:32:36 +08:00 |
|
huangjiayu
|
7835c20f8a
|
123
|
2023-09-17 11:30:49 +08:00 |
|
康地林
|
084bbac10c
|
提交钳形电流表逻辑
|
2023-09-17 11:28:54 +08:00 |
|
康地林
|
61e7bde1a9
|
推送融合
|
2023-09-17 11:04:14 +08:00 |
|
huangjiayu
|
08666dfb46
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-17 02:21:54 +08:00 |
|
huangjiayu
|
1634fd3c3c
|
123
|
2023-09-17 02:21:34 +08:00 |
|
康地林
|
4cf69a5f30
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-17 02:19:59 +08:00 |
|
康地林
|
fb47d96870
|
提交逻辑
|
2023-09-17 02:19:49 +08:00 |
|
huangjiayu
|
dceefa77f2
|
工具包 Tips 弹窗
|
2023-09-17 01:07:11 +08:00 |
|
康地林
|
8efe925d20
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-17 00:19:20 +08:00 |
|
康地林
|
c19903a1b5
|
修复钳形电流表，修复分数逻辑
|
2023-09-17 00:19:12 +08:00 |
|
YangHua
|
5d476f941d
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-16 23:57:18 +08:00 |
|
YangHua
|
27597ba5c4
|
修改UI
|
2023-09-16 23:57:11 +08:00 |
|
huangjiayu
|
142fe3204f
|
电箱动画修改
|
2023-09-16 23:56:13 +08:00 |
|
huangjiayu
|
e541ef2502
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-16 23:45:19 +08:00 |
|
huangjiayu
|
f15cdabf94
|
xiugai 工具间铭牌
|
2023-09-16 23:44:48 +08:00 |
|
康地林
|
33f584fbc0
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-16 23:39:06 +08:00 |
|
康地林
|
5eb98ba499
|
提交钳形电流表
|
2023-09-16 23:38:54 +08:00 |
|
YangHua
|
cb555d7071
|
1
|
2023-09-16 23:26:43 +08:00 |
|
YangHua
|
4395a64572
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-16 23:24:36 +08:00 |
|
YangHua
|
c3f218d838
|
改工作证
|
2023-09-16 23:24:05 +08:00 |
|
huangjiayu
|
90aa172a8f
|
xiugai prefabs
|
2023-09-16 22:41:47 +08:00 |
|
huangjiayu
|
2cc1fa2c7b
|
1212
|
2023-09-16 22:19:27 +08:00 |
|
huangjiayu
|
2d310695e9
|
修改冲突
|
2023-09-16 22:13:08 +08:00 |
|
huangjiayu
|
6635e9013a
|
1
|
2023-09-16 22:11:31 +08:00 |
|
康地林
|
013e374928
|
融合
|
2023-09-16 22:03:58 +08:00 |
|
康地林
|
942c1f386b
|
1
|
2023-09-16 22:01:47 +08:00 |
|
YangHua
|
f3f8eb6dac
|
还原电流表
|
2023-09-16 21:48:18 +08:00 |
|
YangHua
|
f7bdeededb
|
1
|
2023-09-16 21:32:47 +08:00 |
|
YangHua
|
5e7cab268c
|
融合
|
2023-09-16 21:30:34 +08:00 |
|
YangHua
|
73c70b3d28
|
添加试卷接口，修改跳场景逻辑。
|
2023-09-16 21:29:09 +08:00 |
|
康地林
|
bb4ab95cfe
|
提交
|
2023-09-16 17:45:14 +08:00 |
|
康地林
|
69f42b46fa
|
提交融合
|
2023-09-16 16:21:51 +08:00 |
|
康地林
|
4bba746adf
|
完成万用表
|
2023-09-16 16:20:56 +08:00 |
|
康地林
|
eb7bebd470
|
提交万用表逻辑
|
2023-09-16 10:08:35 +08:00 |
 王军
|
272dc3f8f4
|
钳形电流表
|
2023-09-16 00:27:36 +08:00 |
|
王军
|
7fbff9c39d
|
电表模型修改
|
2023-09-16 00:26:39 +08:00 |
|
康地林
|
f34d66c0c4
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-15 22:10:17 +08:00 |
|
康地林
|
290596ddf9
|
提交拆电箱逻辑
|
2023-09-15 22:10:10 +08:00 |
|
王军
|
0c0888cbb4
|
wanyongbiao
|
2023-09-15 22:04:26 +08:00 |
|
王军
|
909132cc03
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-15 21:01:25 +08:00 |
|
王军
|
18913724ca
|
diangui
|
2023-09-15 21:01:06 +08:00 |
|
康地林
|
6cdc87bc89
|
融合工具间
|
2023-09-15 20:52:55 +08:00 |
|
康地林
|
8b3831e23a
|
完成万用表
|
2023-09-15 20:52:04 +08:00 |
|
王军
|
b901ea699f
|
qianxingdianliubiao
|
2023-09-15 20:45:38 +08:00 |
|
王军
|
9a4334690e
|
123
|
2023-09-15 19:43:55 +08:00 |
|
康地林
|
30f82bbb61
|
融合
|
2023-09-15 18:39:41 +08:00 |
|
康地林
|
584b055077
|
提交农家乐修改
|
2023-09-15 18:38:41 +08:00 |
|
王军
|
54fb77f38d
|
123
|
2023-09-15 18:37:05 +08:00 |
|
康地林
|
fbc8343d11
|
提交万用表
|
2023-09-15 18:25:48 +08:00 |
|
王军
|
dd10794e01
|
场景修改
|
2023-09-15 16:39:30 +08:00 |
|
康地林
|
7311401cd8
|
Merge branch 'master' of http://git.lgzn.space/zhuyayu/E_ElecCompetition
|
2023-09-15 16:23:40 +08:00 |
|
康地林
|
d6f95bde67
|
修改旋转逻辑
|
2023-09-15 16:23:32 +08:00 |
|
YangHua
|
60f99262f5
|
1
|
2023-09-15 16:00:45 +08:00 |
|
YangHua
|
c327fe304f
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-15 16:00:19 +08:00 |
|
YangHua
|
c3555b69f6
|
修改接口名称
|
2023-09-15 15:59:55 +08:00 |
|
康地林
|
113ac5bcda
|
融合
|
2023-09-15 15:25:52 +08:00 |
|
康地林
|
518100b338
|
提交UI旋转
|
2023-09-15 15:23:45 +08:00 |
|
YangHua
|
cddaae062f
|
添加收回工具
|
2023-09-15 15:22:45 +08:00 |
|
YangHua
|
feb1e24d2f
|
添加贴图
|
2023-09-15 10:57:28 +08:00 |
|
YangHua
|
b2ac158b81
|
融合修改bug
|
2023-09-15 09:42:56 +08:00 |
|
康地林
|
4fbaa34c48
|
融合
|
2023-09-15 00:07:18 +08:00 |
|
康地林
|
ef6d939f8b
|
提交预设
|
2023-09-15 00:05:55 +08:00 |
|
王军
|
de34c73a53
|
meishu
|
2023-09-14 23:57:35 +08:00 |
|
王军
|
f6bfbb9c60
|
融合
|
2023-09-14 23:54:37 +08:00 |
|
王军
|
397f9f161d
|
123
|
2023-09-14 23:44:40 +08:00 |
|
康地林
|
f7140059a9
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-14 23:09:49 +08:00 |
|
康地林
|
fa3248e8a6
|
修改了3D场景
|
2023-09-14 23:04:44 +08:00 |
|
YangHua
|
1cfa1ba24e
|
融合
|
2023-09-14 22:56:36 +08:00 |
|
YangHua
|
6f6039ff60
|
串逻辑
|
2023-09-14 22:54:26 +08:00 |
|
康地林
|
6396b9294c
|
提交一个版本，准备开始压缩贴图优化场景
|
2023-09-14 21:04:15 +08:00 |
|
康地林
|
25cef5bd8f
|
更新线缆贴图问题
|
2023-09-14 17:12:49 +08:00 |
|
王军
|
ccb966c1b2
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-14 16:50:01 +08:00 |
|
王军
|
d3cc726b93
|
123
|
2023-09-14 16:49:48 +08:00 |
|
康地林
|
ceb7a44d9b
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-14 16:47:17 +08:00 |
|
康地林
|
39b6b419ab
|
提交农家乐
|
2023-09-14 16:47:03 +08:00 |
|
YangHua
|
0a26adf9d3
|
串UI
|
2023-09-14 16:45:22 +08:00 |
|
YangHua
|
aa73d16fb2
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-14 15:22:11 +08:00 |
|
YangHua
|
3c0af738e5
|
任务书接口
|
2023-09-14 15:13:22 +08:00 |
|
王军
|
df8fef1f0e
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-14 15:13:06 +08:00 |
|
YangHua
|
0e1424e037
|
添加任务书接口
|
2023-09-14 15:13:06 +08:00 |
|
王军
|
e70fdac83e
|
H场景替换
|
2023-09-14 15:12:53 +08:00 |
|
YangHua
|
06a144fb6a
|
添加toolmodelclick委托方法。
|
2023-09-14 14:41:03 +08:00 |
|
王军
|
033076790f
|
ronghe
|
2023-09-14 13:33:28 +08:00 |
|
王军
|
b8ebd27711
|
H场景修改
|
2023-09-14 13:31:33 +08:00 |
|
YangHua
|
a29c15e24f
|
Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition
|
2023-09-14 13:29:22 +08:00 |
|
YangHua
|
23ed19bfff
|
串UI逻辑
|
2023-09-14 13:28:58 +08:00 |
|
康地林
|
8112365957
|
修改相机滚轮无法放大问题
|
2023-09-14 11:32:03 +08:00 |
|
康地林
|
bf398d3ad2
|
提交GameManager
|
2023-09-14 10:41:23 +08:00 |
|
YangHua
|
6002315ece
|
修改工具间
|
2023-09-14 09:54:44 +08:00 |