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

208 Commits

Author SHA1 Message Date
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