Commit Graph

75 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
liuyu fad34728af 合并断线重连 2024-09-06 16:43:27 +08:00
YangHua c64d8daf2f 修改livescene客户和负责人效果 2024-09-06 13:18:32 +08:00
liuyu 5276fcaede 20240906基线2 2024-09-06 11:00:07 +08:00
liuyu 17067bc33d 新增工单管理类 2024-09-06 10:04:23 +08:00
liuyu 27c356ba28 111 2024-09-06 08:18:31 +08:00
liuyu 824bc36529 111 2024-09-05 19:51:41 +08:00
YangHua 93f2b5ad2c 整理目录,剔除多余模型 2024-09-05 18:57:00 +08:00
liuyu d38e193431 修复从现场回到工具间拿取的工具不消失的bug 2024-09-05 17:25:37 +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
YangHua ee0bc2049b 1 2024-09-05 13:23:39 +08:00
YangHua 0ec147e9ec 修改layer 2024-09-05 13:09:28 +08:00
YangHua b45f5190d8 添加 人物移动判断 2024-09-05 12:53:36 +08:00
liuyu b0d1ac0edd 添加Trigger状态记录函数 2024-09-05 11:14:16 +08:00
陈向学 3982ab5723 改细节 2024-09-05 11:00:56 +08:00
liuyu 3c9b1c9a8a 读取场景缓存 2024-09-04 17:54:42 +08:00
liuyu 36c6945209 缓存读取 2024-09-04 17:28:08 +08:00
YangHua 52bd5396a9 修改常驻基类 2024-09-04 15:55:52 +08:00
liuyu 009110306d 工具栏显示BUG 2024-09-04 15:26:39 +08:00
liuyu ce401f8b53 Merge branch 'main' into HQB_workspace 2024-09-04 09:24:34 +08:00
liuyu 165d08a8ec no message 2024-09-03 17:58:03 +08:00
陈向学 0aa001c950 现场设备大改,科目2 2024-09-03 17:57:49 +08:00
liuyu b5083fa17e 记录分数 2024-09-03 17:34:49 +08:00
liuyu aa02fffc38 Merge branch 'main' into HQB_workspace 2024-09-03 15:04:19 +08:00
liuyu a502be2aa0 工具和材料状态的保存 2024-09-03 10:53:32 +08:00
YangHua 872aff659d 修改流程 2024-09-02 18:13:17 +08:00
陈向学 837eabc069 ss 2024-09-02 09:43:07 +08:00
陈向学 33b9624624 配置改成xml 2024-09-01 16:23:50 +08:00
YangHua f3cfd65e99 修改数据 2024-08-30 16:45:37 +08:00
陈向学 f91388e3d2 配置表 2024-08-30 16:35:34 +08:00
YangHua 8cc5f369f5 添加步骤完成提示,修复封印提示问题 2024-08-29 17:54:36 +08:00
陈向学 9728a2de88 ss 2024-08-29 15:42:21 +08:00
陈向学 a0782efc36 改Excel 2024-08-29 11:39:52 +08:00
taosuqi d965c009e1 修改任务书动画 2024-08-29 09:37:39 +08:00
YangHua f796755ef4 修改提示问题,修改收回工具逻辑,修改继承重载问题,修改流程triggerID实时更新的问题 2024-08-29 00:38:45 +08:00
陈向学 d46f5070e5 sa 2024-08-27 16:06:08 +08:00
YangHua ce63dea44e 修改工作证逻辑 2024-08-27 13:24:25 +08:00
YangHua 227657da5c 添加限制 2024-08-27 13:12:05 +08:00
YangHua f4a9c04e0a 添加所有流程 2024-08-26 21:50:05 +08:00
YangHua abe6d99b8d 修改流程 2024-08-26 20:37:56 +08:00
YangHua ffedeb738c 修改流程 2024-08-26 19:19:52 +08:00
YangHua 7a683b707d 添加操作步骤 2024-08-26 15:53:36 +08:00
YangHua d695dcd275 修改流程操作 2024-08-26 15:38:35 +08:00
YangHua d1ca48b6ce 修改数据 2024-08-26 11:29:26 +08:00