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

98 Commits

Author SHA1 Message Date
liuyu 5e26973e4e 使用反射保存Trigger状态变量 2024-09-07 17:17:12 +08:00
liuyu e26450191a Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/StreamingAssets/realtimeStat.json
 2024-09-06 14:51:00 +08:00
YangHua c64d8daf2f 修改livescene客户和负责人效果 2024-09-06 13:18:32 +08:00
liuyu 9e3d0fd4f1 Merge branch 'main' into HQB_workspace 2024-09-06 11:00:25 +08:00
陈向学 2e82cd11a3 优化 2024-09-06 10:10:50 +08:00
liuyu 22c974d21c Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/StreamingAssets/realtimeStat.json
 2024-09-06 09:07:35 +08:00
陈向学 9d731799cb ll 2024-09-05 19:31:08 +08:00
陈向学 5a91f10875 电能表 2024-09-05 15:56:23 +08:00
陈向学 8f905f2787 科目2 2024-09-05 15:10:19 +08:00
陈向学 5684b01a10 x 2024-09-05 13:59:56 +08:00
liuyu 939810213c Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/Scenes/01_InitScene.unity
#	Assets/Scripts/CXX/Devices/杂/低压电流互感器/Device_LowVoltageCurrentTransformer.cs
#	Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
#	Assets/Scripts/CXX/Score/ScoreBase.cs
#	Assets/Scripts/Project/Manager/ReconnectMgr.cs
#	Assets/Scripts/Project/Objects/Other/NPCController.cs
#	Assets/StreamingAssets/realtimeStat.json
#	Assets/StreamingAssets/realtimeStat.json.meta
 2024-09-05 13:45:27 +08:00
liuyu 9ca554ab57 抽象类改virtual 2024-09-05 13:41:34 +08:00
陈向学 734c49f6ed ssss 2024-09-05 13:22:56 +08:00
liuyu 0b6a393e81 保存读取trigger状态 2024-09-05 13:05:31 +08:00
liuyu b0d1ac0edd 添加Trigger状态记录函数 2024-09-05 11:14:16 +08:00
YangHua 8eacd5c099 Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-04 15:56:29 +08:00
YangHua 52bd5396a9 修改常驻基类 2024-09-04 15:55:52 +08:00
陈向学 dd97946d12 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-04 15:25:44 +08:00
YangHua 551ce83487 修改穿透问题 2024-09-04 15:24:48 +08:00
陈向学 e67b5836a1 新科目 2024-09-04 15:12:10 +08:00
陈向学 57b484c906 改动修复 2024-09-04 10:03:33 +08:00
陈向学 e66378f5f0 aaa 2024-09-03 20:00:30 +08:00
陈向学 7d6b942a8a aa 2024-09-03 18:31:51 +08:00
陈向学 0aa001c950 现场设备大改，科目2 2024-09-03 17:57:49 +08:00
陈向学 316a5c2b8f 门交互 2024-09-02 10:49:35 +08:00
YangHua 1444dc395f 修改 接线完好不高亮问题 2024-08-30 18:35:28 +08:00
陈向学 0966d0e826 aaaa 2024-08-30 18:06:33 +08:00
YangHua da9cef79e3 修改练习问题 2024-08-30 16:37:08 +08:00
YangHua 3ca2d5ecb8 修改垃圾触发逻辑 2024-08-30 14:52:04 +08:00
YangHua 55c6275293 Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-30 14:33:23 +08:00
YangHua 1a4ec4d0e7 修改清理杂物判断逻辑 2024-08-30 14:33:19 +08:00
陈向学 e50f397089 开关门 2024-08-30 14:10:01 +08:00
陈向学 436a5c2213 d 2024-08-30 11:14:02 +08:00
YangHua d08e92b26d 注册事件 2024-08-29 21:18:02 +08:00
陈向学 33f7e9de9a 开始结束事件 2024-08-29 19:54:45 +08:00
陈向学 b968dadcaa 改bug 2024-08-29 18:49:53 +08:00
陈向学 4184b24f4b Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-29 18:00:19 +08:00
陈向学 8341539b4c 打分 2024-08-29 18:00:15 +08:00
YangHua 8cc5f369f5 添加步骤完成提示，修复封印提示问题 2024-08-29 17:54:36 +08:00
陈向学 fa773a1cd9 打分 2024-08-29 13:53:56 +08:00
陈向学 bbbdd24351 打分 2024-08-29 11:38:23 +08:00
YangHua f796755ef4 修改提示问题，修改收回工具逻辑，修改继承重载问题，修改流程triggerID实时更新的问题 2024-08-29 00:38:45 +08:00
陈向学 20312ee14d 打分 2024-08-28 19:19:02 +08:00
陈向学 afed813ff8 打分 2024-08-28 16:08:13 +08:00
陈向学 4ca5a5346a aa 2024-08-28 14:33:05 +08:00
陈向学 5bf0e384c6 优化 2024-08-28 13:08:12 +08:00
YangHua f6f03a7fbf 修改单列 2024-08-27 17:12:14 +08:00
陈向学 8c8ebef03a 步骤还原 2024-08-27 16:00:20 +08:00
陈向学 da6478bfad i 2024-08-27 13:25:22 +08:00
YangHua f4a9c04e0a 添加所有流程 2024-08-26 21:50:05 +08:00