Commit Graph
433 Commits
Author SHA1 Message Date
dingyuntian 360293941a chore: 编辑器分类清理 2026-07-23 16:25:45 +08:00
dingyuntian 0825204666 Merge branch 'develop' into bugfix/美术素材填充 2026-07-22 21:55:45 +08:00
dingyuntian 2ae6f712a4 fix: 修正文字速度修改不生效的问题 2026-07-22 21:17:16 +08:00
bottlefishandCursor 3debdb39e4 merge: 合并 develop 到 7.22春优化
保留 PullUpCable 线缆收起逻辑,并接入 develop 的 BodyModule 退出清屏。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 16:30:10 +08:00
bottlefishandCursor 97ef0972fd art(fixsystem): 调整物理线缆色阶与高光参数
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 16:25:17 +08:00
bottlefishandCursor 2fb32c44e8 fix(fixsystem): 修复发条归零时充能状态未重置
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 16:25:05 +08:00
bottlefishandCursor 3d65941b03 fix(fixsystem): 修复线缆收放状态与阶段切换竞态
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 16:24:52 +08:00
dingyuntian 02d3fc04e6 fix: 保证离开BodyModule一定清屏 2026-07-22 04:05:46 +08:00
dingyuntian b7fdcf97fe fix: 插头不拔出屏幕不刷新 2026-07-22 04:01:52 +08:00
dingyuntian 3919ea9a75 fix: 气泡时序问题 2026-07-22 00:07:54 +08:00
bottlefishandCursor 6159704116 feat(cable): 线缆暖色配色与拉紧驱动线盘转动
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 22:16:41 +08:00
bottlefishandCursor c4ef30b151 style(screen): 调整维修面板标题与日志文本配色
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 18:50:48 +08:00
bottlefishandCursor 597e97c5d7 fix(bodymodule): 切割入场同步全部模块CutText
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 17:42:58 +08:00
bottlefishandCursor 7a8f7dbbd7 fix(cable): 强制收线改用运动学收拢避免甩鞭
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 17:42:50 +08:00
bottlefishandCursor 2ac0b4695d feat(fix-panel): Warning回落增加闪烁淡出并对齐等待
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 01:18:03 +08:00
bottlefishandCursor ecfefa5b87 fix(bodymodule): 切割时按舱外状态同步CutText
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 01:17:52 +08:00
bottlefishandCursor 3164fd7d8c feat(shock): 拉杆接入EventTriggerEx并统一光标
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-21 01:17:41 +08:00
bottlefish bd30cdabd0 Merge branch 'develop' into 7.19春优化 2026-07-20 03:50:37 +08:00
bottlefishandCursor f8821b1b3e fix(fix-system): 切割进入时支持 Cut Text 闪烁
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-20 01:20:25 +08:00
dingyuntian a6d541383b Merge branch 'develop' into bugfix/小问题修复 2026-07-19 23:04:53 +08:00
bottlefish 06d6127c69 chore(merge): 合并 develop 并整合 Day2 梦境剧情与演出 2026-07-19 21:25:30 +08:00
bottlefish bb6b3dd599 feat(fix-system): 区分维修终端错误提示颜色 2026-07-19 20:30:05 +08:00
dingyuntian 2999f753f7 fix: 进入记忆界面相关修改 2026-07-19 19:41:13 +08:00
dingyuntian d316922b3a fix(fix-system): 修复维修中心销毁时的依赖清理异常
FixSystemCenter.OnSingletonDestroy 在场景销毁阶段访问的 CameraKit、
BubbleSlotKit 可能已清理,且 Director.QuitCurrentMode 协程依赖的
对象可能已拆除。改为判空访问,并新增 Director.Reset 直接清理状态。
2026-07-18 23:59:19 +08:00
dingyuntian 0dc1001723 fix: BodyModule可能的注册失败问题 2026-07-18 17:28:06 +08:00
dingyuntian 1a113dbd25 fix: 冲突合并问题,修复线缆相关 2026-07-16 23:05:46 +08:00
bottlefish 509e0ae169 Merge branch 'develop' into '7.11春优化'
# Conflicts:
#   Assets/Scripts/FixSystemNew/Screen System/FixPanel/CablePanel.cs
2026-07-16 11:11:07 +00:00
bottlefish fd79ff9d93 feat(fix-system): 优化线缆松手下坠与插头朝向 2026-07-16 19:09:25 +08:00
bottlefish 8b1fe28edb fix(fix-system): 移除线缆拖拽的插孔自动吸附 2026-07-16 19:08:31 +08:00
dingyuntian b4f0cebc1d fix: 插孔打开时机 2026-07-16 18:50:00 +08:00
bottlefish cb1ddc1f93 Merge branch 'develop' into 7.11春优化 2026-07-16 18:42:23 +08:00
dingyuntian f51a670239 refactor: 将淡入淡出迁移到 ScreenTransitionPanel
- 将 BaseYarnCommand、FixSystemNew 各状态、GameManager、
  SaveSystem、PlayToolPanel 中的 PlayToolPanel 遮罩调用
  统一迁移到 ScreenTransitionPanel
