Commit Graph

86 Commits

Author SHA1 Message Date
taosuqi cdd7bf0bfc 6.18日上午提交 2024-06-18 10:47:27 +08:00
taosuqi d59c376ec8 提交6.17 2024-06-17 09:01:50 +08:00
taosuqi a1b20859e4 提交i 2024-06-14 20:39:01 +08:00
taosuqi 62a63a2d73 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-14 20:27:26 +08:00
taosuqi 68af45d974 tijiao 2024-06-14 20:27:21 +08:00
yzx 052971a5f8 提交 2024-06-14 20:14:51 +08:00
yzx bb2791069d 提交 2024-06-14 17:08:48 +08:00
yzx bf8b5a9be1 提交 2024-06-14 13:03:55 +08:00
yzx e26a60e951 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition
# Conflicts:
#	SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json
2024-06-14 09:18:35 +08:00
yzx 75f9488172 提交 2024-06-14 09:18:19 +08:00
taosuqi 7dcc199ec8 taotijiao1 2024-06-14 01:53:38 +08:00
taosuqi 80ed33e142 提交 2024-06-13 19:02:58 +08:00
yzx dc4a1d9537 提交 2024-06-13 19:00:37 +08:00
taosuqi 9b39223027 提交 2024-06-13 18:14:03 +08:00
yzx 4a533b32ae 提交 2024-06-13 18:07:27 +08:00
yzx 3df290f565 提交 2024-06-13 17:41:30 +08:00
taosuqi 2bc1de58da 提交 2024-06-13 17:26:23 +08:00
yzx 31ce55cbef Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition
# Conflicts:
#	SXElectricityInformationAcquisition/Assembly-CSharp.csproj
2024-06-13 17:25:11 +08:00
yzx b52326eff7 提交 2024-06-13 17:24:54 +08:00
taosuqi 576ae2f871 t 2024-06-13 17:24:23 +08:00
yzx 398de6d359 提交 2024-06-13 17:07:54 +08:00
yzx 798549b5f9 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition
# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity
#	SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/StepData.json
2024-06-13 14:51:12 +08:00
yzx 55edaf3b7f 提交 2024-06-13 14:50:45 +08:00
taosuqi d776710141 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-13 14:49:45 +08:00
taosuqi b94a336148 提交 2024-06-13 14:49:40 +08:00
yzx 6e068bde01 提交 2024-06-13 09:26:52 +08:00
taosuqi 1d87accc0d 提交1 2024-06-13 00:08:59 +08:00
taosuqi ed3716930c 提交 2024-06-12 23:53:45 +08:00
taosuqi 2b7f49eb80 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition
# Conflicts:
#	.gitignore
#	SXElectricityInformationAcquisition/Assembly-CSharp.csproj
2024-06-12 23:52:13 +08:00
taosuqi 7335b3fca5 提交 2024-06-12 23:51:49 +08:00
yzx a28431a9ff 提交 2024-06-12 23:46:14 +08:00
taosuqi 61c1974b04 6.12晚上 2024-06-12 23:41:42 +08:00
yzx 5ef503506e 提交 2024-06-12 23:09:38 +08:00
yzx fcb3bc2f8b 提交 2024-06-12 19:56:30 +08:00
yzx 151bdeaf79 提交 2024-06-12 19:43:44 +08:00
yzx e665ad159e 提交 2024-06-12 19:02:14 +08:00
yzx 323984012e 提交 2024-06-12 14:53:57 +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 b07e04ab13 工具设备使用 2024-06-07 18:08:49 +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
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
黄嘉宇 75fedbed15 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-06 17:36:53 +08:00