 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 |
|
liuyu
|
fad34728af
|
合并断线重连
|
2024-09-06 16:43:27 +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
|
a78f37d7ca
|
修改 NPC 交互方式
|
2024-09-06 13:44:40 +08:00 |
|
liuyu
|
0c4162df67
|
添加对多场景的记录
|
2024-09-06 13:27:02 +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
|
877e3fb7cc
|
20240906基线
|
2024-09-06 10:58:09 +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 |
|
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 |
|
陈向学
|
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 |
|
YangHua
|
1ab135be02
|
修改注册时间差
|
2024-09-05 14:00:50 +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 |
|
YangHua
|
ee0bc2049b
|
1
|
2024-09-05 13:23:39 +08:00 |
|
YangHua
|
cab83a480d
|
修复 办公室场景来回跳 不显示 相机得问题
|
2024-09-05 12:59:23 +08:00 |
|
YangHua
|
b45f5190d8
|
添加 人物移动判断
|
2024-09-05 12:53:36 +08:00 |
|
liuyu
|
b0d1ac0edd
|
添加Trigger状态记录函数
|
2024-09-05 11:14:16 +08:00 |
|
YangHua
|
6c2322a99f
|
Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology
|
2024-09-05 11:06:09 +08:00 |
|
YangHua
|
897c41c226
|
修改动画
|
2024-09-05 11:06:06 +08:00 |
|
陈向学
|
3982ab5723
|
改细节
|
2024-09-05 11:00:56 +08:00 |
|
YangHua
|
b27ab42de3
|
修改错误提示
|
2024-09-05 10:52:36 +08:00 |
|
liuyu
|
36c6945209
|
缓存读取
|
2024-09-04 17:28:08 +08:00 |
|
liuyu
|
1597d53826
|
读取缓存
|
2024-09-04 17:12:56 +08:00 |
|
liuyu
|
8fdc47d314
|
保存场景缓存
|
2024-09-04 16:52:47 +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 |
|
liuyu
|
009110306d
|
工具栏显示BUG
|
2024-09-04 15:26:39 +08:00 |
|
陈向学
|
d9325fdba9
|
Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology
|
2024-09-04 15:12:20 +08:00 |
|
陈向学
|
e67b5836a1
|
新科目
|
2024-09-04 15:12:10 +08:00 |
|
YangHua
|
b771e1d8fe
|
Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology
|
2024-09-04 14:45:07 +08:00 |
|
YangHua
|
fe3e2d3e9d
|
添加动画只能播放一次
|
2024-09-04 14:44:59 +08:00 |
|
liuyu
|
11854f7fd6
|
scene中挂载ReconnectMgr；自动保存移出ProcessManager;工具间模型恢复时穿戴装备;
|
2024-09-04 14:20:35 +08:00 |
|
liuyu
|
eadf603199
|
在工具间模型上恢复穿戴
|
2024-09-04 14:07:58 +08:00 |