WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
604 Commits 2 Branches 0 Tags 705 MiB
Commit Graph

594 Commits

Author SHA1 Message Date
liuyu 19e9b34fa1 Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/StreamingAssets/realtimeStat.json
 2024-09-09 08:20:29 +08:00
YangHua fa4ebea54d 修改任务书的读取 2024-09-08 00:42:12 +08:00
YangHua a0b04f7e3b 修复bug 2024-09-08 00:13:02 +08:00
liuyu 6ccdb07928 合并反射保存相关方法 2024-09-07 17:39:49 +08:00
liuyu a66a6f9a3d Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/Scripts/Project/Manager/ReconnectMgr.cs
#	Assets/Scripts/Project/Objects/Other/MobileController.cs
#	Assets/StreamingAssets/realtimeStat.json
 2024-09-07 17:20:23 +08:00
liuyu 5e26973e4e 使用反射保存Trigger状态变量 2024-09-07 17:17:12 +08:00
YangHua 27d6d8100b 修改bug和清楚不需要用到得插件 2024-09-06 20:34:01 +08:00
YangHua b92213307b 修复 重新学习 不能进行下一步得bug 2024-09-06 19:08:00 +08:00
YangHua 9ed10b2a47 q 2024-09-06 17:46:20 +08:00
YangHua 218989210e 1 2024-09-06 17:45:17 +08:00
陈向学 585bf2e774 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-06 17:12:29 +08:00
陈向学 0f63b1c886 jsjsjjs 2024-09-06 17:12:23 +08:00
liuyu a105033700 Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/Scripts/CXX/Score/Score_1002.cs
#	Assets/Scripts/ExcelData/DataContainer/TB_UserExamStat.cs
#	Assets/Scripts/Project/Manager/ReconnectMgr.cs
#	Assets/Scripts/Project/Objects/Other/MobileController.cs
#	Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
 2024-09-06 16:44:28 +08:00
liuyu fad34728af 合并断线重连 2024-09-06 16:43:27 +08:00
YangHua 0edc7cd7cc 融合 2024-09-06 16:09:37 +08:00
YangHua 9402ffb1fd 融合 2024-09-06 16:08:18 +08:00
shengtao 453ca1e068 1 2024-09-06 15:52:03 +08:00
shengtao 3b0e16040c 1 2024-09-06 15:51:51 +08:00
shengtao 2f9a8072ca 1 2024-09-06 15:41:49 +08:00
liuyu b4cf6286a8 添加部分多场景保存 2024-09-06 15:24:48 +08:00
liuyu b280c5d0de 合并准备 2024-09-06 14:55:01 +08:00
liuyu e26450191a Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/StreamingAssets/realtimeStat.json
 2024-09-06 14:51:00 +08:00
YangHua 62549600a4 Merge branch 'main' of http://3d3d5658.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-06 13:58:03 +08:00
YangHua a78f37d7ca 修改 NPC 交互方式 2024-09-06 13:44:40 +08:00
陈向学 729a2d92d8 aaa 2024-09-06 13:40:58 +08:00
shengtao 30de6d2cd6 1 2024-09-06 13:39:50 +08:00
shengtao db874d547e 1 2024-09-06 13:35:04 +08:00
shengtao 1f7b11e990 1 2024-09-06 13:27:07 +08:00
liuyu 0c4162df67 添加对多场景的记录 2024-09-06 13:27:02 +08:00
shengtao cfa5ad0c59 1 2024-09-06 13:26:50 +08:00
shengtao 8730a4083e 1 2024-09-06 13:24:03 +08:00
shengtao 5d0c662573 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-06 13:21:22 +08:00
shengtao b0a4d9de47 1 2024-09-06 13:18:45 +08:00
YangHua c64d8daf2f 修改livescene客户和负责人效果 2024-09-06 13:18:32 +08:00
shengtao 2fa5fdb563 1 2024-09-06 13:17:59 +08:00
liuyu 9e3d0fd4f1 Merge branch 'main' into HQB_workspace 2024-09-06 11:00:25 +08:00
liuyu 5276fcaede 20240906基线2 2024-09-06 11:00:07 +08:00
liuyu 877e3fb7cc 20240906基线 2024-09-06 10:58:09 +08:00
陈向学 2e82cd11a3 优化 2024-09-06 10:10:50 +08:00
liuyu 17067bc33d 新增工单管理类 2024-09-06 10:04:23 +08:00
liuyu 22c974d21c Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/StreamingAssets/realtimeStat.json
 2024-09-06 09:07:35 +08:00
liuyu 27c356ba28 111 2024-09-06 08:18:31 +08:00
陈向学 2ecebd6a3f aa 2024-09-05 20:23:20 +08:00
liuyu 824bc36529 111 2024-09-05 19:51:41 +08:00
陈向学 9d731799cb ll 2024-09-05 19:31:08 +08:00
YangHua 93f2b5ad2c 整理目录，剔除多余模型 2024-09-05 18:57:00 +08:00
liuyu d38e193431 修复从现场回到工具间拿取的工具不消失的bug 2024-09-05 17:25:37 +08:00
陈向学 5a91f10875 电能表 2024-09-05 15:56:23 +08:00
陈向学 bf1eacad77 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-05 15:10:22 +08:00
陈向学 8f905f2787 科目2 2024-09-05 15:10:19 +08:00