Commit Graph

94 Commits

Author SHA1 Message Date
taosuqi 61c1974b04 6.12晚上 2024-06-12 23:41:42 +08:00
taosuqi c78c8a12d2 6.12下午json提交 2024-06-12 15:15:15 +08:00
yzx 9b9874de4c Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition
# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Screwdriver.cs
2024-06-12 14:54:17 +08:00
yzx 323984012e 提交 2024-06-12 14:53:57 +08:00
taosuqi 368c0eaf35 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-12 13:43:29 +08:00
taosuqi 64f95e7533 6.12上午修改动画 2024-06-12 13:42:57 +08:00
yzx 7d6745dd3e 提交 2024-06-12 13:22:53 +08:00
yzx 5ad1d14b3d 提交 2024-06-12 10:34:39 +08:00
taosuqi b2c7b7badb Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-11 18:21:47 +08:00
taosuqi 818f4f1693 今日:
1,用电信息采集终端- 接线盒交互100%
2,用电信息采集终端- 绝缘胶带使用 100%
3,用电信息采集终端- 集中器和电能表操作100%
明日:
1、用电信息采集终端- 设备响应
问题:
无
2024-06-11 18:20:29 +08:00
yzx 20f7a248e0 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-11 10:25:14 +08:00
yzx 428b069e7c 提交 2024-06-11 10:17:10 +08:00
taosuqi aa7e191cb4 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-07 18:09:46 +08:00
taosuqi b07e04ab13 工具设备使用 2024-06-07 18:08:49 +08:00
yzx 8b09b91692 提交 2024-06-07 16:35:50 +08:00
yzx 6a6d8ff203 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-07 16:35:22 +08:00
yzx a5b4471567 异常记录和步骤 2024-06-07 16:35:17 +08:00
黄嘉宇 51da0498ed Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-07 10:53:17 +08:00
黄嘉宇 ada5dd5131 绝缘胶带效果 2024-06-07 10:53:05 +08:00
yzx 43f48c0d7d Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-07 10:44:17 +08:00
yzx 44cfb049fc 提交 2024-06-07 10:44:08 +08:00
黄嘉宇 386e2d6a23 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-07 10:41:38 +08:00
黄嘉宇 a05d19f924 插座上传 2024-06-07 10:41:31 +08:00
taosuqi 13f51955ca Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-06 18:12:41 +08:00
taosuqi cd992ac9ef 1,用电信息采集终端- 梯子功能的制作及梯子预制体100%
2,用电信息采集终端- 工作证功能制作及工作证预制体 100%
3,用电信息采集终端- 剥线钳功能的制作及剥线钳和封印交互的动画100%
明日:
1、用电信息采集终端- 螺丝刀预制体制作及使用
问题:
无
2024-06-06 18:12:04 +08:00
黄嘉宇 44c4325c28 UItianjia 2024-06-06 18:04:25 +08:00
黄嘉宇 c67b5a5604 高亮效果调整,工作证UI 2024-06-06 17:50:33 +08:00
黄嘉宇 7f7e9fbce1 工具修改 2024-06-06 17:38:14 +08:00
黄嘉宇 75fedbed15 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-06 17:36:53 +08:00
黄嘉宇 9a16ab6ab1 工具UI 2024-06-06 17:36:23 +08:00
黄嘉宇 ad3a07a2ef 工具UI提交 2024-06-06 17:35:44 +08:00
yzx d4fc0b6c86 1 2024-06-06 17:34:43 +08:00
yzx 55a3ac2b04 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition
# Conflicts:
#	SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln
2024-06-06 17:07:07 +08:00
yzx bfc83ada21 1 2024-06-06 17:06:43 +08:00
taosuqi cba98f1fdb 111 2024-06-06 17:06:19 +08:00
taosuqi 2e2ba4fbd2 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition
# Conflicts:
#	SXElectricityInformationAcquisition/Assembly-CSharp.csproj
2024-06-06 16:58:43 +08:00
taosuqi 3b99a0303e 2024.工具修改 2024-06-06 16:57:52 +08:00
yzx 41bf965b9e Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-06 16:56:18 +08:00
yzx 5817182f9b 1 2024-06-06 16:56:12 +08:00
taosuqi a8e0db2efa Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition
# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Model/工具/剥线钳.fbx.meta
2024-06-06 16:47:42 +08:00
taosuqi 675b52902c 6.6taoruiqi 2024-06-06 16:42:48 +08:00
黄嘉宇 d7ba5c9e14 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-06 16:34:48 +08:00
黄嘉宇 e2461cfdae 剥线钳动画更新 2024-06-06 16:34:02 +08:00
yzx bd72c248d2 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition
# Conflicts:
#	SXElectricityInformationAcquisition/Assembly-CSharp-firstpass.csproj
#	SXElectricityInformationAcquisition/MotionFramework.csproj
#	SXElectricityInformationAcquisition/NaughtyAttributes.Core.csproj
#	SXElectricityInformationAcquisition/NaughtyAttributes.Editor.csproj
#	SXElectricityInformationAcquisition/NaughtyAttributes.Test.csproj
#	SXElectricityInformationAcquisition/UniTask.Addressables.csproj
#	SXElectricityInformationAcquisition/UniTask.DOTween.csproj
#	SXElectricityInformationAcquisition/UniTask.Editor.csproj
#	SXElectricityInformationAcquisition/UniTask.Linq.csproj
#	SXElectricityInformationAcquisition/UniTask.TextMeshPro.csproj
#	SXElectricityInformationAcquisition/UniTask.csproj
2024-06-06 11:10:36 +08:00
yzx eb89b8fb4e 提交 2024-06-06 11:10:16 +08:00
黄嘉宇 23c370373f Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition
# Conflicts:
#	SXElectricityInformationAcquisition/Assembly-CSharp.csproj
2024-06-05 20:19:52 +08:00
黄嘉宇 ed9aa87568 现场效果更改 2024-06-05 20:18:49 +08:00
yzx 6bec33342d Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-05 20:17:17 +08:00
yzx 63970152cb 提交 2024-06-05 20:17:12 +08:00
taosuqi a381342ae1 12 2024-06-05 19:13:21 +08:00