Commit Graph

141 Commits

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