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 ce4bd14983 提交 2024-06-28 10:12:19 +08:00
yzx 731a39f598 提交 2024-06-27 13:50:22 +08:00
yzx 6cafd313bf 提交 2024-06-26 20:50:31 +08:00
yzx 2b71151098 提交 2024-06-26 18:24:53 +08:00
yzx 09762597b9 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-26 18:01:23 +08:00
yzx df4df723da 提交 2024-06-26 18:01:18 +08:00
2274240467@qq.com e4af0fdece Merge branch 'SXElectricityInformationAcquisition' of http://git.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-26 18:00:04 +08:00
2274240467@qq.com 6dd562409e 6.26下班提交 2024-06-26 17:59:52 +08:00
yzx 0a618fea1e 提交 2024-06-26 17:56:57 +08:00
yzx 3434509790 提交 2024-06-26 17:01:36 +08:00
yzx 097f748cfa 提交 2024-06-26 16:46:25 +08:00
yzx 260a04d25c 提交 2024-06-26 16:37:45 +08:00
yzx c1b3326030 提交 2024-06-26 14:43:47 +08:00
yzx 9653235011 t 2024-06-26 09:02:42 +08:00
yzx 8d21e5647b 提交 2024-06-25 09:19:37 +08:00
yzx 0348933c7c Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-24 17:46:46 +08:00
yzx 9ed39a9382 提交 2024-06-24 17:46:41 +08:00
2274240467@qq.com 9f3153ee9d json修改提交 2024-06-24 17:26:28 +08:00
2274240467@qq.com 23c9956b7d Merge branch 'SXElectricityInformationAcquisition' of http://git.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-24 15:33:31 +08:00
2274240467@qq.com 3299d18947 6.24下午单独场景 2024-06-24 15:33:23 +08:00
yzx 2495a252f9 提交 2024-06-24 14:44:21 +08:00
yzx e499103b4e 提交 2024-06-24 14:36:37 +08:00
yzx 8338b2dbc0 提交 2024-06-24 14:29:45 +08:00
2274240467@qq.com 4023a75f52 6.23修改 2024-06-23 19:05:53 +08:00
2274240467@qq.com 1a0b71dd82 6.22晚上提交 2024-06-22 22:23:12 +08:00
2274240467@qq.com 862e2c955f 6.21九点提交 2024-06-21 21:09:49 +08:00
2274240467@qq.com 1de45c5b3c Merge branch 'SXElectricityInformationAcquisition' of http://git.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-21 18:57:43 +08:00
2274240467@qq.com 878d6cd25b 6.21晚提交 2024-06-21 18:57:26 +08:00
yzx fca9260597 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-21 17:35:18 +08:00
yzx 0d1767ad0a 提交 2024-06-21 17:35:13 +08:00
2274240467@qq.com 39c7139c68 Merge branch 'SXElectricityInformationAcquisition' of http://git.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-21 15:51:32 +08:00
2274240467@qq.com 15996bf6fc 提交集中器ui图片 2024-06-21 15:51:19 +08:00
黄嘉宇 c6a75a5817 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 2024-06-21 14:45:25 +08:00
黄嘉宇 1b311d2571 验电笔材质球修改 2024-06-21 14:45:18 +08:00
2274240467@qq.com 8e36f64580 621下午 2024-06-21 14:27:10 +08:00
2274240467@qq.com e03bf24ded 6.21中午提交 2024-06-21 14:19:50 +08:00
黄嘉宇 aab0b3f40d Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 
# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Model/工具/Mat/遮罩材质球/Electroprobe_mat.mat
 2024-06-21 14:07:46 +08:00
黄嘉宇 593d8fede8 1 2024-06-21 14:07:19 +08:00
黄嘉宇 6e9e22607d 123 2024-06-21 13:58:37 +08:00
yzx d36d5af466 提交 2024-06-21 13:56:42 +08:00
黄嘉宇 bf62aaa362 1 2024-06-21 13:52:52 +08:00
黄嘉宇 6a40240939 材质修改 2024-06-21 10:39:25 +08:00
taosuqi 7ec722979d u 2024-06-21 10:17:47 +08:00
yzx df39d26ef4 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition 
# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Model/工具/Prefab/验电笔.prefab
 2024-06-21 10:15:54 +08:00
yzx ebbcb2400b 提交 2024-06-21 10:15:40 +08:00
2274240467@qq.com 91dd956bbf 6.20晚修改提交 2024-06-20 23:51:09 +08:00
taosuqi 10a0e293f5 1 2024-06-20 09:33:31 +08:00
taosuqi 44841a876e 1 2024-06-20 09:29:32 +08:00
taosuqi 3d8a8346c5 6.20上午提交tsq 2024-06-20 09:13:38 +08:00
yzx ee2bdaacaf 提交 2024-06-19 18:01:58 +08:00
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