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

150 Commits

Author SHA1 Message Date
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 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
陈向学 3982ab5723 改细节 2024-09-05 11:00:56 +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
liuyu 009110306d 工具栏显示BUG 2024-09-04 15:26:39 +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
liuyu a79129a467 自动保存的启动放在ReconnectMgr中 2024-09-04 13:34:03 +08:00
liuyu 096c742205 分数读取后赋值 2024-09-04 10:38:36 +08:00
liuyu e5638a87e9 添加脚本到主分支 2024-09-04 09:35:32 +08:00
liuyu ce401f8b53 Merge branch 'main' into HQB_workspace 2024-09-04 09:24:34 +08:00
YangHua 9bf48dbacd 12 2024-09-03 18:32:30 +08:00
YangHua c4d6ab745f 修改 掏出工具逻辑 2024-09-03 18:30:49 +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 2adbebe563 还原现场触发物场景 2024-09-03 16:09:24 +08:00
liuyu aa02fffc38 Merge branch 'main' into HQB_workspace 2024-09-03 15:04:19 +08:00
liuyu 03735133df 记录现场设备状态 2024-09-03 14:58:28 +08:00
liuyu bcc75cf099 穿戴装备恢复 2024-09-03 14:24:02 +08:00
liuyu 36098d8173 右侧工具栏切换 2024-09-03 14:05:26 +08:00
liuyu da457d6aff 0903 2024-09-03 11:22:28 +08:00
liuyu a502be2aa0 工具和材料状态的保存 2024-09-03 10:53:32 +08:00
liuyu 56eba812fe 获取场景内所有可以点击的物品 2024-09-03 09:38:55 +08:00
liuyu 254f54a708 0902 2024-09-02 22:30:24 +08:00
YangHua bbf7dc948b 修改已知bug，修改流程。 2024-09-02 19:28:37 +08:00
liuyu 97504b1e4b 保存工具 2024-09-02 19:04:31 +08:00
YangHua 93832af2ab Merge branch 'main' of http://5a4e4c01.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-02 18:13:28 +08:00
YangHua 872aff659d 修改流程 2024-09-02 18:13:17 +08:00
liuyu 70ada07f3a 记录工具,材料,装备 2024-09-02 18:09:39 +08:00
liuyu 1397e0e6ff GM中添加初始化 2024-09-02 17:19:46 +08:00
liuyu 344a6badcb 在ProcessManager中添加自动保存的相关协程 2024-09-02 17:17:20 +08:00
YangHua 2273c14be7 Merge branch 'main' of http://5a4e4c01.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-02 16:14:40 +08:00
YangHua b1da4d58c6 修改流程 2024-09-02 16:14:35 +08:00
陈向学 55ef60e077 s 2024-09-02 16:13:16 +08:00
liuyu b00a57c15a Merge branch 'main' of http://git.umayle.com/WangWeiZhi/YanCheng_Metrology 2024-09-02 15:18:37 +08:00
liuyu b31f0f125d 重连功能:可以保存当前子步骤,可以手动调用触发子步骤切换 2024-09-02 15:18:32 +08:00
YangHua d36b07d783 添加重置学习和重新练习 2024-09-02 15:13:33 +08:00
YangHua e2bc09bd19 串UI 串逻辑 2024-09-02 13:47:03 +08:00
YangHua b1e6a750a3 修改数据读取 2024-09-01 18:37:49 +08:00
陈向学 33b9624624 配置改成xml 2024-09-01 16:23:50 +08:00
YangHua 25b679ada9 修改缩放之后，旋转、移动灵敏度问题，添加缩放和工具提示联动，添加顶部状态显示隐藏逻辑，修复一些已知bug. 2024-09-01 00:10:59 +08:00