huangjiayu
/
ShanxiKnowledgeBase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
256 Commits 8 Branches 0 Tags 7 GiB
Commit Graph

253 Commits

Author SHA1 Message Date
yzx 4366914e60 修改模式 2024-06-19 09:55:49 +08:00
taosuqi ebeccad778 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-18 16:08:15 +08:00
taosuqi 62c7ff8c35 t 2024-06-18 16:08:09 +08:00
yzx 6f5212a27d Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-18 16:05:55 +08:00
yzx 32558e1684 提交 2024-06-18 16:05:50 +08:00
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 22720a0970 提交 2024-06-14 20:21:09 +08:00
yzx 052971a5f8 提交 2024-06-14 20:14:51 +08:00
yzx 500317e3b7 提交 2024-06-14 18:06:23 +08:00
yzx 21ca8b17f1 提交 2024-06-14 17:57:29 +08:00
yzx 8b1fbb9d09 提交 2024-06-14 17:15:49 +08:00
yzx 81456dab25 提交 2024-06-14 17:12:11 +08:00
yzx bb2791069d 提交 2024-06-14 17:08:48 +08:00
黄嘉宇 fd73c710dd 人模上传 2024-06-14 14:10:36 +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
yzx 1cf7f71f98 提交 2024-06-13 20:31:02 +08:00
taosuqi 80ed33e142 提交 2024-06-13 19:02:58 +08:00
yzx dc4a1d9537 提交 2024-06-13 19:00:37 +08:00
yzx 3a802809f5 提交 2024-06-13 18:29:51 +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 a72329ab4f 提交 2024-06-13 17:15:51 +08:00
yzx 398de6d359 提交 2024-06-13 17:07:54 +08:00
黄嘉宇 830011f6d8 闪烁灯光材质 2024-06-13 16:09:27 +08:00
yzx 925e787d89 提交 2024-06-13 15:28:04 +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 04c0282792 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 
# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity
 2024-06-12 23:47:11 +08:00
yzx a28431a9ff 提交 2024-06-12 23:46:14 +08:00
taosuqi 55fca97f42 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 
# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity
 2024-06-12 23:43:59 +08:00
taosuqi 61c1974b04 6.12晚上 2024-06-12 23:41:42 +08:00
yzx d47354bbbc 提交 2024-06-12 23:35:47 +08:00
yzx db0a7e0ec8 提交 2024-06-12 23:35:35 +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 0a531125b2 提交 2024-06-12 18:01:35 +08:00
yzx 4fece283a9 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-12 15:15:55 +08:00
yzx 605bdd2f96 提交 2024-06-12 15:15:50 +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
taosuqi a300ca94c8 2024.6.5TSQ 2024-06-05 18:32:15 +08:00
yzx 5020941175 提交 2024-06-05 17:06:34 +08:00
taosuqi 79e111769e 15.47 2024-06-05 15:47:28 +08:00
taosuqi 06c1afdb6d 11 2024-06-05 15:38:23 +08:00
yzx a4453c89e2 提交 2024-06-05 14:37:04 +08:00
yzx e930863288 提交 2024-06-05 14:23:47 +08:00
yzx 4c15139ca8 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-05 14:22:59 +08:00
yzx 647e170f5c 工具箱开发完成 2024-06-05 14:22:53 +08:00
黄嘉宇 a636c134e2 2024.6.5现场模型更新 2024-06-05 13:07:52 +08:00
yzx 46f1f02cdc 提交 2024-06-05 10:50:00 +08:00
yzx c24ecff39c Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-05 10:49:27 +08:00
yzx 287973be2a 开发完成背包功能 2024-06-05 10:49:21 +08:00
黄嘉宇 1315f118ff 材质修改 2024-06-05 00:29:28 +08:00
黄嘉宇 a5faf89ff9 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-05 00:18:10 +08:00
黄嘉宇 5783343c3e 2024.6.5H替换剥线钳，放大剥线钳及螺丝刀模型 2024-06-05 00:17:56 +08:00
yzx 9e2177f4fa 提交 2024-06-04 20:52:40 +08:00
yzx 9bcec30603 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 
# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
 2024-06-04 20:14:06 +08:00
yzx dcbecd6c46 提交 2024-06-04 20:13:51 +08:00
黄嘉宇 86dedea73f 2024.6.4工器具室修改 2024-06-04 20:13:02 +08:00
黄嘉宇 6c96e20746 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-04 17:47:53 +08:00
黄嘉宇 f16eec42ec 集中器模型替换 2024-06-04 17:47:43 +08:00
yzx b7e134b86f Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 
# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
 2024-06-04 17:38:03 +08:00
yzx 80a715244e 提交 2024-06-04 17:37:44 +08:00
黄嘉宇 fc0c77ea65 2024.6.4增加剥线钳动画 2024-06-04 17:36:54 +08:00
黄嘉宇 18f165b494 2024.6.4工器具间修改，增加剥线钳动画 2024-06-04 17:36:29 +08:00
黄嘉宇 a4fd868505 碰撞体修改 2024-06-04 16:51:30 +08:00
yzx de2323f262 提交 2024-06-04 16:46:04 +08:00
yzx b57f870783 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 
# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
 2024-06-04 16:18:59 +08:00
yzx a4d96b0578 提交 2024-06-04 16:18:40 +08:00
黄嘉宇 535246e0ba Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-04 16:17:33 +08:00
黄嘉宇 1510aa3a11 2024.6.4工器具间修改 2024-06-04 16:17:16 +08:00
yzx 57d230cf8f Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-04 11:28:48 +08:00
yzx 03dc9bc2c1 提交 2024-06-04 11:28:41 +08:00
黄嘉宇 13a2ee04d0 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 
# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Model/Man/Mat/无安全帽.mat
#	SXElectricityInformationAcquisition/Assets/Model/Man/Mat/无手套.mat
 2024-06-04 10:26:25 +08:00
黄嘉宇 3b8d40b70f HHHHxiugai 2024-06-04 10:25:26 +08:00
yzx 2c7752c463 人物穿戴材质球Resources 2024-06-04 10:23:25 +08:00
yzx be7a05a650 材质球更改 2024-06-04 09:06:53 +08:00
yzx 7b4359ce7e Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-03 20:43:58 +08:00
yzx 4818929da0 提交 2024-06-03 20:43:51 +08:00
黄嘉宇 44681f3123 2024.6.3人模及安全帽手套提交 2024-06-03 20:04:49 +08:00
yzx e0a7d515be 提交 2024-06-03 18:04:30 +08:00
yzx 619e1bfa51 提交 2024-06-03 15:01:18 +08:00