- 从 PlayToolPanel 移除 _fadeImage 及相关 fade 方法
- 从 Play Tool Panel Prefab 移除 Fade Image 子对象
2026-07-16 17:56:51 +08:00
bottlefish 754d03b47d feat(fix-system): 优化损坏模块火花表现 2026-07-16 17:50:48 +08:00
bottlefish 3be0bf8201 feat(fix-system): 重构序章维修流程与面板启动表现 2026-07-16 17:50:35 +08:00
bottlefish 89850c75f3 feat(fix-system): 优化线缆与警报灯表现 2026-07-15 19:35:47 +08:00
bottlefish d075d1e0f8 feat(fix-system): 添加维修模块运行状态表现 2026-07-15 19:34:50 +08:00
bottlefishandCursor cd00a524bb fix(heatmap): 优化温度过渡并修复热点尺寸
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-11 19:40:10 +08:00
bottlefish 233cedd528 Merge branch 'develop' into 7.3春优化 2026-07-09 14:19:28 +08:00
bottlefishandCursor 8a7b2d0ed2 feat(cable): 优化插线手感与线缆表现
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 14:04:48 +08:00
bottlefishandCursor 4a66ba766e fix(cable): 固定插头与线缆排序并移除拖拽切层
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 12:54:45 +08:00
bottlefishandCursor 4ded2b8eab feat(cable): 线缆改用 Mesh 渲染并优化插接物理
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 12:54:36 +08:00
bottlefishandCursor f6997e8816 feat(cable): 新增单 Mesh 线缆渲染器
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 12:54:28 +08:00
bottlefish 2e7c87c886 fix(fix-system): 优化线缆物理拖拽和像素风渲染 2026-07-09 00:51:34 +08:00
bottlefish f273569e7c feat(cable): 线缆优化 2026-07-08 22:31:21 +08:00
bottlefishandCursor 3092c3554b feat(fix-system): 优化线缆渲染与拖拽排序
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-07 22:21:29 +08:00
dingyuntian c5c8729704 fix(fix-system): 修复修复系统气泡加载前相机切换问题 2026-07-05 00:11:46 +08:00
dingyuntian bd70442e45 style(fix-system): 补全 Cable 脚本文件末尾换行 2026-07-02 19:16:28 +08:00
dingyuntian fcd0955ae7 fix(fix-system): 修正线缆连接点与火花 VFX 参数 2026-07-02 14:52:44 +08:00
dingyuntian 3b96003c03 Merge branch 'develop' into feature/UI更新 2026-07-01 19:09:45 +08:00
dingyuntianandCursor da436479db fix(scene-mgmt): 修复场景加载后立即开对话的时序问题
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-01 12:05:46 +08:00