Compare commits
12 Commits
caadd87d8f
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
 starmen1265
|
bc1cd45c38 | ||
|
starmen1265
|
2342b63fc2 | ||
|
starmen1265
|
ac7a3abda9 | ||
|
starmen1265
|
3b851a195e | ||
|
starmen1265
|
39a34577da | ||
|
starmen1265
|
fd40217ab8 | ||
|
starmen1265
|
85c2062318 | ||
|
starmen1265
|
5df451011c | ||
|
starmen1265
|
00ca7044c7 | ||
|
starmen1265
|
a4fd3d3092 | ||
|
starmen1265
|
8ee21e5e80 | ||
|
starmen1265
|
c4ea51b7e6 |
@@ -2,3 +2,4 @@
|
|||||||
- [UE5.7 Python API](ue57-python-api.md) — 实测 API 差异（set_actor_rotation、new_level、CWD、import 路径、Rotator 关键字参数）
|
- [UE5.7 Python API](ue57-python-api.md) — 实测 API 差异（set_actor_rotation、new_level、CWD、import 路径、Rotator 关键字参数）
|
||||||
- [V01 Bugfix](level-builder-bugfix-v01.md) — 8个白模关卡问题诊断修复（搭建指南6+解析器双重解析+构建器静默fallback）
|
- [V01 Bugfix](level-builder-bugfix-v01.md) — 8个白模关卡问题诊断修复（搭建指南6+解析器双重解析+构建器静默fallback）
|
||||||
- [BSP Pivot Types](bsp-pivot-types.md) — 38种 BSP 资产实测锚点+自动补偿机制（角落/底边中心/底面中心）
|
- [BSP Pivot Types](bsp-pivot-types.md) — 38种 BSP 资产实测锚点+自动补偿机制（角落/底边中心/底面中心）
|
||||||
|
- [交互系统架构](interaction-effect-architecture.md) — v1.0 Effect/Action 数据驱动架构（Manager在GI、AInfo Tick、门派生、Prompt独立）
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
---
|
||||||
|
name: interaction-effect-architecture
|
||||||
|
description: 交互系统 v1.0 Effect/Action 数据驱动架构决策记录
|
||||||
|
metadata:
|
||||||
|
type: project
|
||||||
|
---
|
||||||
|
|
||||||
|
## 交互系统架构决策（v1.0 重构，2026-06-11）
|
||||||
|
|
||||||
|
### 核心架构：Effect/Action 数据驱动
|
||||||
|
|
||||||
|
交互物不关心"交互后发生什么"，只配置 Effect（由 Action 组成）交给 EffectManager 执行。
|
||||||
|
|
||||||
|
**Why:** v0.1 用 switch(Type) 硬编码，新增交互类型需改代码。v1.0 配数据即可。
|
||||||
|
|
||||||
|
### Manager 归属
|
||||||
|
- FInteractionManager / FEffectManager 是普通 C++ 类，不是 UObject
|
||||||
|
- 由 ASystemDriver (AInfo) 持有，随 World 生灭
|
||||||
|
- 不依赖 UE Subsystem 生命周期，显式控制创建顺序和 Tick 顺序
|
||||||
|
- 所有 UObject 引用用 TWeakObjectPtr，回调用 TFunction
|
||||||
|
- GameInstance 不持有任何交互系统对象，只有 UPersistenceSubsystem 跨 World
|
||||||
|
|
||||||
|
### 分层规则
|
||||||
|
- 表现层只读 Manager 缓存（getter），不碰 Component
|
||||||
|
- Manager 在选择变化时从 Component 读一次并缓存
|
||||||
|
- 逻辑事件仅用于 "A 影响 B"（如 Consume → Persistence）
|
||||||
|
|
||||||
|
### 协调方式
|
||||||
|
- Character 输入回调通过 ASystemDriver::Get(World) 访问两个 Manager
|
||||||
|
- Driver::BeginPlay 中 TFunction 连线 EffectManager.OnEffectComplete → Manager.OnInteractionFinished
|
||||||
|
- PromptComponent 通过 Driver 获取 Manager，只读缓存
|
||||||
@@ -243,6 +243,34 @@ GameConfig/ # 数值配置表
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## Git 工作流（develop 分支模型）
|
||||||
|
|
||||||
|
项目使用 `develop` 长期开发分支。所有 agent 在 develop 上工作，迭代结束时由 PM 发起 PR 合并回 main。
|
||||||
|
|
||||||
|
### 开始工作
|
||||||
|
```bash
|
||||||
|
bash .claude/scripts/git-workflow.sh ready
|
||||||
|
```
|
||||||
|
|
||||||
|
### 提交文档
|
||||||
|
```bash
|
||||||
|
bash .claude/scripts/git-workflow.sh commit docs <scope> "中文描述"
|
||||||
|
```
|
||||||
|
示例：`bash .claude/scripts/git-workflow.sh commit docs design "交互系统执行案"`
|
||||||
|
|
||||||
|
### 推送
|
||||||
|
```bash
|
||||||
|
bash .claude/scripts/git-workflow.sh push
|
||||||
|
```
|
||||||
|
|
||||||
|
### 完成工作后
|
||||||
|
1. 推送文档到 develop
|
||||||
|
2. 通过 gitea-collab 在对应 Issue 下评论汇报进度
|
||||||
|
3. 更新 Issue 标签为 `status:in-review`
|
||||||
|
4. 启动 `game-reviewer` 子代理
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 审查交接
|
## 审查交接
|
||||||
|
|
||||||
完成工作并发布 Issue 评论后，启动审查流程：
|
完成工作并发布 Issue 评论后，启动审查流程：
|
||||||
|
|||||||
@@ -221,6 +221,42 @@ skills:
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## Git 工作流（develop 分支模型）
|
||||||
|
|
||||||
|
项目使用 `develop` 长期开发分支。所有 agent 在 develop 上工作，迭代结束时由 PM 发起 PR 合并回 main。
|
||||||
|
|
||||||
|
### 开始开发
|
||||||
|
```bash
|
||||||
|
bash .claude/scripts/git-workflow.sh ready
|
||||||
|
```
|
||||||
|
确认在 develop 分支上且代码最新。
|
||||||
|
|
||||||
|
### 提交代码
|
||||||
|
```bash
|
||||||
|
bash .claude/scripts/git-workflow.sh commit <type> <scope> "中文描述"
|
||||||
|
```
|
||||||
|
- ⚠️ 只提交自己修改的文件，避免提交其他 agent 的 WIP
|
||||||
|
- 蓝图(.uasset)和 C++ 分开提交
|
||||||
|
- commit message subject ≤ 50 字符
|
||||||
|
|
||||||
|
### 推送
|
||||||
|
```bash
|
||||||
|
bash .claude/scripts/git-workflow.sh push
|
||||||
|
```
|
||||||
|
|
||||||
|
### 完成开发后
|
||||||
|
1. 推送代码到 develop
|
||||||
|
2. 通过 gitea-collab 在对应 Issue 下评论汇报进度
|
||||||
|
3. 更新 Issue 标签为 `status:in-review`
|
||||||
|
4. 启动 `game-reviewer` 子代理
|
||||||
|
|
||||||
|
### 开发中发现 main 有更新
|
||||||
|
```bash
|
||||||
|
bash .claude/scripts/git-workflow.sh catchup
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 代码规范
|
## 代码规范
|
||||||
|
|
||||||
- C++ 和蓝图遵循 UE5 编码规范
|
- C++ 和蓝图遵循 UE5 编码规范
|
||||||
|
|||||||
@@ -103,6 +103,36 @@ skills:
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## Git 工作流（develop 分支模型）
|
||||||
|
|
||||||
|
项目使用 `develop` 长期开发分支，所有 agent 在 develop 上工作。
|
||||||
|
|
||||||
|
### PM 日常
|
||||||
|
```bash
|
||||||
|
# 会话开始时同步
|
||||||
|
bash .claude/scripts/git-workflow.sh ready
|
||||||
|
```
|
||||||
|
|
||||||
|
### 迭代完成 → 发布
|
||||||
|
当所有 Issue 都 review:pass 且用户确认发布时：
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 创建 develop → main 的 PR
|
||||||
|
bash .claude/scripts/git-workflow.sh release "迭代名称"
|
||||||
|
# 或手动:
|
||||||
|
# node .claude/skills/gitea-pm/gitea.js --role pm pr create --base main --head develop --title "标题" --body "描述"
|
||||||
|
```
|
||||||
|
|
||||||
|
通知用户在 Gitea 审查并合并 PR。
|
||||||
|
|
||||||
|
### 用户合并后同步
|
||||||
|
```bash
|
||||||
|
bash .claude/scripts/git-workflow.sh post-release
|
||||||
|
```
|
||||||
|
自动同步 main 并将 merge commit 同步回 develop。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 决策框架
|
## 决策框架
|
||||||
|
|
||||||
### 你可以自主决定：
|
### 你可以自主决定：
|
||||||
|
|||||||
@@ -6,23 +6,30 @@
|
|||||||
|
|
||||||
## 分支策略
|
## 分支策略
|
||||||
|
|
||||||
**轻量 Feature Branch** — 单人开发，`main` 永远可玩可编译。
|
**develop 长期开发分支模型** — 单人开发 + 多 Agent 协作。
|
||||||
|
|
||||||
|
```
|
||||||
|
main ─────────── 永远可玩可编译，受保护，禁止直接推送
|
||||||
|
│
|
||||||
|
│ PR (Gitea) ← 里程碑/迭代结束时，PM 发起
|
||||||
|
│
|
||||||
|
└── develop ──── 长期分支，所有 agent 在此工作
|
||||||
|
```
|
||||||
|
|
||||||
|
| 分支 | 生命期 | 说明 |
|
||||||
|
|---|---|---|
|
||||||
|
| `main` | 永久 | 稳定版本，受保护 |
|
||||||
|
| `develop` | 永久 | 日常开发分支，所有 agent 共用 |
|
||||||
|
|
||||||
|
**辅助分支（可选，用于实验）：**
|
||||||
|
|
||||||
| 分支 | 前缀 | 生命期 | 说明 |
|
| 分支 | 前缀 | 生命期 | 说明 |
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
| 主线 | `main` | 永久 | 稳定版本，不直接在上面开发 |
|
|
||||||
| 功能 | `feature/` | 合并后删 | 新系统、新功能 |
|
|
||||||
| 修复 | `fix/` | 合并后删 | Bug 修复 |
|
|
||||||
| 原型 | `prototype/` | 实验完即删 | 技术验证，随便写 |
|
| 原型 | `prototype/` | 实验完即删 | 技术验证，随便写 |
|
||||||
| 发布 | `release/` | 永久 | 从 main 切出，版本标记 |
|
| 发布 | `release/` | 永久 | 从 main 切出，版本标记 |
|
||||||
|
|
||||||
**命名规则：** `<类型>/<小写连字符描述>`
|
|
||||||
```
|
|
||||||
feature/player-movement fix/camera-clipping release/v0.1
|
|
||||||
```
|
|
||||||
|
|
||||||
**流程：**
|
**流程：**
|
||||||
1. 从 `main` 拉分支 → 2. 开发并提交 → 3. 测试通过后合并回 `main` → 4. 删除分支
|
1. 所有开发在 `develop` 上进行 → 2. 迭代完成时创建 PR → 3. 审查通过后合并回 `main`
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -100,3 +107,33 @@ Host gitea micecola.top
|
|||||||
**内网地址**（家里用）：`ssh://sc-gitea@192.168.1.22:2223/starmen1265/ChildHood.git`
|
**内网地址**（家里用）：`ssh://sc-gitea@192.168.1.22:2223/starmen1265/ChildHood.git`
|
||||||
|
|
||||||
完整规范见 → [GIT-GUIDE.md](GIT-GUIDE.md)
|
完整规范见 → [GIT-GUIDE.md](GIT-GUIDE.md)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 自动化工作流
|
||||||
|
|
||||||
|
`git-workflow.sh` 脚本封装了常用 git 操作：
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 开始工作：确保在 develop 上且最新
|
||||||
|
bash .claude/scripts/git-workflow.sh ready
|
||||||
|
|
||||||
|
# 提交修改
|
||||||
|
bash .claude/scripts/git-workflow.sh commit <type> <scope> "中文描述"
|
||||||
|
|
||||||
|
# 推送到远程
|
||||||
|
bash .claude/scripts/git-workflow.sh push
|
||||||
|
|
||||||
|
# 查看状态
|
||||||
|
bash .claude/scripts/git-workflow.sh status
|
||||||
|
```
|
||||||
|
|
||||||
|
### PM 发布流程
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 创建 develop → main PR
|
||||||
|
bash .claude/scripts/git-workflow.sh release "迭代名称"
|
||||||
|
|
||||||
|
# 用户在 Gitea 合并后同步
|
||||||
|
bash .claude/scripts/git-workflow.sh post-release
|
||||||
|
```
|
||||||
|
|||||||
+35
-59
@@ -7,81 +7,57 @@
|
|||||||
|
|
||||||
## 一、分支策略
|
## 一、分支策略
|
||||||
|
|
||||||
采用**轻量级 Feature Branch 模型**，避免企业级复杂流程，保持 `main` 分支随时可玩。
|
采用 **develop 长期开发分支模型**，适合单人开发 + 多 AI Agent 协作场景。所有 agent 在 `develop` 上工作，迭代结束时通过 PR 合并回 `main`。
|
||||||
|
|
||||||
### 1.1 分支总览
|
### 1.1 分支总览
|
||||||
|
|
||||||
```
|
```
|
||||||
main ──────────────────────────────────────── 稳定主线
|
main ──────────── 永远可玩可编译，受保护，禁止直接推送
|
||||||
│
|
│
|
||||||
├── feature/player-movement ───→ 合并后删除
|
│ PR (Gitea) ← 里程碑/迭代结束时，PM 发起
|
||||||
├── feature/inventory-system ──→ 合并后删除
|
│
|
||||||
├── fix/camera-clipping ───────→ 合并后删除
|
└── develop ──── 长期分支，所有 agent 的日常工作分支
|
||||||
├── prototype/procedural-gen ──→ 实验完即删
|
│
|
||||||
└── release/v0.1 ──────────────→ 永久保留
|
├── 程序1 提交代码
|
||||||
|
├── 策划 提交文档
|
||||||
|
├── 程序2 提交代码
|
||||||
|
└── 迭代就绪 → PR develop→main
|
||||||
```
|
```
|
||||||
|
|
||||||
### 1.2 分支类型
|
### 1.2 分支类型
|
||||||
|
|
||||||
| 分支 | 前缀 | 用途 | 合并目标 | 生命周期 |
|
| 分支 | 用途 | 生命周期 |
|
||||||
|---|---|---|---|---|
|
|---|---|---|
|
||||||
| 主线 | `main` | 稳定可玩版本，每次提交都能编译运行 | — | 永久 |
|
| `main` | 稳定可玩版本，受保护 | 永久 |
|
||||||
| 功能 | `feature/` | 新系统、新功能开发 | `main` | 完成后删除 |
|
| `develop` | 日常开发，所有 agent 共用 | 永久 |
|
||||||
| 修复 | `fix/` | Bug 修复 | `main` | 完成后删除 |
|
| `prototype/` | 技术验证、玩法实验 | 实验完即删 |
|
||||||
| 原型 | `prototype/` | 技术验证、玩法实验 | 合并或丢弃 | 实验完即删 |
|
| `release/` | 版本发布标记，只从 main 切出 | 永久保留 |
|
||||||
| 发布 | `release/` | 版本发布标记，只从 `main` 切出 | — | 永久保留 |
|
|
||||||
|
|
||||||
### 1.3 命名规范
|
### 1.3 工作流程
|
||||||
|
|
||||||
格式：`<类型>/<简短描述>`，全小写，用连字符分隔单词。
|
|
||||||
|
|
||||||
```
|
```
|
||||||
# ✅ 好的命名
|
1. 开始工作（agent 自动执行）
|
||||||
feature/player-movement
|
bash .claude/scripts/git-workflow.sh ready
|
||||||
feature/inventory-system
|
|
||||||
feature/dialogue-tree
|
|
||||||
fix/camera-clipping-through-walls
|
|
||||||
fix/enemy-ai-stuck-on-navmesh
|
|
||||||
prototype/procedural-dungeon
|
|
||||||
release/v0.1
|
|
||||||
|
|
||||||
# ❌ 不好的命名
|
2. 开发并提交
|
||||||
my-new-feature
|
bash .claude/scripts/git-workflow.sh commit <type> <scope> "描述"
|
||||||
fix-bug
|
|
||||||
test
|
3. 推送到远程
|
||||||
feature/AddPlayerMovement
|
bash .claude/scripts/git-workflow.sh push
|
||||||
|
|
||||||
|
4. 迭代完成，PM 创建 PR
|
||||||
|
bash .claude/scripts/git-workflow.sh release "迭代名称"
|
||||||
|
|
||||||
|
5. 用户在 Gitea 合并后同步
|
||||||
|
bash .claude/scripts/git-workflow.sh post-release
|
||||||
```
|
```
|
||||||
|
|
||||||
### 1.4 工作流程
|
### 1.4 核心原则
|
||||||
|
|
||||||
```
|
- **`main` 永远可玩**：通过 develop → main PR 合并，不直接推送
|
||||||
1. 开始新功能
|
- **develop 是工作台**：所有 agent 在 develop 上并行工作
|
||||||
git checkout main
|
- **不同文件不冲突**：各 agent 修改不同文件，可真正并行
|
||||||
git pull
|
- **同一文件需协调**：两个 agent 修改同一文件时需顺序执行
|
||||||
git checkout -b feature/xxx
|
|
||||||
|
|
||||||
2. 开发过程中（随时提交）
|
|
||||||
git add .
|
|
||||||
git commit -m "wip(xxx): 进度描述"
|
|
||||||
|
|
||||||
3. 功能完成，测试通过
|
|
||||||
git checkout main
|
|
||||||
git merge feature/xxx
|
|
||||||
git branch -d feature/xxx # 删除已合并分支
|
|
||||||
|
|
||||||
4. 到达里程碑
|
|
||||||
git checkout main
|
|
||||||
git tag -a v0.1.0 -m "第一个可玩原型"
|
|
||||||
git checkout -b release/v0.1
|
|
||||||
git push origin release/v0.1
|
|
||||||
```
|
|
||||||
|
|
||||||
### 1.5 核心原则
|
|
||||||
|
|
||||||
- **`main` 永远可玩**：坏了就留在 feature 分支继续改，不要合并进 main
|
|
||||||
- **功能分支粒度**：一个分支做一件事，不要在一个分支里同时做多个系统
|
|
||||||
- **原型不怕乱**：`prototype/` 分支随便写，验证完再决定合并还是丢弃
|
|
||||||
- **定期清理**：已合并的 feature/fix 分支及时删除，避免分支堆积
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,326 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# ═══════════════════════════════════════════════════════════════
|
||||||
|
# git-workflow.sh — ChildHood 项目 Git 工作流自动化
|
||||||
|
#
|
||||||
|
# 基于 develop 长期开发分支模型。
|
||||||
|
# 所有 agent 在 develop 上工作，迭代结束时通过 PR 合并回 main。
|
||||||
|
#
|
||||||
|
# 用法: bash .claude/scripts/git-workflow.sh <command> [args...]
|
||||||
|
#
|
||||||
|
# 命令:
|
||||||
|
# ready 确保在 develop 上且最新
|
||||||
|
# commit <type> <scope> "<msg>" 格式化提交
|
||||||
|
# push 推送 develop 到远程
|
||||||
|
# submit <issue-number> 一键 commit + push（从 Issue 拉取信息）
|
||||||
|
# release [milestone-name] 创建 develop→main 的 PR
|
||||||
|
# post-release 合并后同步 main 和 develop
|
||||||
|
# catchup 将 develop 合并最新 main 的内容
|
||||||
|
# status 显示当前分支和状态
|
||||||
|
# ═══════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# ─── 配置 ───
|
||||||
|
DEVELOP_BRANCH="develop"
|
||||||
|
MAIN_BRANCH="main"
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
||||||
|
GITEA_PM_CLI="node $PROJECT_ROOT/.claude/skills/gitea-pm/gitea.js"
|
||||||
|
GITEA_COLLAB_CLI="node $PROJECT_ROOT/.claude/skills/gitea-collab/gitea.js"
|
||||||
|
|
||||||
|
# ─── 颜色 ───
|
||||||
|
RED='\033[0;31m'
|
||||||
|
GREEN='\033[0;32m'
|
||||||
|
YELLOW='\033[1;33m'
|
||||||
|
BLUE='\033[0;34m'
|
||||||
|
NC='\033[0m' # No Color
|
||||||
|
|
||||||
|
info() { echo -e "${BLUE}ℹ️ $*${NC}"; }
|
||||||
|
ok() { echo -e "${GREEN}✅ $*${NC}"; }
|
||||||
|
warn() { echo -e "${YELLOW}⚠️ $*${NC}"; }
|
||||||
|
fail() { echo -e "${RED}❌ $*${NC}"; exit 1; }
|
||||||
|
|
||||||
|
# ─── 当前分支 ───
|
||||||
|
current_branch() { git rev-parse --abbrev-ref HEAD; }
|
||||||
|
|
||||||
|
# ─── 检查是否有未提交的修改 ───
|
||||||
|
has_changes() { [ -n "$(git status --porcelain)" ]; }
|
||||||
|
|
||||||
|
# ─── 检测 UE5 二进制文件 ───
|
||||||
|
has_ue5_binaries() {
|
||||||
|
git diff --cached --name-only 2>/dev/null | grep -qE '\.(uasset|umap)$'
|
||||||
|
}
|
||||||
|
|
||||||
|
# ═══════════════════════════════════════════════════════════════
|
||||||
|
# 命令实现
|
||||||
|
# ═══════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
|
cmd_ready() {
|
||||||
|
info "准备工作环境..."
|
||||||
|
|
||||||
|
local branch
|
||||||
|
branch=$(current_branch)
|
||||||
|
|
||||||
|
# 如果不在 develop 上，切换过去
|
||||||
|
if [ "$branch" != "$DEVELOP_BRANCH" ]; then
|
||||||
|
if has_changes; then
|
||||||
|
warn "有未提交的修改，暂存中..."
|
||||||
|
git stash push --include-untracked -m "auto-stash-$(date +%s)"
|
||||||
|
fi
|
||||||
|
git checkout "$DEVELOP_BRANCH" 2>/dev/null || {
|
||||||
|
# 本地没有 develop 分支，从 main 创建
|
||||||
|
info "本地没有 $DEVELOP_BRANCH 分支，从 $MAIN_BRANCH 创建..."
|
||||||
|
git checkout "$MAIN_BRANCH"
|
||||||
|
git pull origin "$MAIN_BRANCH"
|
||||||
|
git checkout -b "$DEVELOP_BRANCH"
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 拉取最新 develop
|
||||||
|
if git remote get-url origin &>/dev/null; then
|
||||||
|
info "拉取远程 $DEVELOP_BRANCH..."
|
||||||
|
git pull origin "$DEVELOP_BRANCH" 2>/dev/null || {
|
||||||
|
# 远程没有 develop，首次推送
|
||||||
|
warn "远程没有 $DEVELOP_BRANCH 分支，将首次推送"
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
|
||||||
|
local commit_hash
|
||||||
|
commit_hash=$(git rev-parse --short HEAD)
|
||||||
|
ok "已在 $DEVELOP_BRANCH 分支上 (${commit_hash})"
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd_commit() {
|
||||||
|
local type="${1:-}"
|
||||||
|
local scope="${2:-}"
|
||||||
|
local message="${3:-}"
|
||||||
|
|
||||||
|
if [ -z "$type" ] || [ -z "$scope" ] || [ -z "$message" ]; then
|
||||||
|
fail "用法: git-workflow.sh commit <type> <scope> \"<message>\"\n 示例: git-workflow.sh commit feat player \"实现角色跳跃\""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 校验分支
|
||||||
|
if [ "$(current_branch)" != "$DEVELOP_BRANCH" ]; then
|
||||||
|
warn "当前不在 $DEVELOP_BRANCH 分支上 (当前: $(current_branch))"
|
||||||
|
read -rp "继续提交? [y/N] " confirm
|
||||||
|
[[ "$confirm" != [yY] ]] && { info "已取消"; return; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 暂存所有修改
|
||||||
|
if ! has_changes; then
|
||||||
|
warn "没有检测到修改"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
git add -A
|
||||||
|
|
||||||
|
# UE5 二进制文件检测
|
||||||
|
if has_ue5_binaries; then
|
||||||
|
warn "检测到 .uasset/.umap 文件，请确保 commit message 清楚描述了变更内容"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 格式化 commit message
|
||||||
|
local commit_msg="${type}(${scope}): ${message}"
|
||||||
|
|
||||||
|
# subject ≤ 50 字符检查（仅消息部分）
|
||||||
|
local msg_len=${#commit_msg}
|
||||||
|
if [ "$msg_len" -gt 72 ]; then
|
||||||
|
warn "提交消息较长 ($msg_len 字符)，建议精简"
|
||||||
|
fi
|
||||||
|
|
||||||
|
git commit -m "$commit_msg"
|
||||||
|
ok "已提交: $commit_msg"
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd_push() {
|
||||||
|
local branch
|
||||||
|
branch=$(current_branch)
|
||||||
|
|
||||||
|
info "推送 $branch 到远程..."
|
||||||
|
|
||||||
|
# 设置上游分支（首次）
|
||||||
|
if ! git rev-parse --abbrev-ref "@{upstream}" &>/dev/null; then
|
||||||
|
git push -u origin "$branch"
|
||||||
|
else
|
||||||
|
git push origin "$branch"
|
||||||
|
fi
|
||||||
|
|
||||||
|
ok "已推送 $branch 到远程"
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd_submit() {
|
||||||
|
local issue_number="${1:-}"
|
||||||
|
if [ -z "$issue_number" ]; then
|
||||||
|
fail "用法: git-workflow.sh submit <issue-number>"
|
||||||
|
fi
|
||||||
|
|
||||||
|
info "提交工作 (Issue #$issue_number)..."
|
||||||
|
|
||||||
|
# 从 Issue 拉取标题作为 commit 参考
|
||||||
|
local issue_title=""
|
||||||
|
issue_title=$($GITEA_COLLAB_CLI --role dev issue get "$issue_number" --json 2>/dev/null | grep -o '"title":"[^"]*"' | head -1 | sed 's/"title":"//;s/"//') || true
|
||||||
|
|
||||||
|
# 提交
|
||||||
|
if has_changes; then
|
||||||
|
if [ -n "$issue_title" ]; then
|
||||||
|
info "Issue 标题: $issue_title"
|
||||||
|
fi
|
||||||
|
warn "有未提交的修改，请先运行: git-workflow.sh commit <type> <scope> \"<message>\""
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 推送
|
||||||
|
cmd_push
|
||||||
|
|
||||||
|
ok "工作已提交到 $DEVELOP_BRANCH (关联 Issue #$issue_number)"
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd_release() {
|
||||||
|
local milestone_name="${1:-}"
|
||||||
|
|
||||||
|
info "准备发布 PR ($DEVELOP_BRANCH → $MAIN_BRANCH)..."
|
||||||
|
|
||||||
|
# 确保在 develop 上
|
||||||
|
if [ "$(current_branch)" != "$DEVELOP_BRANCH" ]; then
|
||||||
|
fail "请先切换到 $DEVELOP_BRANCH 分支"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 确保本地最新
|
||||||
|
git pull origin "$DEVELOP_BRANCH"
|
||||||
|
|
||||||
|
# 获取里程碑名称
|
||||||
|
if [ -z "$milestone_name" ]; then
|
||||||
|
# 尝试从当前里程碑获取
|
||||||
|
milestone_name=$($GITEA_PM_CLI --role pm milestone list --state open --json 2>/dev/null | grep -o '"title":"[^"]*"' | head -1 | sed 's/"title":"//;s/"//') || "迭代发布"
|
||||||
|
if [ -z "$milestone_name" ]; then
|
||||||
|
milestone_name="迭代发布"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
local pr_title="Merge develop → main: ${milestone_name}"
|
||||||
|
|
||||||
|
# 构造 PR body（汇总已关闭的 Issue）
|
||||||
|
local pr_body="## 发布合并\n\n将 \`${DEVELOP_BRANCH}\` 分支的成果合并到 \`${MAIN_BRANCH}\`。\n\n### 里程碑\n${milestone_name}"
|
||||||
|
|
||||||
|
# 创建 PR
|
||||||
|
info "创建 PR: $pr_title"
|
||||||
|
local pr_result
|
||||||
|
pr_result=$($GITEA_PM_CLI --role pm pr create \
|
||||||
|
--base "$MAIN_BRANCH" \
|
||||||
|
--head "$DEVELOP_BRANCH" \
|
||||||
|
--title "$pr_title" \
|
||||||
|
--body "$(echo -e "$pr_body")" \
|
||||||
|
--json 2>&1) || {
|
||||||
|
fail "创建 PR 失败: $pr_result"
|
||||||
|
}
|
||||||
|
|
||||||
|
local pr_number
|
||||||
|
pr_number=$(echo "$pr_result" | grep -o '"number":[0-9]*' | head -1 | sed 's/"number"://') || true
|
||||||
|
|
||||||
|
if [ -n "$pr_number" ]; then
|
||||||
|
ok "PR #$pr_number 已创建: $pr_title"
|
||||||
|
info "请在 Gitea 审查并合并: http://micecola.top:8418/starmen1265/ChildHood/pulls/$pr_number"
|
||||||
|
else
|
||||||
|
ok "PR 已创建，请查看 Gitea"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd_post_release() {
|
||||||
|
info "合并后同步..."
|
||||||
|
|
||||||
|
# 同步 main
|
||||||
|
info "同步 $MAIN_BRANCH..."
|
||||||
|
git checkout "$MAIN_BRANCH"
|
||||||
|
git pull origin "$MAIN_BRANCH"
|
||||||
|
ok "$MAIN_BRANCH 已更新"
|
||||||
|
|
||||||
|
# 切回 develop 并合并 main（保持 develop 包含 merge commit）
|
||||||
|
info "同步 $DEVELOP_BRANCH..."
|
||||||
|
git checkout "$DEVELOP_BRANCH"
|
||||||
|
git merge "$MAIN_BRANCH" --no-edit
|
||||||
|
git push origin "$DEVELOP_BRANCH"
|
||||||
|
ok "$DEVELOP_BRANCH 已同步（包含 $MAIN_BRANCH 的 merge commit）"
|
||||||
|
|
||||||
|
local commit_hash
|
||||||
|
commit_hash=$(git rev-parse --short HEAD)
|
||||||
|
ok "完成，当前在 $DEVELOP_BRANCH (${commit_hash})"
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd_catchup() {
|
||||||
|
info "将 develop 跟上最新的 $MAIN_BRANCH..."
|
||||||
|
|
||||||
|
if [ "$(current_branch)" != "$DEVELOP_BRANCH" ]; then
|
||||||
|
fail "请先切换到 $DEVELOP_BRANCH 分支"
|
||||||
|
fi
|
||||||
|
|
||||||
|
git fetch origin
|
||||||
|
git merge "origin/$MAIN_BRANCH" --no-edit
|
||||||
|
ok "$DEVELOP_BRANCH 已合并最新 $MAIN_BRANCH"
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd_status() {
|
||||||
|
local branch
|
||||||
|
branch=$(current_branch)
|
||||||
|
local commit_hash
|
||||||
|
commit_hash=$(git rev-parse --short HEAD)
|
||||||
|
local changed
|
||||||
|
changed=$(git status --porcelain | wc -l | tr -d ' ')
|
||||||
|
|
||||||
|
echo -e "${BLUE}═══ Git 工作流状态 ═══${NC}"
|
||||||
|
echo " 当前分支: ${branch} (${commit_hash})"
|
||||||
|
|
||||||
|
if [ "$branch" = "$DEVELOP_BRANCH" ]; then
|
||||||
|
echo -e " ${GREEN}✓ 在 develop 开发分支上${NC}"
|
||||||
|
elif [ "$branch" = "$MAIN_BRANCH" ]; then
|
||||||
|
echo -e " ${YELLOW}⚠ 在 main 分支上，请切换到 develop 开始工作${NC}"
|
||||||
|
else
|
||||||
|
echo -e " ${YELLOW}⚠ 在非标准分支上: $branch${NC}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo " 未提交修改: ${changed} 个文件"
|
||||||
|
|
||||||
|
if [ "$changed" -gt 0 ]; then
|
||||||
|
echo ""
|
||||||
|
git status --short
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 远程同步状态
|
||||||
|
if git rev-parse "@{upstream}" &>/dev/null; then
|
||||||
|
local ahead behind
|
||||||
|
ahead=$(git rev-list --count "@{upstream}..HEAD" 2>/dev/null || echo "0")
|
||||||
|
behind=$(git rev-list --count "HEAD..@{upstream}" 2>/dev/null || echo "0")
|
||||||
|
echo " 远程状态: ahead ${ahead}, behind ${behind}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# ═══════════════════════════════════════════════════════════════
|
||||||
|
# 入口
|
||||||
|
# ═══════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
|
case "${1:-}" in
|
||||||
|
ready) cmd_ready ;;
|
||||||
|
commit) shift; cmd_commit "$@" ;;
|
||||||
|
push) cmd_push ;;
|
||||||
|
submit) shift; cmd_submit "$@" ;;
|
||||||
|
release) shift; cmd_release "$@" ;;
|
||||||
|
post-release) cmd_post_release ;;
|
||||||
|
catchup) cmd_catchup ;;
|
||||||
|
status) cmd_status ;;
|
||||||
|
*)
|
||||||
|
echo "git-workflow.sh — ChildHood 项目 Git 工作流自动化"
|
||||||
|
echo ""
|
||||||
|
echo "用法: bash .claude/scripts/git-workflow.sh <command> [args...]"
|
||||||
|
echo ""
|
||||||
|
echo "命令:"
|
||||||
|
echo " ready 确保在 develop 上且最新"
|
||||||
|
echo " commit <type> <scope> \"<msg>\" 格式化提交"
|
||||||
|
echo " push 推送 develop 到远程"
|
||||||
|
echo " submit <issue-number> 推送并关联 Issue"
|
||||||
|
echo " release [milestone-name] 创建 develop→main PR"
|
||||||
|
echo " post-release 合并后同步 main 和 develop"
|
||||||
|
echo " catchup 将 develop 合并最新 main"
|
||||||
|
echo " status 显示当前分支和状态"
|
||||||
|
echo ""
|
||||||
|
echo "工作流模型: develop 长期开发分支 → 迭代完成时 PR 合并回 main"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
@@ -148,7 +148,43 @@ node .claude/skills/gitea-collab/gitea.js --role reviewer issue labels <number>
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 7. 汇报模板
|
## 7. PR 查询
|
||||||
|
|
||||||
|
非 PM 角色可以查看 PR 状态（创建和合并由 PM 负责）：
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 列出 PR
|
||||||
|
node .claude/skills/gitea-collab/gitea.js --role <角色名> pr list
|
||||||
|
|
||||||
|
# 查看 PR 详情
|
||||||
|
node .claude/skills/gitea-collab/gitea.js --role <角色名> pr get <number>
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 8. Git 工作流
|
||||||
|
|
||||||
|
所有 agent 在 `develop` 长期开发分支上工作：
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 开始工作时：确保在 develop 上
|
||||||
|
bash .claude/scripts/git-workflow.sh ready
|
||||||
|
|
||||||
|
# 提交代码/文档
|
||||||
|
bash .claude/scripts/git-workflow.sh commit <type> <scope> "中文描述"
|
||||||
|
|
||||||
|
# 推送到远程
|
||||||
|
bash .claude/scripts/git-workflow.sh push
|
||||||
|
|
||||||
|
# 查看当前状态
|
||||||
|
bash .claude/scripts/git-workflow.sh status
|
||||||
|
```
|
||||||
|
|
||||||
|
详见 `.claude/refs/GIT-GUIDE-LITE.md` 的"自动化工作流"章节。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 9. 汇报模板
|
||||||
|
|
||||||
### 策划汇报
|
### 策划汇报
|
||||||
|
|
||||||
|
|||||||
@@ -222,6 +222,27 @@ class GiteaAPI {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ====== Pull Requests ======
|
||||||
|
|
||||||
|
listPullRequests(params = {}) {
|
||||||
|
return this.request('GET', '/pulls', null, { state: 'open', limit: 50, ...params });
|
||||||
|
}
|
||||||
|
|
||||||
|
getPullRequest(number) {
|
||||||
|
return this.request('GET', `/pulls/${number}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
createPullRequest(data) {
|
||||||
|
return this.request('POST', '/pulls', data);
|
||||||
|
}
|
||||||
|
|
||||||
|
mergePullRequest(number, data = {}) {
|
||||||
|
return this.request('POST', `/pulls/${number}/merge`, {
|
||||||
|
Do: data.style || 'merge',
|
||||||
|
...data,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// ====== 辅助方法 ======
|
// ====== 辅助方法 ======
|
||||||
|
|
||||||
/** 通过名称查找标签，返回 ID（不存在则返回 null） */
|
/** 通过名称查找标签，返回 ID（不存在则返回 null） */
|
||||||
|
|||||||
@@ -520,6 +520,84 @@ cmd.pipeline = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// ──────── pr ────────
|
||||||
|
|
||||||
|
cmd.pr = {
|
||||||
|
async list(api, opts) {
|
||||||
|
const params = {};
|
||||||
|
if (opts.options.state) params.state = opts.options.state;
|
||||||
|
if (opts.options.base) params.base = opts.options.base;
|
||||||
|
if (opts.options.head) params.head = opts.options.head;
|
||||||
|
|
||||||
|
const prs = await api.listPullRequests(params);
|
||||||
|
out(prs);
|
||||||
|
if (!opts.options.json) {
|
||||||
|
outText(`\n🔀 Pull Requests (${prs.length || 0})\n`);
|
||||||
|
if (!prs || !prs.length) { outText(' (无)'); return; }
|
||||||
|
table(
|
||||||
|
['#', '标题', '状态', 'Base', 'Head', '合并'],
|
||||||
|
prs.map(p => [
|
||||||
|
p.number,
|
||||||
|
truncate(p.title, 35),
|
||||||
|
p.state,
|
||||||
|
p.base?.ref || '—',
|
||||||
|
p.head?.ref || '—',
|
||||||
|
p.merged ? '✅' : '—',
|
||||||
|
])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async get(api, opts) {
|
||||||
|
const num = opts.rest[0];
|
||||||
|
if (!num) { fail('用法: pr get <number>'); return; }
|
||||||
|
const pr = await api.getPullRequest(num);
|
||||||
|
out(pr);
|
||||||
|
if (!opts.options.json) {
|
||||||
|
outText(`\n🔀 PR #${pr.number}: ${pr.title}`);
|
||||||
|
outText(` 状态: ${pr.state}`);
|
||||||
|
outText(` ${pr.base?.ref} ← ${pr.head?.ref}`);
|
||||||
|
outText(` 合并: ${pr.merged ? '✅ 已合并' : '❌ 未合并'}`);
|
||||||
|
if (pr.body) {
|
||||||
|
outText(`\n--- Body ---\n${pr.body.slice(0, 500)}${pr.body.length > 500 ? '…' : ''}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async create(api, opts) {
|
||||||
|
const base = opts.options.base || 'main';
|
||||||
|
const head = opts.options.head;
|
||||||
|
const title = opts.options.title;
|
||||||
|
const body = opts.options.body || '';
|
||||||
|
|
||||||
|
if (!head || !title) {
|
||||||
|
fail('用法: pr create --head <分支> --title "标题" [--base main] [--body "描述"]');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const pr = await api.createPullRequest({ base, head, title, body });
|
||||||
|
out(pr);
|
||||||
|
if (!opts.options.json) {
|
||||||
|
ok(`PR #${pr.number} 已创建: ${pr.title}`);
|
||||||
|
outText(` ${pr.html_url}`);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async merge(api, opts) {
|
||||||
|
const num = opts.rest[0];
|
||||||
|
if (!num) { fail('用法: pr merge <number> [--style merge|squash|rebase]'); return; }
|
||||||
|
const style = opts.options.style || 'merge';
|
||||||
|
|
||||||
|
const pr = await api.getPullRequest(num);
|
||||||
|
if (pr.merged) { fail(`PR #${num} 已合并，无需重复操作`); return; }
|
||||||
|
if (pr.mergeable === false) { fail(`PR #${num} 存在冲突，无法自动合并。请先解决冲突。`); return; }
|
||||||
|
|
||||||
|
const result = await api.mergePullRequest(num, { style });
|
||||||
|
out(result);
|
||||||
|
if (!opts.options.json) ok(`PR #${num} 已合并 (${style})`);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
// ──────── test ────────
|
// ──────── test ────────
|
||||||
|
|
||||||
cmd.test = {
|
cmd.test = {
|
||||||
@@ -682,6 +760,11 @@ Gitea CLI — 项目管理工具
|
|||||||
pipeline status 查看当前流水线进度
|
pipeline status 查看当前流水线进度
|
||||||
pipeline update <#> 更新 Pipeline 字段 --field <阶段|当前迭代> --value <值>
|
pipeline update <#> 更新 Pipeline 字段 --field <阶段|当前迭代> --value <值>
|
||||||
|
|
||||||
|
pr list 列出 Pull Requests [--state open|closed|all] [--base <分支>] [--head <分支>]
|
||||||
|
pr get <#> 查看 PR 详情
|
||||||
|
pr create 创建 PR --head <分支> --title "标题" [--base main] [--body "描述"]
|
||||||
|
pr merge <#> 合并 PR [--style merge|squash|rebase]
|
||||||
|
|
||||||
test 验证所有 API 接口
|
test 验证所有 API 接口
|
||||||
|
|
||||||
角色自动映射:
|
角色自动映射:
|
||||||
|
|||||||
@@ -218,7 +218,36 @@ Pipeline Tracker 是一个 Meta Issue，仅记录**无法从 Issue/Milestone 推
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 8. 标签体系
|
## 8. PR 操作（发布合并）
|
||||||
|
|
||||||
|
迭代完成时，PM 负责创建 develop → main 的 PR：
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 列出当前 PR
|
||||||
|
node .claude/skills/gitea-pm/gitea.js --role pm pr list
|
||||||
|
|
||||||
|
# 创建发布 PR
|
||||||
|
bash .claude/scripts/git-workflow.sh release "迭代名称"
|
||||||
|
|
||||||
|
# 或手动创建
|
||||||
|
node .claude/skills/gitea-pm/gitea.js --role pm pr create \
|
||||||
|
--base main --head develop \
|
||||||
|
--title "Merge develop → main: 迭代名称" \
|
||||||
|
--body "发布描述"
|
||||||
|
|
||||||
|
# 查看 PR 详情
|
||||||
|
node .claude/skills/gitea-pm/gitea.js --role pm pr get <number>
|
||||||
|
|
||||||
|
# 合并 PR（用户审查确认后）
|
||||||
|
node .claude/skills/gitea-pm/gitea.js --role pm pr merge <number> --style merge
|
||||||
|
|
||||||
|
# 合并后同步
|
||||||
|
bash .claude/scripts/git-workflow.sh post-release
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 9. 标签体系
|
||||||
|
|
||||||
从 `gitea-config.json` 的 `labels` 字段定义。`label init` 命令从此配置创建标签。
|
从 `gitea-config.json` 的 `labels` 字段定义。`label init` 命令从此配置创建标签。
|
||||||
|
|
||||||
|
|||||||
@@ -222,6 +222,27 @@ class GiteaAPI {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ====== Pull Requests ======
|
||||||
|
|
||||||
|
listPullRequests(params = {}) {
|
||||||
|
return this.request('GET', '/pulls', null, { state: 'open', limit: 50, ...params });
|
||||||
|
}
|
||||||
|
|
||||||
|
getPullRequest(number) {
|
||||||
|
return this.request('GET', `/pulls/${number}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
createPullRequest(data) {
|
||||||
|
return this.request('POST', '/pulls', data);
|
||||||
|
}
|
||||||
|
|
||||||
|
mergePullRequest(number, data = {}) {
|
||||||
|
return this.request('POST', `/pulls/${number}/merge`, {
|
||||||
|
Do: data.style || 'merge', // merge | squash | rebase
|
||||||
|
...data,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// ====== 辅助方法 ======
|
// ====== 辅助方法 ======
|
||||||
|
|
||||||
/** 通过名称查找标签，返回 ID（不存在则返回 null） */
|
/** 通过名称查找标签，返回 ID（不存在则返回 null） */
|
||||||
|
|||||||
@@ -520,6 +520,87 @@ cmd.pipeline = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// ──────── pr ────────
|
||||||
|
|
||||||
|
cmd.pr = {
|
||||||
|
async list(api, opts) {
|
||||||
|
const params = {};
|
||||||
|
if (opts.options.state) params.state = opts.options.state;
|
||||||
|
if (opts.options.base) params.base = opts.options.base;
|
||||||
|
if (opts.options.head) params.head = opts.options.head;
|
||||||
|
|
||||||
|
const prs = await api.listPullRequests(params);
|
||||||
|
out(prs);
|
||||||
|
if (!opts.options.json) {
|
||||||
|
outText(`\n🔀 Pull Requests (${prs.length || 0})\n`);
|
||||||
|
if (!prs || !prs.length) { outText(' (无)'); return; }
|
||||||
|
table(
|
||||||
|
['#', '标题', '状态', 'Base', 'Head', '合并'],
|
||||||
|
prs.map(p => [
|
||||||
|
p.number,
|
||||||
|
truncate(p.title, 35),
|
||||||
|
p.state,
|
||||||
|
p.base?.ref || '—',
|
||||||
|
p.head?.ref || '—',
|
||||||
|
p.merged ? '✅' : '—',
|
||||||
|
])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async get(api, opts) {
|
||||||
|
const num = opts.rest[0];
|
||||||
|
if (!num) { fail('用法: pr get <number>'); return; }
|
||||||
|
const pr = await api.getPullRequest(num);
|
||||||
|
out(pr);
|
||||||
|
if (!opts.options.json) {
|
||||||
|
outText(`\n🔀 PR #${pr.number}: ${pr.title}`);
|
||||||
|
outText(` 状态: ${pr.state}`);
|
||||||
|
outText(` ${pr.base?.ref} ← ${pr.head?.ref}`);
|
||||||
|
outText(` 合并: ${pr.merged ? '✅ 已合并' : '❌ 未合并'}`);
|
||||||
|
outText(` 创建: ${pr.created_at?.slice(0, 10)}`);
|
||||||
|
outText(` 更新: ${pr.updated_at?.slice(0, 10)}`);
|
||||||
|
if (pr.body) {
|
||||||
|
outText(`\n--- Body ---\n${pr.body.slice(0, 500)}${pr.body.length > 500 ? '…' : ''}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async create(api, opts) {
|
||||||
|
const base = opts.options.base || 'main';
|
||||||
|
const head = opts.options.head;
|
||||||
|
const title = opts.options.title;
|
||||||
|
const body = opts.options.body || '';
|
||||||
|
|
||||||
|
if (!head || !title) {
|
||||||
|
fail('用法: pr create --head <分支> --title "标题" [--base main] [--body "描述"]');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const pr = await api.createPullRequest({ base, head, title, body });
|
||||||
|
out(pr);
|
||||||
|
if (!opts.options.json) {
|
||||||
|
ok(`PR #${pr.number} 已创建: ${pr.title}`);
|
||||||
|
outText(` ${pr.html_url}`);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async merge(api, opts) {
|
||||||
|
const num = opts.rest[0];
|
||||||
|
if (!num) { fail('用法: pr merge <number> [--style merge|squash|rebase]'); return; }
|
||||||
|
const style = opts.options.style || 'merge';
|
||||||
|
|
||||||
|
// 先检查 PR 状态
|
||||||
|
const pr = await api.getPullRequest(num);
|
||||||
|
if (pr.merged) { fail(`PR #${num} 已合并，无需重复操作`); return; }
|
||||||
|
if (pr.mergeable === false) { fail(`PR #${num} 存在冲突，无法自动合并。请先解决冲突。`); return; }
|
||||||
|
|
||||||
|
const result = await api.mergePullRequest(num, { style });
|
||||||
|
out(result);
|
||||||
|
if (!opts.options.json) ok(`PR #${num} 已合并 (${style})`);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
// ──────── test ────────
|
// ──────── test ────────
|
||||||
|
|
||||||
cmd.test = {
|
cmd.test = {
|
||||||
@@ -682,6 +763,11 @@ Gitea CLI — 项目管理工具
|
|||||||
pipeline status 查看当前流水线进度
|
pipeline status 查看当前流水线进度
|
||||||
pipeline update <#> 更新 Pipeline 字段 --field <阶段|当前迭代> --value <值>
|
pipeline update <#> 更新 Pipeline 字段 --field <阶段|当前迭代> --value <值>
|
||||||
|
|
||||||
|
pr list 列出 Pull Requests [--state open|closed|all] [--base <分支>] [--head <分支>]
|
||||||
|
pr get <#> 查看 PR 详情
|
||||||
|
pr create 创建 PR --head <分支> --title "标题" [--base main] [--body "描述"]
|
||||||
|
pr merge <#> 合并 PR [--style merge|squash|rebase]
|
||||||
|
|
||||||
test 验证所有 API 接口
|
test 验证所有 API 接口
|
||||||
|
|
||||||
角色自动映射:
|
角色自动映射:
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ public class ChildHood : ModuleRules
|
|||||||
|
|
||||||
PublicIncludePaths.AddRange(new string[] {
|
PublicIncludePaths.AddRange(new string[] {
|
||||||
"ChildHood",
|
"ChildHood",
|
||||||
|
"ChildHood/Interaction",
|
||||||
"ChildHood/Variant_Platforming",
|
"ChildHood/Variant_Platforming",
|
||||||
"ChildHood/Variant_Platforming/Animation",
|
"ChildHood/Variant_Platforming/Animation",
|
||||||
"ChildHood/Variant_Combat",
|
"ChildHood/Variant_Combat",
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
#include "EnhancedInputSubsystems.h"
|
#include "EnhancedInputSubsystems.h"
|
||||||
#include "InputActionValue.h"
|
#include "InputActionValue.h"
|
||||||
#include "ChildHood.h"
|
#include "ChildHood.h"
|
||||||
|
#include "Interaction/InteractionManager.h"
|
||||||
|
|
||||||
AChildHoodCharacter::AChildHoodCharacter()
|
AChildHoodCharacter::AChildHoodCharacter()
|
||||||
{
|
{
|
||||||
@@ -31,8 +32,6 @@ AChildHoodCharacter::AChildHoodCharacter()
|
|||||||
CMC->BrakingDecelerationWalking = 1500.0f; // 停止减速 0.3s (450/0.3)
|
CMC->BrakingDecelerationWalking = 1500.0f; // 停止减速 0.3s (450/0.3)
|
||||||
CMC->BrakingDecelerationFalling = 1500.0f;
|
CMC->BrakingDecelerationFalling = 1500.0f;
|
||||||
CMC->MinAnalogWalkSpeed = 20.f;
|
CMC->MinAnalogWalkSpeed = 20.f;
|
||||||
// WalkableFloorAngle 默认 45°，无需修改
|
|
||||||
// v0.1 不跳跃，不设置 JumpZVelocity / AirControl
|
|
||||||
|
|
||||||
// Create a camera boom (pulls in towards the player if there is a collision)
|
// Create a camera boom (pulls in towards the player if there is a collision)
|
||||||
CameraBoom = CreateDefaultSubobject<USpringArmComponent>(TEXT("CameraBoom"));
|
CameraBoom = CreateDefaultSubobject<USpringArmComponent>(TEXT("CameraBoom"));
|
||||||
@@ -42,19 +41,22 @@ AChildHoodCharacter::AChildHoodCharacter()
|
|||||||
CameraBoom->bUsePawnControlRotation = true;
|
CameraBoom->bUsePawnControlRotation = true;
|
||||||
|
|
||||||
// 摄像机软跟随
|
// 摄像机软跟随
|
||||||
CameraBoom->bEnableCameraLag = true; // 启用位置延迟跟随
|
CameraBoom->bEnableCameraLag = true;
|
||||||
CameraBoom->CameraLagSpeed = 6.0f; // 跟随速度（可调 2-8）
|
CameraBoom->CameraLagSpeed = 6.0f;
|
||||||
CameraBoom->bEnableCameraRotationLag = false; // v0.1 不启用旋转延迟
|
CameraBoom->bEnableCameraRotationLag = false;
|
||||||
|
|
||||||
// 摄像机碰撞处理
|
// 摄像机碰撞处理
|
||||||
CameraBoom->bDoCollisionTest = true; // 启用碰撞检测
|
CameraBoom->bDoCollisionTest = true;
|
||||||
CameraBoom->ProbeSize = 12.0f; // 碰撞探针半径
|
CameraBoom->ProbeSize = 12.0f;
|
||||||
CameraBoom->ProbeChannel = ECC_Camera; // 使用 Camera 碰撞通道
|
CameraBoom->ProbeChannel = ECC_Camera;
|
||||||
|
|
||||||
// Create a follow camera
|
// Create a follow camera
|
||||||
FollowCamera = CreateDefaultSubobject<UCameraComponent>(TEXT("FollowCamera"));
|
FollowCamera = CreateDefaultSubobject<UCameraComponent>(TEXT("FollowCamera"));
|
||||||
FollowCamera->SetupAttachment(CameraBoom, USpringArmComponent::SocketName);
|
FollowCamera->SetupAttachment(CameraBoom, USpringArmComponent::SocketName);
|
||||||
FollowCamera->bUsePawnControlRotation = false;
|
FollowCamera->bUsePawnControlRotation = false;
|
||||||
|
|
||||||
|
// 创建交互管理器组件
|
||||||
|
InteractionManager = CreateDefaultSubobject<UInteractionManager>(TEXT("InteractionManager"));
|
||||||
}
|
}
|
||||||
|
|
||||||
void AChildHoodCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent)
|
void AChildHoodCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent)
|
||||||
@@ -69,7 +71,7 @@ void AChildHoodCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInput
|
|||||||
EnhancedInputComponent->BindAction(LookAction, ETriggerEvent::Triggered, this, &AChildHoodCharacter::Look);
|
EnhancedInputComponent->BindAction(LookAction, ETriggerEvent::Triggered, this, &AChildHoodCharacter::Look);
|
||||||
EnhancedInputComponent->BindAction(MouseLookAction, ETriggerEvent::Triggered, this, &AChildHoodCharacter::Look);
|
EnhancedInputComponent->BindAction(MouseLookAction, ETriggerEvent::Triggered, this, &AChildHoodCharacter::Look);
|
||||||
|
|
||||||
// Interaction IAs — bind to placeholder callbacks; interaction system will hook into these
|
// Interaction — delegates to InteractionManager
|
||||||
if (InteractAction)
|
if (InteractAction)
|
||||||
{
|
{
|
||||||
EnhancedInputComponent->BindAction(InteractAction, ETriggerEvent::Started, this, &AChildHoodCharacter::OnInteract);
|
EnhancedInputComponent->BindAction(InteractAction, ETriggerEvent::Started, this, &AChildHoodCharacter::OnInteract);
|
||||||
@@ -109,23 +111,35 @@ void AChildHoodCharacter::Look(const FInputActionValue& Value)
|
|||||||
|
|
||||||
void AChildHoodCharacter::OnInteract(const FInputActionValue& Value)
|
void AChildHoodCharacter::OnInteract(const FInputActionValue& Value)
|
||||||
{
|
{
|
||||||
// v0.1 placeholder — interaction system will provide implementation
|
if (UInteractionManager* IM = GetInteractionManager())
|
||||||
// Interaction system hooks in via blueprint or future C++ delegate
|
{
|
||||||
|
// E 键双重功能：Free 发起交互，Active 结束交互
|
||||||
|
IM->BeginInteract();
|
||||||
|
IM->CancelInteract();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AChildHoodCharacter::OnCancel(const FInputActionValue& Value)
|
void AChildHoodCharacter::OnCancel(const FInputActionValue& Value)
|
||||||
{
|
{
|
||||||
// v0.1 placeholder — interaction system will provide implementation
|
if (UInteractionManager* IM = GetInteractionManager())
|
||||||
|
{
|
||||||
|
IM->CancelInteract();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AChildHoodCharacter::OnSwitchInteract(const FInputActionValue& Value)
|
void AChildHoodCharacter::OnSwitchInteract(const FInputActionValue& Value)
|
||||||
{
|
{
|
||||||
// v0.1 placeholder — interaction system will provide implementation
|
if (UInteractionManager* IM = GetInteractionManager())
|
||||||
|
{
|
||||||
|
float DirectionValue = Value.Get<float>();
|
||||||
|
int32 Direction = (DirectionValue >= 0.f) ? 1 : -1;
|
||||||
|
IM->SwitchTarget(Direction);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AChildHoodCharacter::DoMove(float Right, float Forward)
|
void AChildHoodCharacter::DoMove(float Right, float Forward)
|
||||||
{
|
{
|
||||||
// P1: 交互中忽略移动输入
|
// 交互中屏蔽移动
|
||||||
if (bIsInteracting)
|
if (bIsInteracting)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@@ -159,6 +173,15 @@ void AChildHoodCharacter::DoLook(float Yaw, float Pitch)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 交互系统方法
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
UInteractionManager* AChildHoodCharacter::GetInteractionManager() const
|
||||||
|
{
|
||||||
|
return InteractionManager;
|
||||||
|
}
|
||||||
|
|
||||||
void AChildHoodCharacter::SetInteracting(bool bValue)
|
void AChildHoodCharacter::SetInteracting(bool bValue)
|
||||||
{
|
{
|
||||||
bIsInteracting = bValue;
|
bIsInteracting = bValue;
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
class USpringArmComponent;
|
class USpringArmComponent;
|
||||||
class UCameraComponent;
|
class UCameraComponent;
|
||||||
class UInputAction;
|
class UInputAction;
|
||||||
|
class UInteractionManager;
|
||||||
struct FInputActionValue;
|
struct FInputActionValue;
|
||||||
|
|
||||||
DECLARE_LOG_CATEGORY_EXTERN(LogTemplateCharacter, Log, All);
|
DECLARE_LOG_CATEGORY_EXTERN(LogTemplateCharacter, Log, All);
|
||||||
@@ -57,6 +58,10 @@ protected:
|
|||||||
UPROPERTY(EditAnywhere, Category="Input")
|
UPROPERTY(EditAnywhere, Category="Input")
|
||||||
UInputAction* SwitchInteractAction;
|
UInputAction* SwitchInteractAction;
|
||||||
|
|
||||||
|
/** 交互管理器组件 */
|
||||||
|
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Interaction", meta = (AllowPrivateAccess = "true"))
|
||||||
|
UInteractionManager* InteractionManager;
|
||||||
|
|
||||||
/** Whether the character is currently in an interaction */
|
/** Whether the character is currently in an interaction */
|
||||||
bool bIsInteracting = false;
|
bool bIsInteracting = false;
|
||||||
|
|
||||||
@@ -65,6 +70,22 @@ public:
|
|||||||
/** Constructor */
|
/** Constructor */
|
||||||
AChildHoodCharacter();
|
AChildHoodCharacter();
|
||||||
|
|
||||||
|
/** 获取交互管理器组件 */
|
||||||
|
UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Interaction")
|
||||||
|
UInteractionManager* GetInteractionManager() const;
|
||||||
|
|
||||||
|
/** Set interaction state — called by interaction system */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interaction")
|
||||||
|
void SetInteracting(bool bValue);
|
||||||
|
|
||||||
|
/** Query: is the character currently interacting? */
|
||||||
|
UFUNCTION(BlueprintCallable, BlueprintPure, Category="Interaction")
|
||||||
|
bool IsInteracting() const;
|
||||||
|
|
||||||
|
/** Query: is the character currently running (moving on ground)? */
|
||||||
|
UFUNCTION(BlueprintCallable, BlueprintPure, Category="Interaction")
|
||||||
|
bool IsRunning() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
/** Initialize input action bindings */
|
/** Initialize input action bindings */
|
||||||
@@ -78,13 +99,13 @@ protected:
|
|||||||
/** Called for looking input */
|
/** Called for looking input */
|
||||||
void Look(const FInputActionValue& Value);
|
void Look(const FInputActionValue& Value);
|
||||||
|
|
||||||
/** Called for interact input (E) — placeholder, delegates to interaction system */
|
/** Called for interact input (E) — delegates to InteractionManager */
|
||||||
void OnInteract(const FInputActionValue& Value);
|
void OnInteract(const FInputActionValue& Value);
|
||||||
|
|
||||||
/** Called for cancel input (ESC) — placeholder, delegates to interaction system */
|
/** Called for cancel input (ESC) — delegates to InteractionManager */
|
||||||
void OnCancel(const FInputActionValue& Value);
|
void OnCancel(const FInputActionValue& Value);
|
||||||
|
|
||||||
/** Called for switch interact target input (Tab/Wheel) — placeholder, delegates to interaction system */
|
/** Called for switch interact target input (Tab/Wheel) — delegates to InteractionManager */
|
||||||
void OnSwitchInteract(const FInputActionValue& Value);
|
void OnSwitchInteract(const FInputActionValue& Value);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
@@ -97,18 +118,6 @@ public:
|
|||||||
UFUNCTION(BlueprintCallable, Category="Input")
|
UFUNCTION(BlueprintCallable, Category="Input")
|
||||||
virtual void DoLook(float Yaw, float Pitch);
|
virtual void DoLook(float Yaw, float Pitch);
|
||||||
|
|
||||||
/** Set interaction state — called by interaction system */
|
|
||||||
UFUNCTION(BlueprintCallable, Category="Interaction")
|
|
||||||
void SetInteracting(bool bValue);
|
|
||||||
|
|
||||||
/** Query: is the character currently interacting? */
|
|
||||||
UFUNCTION(BlueprintCallable, BlueprintPure, Category="Interaction")
|
|
||||||
bool IsInteracting() const;
|
|
||||||
|
|
||||||
/** Query: is the character currently running (moving on ground)? */
|
|
||||||
UFUNCTION(BlueprintCallable, BlueprintPure, Category="Interaction")
|
|
||||||
bool IsRunning() const;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
/** Returns CameraBoom subobject **/
|
/** Returns CameraBoom subobject **/
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
// ChildHood Project - 跨关卡持久数据持有者 实现
|
||||||
|
|
||||||
|
#include "ChildHoodGameInstance.h"
|
||||||
|
|
||||||
|
bool UChildHoodGameInstance::IsItemCollected(FName ItemId) const
|
||||||
|
{
|
||||||
|
return CollectedItemIDs.Contains(ItemId);
|
||||||
|
}
|
||||||
|
|
||||||
|
void UChildHoodGameInstance::MarkItemCollected(FName ItemId)
|
||||||
|
{
|
||||||
|
CollectedItemIDs.Add(ItemId);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool UChildHoodGameInstance::IsDoorOpen(FName DoorId) const
|
||||||
|
{
|
||||||
|
const bool* Found = DoorStates.Find(DoorId);
|
||||||
|
return Found ? *Found : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void UChildHoodGameInstance::SetDoorOpen(FName DoorId, bool bIsOpen)
|
||||||
|
{
|
||||||
|
DoorStates.Add(DoorId, bIsOpen);
|
||||||
|
}
|
||||||
|
|
||||||
|
void UChildHoodGameInstance::ResetAll()
|
||||||
|
{
|
||||||
|
CollectedItemIDs.Empty();
|
||||||
|
DoorStates.Empty();
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
// ChildHood Project - 跨关卡持久数据持有者
|
||||||
|
// 对应技术方案: docs/technical/交互系统-技术方案.md 第12节（跨场景持久化设计）
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "CoreMinimal.h"
|
||||||
|
#include "Engine/GameInstance.h"
|
||||||
|
#include "ChildHoodGameInstance.generated.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* UChildHoodGameInstance
|
||||||
|
*
|
||||||
|
* 跨关卡持久数据持有者。UE5 的 OpenLevel() 会销毁整个旧 World（包括
|
||||||
|
* Character 及其所有 UActorComponent），因此需要将持久数据与运行时行为分离。
|
||||||
|
*
|
||||||
|
* v0.1 为单场景原型，此 GameInstance 以空数据初始化。
|
||||||
|
* 后续多场景版本只需在 Project Settings 中将 GameInstance Class 设为此类即可。
|
||||||
|
*/
|
||||||
|
UCLASS()
|
||||||
|
class UChildHoodGameInstance : public UGameInstance
|
||||||
|
{
|
||||||
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
// === 物品消耗状态 ===
|
||||||
|
|
||||||
|
/** 查询指定物品是否已被收集（跨场景持久） */
|
||||||
|
bool IsItemCollected(FName ItemId) const;
|
||||||
|
|
||||||
|
/** 标记指定物品为已收集（写入持久层） */
|
||||||
|
void MarkItemCollected(FName ItemId);
|
||||||
|
|
||||||
|
// === 门状态 ===
|
||||||
|
|
||||||
|
/** 查询指定门的开关状态（跨场景持久），未记录的门默认为关闭 */
|
||||||
|
bool IsDoorOpen(FName DoorId) const;
|
||||||
|
|
||||||
|
/** 设置指定门的开关状态（写入持久层） */
|
||||||
|
void SetDoorOpen(FName DoorId, bool bIsOpen);
|
||||||
|
|
||||||
|
// === 重置 ===
|
||||||
|
|
||||||
|
/** 重置所有持久数据（新游戏时调用） */
|
||||||
|
void ResetAll();
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
/** 已收集物品ID集合 */
|
||||||
|
UPROPERTY()
|
||||||
|
TSet<FName> CollectedItemIDs;
|
||||||
|
|
||||||
|
/** 门开关状态映射（true=打开，false=关闭） */
|
||||||
|
UPROPERTY()
|
||||||
|
TMap<FName, bool> DoorStates;
|
||||||
|
};
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
// ChildHood Project - 通用交互物 Actor 基类 实现
|
||||||
|
|
||||||
|
#include "Interaction/InteractableActor.h"
|
||||||
|
#include "Interaction/InteractableComponent.h"
|
||||||
|
|
||||||
|
#include "Components/StaticMeshComponent.h"
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 构造函数
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
AInteractableActor::AInteractableActor()
|
||||||
|
{
|
||||||
|
PrimaryActorTick.bCanEverTick = false;
|
||||||
|
|
||||||
|
// 创建 Mesh 为根组件
|
||||||
|
MeshComp = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("MeshComp"));
|
||||||
|
RootComponent = MeshComp;
|
||||||
|
MeshComp->SetCollisionProfileName(TEXT("BlockAll"));
|
||||||
|
|
||||||
|
// 创建交互组件（UActorComponent 不需要 SetupAttachment，数据驱动型组件）
|
||||||
|
InteractableComp = CreateDefaultSubobject<UInteractableComponent>(TEXT("InteractableComp"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 交互回调
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void AInteractableActor::OnInteractStarted_Implementation(UInteractableComponent* Comp)
|
||||||
|
{
|
||||||
|
if (!Comp || !MeshComp) return;
|
||||||
|
|
||||||
|
const FInteractableData& Data = Comp->GetInteractableData();
|
||||||
|
|
||||||
|
// 门类型：根据开关状态旋转 Mesh
|
||||||
|
if (Data.Type == EInteractType::Operate && Data.OperateSubType == EOperateSubType::Door)
|
||||||
|
{
|
||||||
|
FRotator CurrentRot = MeshComp->GetRelativeRotation();
|
||||||
|
float TargetYaw = Comp->IsDoorOpen() ? 90.0f : 0.0f;
|
||||||
|
MeshComp->SetRelativeRotation(FRotator(CurrentRot.Pitch, TargetYaw, CurrentRot.Roll));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void AInteractableActor::OnInteractEnded_Implementation(UInteractableComponent* Comp)
|
||||||
|
{
|
||||||
|
// 默认空实现，子类可覆盖
|
||||||
|
}
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
// ChildHood Project - 通用交互物 Actor 基类
|
||||||
|
// 对应技术方案: docs/technical/交互系统-技术方案.md 第3节（类设计）
|
||||||
|
// 职责：持有 Mesh + InteractableComponent，提供可被子类覆盖的交互回调
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "CoreMinimal.h"
|
||||||
|
#include "GameFramework/Actor.h"
|
||||||
|
#include "InteractableActor.generated.h"
|
||||||
|
|
||||||
|
class UInteractableComponent;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AInteractableActor
|
||||||
|
*
|
||||||
|
* 通用交互物 Actor 基类。场景中的每个交互物（冰箱、门、NPC 等）
|
||||||
|
* 均为该类的实例或其子类的实例。
|
||||||
|
*
|
||||||
|
* 组成：
|
||||||
|
* - UStaticMeshComponent* MeshComp（根组件，承载可视模型）
|
||||||
|
* - UInteractableComponent* InteractableComp（交互逻辑与数据）
|
||||||
|
*
|
||||||
|
* 子类可覆盖 OnInteractStarted / OnInteractEnded 以实现类型特定行为，
|
||||||
|
* 如门开关时的 Mesh 旋转、拾取物的消失效果等。
|
||||||
|
*/
|
||||||
|
UCLASS()
|
||||||
|
class AInteractableActor : public AActor
|
||||||
|
{
|
||||||
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
AInteractableActor();
|
||||||
|
|
||||||
|
// === 组件访问 ===
|
||||||
|
|
||||||
|
/** 获取静态网格组件 */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interact")
|
||||||
|
UStaticMeshComponent* GetMeshComp() const { return MeshComp; }
|
||||||
|
|
||||||
|
/** 获取交互组件 */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interact")
|
||||||
|
UInteractableComponent* GetInteractableComp() const { return InteractableComp; }
|
||||||
|
|
||||||
|
// === 可被子类覆盖的交互回调 ===
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 交互开始时调用（门开关切换、状态恢复时也调用）。
|
||||||
|
* 默认实现：门类型根据开关状态对 Mesh 做 Yaw 旋转（开门+90度/关门0度）。
|
||||||
|
*/
|
||||||
|
UFUNCTION(BlueprintNativeEvent, Category = "Interact")
|
||||||
|
void OnInteractStarted(UInteractableComponent* Comp);
|
||||||
|
virtual void OnInteractStarted_Implementation(UInteractableComponent* Comp);
|
||||||
|
|
||||||
|
/** 交互结束时调用。默认为空实现，子类可覆盖。 */
|
||||||
|
UFUNCTION(BlueprintNativeEvent, Category = "Interact")
|
||||||
|
void OnInteractEnded(UInteractableComponent* Comp);
|
||||||
|
virtual void OnInteractEnded_Implementation(UInteractableComponent* Comp);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
|
||||||
|
/** 交互物的可视模型 */
|
||||||
|
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Components", meta = (AllowPrivateAccess = "true"))
|
||||||
|
UStaticMeshComponent* MeshComp;
|
||||||
|
|
||||||
|
/** 交互物的交互组件（数据 + 检测 + 状态） */
|
||||||
|
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Components", meta = (AllowPrivateAccess = "true"))
|
||||||
|
UInteractableComponent* InteractableComp;
|
||||||
|
};
|
||||||
@@ -0,0 +1,221 @@
|
|||||||
|
// ChildHood Project - 可交互物组件 实现
|
||||||
|
|
||||||
|
#include "Interaction/InteractableComponent.h"
|
||||||
|
#include "Interaction/InteractableActor.h"
|
||||||
|
#include "Interaction/InteractionManager.h"
|
||||||
|
#include "ChildHoodGameInstance.h"
|
||||||
|
#include "ChildHood.h"
|
||||||
|
|
||||||
|
#include "Components/SphereComponent.h"
|
||||||
|
#include "Engine/World.h"
|
||||||
|
#include "GameFramework/Character.h"
|
||||||
|
#include "Kismet/GameplayStatics.h"
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 构造函数
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
UInteractableComponent::UInteractableComponent()
|
||||||
|
{
|
||||||
|
// 不需要 Tick，检测由碰撞事件驱动
|
||||||
|
PrimaryComponentTick.bCanEverTick = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 生命周期
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractableComponent::BeginPlay()
|
||||||
|
{
|
||||||
|
Super::BeginPlay();
|
||||||
|
|
||||||
|
AActor* Owner = GetOwner();
|
||||||
|
if (!Owner)
|
||||||
|
{
|
||||||
|
UE_LOG(LogChildHood, Warning, TEXT("InteractableComponent: 无 Owner，跳过初始化"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- 创建检测球 ---
|
||||||
|
DetectionSphere = NewObject<USphereComponent>(this, USphereComponent::StaticClass(), TEXT("DetectionSphere"));
|
||||||
|
if (DetectionSphere)
|
||||||
|
{
|
||||||
|
DetectionSphere->SetupAttachment(Owner->GetRootComponent());
|
||||||
|
DetectionSphere->RegisterComponent();
|
||||||
|
DetectionSphere->SetSphereRadius(Data.TriggerRadius);
|
||||||
|
DetectionSphere->SetCollisionProfileName(TEXT("OverlapAllDynamic"));
|
||||||
|
// 关闭物理模拟，仅用于 Overlap 检测
|
||||||
|
DetectionSphere->SetGenerateOverlapEvents(true);
|
||||||
|
DetectionSphere->SetCanEverAffectNavigation(false);
|
||||||
|
|
||||||
|
// 绑定碰撞事件
|
||||||
|
DetectionSphere->OnComponentBeginOverlap.AddDynamic(this, &UInteractableComponent::OnDetectionOverlapBegin);
|
||||||
|
DetectionSphere->OnComponentEndOverlap.AddDynamic(this, &UInteractableComponent::OnDetectionOverlapEnd);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
UE_LOG(LogChildHood, Error, TEXT("InteractableComponent: DetectionSphere 创建失败"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- 恢复跨场景持久状态 ---
|
||||||
|
if (UChildHoodGameInstance* GI = GetWorld()->GetGameInstance<UChildHoodGameInstance>())
|
||||||
|
{
|
||||||
|
RestorePersistentState(GI);
|
||||||
|
}
|
||||||
|
|
||||||
|
UE_LOG(LogChildHood, Log, TEXT("InteractableComponent Init: %s (Type=%s, Radius=%f)"),
|
||||||
|
Data.DisplayName.IsEmpty() ? TEXT("(unnamed)") : *Data.DisplayName,
|
||||||
|
*UEnum::GetValueAsString(Data.Type),
|
||||||
|
Data.TriggerRadius);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 提示文本
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
FString UInteractableComponent::GetPromptText() const
|
||||||
|
{
|
||||||
|
FString Verb = Data.InteractVerb;
|
||||||
|
// 门类型：根据当前开关状态选择动词
|
||||||
|
if (Data.Type == EInteractType::Operate && Data.OperateSubType == EOperateSubType::Door)
|
||||||
|
{
|
||||||
|
Verb = bDoorIsOpen ? Data.InteractVerbAlt : Data.InteractVerb;
|
||||||
|
}
|
||||||
|
return FString::Printf(TEXT("[E] %s %s"), *Verb, *Data.DisplayName);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 消耗管理
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractableComponent::Consume()
|
||||||
|
{
|
||||||
|
bIsConsumed = true;
|
||||||
|
|
||||||
|
// 禁用检测球，不再触发 Overlap
|
||||||
|
if (DetectionSphere)
|
||||||
|
{
|
||||||
|
DetectionSphere->SetCollisionEnabled(ECollisionEnabled::NoCollision);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 写入持久层
|
||||||
|
if (UWorld* World = GetWorld())
|
||||||
|
{
|
||||||
|
if (UChildHoodGameInstance* GI = World->GetGameInstance<UChildHoodGameInstance>())
|
||||||
|
{
|
||||||
|
GI->MarkItemCollected(Data.ItemId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
UE_LOG(LogChildHood, Log, TEXT("InteractableComponent 已消耗: %s"), *Data.ItemId.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 门状态管理
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractableComponent::ToggleDoor()
|
||||||
|
{
|
||||||
|
bDoorIsOpen = !bDoorIsOpen;
|
||||||
|
UE_LOG(LogChildHood, Log, TEXT("InteractableComponent 门状态切换: %s → %s"),
|
||||||
|
*Data.ItemId.ToString(),
|
||||||
|
bDoorIsOpen ? TEXT("开") : TEXT("关"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 位置查询
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
FVector UInteractableComponent::GetWorldLocation() const
|
||||||
|
{
|
||||||
|
AActor* Owner = GetOwner();
|
||||||
|
return Owner ? Owner->GetActorLocation() : FVector::ZeroVector;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 跨场景持久状态恢复
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractableComponent::RestorePersistentState(UChildHoodGameInstance* GI)
|
||||||
|
{
|
||||||
|
if (!GI) return;
|
||||||
|
|
||||||
|
// oneShot 物品：已消耗 → 隐藏 + 禁用检测
|
||||||
|
if (Data.bOneShot && GI->IsItemCollected(Data.ItemId))
|
||||||
|
{
|
||||||
|
bIsConsumed = true;
|
||||||
|
if (DetectionSphere)
|
||||||
|
{
|
||||||
|
DetectionSphere->SetCollisionEnabled(ECollisionEnabled::NoCollision);
|
||||||
|
}
|
||||||
|
if (AInteractableActor* Owner = Cast<AInteractableActor>(GetOwner()))
|
||||||
|
{
|
||||||
|
Owner->SetActorHiddenInGame(true);
|
||||||
|
}
|
||||||
|
UE_LOG(LogChildHood, Log, TEXT("RestorePersistentState: 已消耗物品隐藏: %s"), *Data.ItemId.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
// 门：恢复开关状态
|
||||||
|
if (Data.Type == EInteractType::Operate && Data.OperateSubType == EOperateSubType::Door)
|
||||||
|
{
|
||||||
|
bDoorIsOpen = GI->IsDoorOpen(Data.ItemId);
|
||||||
|
// 通知 Actor 应用视觉状态（Mesh 旋转）
|
||||||
|
if (AInteractableActor* Owner = Cast<AInteractableActor>(GetOwner()))
|
||||||
|
{
|
||||||
|
Owner->OnInteractStarted(this);
|
||||||
|
}
|
||||||
|
UE_LOG(LogChildHood, Log, TEXT("RestorePersistentState: 门状态恢复: %s → %s"),
|
||||||
|
*Data.ItemId.ToString(),
|
||||||
|
bDoorIsOpen ? TEXT("开") : TEXT("关"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 碰撞回调
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractableComponent::OnDetectionOverlapBegin(UPrimitiveComponent* OverlappedComponent,
|
||||||
|
AActor* OtherActor,
|
||||||
|
UPrimitiveComponent* OtherComp,
|
||||||
|
int32 OtherBodyIndex,
|
||||||
|
bool bFromSweep,
|
||||||
|
const FHitResult& SweepResult)
|
||||||
|
{
|
||||||
|
if (!OtherActor) return;
|
||||||
|
|
||||||
|
// 只响应 Character（玩家）的进入
|
||||||
|
ACharacter* Character = Cast<ACharacter>(OtherActor);
|
||||||
|
if (!Character) return;
|
||||||
|
|
||||||
|
// 已消耗的交互物不再注册
|
||||||
|
if (bIsConsumed) return;
|
||||||
|
|
||||||
|
UE_LOG(LogChildHood, Verbose, TEXT("检测到角色进入范围: %s ← %s"),
|
||||||
|
*Data.DisplayName, *OtherActor->GetName());
|
||||||
|
|
||||||
|
// 获取角色的 InteractionManager 并注册自己
|
||||||
|
if (UInteractionManager* IM = Character->FindComponentByClass<UInteractionManager>())
|
||||||
|
{
|
||||||
|
IM->RegisterInteractable(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractableComponent::OnDetectionOverlapEnd(UPrimitiveComponent* OverlappedComponent,
|
||||||
|
AActor* OtherActor,
|
||||||
|
UPrimitiveComponent* OtherComp,
|
||||||
|
int32 OtherBodyIndex)
|
||||||
|
{
|
||||||
|
if (!OtherActor) return;
|
||||||
|
|
||||||
|
ACharacter* Character = Cast<ACharacter>(OtherActor);
|
||||||
|
if (!Character) return;
|
||||||
|
|
||||||
|
UE_LOG(LogChildHood, Verbose, TEXT("角色离开范围: %s ← %s"),
|
||||||
|
*Data.DisplayName, *OtherActor->GetName());
|
||||||
|
|
||||||
|
// 获取角色的 InteractionManager 并注销自己
|
||||||
|
if (UInteractionManager* IM = Character->FindComponentByClass<UInteractionManager>())
|
||||||
|
{
|
||||||
|
IM->UnregisterInteractable(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
// ChildHood Project - 可交互物组件
|
||||||
|
// 对应技术方案: docs/technical/交互系统-技术方案.md 第3节（类设计）+ 第12节（跨场景持久化）
|
||||||
|
// 职责：单个交互物配置数据、触发区域、运行时状态、跨场景持久状态恢复
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "CoreMinimal.h"
|
||||||
|
#include "Components/ActorComponent.h"
|
||||||
|
#include "InteractionTypes.h"
|
||||||
|
#include "InteractableComponent.generated.h"
|
||||||
|
|
||||||
|
class UChildHoodGameInstance;
|
||||||
|
class USphereComponent;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* UInteractableComponent
|
||||||
|
*
|
||||||
|
* 挂载在 AInteractableActor（或其子类）上的组件。
|
||||||
|
* 持有该交互物的全部配置数据（FInteractableData）、运行时触发检测球、
|
||||||
|
* 消耗/门状态管理，以及跨场景持久状态恢复。
|
||||||
|
*/
|
||||||
|
UCLASS(ClassGroup=(Interaction), meta=(BlueprintSpawnableComponent))
|
||||||
|
class UInteractableComponent : public UActorComponent
|
||||||
|
{
|
||||||
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
UInteractableComponent();
|
||||||
|
|
||||||
|
// === 配置数据 ===
|
||||||
|
|
||||||
|
/** 该交互物的全部配置数据，编辑器中按实例独立配置 */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact")
|
||||||
|
FInteractableData Data;
|
||||||
|
|
||||||
|
// === 查询接口 ===
|
||||||
|
|
||||||
|
/** 获取配置数据引用（只读） */
|
||||||
|
const FInteractableData& GetInteractableData() const { return Data; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取提示文本，格式："[E] 动作词 名称"
|
||||||
|
* 门类型根据当前开关状态选择动词
|
||||||
|
*/
|
||||||
|
FString GetPromptText() const;
|
||||||
|
|
||||||
|
/** 该交互物是否已被消耗（oneShot 模式） */
|
||||||
|
bool IsConsumed() const { return bIsConsumed; }
|
||||||
|
|
||||||
|
/** 标记为已消耗，禁用检测球，写入持久层 */
|
||||||
|
void Consume();
|
||||||
|
|
||||||
|
// === 门状态管理 ===
|
||||||
|
|
||||||
|
/** 切换门开关状态 */
|
||||||
|
void ToggleDoor();
|
||||||
|
|
||||||
|
/** 门是否处于打开状态 */
|
||||||
|
bool IsDoorOpen() const { return bDoorIsOpen; }
|
||||||
|
|
||||||
|
/** 获取交互物在世界空间的位置 */
|
||||||
|
FVector GetWorldLocation() const;
|
||||||
|
|
||||||
|
/** 从 GameInstance 恢复跨场景持久状态（BeginPlay 中调用） */
|
||||||
|
void RestorePersistentState(UChildHoodGameInstance* GI);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
|
||||||
|
virtual void BeginPlay() override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
/** 运行时创建的检测球，用于触发玩家进入/离开交互范围 */
|
||||||
|
UPROPERTY()
|
||||||
|
USphereComponent* DetectionSphere;
|
||||||
|
|
||||||
|
/** oneShot 物品是否已被消耗 */
|
||||||
|
bool bIsConsumed = false;
|
||||||
|
|
||||||
|
/** 门是否处于打开状态（仅 Operate+Door 类型使用） */
|
||||||
|
bool bDoorIsOpen = false;
|
||||||
|
|
||||||
|
// === 碰撞回调 ===
|
||||||
|
|
||||||
|
/** 玩家进入检测范围 */
|
||||||
|
UFUNCTION()
|
||||||
|
void OnDetectionOverlapBegin(UPrimitiveComponent* OverlappedComponent,
|
||||||
|
AActor* OtherActor,
|
||||||
|
UPrimitiveComponent* OtherComp,
|
||||||
|
int32 OtherBodyIndex,
|
||||||
|
bool bFromSweep,
|
||||||
|
const FHitResult& SweepResult);
|
||||||
|
|
||||||
|
/** 玩家离开检测范围 */
|
||||||
|
UFUNCTION()
|
||||||
|
void OnDetectionOverlapEnd(UPrimitiveComponent* OverlappedComponent,
|
||||||
|
AActor* OtherActor,
|
||||||
|
UPrimitiveComponent* OtherComp,
|
||||||
|
int32 OtherBodyIndex);
|
||||||
|
};
|
||||||
@@ -0,0 +1,897 @@
|
|||||||
|
// ChildHood Project - 交互管理器核心组件 实现
|
||||||
|
// 对应技术方案: docs/technical/交互系统-技术方案.md 第6节（行为规则实现）
|
||||||
|
|
||||||
|
#include "Interaction/InteractionManager.h"
|
||||||
|
#include "Interaction/InteractableComponent.h"
|
||||||
|
#include "Interaction/InteractableActor.h"
|
||||||
|
#include "Interaction/PushCameraActor.h"
|
||||||
|
#include "Interaction/InteractionPromptWidget.h"
|
||||||
|
#include "Interaction/NarrativeTextWidget.h"
|
||||||
|
#include "ChildHoodCharacter.h"
|
||||||
|
#include "ChildHoodGameInstance.h"
|
||||||
|
#include "ChildHood.h"
|
||||||
|
|
||||||
|
#include "GameFramework/Character.h"
|
||||||
|
#include "GameFramework/PlayerController.h"
|
||||||
|
#include "GameFramework/SpringArmComponent.h"
|
||||||
|
#include "Camera/CameraComponent.h"
|
||||||
|
#include "Components/SphereComponent.h"
|
||||||
|
#include "Engine/World.h"
|
||||||
|
#include "TimerManager.h"
|
||||||
|
#include "Kismet/GameplayStatics.h"
|
||||||
|
#include "Blueprint/WidgetBlueprintLibrary.h"
|
||||||
|
|
||||||
|
// 定义交互系统日志类别
|
||||||
|
DECLARE_LOG_CATEGORY_EXTERN(LogInteraction, Log, All);
|
||||||
|
DEFINE_LOG_CATEGORY(LogInteraction);
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 构造函数
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
UInteractionManager::UInteractionManager()
|
||||||
|
{
|
||||||
|
// 默认关闭 Tick，首个交互物注册时开启
|
||||||
|
PrimaryComponentTick.bCanEverTick = true;
|
||||||
|
PrimaryComponentTick.bStartWithTickEnabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 生命周期
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::BeginPlay()
|
||||||
|
{
|
||||||
|
Super::BeginPlay();
|
||||||
|
|
||||||
|
// Spawn 推镜用临时摄像机 Actor（使用专用的 APushCameraActor）
|
||||||
|
// 随 Character 生命周期，不反复创建/销毁
|
||||||
|
FActorSpawnParameters SpawnParams;
|
||||||
|
SpawnParams.Owner = GetOwner();
|
||||||
|
SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
|
||||||
|
|
||||||
|
APushCameraActor* SpawnedCamera = GetWorld()->SpawnActor<APushCameraActor>(APushCameraActor::StaticClass(), FVector::ZeroVector, FRotator::ZeroRotator, SpawnParams);
|
||||||
|
PushCameraActor = SpawnedCamera;
|
||||||
|
if (PushCameraActor)
|
||||||
|
{
|
||||||
|
PushCameraActor->SetActorHiddenInGame(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("InteractionManager: BeginPlay 完成, PushCameraActor=%s"),
|
||||||
|
PushCameraActor ? *PushCameraActor->GetName() : TEXT("nullptr"));
|
||||||
|
|
||||||
|
// --- 创建 UI Widget ---
|
||||||
|
APlayerController* PC = GetWorld()->GetFirstPlayerController();
|
||||||
|
if (PC)
|
||||||
|
{
|
||||||
|
// 创建提示 UI
|
||||||
|
if (PromptWidgetClass)
|
||||||
|
{
|
||||||
|
PromptWidget = CreateWidget<UInteractionPromptWidget>(PC, PromptWidgetClass);
|
||||||
|
if (PromptWidget)
|
||||||
|
{
|
||||||
|
PromptWidget->AddToViewport(10);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
UE_LOG(LogInteraction, Warning, TEXT("InteractionManager: PromptWidgetClass 未设置，提示 UI 不可用"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 创建文本底框 UI
|
||||||
|
if (NarrativeWidgetClass)
|
||||||
|
{
|
||||||
|
NarrativeWidget = CreateWidget<UNarrativeTextWidget>(PC, NarrativeWidgetClass);
|
||||||
|
if (NarrativeWidget)
|
||||||
|
{
|
||||||
|
NarrativeWidget->AddToViewport(20);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
UE_LOG(LogInteraction, Warning, TEXT("InteractionManager: NarrativeWidgetClass 未设置，文本 UI 不可用"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// Tick 驱动
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
|
||||||
|
{
|
||||||
|
Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
|
||||||
|
|
||||||
|
if (State == EInteractionState::Free)
|
||||||
|
{
|
||||||
|
// Free 状态下更新提示 UI 的屏幕位置
|
||||||
|
if (PromptWidget && PromptWidget->IsVisible() &&
|
||||||
|
NearbyInteractables.Num() > 0 && NearbyInteractables.IsValidIndex(SelectedIndex))
|
||||||
|
{
|
||||||
|
UInteractableComponent* Selected = NearbyInteractables[SelectedIndex];
|
||||||
|
if (Selected)
|
||||||
|
{
|
||||||
|
UpdatePromptScreenPosition(Selected);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (Phase)
|
||||||
|
{
|
||||||
|
case EInteractPhase::Enter:
|
||||||
|
TickEnterPhase(DeltaTime);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EInteractPhase::AnimLock:
|
||||||
|
TickAnimLockPhase(DeltaTime);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EInteractPhase::Active:
|
||||||
|
// 等待玩家输入，无需 Tick 处理
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EInteractPhase::Exit:
|
||||||
|
TickExitPhase(DeltaTime);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EInteractPhase::None:
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 公开方法
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::BeginInteract()
|
||||||
|
{
|
||||||
|
// 前置检查：必须 Free 状态
|
||||||
|
if (State != EInteractionState::Free)
|
||||||
|
{
|
||||||
|
UE_LOG(LogInteraction, Verbose, TEXT("BeginInteract: 拒绝，当前状态不是 Free (State=%d)"),
|
||||||
|
static_cast<int32>(State));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 前置检查：必须有选中的交互物
|
||||||
|
if (NearbyInteractables.Num() == 0 || !NearbyInteractables.IsValidIndex(SelectedIndex))
|
||||||
|
{
|
||||||
|
UE_LOG(LogInteraction, Verbose, TEXT("BeginInteract: 拒绝，没有选中的交互物"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
UInteractableComponent* Target = NearbyInteractables[SelectedIndex];
|
||||||
|
|
||||||
|
// 前置检查：交互物不能已被消耗
|
||||||
|
if (!Target || Target->IsConsumed())
|
||||||
|
{
|
||||||
|
UE_LOG(LogInteraction, Verbose, TEXT("BeginInteract: 拒绝，交互物已被消耗"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 进入交互
|
||||||
|
State = EInteractionState::Interacting;
|
||||||
|
Phase = EInteractPhase::Enter;
|
||||||
|
CurrentInteractable = Target;
|
||||||
|
|
||||||
|
// 通知 Character 进入交互状态（屏蔽移动）
|
||||||
|
AChildHoodCharacter* Char = Cast<AChildHoodCharacter>(GetOwner());
|
||||||
|
if (Char)
|
||||||
|
{
|
||||||
|
Char->SetInteracting(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 隐藏提示 UI
|
||||||
|
HidePrompt();
|
||||||
|
|
||||||
|
// 重置 Enter 阶段计时器
|
||||||
|
TurnElapsed = 0.0f;
|
||||||
|
WaitElapsed = 0.0f;
|
||||||
|
bPushStarted = false;
|
||||||
|
|
||||||
|
const FInteractableData& Data = Target->GetInteractableData();
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("BeginInteract: 开始交互 '%s' (Type=%d)"),
|
||||||
|
*Data.DisplayName, static_cast<int32>(Data.Type));
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractionManager::CancelInteract()
|
||||||
|
{
|
||||||
|
// 前置检查：必须 Interacting 状态
|
||||||
|
if (State != EInteractionState::Interacting)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// AnimLock 期间不可取消
|
||||||
|
if (Phase == EInteractPhase::AnimLock)
|
||||||
|
{
|
||||||
|
UE_LOG(LogInteraction, Verbose, TEXT("CancelInteract: 拒绝，AnimLock 阶段不可取消"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("CancelInteract: 取消/结束交互"));
|
||||||
|
|
||||||
|
// 隐藏叙事文本
|
||||||
|
HideNarrativeText();
|
||||||
|
|
||||||
|
// 进入 Exit 阶段
|
||||||
|
Phase = EInteractPhase::Exit;
|
||||||
|
|
||||||
|
// 相机回位
|
||||||
|
const FInteractableData* Data = CurrentInteractable ? &CurrentInteractable->GetInteractableData() : nullptr;
|
||||||
|
float ReturnDuration = (Data && Data->bUseCameraPush) ? Data->CameraReturnDuration : 0.3f;
|
||||||
|
ReturnCamera(ReturnDuration);
|
||||||
|
|
||||||
|
// 清除可能残留的计时器
|
||||||
|
GetWorld()->GetTimerManager().ClearTimer(AnimEventTimerHandle);
|
||||||
|
GetWorld()->GetTimerManager().ClearTimer(AnimEndTimerHandle);
|
||||||
|
|
||||||
|
// 设置退出定时器，回位动画播完后回到 Free
|
||||||
|
GetWorld()->GetTimerManager().SetTimer(ExitTimerHandle, this, &UInteractionManager::OnExitTimerComplete, ReturnDuration, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractionManager::SwitchTarget(int32 Direction)
|
||||||
|
{
|
||||||
|
int32 Num = NearbyInteractables.Num();
|
||||||
|
if (Num == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Interacting 状态下忽略切换
|
||||||
|
if (State != EInteractionState::Free)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
SelectedIndex = (SelectedIndex + Direction + Num) % Num;
|
||||||
|
UpdatePromptUI();
|
||||||
|
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("SwitchTarget: 切换到 %d/%d"), SelectedIndex, Num);
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractionManager::RegisterInteractable(UInteractableComponent* Interactable)
|
||||||
|
{
|
||||||
|
if (!Interactable)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 去重检查
|
||||||
|
if (NearbyInteractables.Contains(Interactable))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
NearbyInteractables.Add(Interactable);
|
||||||
|
|
||||||
|
// 按水平距离排序（DistSquared2D，避免 sqrt）
|
||||||
|
AActor* Owner = GetOwner();
|
||||||
|
if (Owner)
|
||||||
|
{
|
||||||
|
FVector OwnerLoc = Owner->GetActorLocation();
|
||||||
|
NearbyInteractables.Sort([OwnerLoc](const UInteractableComponent& A, const UInteractableComponent& B)
|
||||||
|
{
|
||||||
|
float DistA = FVector::DistSquared2D(OwnerLoc, A.GetWorldLocation());
|
||||||
|
float DistB = FVector::DistSquared2D(OwnerLoc, B.GetWorldLocation());
|
||||||
|
return DistA < DistB;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
UpdateSelection();
|
||||||
|
UpdatePromptUI();
|
||||||
|
|
||||||
|
// 首个交互物注册时开启 Tick
|
||||||
|
if (NearbyInteractables.Num() == 1)
|
||||||
|
{
|
||||||
|
SetComponentTickEnabled(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("RegisterInteractable: 注册 '%s', 列表大小=%d"),
|
||||||
|
*Interactable->GetInteractableData().DisplayName, NearbyInteractables.Num());
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractionManager::UnregisterInteractable(UInteractableComponent* Interactable)
|
||||||
|
{
|
||||||
|
if (!Interactable)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool bRemoved = NearbyInteractables.Remove(Interactable) > 0;
|
||||||
|
if (!bRemoved)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果移除的是当前正在交互的交互物，清空引用
|
||||||
|
if (CurrentInteractable == Interactable)
|
||||||
|
{
|
||||||
|
CurrentInteractable = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (NearbyInteractables.Num() > 0)
|
||||||
|
{
|
||||||
|
UpdateSelection();
|
||||||
|
UpdatePromptUI();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// 列表为空，隐藏提示
|
||||||
|
HidePrompt();
|
||||||
|
// 最后一个注销时关闭 Tick
|
||||||
|
SetComponentTickEnabled(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("UnregisterInteractable: 注销 '%s', 列表大小=%d"),
|
||||||
|
*Interactable->GetInteractableData().DisplayName, NearbyInteractables.Num());
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// Enter 阶段 Tick
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::TickEnterPhase(float DeltaTime)
|
||||||
|
{
|
||||||
|
if (!CurrentInteractable)
|
||||||
|
{
|
||||||
|
UE_LOG(LogInteraction, Warning, TEXT("TickEnterPhase: CurrentInteractable 为空，强制取消"));
|
||||||
|
CancelInteract();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ACharacter* Char = Cast<ACharacter>(GetOwner());
|
||||||
|
if (!Char)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const FInteractableData& Data = CurrentInteractable->GetInteractableData();
|
||||||
|
|
||||||
|
// --- 1. 转向插值 ---
|
||||||
|
TurnElapsed += DeltaTime;
|
||||||
|
|
||||||
|
FVector CharLoc = Char->GetActorLocation();
|
||||||
|
FVector TargetLoc = CurrentInteractable->GetWorldLocation();
|
||||||
|
FVector DirToTarget = (TargetLoc - CharLoc);
|
||||||
|
DirToTarget.Z = 0.0f;
|
||||||
|
FRotator TargetRot = DirToTarget.Rotation();
|
||||||
|
|
||||||
|
// 使用 RInterpTo 进行平滑插值，InterpSpeed = 1/TurnDuration
|
||||||
|
float InterpSpeed = (TurnDuration > 0.f) ? (1.f / TurnDuration) : 10.f;
|
||||||
|
FRotator NewRot = FMath::RInterpTo(Char->GetActorRotation(), TargetRot, DeltaTime, InterpSpeed);
|
||||||
|
Char->SetActorRotation(NewRot);
|
||||||
|
|
||||||
|
// --- 2. 推镜（一次性发起） ---
|
||||||
|
if (Data.bUseCameraPush && !bPushStarted)
|
||||||
|
{
|
||||||
|
FVector PushPos = CalculatePushPosition(CurrentInteractable);
|
||||||
|
PushCamera(PushPos, Data.CameraPushDuration);
|
||||||
|
bPushStarted = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- 3. 判断完成 ---
|
||||||
|
bool bTurnComplete = TurnElapsed >= TurnDuration;
|
||||||
|
bool bPushComplete = !Data.bUseCameraPush || bPushStarted;
|
||||||
|
|
||||||
|
if (bTurnComplete && bPushComplete)
|
||||||
|
{
|
||||||
|
// 推镜后需要额外等待 PushWaitDelay
|
||||||
|
if (Data.bUseCameraPush && Data.PushWaitDelay > 0.f)
|
||||||
|
{
|
||||||
|
WaitElapsed += DeltaTime;
|
||||||
|
if (WaitElapsed >= Data.PushWaitDelay)
|
||||||
|
{
|
||||||
|
TransitionFromEnter();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
TransitionFromEnter();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// AnimLock 阶段 Tick（v0.1 由计时器驱动，此处为空）
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::TickAnimLockPhase(float DeltaTime)
|
||||||
|
{
|
||||||
|
// v0.1: AnimLock 由 AnimEventTimer 和 AnimEndTimer 驱动，无需 Tick 处理
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// Exit 阶段 Tick（v0.1 由定时器驱动回 Free）
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::TickExitPhase(float DeltaTime)
|
||||||
|
{
|
||||||
|
// v0.1: Exit 阶段由 ExitTimerHandle 定时器驱动回到 Free
|
||||||
|
// 此处可做相机回位进度检查等，简单方案留空
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// Enter 完成后类型分发
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::TransitionFromEnter()
|
||||||
|
{
|
||||||
|
if (!CurrentInteractable)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const FInteractableData& Data = CurrentInteractable->GetInteractableData();
|
||||||
|
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("TransitionFromEnter: 类型=%d 分发"), static_cast<int32>(Data.Type));
|
||||||
|
|
||||||
|
switch (Data.Type)
|
||||||
|
{
|
||||||
|
case EInteractType::Examine:
|
||||||
|
Phase = EInteractPhase::Active;
|
||||||
|
ShowNarrativeText(PickRandomNarrative(Data.NarrativeTexts));
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EInteractType::Pickup:
|
||||||
|
Phase = EInteractPhase::AnimLock;
|
||||||
|
EnterAnimLockPhase();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EInteractType::Operate:
|
||||||
|
if (Data.OperateSubType == EOperateSubType::Door)
|
||||||
|
{
|
||||||
|
Phase = EInteractPhase::AnimLock;
|
||||||
|
EnterAnimLockPhase();
|
||||||
|
}
|
||||||
|
else if (Data.OperateSubType == EOperateSubType::Search)
|
||||||
|
{
|
||||||
|
Phase = EInteractPhase::AnimLock;
|
||||||
|
EnterAnimLockPhase();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EInteractType::Talk:
|
||||||
|
Phase = EInteractPhase::Active;
|
||||||
|
ShowNarrativeText(PickRandomNarrative(Data.NarrativeTexts));
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
UE_LOG(LogInteraction, Warning, TEXT("TransitionFromEnter: 未知交互类型 %d"), static_cast<int32>(Data.Type));
|
||||||
|
// 未知类型直接回 Free
|
||||||
|
CancelInteract();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// AnimLock 阶段
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::EnterAnimLockPhase()
|
||||||
|
{
|
||||||
|
if (!CurrentInteractable)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const FInteractableData& Data = CurrentInteractable->GetInteractableData();
|
||||||
|
|
||||||
|
// 计算总动画时长：有蒙太奇用蒙太奇长度，否则用配置的 AnimDuration
|
||||||
|
float TotalAnimTime = Data.AnimDuration;
|
||||||
|
if (Data.InteractMontage)
|
||||||
|
{
|
||||||
|
TotalAnimTime = Data.InteractMontage->GetPlayLength();
|
||||||
|
if (TotalAnimTime <= 0.f)
|
||||||
|
{
|
||||||
|
TotalAnimTime = Data.AnimDuration;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 播放蒙太奇
|
||||||
|
ACharacter* Char = Cast<ACharacter>(GetOwner());
|
||||||
|
if (Char && Char->GetMesh())
|
||||||
|
{
|
||||||
|
Char->GetMesh()->GetAnimInstance()->Montage_Play(Data.InteractMontage);
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("EnterAnimLockPhase: 播放蒙太奇, 时长=%.2f"), TotalAnimTime);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("EnterAnimLockPhase: 无蒙太奇，使用计时器, 时长=%.2f"), TotalAnimTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 动画事件触发计时器（如 60% 时物品消失）
|
||||||
|
float EventTime = TotalAnimTime * Data.AnimEventTimepoint;
|
||||||
|
GetWorld()->GetTimerManager().SetTimer(AnimEventTimerHandle, this, &UInteractionManager::ExecuteAnimEvent, EventTime, false);
|
||||||
|
|
||||||
|
// 动画结束计时器
|
||||||
|
GetWorld()->GetTimerManager().SetTimer(AnimEndTimerHandle, this, &UInteractionManager::OnAnimLockComplete, TotalAnimTime, false);
|
||||||
|
|
||||||
|
bAnimEventFired = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 动画事件触发回调
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::ExecuteAnimEvent()
|
||||||
|
{
|
||||||
|
if (!CurrentInteractable)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
bAnimEventFired = true;
|
||||||
|
const FInteractableData& Data = CurrentInteractable->GetInteractableData();
|
||||||
|
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("ExecuteAnimEvent: 类型=%d, 名称='%s'"),
|
||||||
|
static_cast<int32>(Data.Type), *Data.DisplayName);
|
||||||
|
|
||||||
|
switch (Data.Type)
|
||||||
|
{
|
||||||
|
case EInteractType::Pickup:
|
||||||
|
{
|
||||||
|
// 标记消耗 → 隐藏 Actor → 通知物品系统
|
||||||
|
CurrentInteractable->Consume();
|
||||||
|
|
||||||
|
// 隐藏交互物 Actor
|
||||||
|
if (AInteractableActor* OwnerActor = Cast<AInteractableActor>(CurrentInteractable->GetOwner()))
|
||||||
|
{
|
||||||
|
OwnerActor->SetActorHiddenInGame(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 广播拾取事件
|
||||||
|
OnItemPickedUp.Broadcast(Data.ItemId, Data.DisplayName, FName(TEXT("杂物")));
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("ExecuteAnimEvent: Pickup 拾取完成 '%s'"), *Data.DisplayName);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EInteractType::Operate:
|
||||||
|
{
|
||||||
|
if (Data.OperateSubType == EOperateSubType::Door)
|
||||||
|
{
|
||||||
|
// 切换门状态
|
||||||
|
CurrentInteractable->ToggleDoor();
|
||||||
|
|
||||||
|
// 持久化门状态到 GameInstance
|
||||||
|
if (UChildHoodGameInstance* GI = GetWorld()->GetGameInstance<UChildHoodGameInstance>())
|
||||||
|
{
|
||||||
|
GI->SetDoorOpen(Data.ItemId, CurrentInteractable->IsDoorOpen());
|
||||||
|
}
|
||||||
|
|
||||||
|
// 通知 Actor 处理 Mesh 旋转等视觉反馈
|
||||||
|
if (AInteractableActor* OwnerActor = Cast<AInteractableActor>(CurrentInteractable->GetOwner()))
|
||||||
|
{
|
||||||
|
OwnerActor->OnInteractStarted(CurrentInteractable);
|
||||||
|
}
|
||||||
|
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("ExecuteAnimEvent: Door 门状态切换, 开=%s"),
|
||||||
|
CurrentInteractable->IsDoorOpen() ? TEXT("true") : TEXT("false"));
|
||||||
|
}
|
||||||
|
// Search 类型的结果判定在 OnAnimLockComplete 中处理
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 动画结束回调
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::OnAnimLockComplete()
|
||||||
|
{
|
||||||
|
if (!CurrentInteractable)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const FInteractableData& Data = CurrentInteractable->GetInteractableData();
|
||||||
|
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("OnAnimLockComplete: 类型=%d, 名称='%s'"),
|
||||||
|
static_cast<int32>(Data.Type), *Data.DisplayName);
|
||||||
|
|
||||||
|
switch (Data.Type)
|
||||||
|
{
|
||||||
|
case EInteractType::Pickup:
|
||||||
|
{
|
||||||
|
// 直接回到 Free（无 Active/Exit，无相机/UI 需清理）
|
||||||
|
AChildHoodCharacter* Char = Cast<AChildHoodCharacter>(GetOwner());
|
||||||
|
if (Char)
|
||||||
|
{
|
||||||
|
Char->SetInteracting(false);
|
||||||
|
}
|
||||||
|
State = EInteractionState::Free;
|
||||||
|
Phase = EInteractPhase::None;
|
||||||
|
CurrentInteractable = nullptr;
|
||||||
|
|
||||||
|
// 从检测列表移除已消耗的交互物
|
||||||
|
// Consume 已在 ExecuteAnimEvent 中调用，但 UnregisterInteractable 应由 DetectionSphere 禁用触发
|
||||||
|
// 这里主动从列表移除，确保提示 UI 正确更新
|
||||||
|
if (NearbyInteractables.Num() > 0)
|
||||||
|
{
|
||||||
|
UpdateSelection();
|
||||||
|
UpdatePromptUI();
|
||||||
|
}
|
||||||
|
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("OnAnimLockComplete: Pickup 完成，回到 Free"));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EInteractType::Operate:
|
||||||
|
{
|
||||||
|
if (Data.OperateSubType == EOperateSubType::Door)
|
||||||
|
{
|
||||||
|
// 直接回到 Free
|
||||||
|
AChildHoodCharacter* Char = Cast<AChildHoodCharacter>(GetOwner());
|
||||||
|
if (Char)
|
||||||
|
{
|
||||||
|
Char->SetInteracting(false);
|
||||||
|
}
|
||||||
|
State = EInteractionState::Free;
|
||||||
|
Phase = EInteractPhase::None;
|
||||||
|
CurrentInteractable = nullptr;
|
||||||
|
|
||||||
|
// 更新提示（门动词可能变化）
|
||||||
|
UpdateSelection();
|
||||||
|
UpdatePromptUI();
|
||||||
|
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("OnAnimLockComplete: Door 完成，回到 Free"));
|
||||||
|
}
|
||||||
|
else if (Data.OperateSubType == EOperateSubType::Search)
|
||||||
|
{
|
||||||
|
// 翻找结果判定：v0.1 必定有物品
|
||||||
|
CurrentInteractable->Consume();
|
||||||
|
OnItemFound.Broadcast(Data.ItemId, Data.DisplayName, FName(TEXT("杂物")));
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("OnAnimLockComplete: Search 翻找完成，获得物品 '%s'"), *Data.DisplayName);
|
||||||
|
|
||||||
|
// 进入 Active 阶段等待玩家按 E/ESC 关闭
|
||||||
|
Phase = EInteractPhase::Active;
|
||||||
|
// 有物品时不显示文本底框（架构预留）
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// UI 方法（v0.1 用日志替代）
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::UpdateSelection()
|
||||||
|
{
|
||||||
|
// 排序后选中索引重置为 0（最近的）
|
||||||
|
if (AActor* Owner = GetOwner())
|
||||||
|
{
|
||||||
|
FVector OwnerLoc = Owner->GetActorLocation();
|
||||||
|
NearbyInteractables.Sort([OwnerLoc](const UInteractableComponent& A, const UInteractableComponent& B)
|
||||||
|
{
|
||||||
|
float DistA = FVector::DistSquared2D(OwnerLoc, A.GetWorldLocation());
|
||||||
|
float DistB = FVector::DistSquared2D(OwnerLoc, B.GetWorldLocation());
|
||||||
|
return DistA < DistB;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
SelectedIndex = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractionManager::UpdatePromptUI()
|
||||||
|
{
|
||||||
|
if (NearbyInteractables.Num() == 0 || !NearbyInteractables.IsValidIndex(SelectedIndex))
|
||||||
|
{
|
||||||
|
HidePrompt();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
UInteractableComponent* Selected = NearbyInteractables[SelectedIndex];
|
||||||
|
if (!Selected)
|
||||||
|
{
|
||||||
|
HidePrompt();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
FString PromptText = Selected->GetPromptText();
|
||||||
|
|
||||||
|
if (PromptWidget)
|
||||||
|
{
|
||||||
|
PromptWidget->SetPromptText(PromptText);
|
||||||
|
PromptWidget->Show();
|
||||||
|
UpdatePromptScreenPosition(Selected);
|
||||||
|
}
|
||||||
|
|
||||||
|
UE_LOG(LogInteraction, Verbose, TEXT("UpdatePromptUI: %s"), *PromptText);
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractionManager::HidePrompt()
|
||||||
|
{
|
||||||
|
if (PromptWidget)
|
||||||
|
{
|
||||||
|
PromptWidget->Hide();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractionManager::ShowNarrativeText(const FString& Text)
|
||||||
|
{
|
||||||
|
if (Text.IsEmpty())
|
||||||
|
{
|
||||||
|
UE_LOG(LogInteraction, Warning, TEXT("ShowNarrativeText: text is empty"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (NarrativeWidget)
|
||||||
|
{
|
||||||
|
NarrativeWidget->SetNarrativeText(Text);
|
||||||
|
NarrativeWidget->Show();
|
||||||
|
}
|
||||||
|
|
||||||
|
UE_LOG(LogInteraction, Verbose, TEXT("ShowNarrativeText: %s"), *Text);
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractionManager::HideNarrativeText()
|
||||||
|
{
|
||||||
|
if (NarrativeWidget)
|
||||||
|
{
|
||||||
|
NarrativeWidget->Hide();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 摄像机控制
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::PushCamera(FVector Target, float Duration)
|
||||||
|
{
|
||||||
|
if (!PushCameraActor)
|
||||||
|
{
|
||||||
|
UE_LOG(LogInteraction, Warning, TEXT("PushCamera: PushCameraActor 为空"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 计算朝向交互物的旋转
|
||||||
|
FVector LookTarget = CurrentInteractable ? CurrentInteractable->GetWorldLocation() : Target;
|
||||||
|
FRotator LookAtRot = (LookTarget - Target).Rotation();
|
||||||
|
|
||||||
|
PushCameraActor->SetActorHiddenInGame(false);
|
||||||
|
PushCameraActor->SetActorLocationAndRotation(Target, LookAtRot);
|
||||||
|
|
||||||
|
// 切换 ViewTarget
|
||||||
|
APlayerController* PC = GetWorld()->GetFirstPlayerController();
|
||||||
|
if (PC)
|
||||||
|
{
|
||||||
|
PC->SetViewTargetWithBlend(PushCameraActor, Duration, VTBlend_EaseOut);
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("PushCamera: 推镜到 %s, 时长=%.2f"), *Target.ToString(), Duration);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractionManager::ReturnCamera(float Duration)
|
||||||
|
{
|
||||||
|
AActor* Owner = GetOwner();
|
||||||
|
if (!Owner)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
APlayerController* PC = GetWorld()->GetFirstPlayerController();
|
||||||
|
if (PC)
|
||||||
|
{
|
||||||
|
// 回位到 Character
|
||||||
|
PC->SetViewTargetWithBlend(Owner, Duration, VTBlend_EaseIn);
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("ReturnCamera: 相机回位, 时长=%.2f"), Duration);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 隐藏推镜 Actor
|
||||||
|
if (PushCameraActor)
|
||||||
|
{
|
||||||
|
PushCameraActor->SetActorHiddenInGame(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 推镜位置计算
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
FVector UInteractionManager::CalculatePushPosition(UInteractableComponent* Interactable)
|
||||||
|
{
|
||||||
|
if (!Interactable)
|
||||||
|
{
|
||||||
|
return FVector::ZeroVector;
|
||||||
|
}
|
||||||
|
|
||||||
|
const FInteractableData& Data = Interactable->GetInteractableData();
|
||||||
|
FVector InteractPos = Interactable->GetWorldLocation();
|
||||||
|
FVector CharPos = GetOwner() ? GetOwner()->GetActorLocation() : FVector::ZeroVector;
|
||||||
|
|
||||||
|
FVector Dir = (InteractPos - CharPos);
|
||||||
|
Dir.Z = 0.0f;
|
||||||
|
Dir.Normalize();
|
||||||
|
|
||||||
|
// 交互物前方（面向角色的一侧），推镜距离偏移
|
||||||
|
FVector TargetPos = InteractPos - Dir * Data.CameraPushDistance;
|
||||||
|
// 高度略低于交互物中心（微仰视）
|
||||||
|
TargetPos.Z = InteractPos.Z * 0.8f;
|
||||||
|
|
||||||
|
return TargetPos;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 叙事文本随机选取
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
FString UInteractionManager::PickRandomNarrative(const TArray<FString>& Texts)
|
||||||
|
{
|
||||||
|
if (Texts.Num() == 0)
|
||||||
|
{
|
||||||
|
return TEXT("");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Texts.Num() == 1)
|
||||||
|
{
|
||||||
|
LastNarrativeText = Texts[0];
|
||||||
|
return Texts[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
FString Candidate;
|
||||||
|
int32 Attempts = 0;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
Candidate = Texts[FMath::RandRange(0, Texts.Num() - 1)];
|
||||||
|
Attempts++;
|
||||||
|
} while (Candidate == LastNarrativeText && Attempts < 10);
|
||||||
|
|
||||||
|
LastNarrativeText = Candidate;
|
||||||
|
return Candidate;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// Exit 阶段定时器回调
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::OnExitTimerComplete()
|
||||||
|
{
|
||||||
|
UE_LOG(LogInteraction, Log, TEXT("OnExitTimerComplete: Exit 阶段结束，回到 Free"));
|
||||||
|
|
||||||
|
// 通知 Character 解除交互状态
|
||||||
|
AChildHoodCharacter* Char = Cast<AChildHoodCharacter>(GetOwner());
|
||||||
|
if (Char)
|
||||||
|
{
|
||||||
|
Char->SetInteracting(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 回到 Free 状态
|
||||||
|
State = EInteractionState::Free;
|
||||||
|
Phase = EInteractPhase::None;
|
||||||
|
CurrentInteractable = nullptr;
|
||||||
|
|
||||||
|
// 如果仍在检测范围内，重新显示提示
|
||||||
|
if (NearbyInteractables.Num() > 0)
|
||||||
|
{
|
||||||
|
UpdateSelection();
|
||||||
|
UpdatePromptUI();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 提示 UI 屏幕位置更新
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void UInteractionManager::UpdatePromptScreenPosition(UInteractableComponent* Interactable)
|
||||||
|
{
|
||||||
|
if (!Interactable || !PromptWidget) return;
|
||||||
|
|
||||||
|
APlayerController* PC = GetWorld()->GetFirstPlayerController();
|
||||||
|
if (!PC) return;
|
||||||
|
|
||||||
|
// 交互物世界位置 + 高度偏移 → 屏幕坐标
|
||||||
|
FVector WorldLoc = Interactable->GetWorldLocation() + FVector(0.f, 0.f, PromptHeightOffset);
|
||||||
|
FVector2D ScreenPos;
|
||||||
|
if (UGameplayStatics::ProjectWorldToScreen(PC, WorldLoc, ScreenPos, true))
|
||||||
|
{
|
||||||
|
PromptWidget->SetScreenPosition(ScreenPos);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,225 @@
|
|||||||
|
// ChildHood Project - 交互管理器核心组件
|
||||||
|
// 对应技术方案: docs/technical/交互系统-技术方案.md 第3节（类设计）+ 第6节（行为规则实现）
|
||||||
|
// 职责：交互全流程状态机、检测选择、类型分发、摄像机/转向/UI 控制
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "CoreMinimal.h"
|
||||||
|
#include "Components/ActorComponent.h"
|
||||||
|
#include "InteractionTypes.h"
|
||||||
|
#include "InteractionManager.generated.h"
|
||||||
|
|
||||||
|
class UInteractableComponent;
|
||||||
|
class APushCameraActor;
|
||||||
|
class AChildHoodCharacter;
|
||||||
|
class UInteractionPromptWidget;
|
||||||
|
class UNarrativeTextWidget;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* UInteractionManager
|
||||||
|
*
|
||||||
|
* 挂载在 AChildHoodCharacter 上的组件，负责交互全流程管理：
|
||||||
|
* - 层级状态机驱动（Free / Interacting + 子阶段）
|
||||||
|
* - 附近交互物检测列表排序与选中管理
|
||||||
|
* - 四种交互类型分发（观察/拾取/操作/对话）
|
||||||
|
* - 角色自动转向插值
|
||||||
|
* - 摄像机推镜/回位控制
|
||||||
|
* - UI 提示与文本显示控制（v0.1 先用日志）
|
||||||
|
*/
|
||||||
|
UCLASS(ClassGroup=(Interaction), meta=(BlueprintSpawnableComponent))
|
||||||
|
class UInteractionManager : public UActorComponent
|
||||||
|
{
|
||||||
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
UInteractionManager();
|
||||||
|
|
||||||
|
// === 公开方法 ===
|
||||||
|
|
||||||
|
/** 发起交互（E键触发），前置检查通过后进入 Enter 阶段 */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interaction")
|
||||||
|
void BeginInteract();
|
||||||
|
|
||||||
|
/** 取消/结束交互（ESC/E键在Active阶段触发），AnimLock期间不可取消 */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interaction")
|
||||||
|
void CancelInteract();
|
||||||
|
|
||||||
|
/** 切换选中交互物（Tab/滚轮），Direction: +1下一个 / -1上一个 */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interaction")
|
||||||
|
void SwitchTarget(int32 Direction);
|
||||||
|
|
||||||
|
/** 注册交互物到检测列表（由 InteractableComponent 的碰撞回调触发） */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interaction")
|
||||||
|
void RegisterInteractable(UInteractableComponent* Interactable);
|
||||||
|
|
||||||
|
/** 从检测列表注销交互物（离开范围或消耗时触发） */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interaction")
|
||||||
|
void UnregisterInteractable(UInteractableComponent* Interactable);
|
||||||
|
|
||||||
|
// === 委托 ===
|
||||||
|
|
||||||
|
/** 物品拾取事件 — 通知物品系统（Pickup 类型 ExecuteAnimEvent 中广播） */
|
||||||
|
UPROPERTY(BlueprintAssignable, Category = "Interaction|Events")
|
||||||
|
FMLocalItemEvent OnItemPickedUp;
|
||||||
|
|
||||||
|
/** 物品获得事件 — 通知收集系统（Search 类型 OnAnimLockComplete 中广播） */
|
||||||
|
UPROPERTY(BlueprintAssignable, Category = "Interaction|Events")
|
||||||
|
FMLocalItemEvent OnItemFound;
|
||||||
|
|
||||||
|
// === 可调参数 ===
|
||||||
|
|
||||||
|
/** 角色转向时长（秒） */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interaction|Tuning")
|
||||||
|
float TurnDuration = 0.2f;
|
||||||
|
|
||||||
|
/** 提示 UI 淡入时长（秒） */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interaction|Tuning")
|
||||||
|
float PromptFadeInDuration = 0.2f;
|
||||||
|
|
||||||
|
/** 提示 UI 淡出时长（秒） */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interaction|Tuning")
|
||||||
|
float PromptFadeOutDuration = 0.2f;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
|
||||||
|
virtual void BeginPlay() override;
|
||||||
|
virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
// === 状态机 ===
|
||||||
|
|
||||||
|
/** 交互系统顶层状态 */
|
||||||
|
EInteractionState State = EInteractionState::Free;
|
||||||
|
|
||||||
|
/** Interacting 子阶段 */
|
||||||
|
EInteractPhase Phase = EInteractPhase::None;
|
||||||
|
|
||||||
|
// === 检测与选择 ===
|
||||||
|
|
||||||
|
/** 当前附近的交互物列表，按水平距离排序 */
|
||||||
|
UPROPERTY()
|
||||||
|
TArray<UInteractableComponent*> NearbyInteractables;
|
||||||
|
|
||||||
|
/** 当前选中的交互物索引 */
|
||||||
|
int32 SelectedIndex = 0;
|
||||||
|
|
||||||
|
/** 当前正在交互的交互物（交互过程中锁定） */
|
||||||
|
UPROPERTY()
|
||||||
|
UInteractableComponent* CurrentInteractable = nullptr;
|
||||||
|
|
||||||
|
// === 摄像机控制 ===
|
||||||
|
|
||||||
|
/** 推镜用临时摄像机 Actor（BeginPlay 中 Spawn） */
|
||||||
|
UPROPERTY()
|
||||||
|
TObjectPtr<APushCameraActor> PushCameraActor;
|
||||||
|
|
||||||
|
/** 推镜是否已发起（Enter阶段一次性标志） */
|
||||||
|
bool bPushStarted = false;
|
||||||
|
|
||||||
|
// === 计时器 ===
|
||||||
|
|
||||||
|
/** 转向已用时间 */
|
||||||
|
float TurnElapsed = 0.0f;
|
||||||
|
|
||||||
|
/** 推镜后等待已用时间 */
|
||||||
|
float WaitElapsed = 0.0f;
|
||||||
|
|
||||||
|
/** 动画事件计时器（如60%时物品消失） */
|
||||||
|
FTimerHandle AnimEventTimerHandle;
|
||||||
|
|
||||||
|
/** 动画结束计时器 */
|
||||||
|
FTimerHandle AnimEndTimerHandle;
|
||||||
|
|
||||||
|
/** 退出阶段回位计时器 */
|
||||||
|
FTimerHandle ExitTimerHandle;
|
||||||
|
|
||||||
|
/** 动画事件是否已触发 */
|
||||||
|
bool bAnimEventFired = false;
|
||||||
|
|
||||||
|
// === UI 配置 ===
|
||||||
|
|
||||||
|
/** 提示 UI 蓝图类（需在编辑器中指定为 WBP_InteractionPrompt） */
|
||||||
|
UPROPERTY(EditAnywhere, Category = "Interaction|UI")
|
||||||
|
TSubclassOf<UInteractionPromptWidget> PromptWidgetClass;
|
||||||
|
|
||||||
|
/** 文本底框 UI 蓝图类（需在编辑器中指定为 WBP_NarrativeText） */
|
||||||
|
UPROPERTY(EditAnywhere, Category = "Interaction|UI")
|
||||||
|
TSubclassOf<UNarrativeTextWidget> NarrativeWidgetClass;
|
||||||
|
|
||||||
|
/** 提示 UI 高度偏移（交互物上方的世界空间 Z 偏移，cm） */
|
||||||
|
UPROPERTY(EditAnywhere, Category = "Interaction|UI")
|
||||||
|
float PromptHeightOffset = 80.0f;
|
||||||
|
|
||||||
|
// === UI 实例 ===
|
||||||
|
|
||||||
|
/** 交互提示 Widget 实例 */
|
||||||
|
UPROPERTY()
|
||||||
|
TObjectPtr<UInteractionPromptWidget> PromptWidget;
|
||||||
|
|
||||||
|
/** 文本底框 Widget 实例 */
|
||||||
|
UPROPERTY()
|
||||||
|
TObjectPtr<UNarrativeTextWidget> NarrativeWidget;
|
||||||
|
|
||||||
|
// === 文本选择 ===
|
||||||
|
|
||||||
|
/** 上次显示的叙事文本（用于不重复选取） */
|
||||||
|
FString LastNarrativeText;
|
||||||
|
|
||||||
|
// === 内部方法 ===
|
||||||
|
|
||||||
|
/** 更新选中交互物（排序后 SelectedIndex = 0） */
|
||||||
|
void UpdateSelection();
|
||||||
|
|
||||||
|
/** 更新提示 UI 内容和位置 */
|
||||||
|
void UpdatePromptUI();
|
||||||
|
|
||||||
|
/** 隐藏提示 UI */
|
||||||
|
void HidePrompt();
|
||||||
|
|
||||||
|
/** 更新提示 UI 的屏幕空间位置（跟随交互物世界位置投影） */
|
||||||
|
void UpdatePromptScreenPosition(UInteractableComponent* Interactable);
|
||||||
|
|
||||||
|
/** Enter 阶段 Tick：转向插值 + 推镜 + 等待 */
|
||||||
|
void TickEnterPhase(float DeltaTime);
|
||||||
|
|
||||||
|
/** AnimLock 阶段 Tick（v0.1 由计时器驱动，此处可为空） */
|
||||||
|
void TickAnimLockPhase(float DeltaTime);
|
||||||
|
|
||||||
|
/** Exit 阶段 Tick（v0.1 由定时器驱动回 Free） */
|
||||||
|
void TickExitPhase(float DeltaTime);
|
||||||
|
|
||||||
|
/** Enter 阶段完成后，根据交互类型分发到下一阶段 */
|
||||||
|
void TransitionFromEnter();
|
||||||
|
|
||||||
|
/** 进入 AnimLock 阶段：播放蒙太奇或启动计时器 */
|
||||||
|
void EnterAnimLockPhase();
|
||||||
|
|
||||||
|
/** 动画事件触发点回调（如拾取物消失、门状态切换） */
|
||||||
|
void ExecuteAnimEvent();
|
||||||
|
|
||||||
|
/** 动画结束回调 */
|
||||||
|
void OnAnimLockComplete();
|
||||||
|
|
||||||
|
/** 显示叙事文本（v0.1 用日志输出） */
|
||||||
|
void ShowNarrativeText(const FString& Text);
|
||||||
|
|
||||||
|
/** 隐藏叙事文本（v0.1 用日志输出） */
|
||||||
|
void HideNarrativeText();
|
||||||
|
|
||||||
|
/** 推镜：移动 PushCameraActor 并切换 ViewTarget */
|
||||||
|
void PushCamera(FVector Target, float Duration);
|
||||||
|
|
||||||
|
/** 相机回位：切换回 Character 的 FollowCamera */
|
||||||
|
void ReturnCamera(float Duration);
|
||||||
|
|
||||||
|
/** 计算推镜目标位置 */
|
||||||
|
FVector CalculatePushPosition(UInteractableComponent* Interactable);
|
||||||
|
|
||||||
|
/** 随机选取叙事文本，排除上次 */
|
||||||
|
FString PickRandomNarrative(const TArray<FString>& Texts);
|
||||||
|
|
||||||
|
/** Exit 阶段定时器回调：回到 Free 状态 */
|
||||||
|
void OnExitTimerComplete();
|
||||||
|
};
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
// ChildHood Project - 交互提示 UI 基类 实现
|
||||||
|
|
||||||
|
#include "Interaction/InteractionPromptWidget.h"
|
||||||
|
#include "Components/TextBlock.h"
|
||||||
|
|
||||||
|
void UInteractionPromptWidget::NativeOnInitialized()
|
||||||
|
{
|
||||||
|
Super::NativeOnInitialized();
|
||||||
|
|
||||||
|
// 初始隐藏
|
||||||
|
SetVisibility(ESlateVisibility::Hidden);
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractionPromptWidget::SetPromptText(const FString& Text)
|
||||||
|
{
|
||||||
|
if (PromptTextBlock)
|
||||||
|
{
|
||||||
|
PromptTextBlock->SetText(FText::FromString(Text));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractionPromptWidget::SetScreenPosition(const FVector2D& Position)
|
||||||
|
{
|
||||||
|
// 使用 RenderTranslation 偏移 Widget 位置
|
||||||
|
// 蓝图中 CanvasPanel 的 Anchors 应设置为屏幕左上角
|
||||||
|
// 此处直接设置 RenderTranslation 来移动位置
|
||||||
|
SetRenderTranslation(Position);
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractionPromptWidget::Show()
|
||||||
|
{
|
||||||
|
if (bIsVisible) return;
|
||||||
|
bIsVisible = true;
|
||||||
|
|
||||||
|
SetVisibility(ESlateVisibility::HitTestInvisible);
|
||||||
|
|
||||||
|
if (FadeInAnim)
|
||||||
|
{
|
||||||
|
PlayAnimation(FadeInAnim, 0.0f, 1, EUMGSequencePlayMode::Forward, 1.0f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void UInteractionPromptWidget::Hide()
|
||||||
|
{
|
||||||
|
if (!bIsVisible) return;
|
||||||
|
|
||||||
|
if (FadeOutAnim)
|
||||||
|
{
|
||||||
|
PlayAnimation(FadeOutAnim, 0.0f, 1, EUMGSequencePlayMode::Forward, 1.0f);
|
||||||
|
// 动画播完后隐藏（简单方案：直接设置定时器隐藏）
|
||||||
|
// 动画时长由蓝图中的 FadeOutAnim 决定，这里用固定 0.2s
|
||||||
|
FTimerHandle TempHandle;
|
||||||
|
if (UWorld* World = GetWorld())
|
||||||
|
{
|
||||||
|
World->GetTimerManager().SetTimer(TempHandle, [this]()
|
||||||
|
{
|
||||||
|
bIsVisible = false;
|
||||||
|
SetVisibility(ESlateVisibility::Hidden);
|
||||||
|
}, 0.2f, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
bIsVisible = false;
|
||||||
|
SetVisibility(ESlateVisibility::Hidden);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
// ChildHood Project - 交互提示 UI 基类
|
||||||
|
// 对应技术方案: docs/technical/交互系统-技术方案.md 第6节（提示UI显示/隐藏）
|
||||||
|
// 职责：屏幕空间悬浮提示 "[E] 动作词 名称"，跟随交互物位置
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "CoreMinimal.h"
|
||||||
|
#include "Blueprint/UserWidget.h"
|
||||||
|
#include "InteractionPromptWidget.generated.h"
|
||||||
|
|
||||||
|
class UTextBlock;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* UInteractionPromptWidget
|
||||||
|
*
|
||||||
|
* 交互提示 UI 的 C++ 基类。蓝图子类（WBP_InteractionPrompt）继承此类，
|
||||||
|
* 在 UMG 编辑器中布局可视组件，并确保组件名与 BindWidget 匹配。
|
||||||
|
*
|
||||||
|
* 绑定要求：
|
||||||
|
* - TextBlock 名为 "PromptTextBlock" — 显示提示文字
|
||||||
|
* - WidgetAnimation 名为 "FadeInAnim" — 淡入动画（0.2s）
|
||||||
|
* - WidgetAnimation 名为 "FadeOutAnim" — 淡出动画（0.2s）
|
||||||
|
*/
|
||||||
|
UCLASS(Abstract, Blueprintable)
|
||||||
|
class UInteractionPromptWidget : public UUserWidget
|
||||||
|
{
|
||||||
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
/** 设置提示文字内容 */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interaction|Prompt")
|
||||||
|
void SetPromptText(const FString& Text);
|
||||||
|
|
||||||
|
/** 设置屏幕空间位置（由 InteractionManager 每帧调用） */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interaction|Prompt")
|
||||||
|
void SetScreenPosition(const FVector2D& Position);
|
||||||
|
|
||||||
|
/** 显示提示（播放淡入动画） */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interaction|Prompt")
|
||||||
|
void Show();
|
||||||
|
|
||||||
|
/** 隐藏提示（播放淡出动画） */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interaction|Prompt")
|
||||||
|
void Hide();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
|
||||||
|
/** 提示文字 TextBlock，蓝图子类必须有一个同名 TextBlock */
|
||||||
|
UPROPERTY(meta = (BindWidget))
|
||||||
|
UTextBlock* PromptTextBlock;
|
||||||
|
|
||||||
|
/** 淡入动画（0.2s Opacity 0→1），蓝图子类必须有同名 WidgetAnimation */
|
||||||
|
UPROPERTY(meta = (BindWidgetAnim), Transient)
|
||||||
|
UWidgetAnimation* FadeInAnim;
|
||||||
|
|
||||||
|
/** 淡出动画（0.2s Opacity 1→0），蓝图子类必须有同名 WidgetAnimation */
|
||||||
|
UPROPERTY(meta = (BindWidgetAnim), Transient)
|
||||||
|
UWidgetAnimation* FadeOutAnim;
|
||||||
|
|
||||||
|
/** 是否正在显示中 */
|
||||||
|
bool bIsVisible = false;
|
||||||
|
|
||||||
|
virtual void NativeOnInitialized() override;
|
||||||
|
};
|
||||||
@@ -0,0 +1,178 @@
|
|||||||
|
// ChildHood Project - 交互系统数据类型定义
|
||||||
|
// 对应技术方案: docs/technical/交互系统-技术方案.md 第5节（核心数据结构）+ 第12节（跨场景持久化）
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "CoreMinimal.h"
|
||||||
|
#include "InteractionTypes.generated.h"
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 枚举
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
/** 交互类型 */
|
||||||
|
UENUM(BlueprintType)
|
||||||
|
enum class EInteractType : uint8
|
||||||
|
{
|
||||||
|
Examine UMETA(DisplayName = "观察"),
|
||||||
|
Pickup UMETA(DisplayName = "拾取"),
|
||||||
|
Operate UMETA(DisplayName = "操作"),
|
||||||
|
Talk UMETA(DisplayName = "对话")
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 操作子类型（仅 Operate 类型有效） */
|
||||||
|
UENUM(BlueprintType)
|
||||||
|
enum class EOperateSubType : uint8
|
||||||
|
{
|
||||||
|
Door UMETA(DisplayName = "门（开关切换）"),
|
||||||
|
Search UMETA(DisplayName = "翻找")
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 交互系统顶层状态 */
|
||||||
|
UENUM(BlueprintType)
|
||||||
|
enum class EInteractionState : uint8
|
||||||
|
{
|
||||||
|
Free UMETA(DisplayName = "自由状态"),
|
||||||
|
Interacting UMETA(DisplayName = "交互中"),
|
||||||
|
SubSystem UMETA(DisplayName = "子系统（v0.1预留）"),
|
||||||
|
Cutscene UMETA(DisplayName = "过场（v0.1预留）")
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Interacting 子阶段 */
|
||||||
|
UENUM(BlueprintType)
|
||||||
|
enum class EInteractPhase : uint8
|
||||||
|
{
|
||||||
|
None UMETA(DisplayName = "无"),
|
||||||
|
Enter UMETA(DisplayName = "进入（转向+推镜）"),
|
||||||
|
AnimLock UMETA(DisplayName = "动画锁定"),
|
||||||
|
Active UMETA(DisplayName = "活跃（等待输入）"),
|
||||||
|
Exit UMETA(DisplayName = "退出（回位）")
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 交互结束后动作 */
|
||||||
|
UENUM(BlueprintType)
|
||||||
|
enum class EPostAction : uint8
|
||||||
|
{
|
||||||
|
Return UMETA(DisplayName = "回到Free"),
|
||||||
|
Minigame UMETA(DisplayName = "小游戏（v0.1预留）"),
|
||||||
|
Dialogue UMETA(DisplayName = "对话（v0.1预留）"),
|
||||||
|
SceneChange UMETA(DisplayName = "场景切换（v0.1预留）")
|
||||||
|
};
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 配置数据结构
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
/** 可交互物配置数据 — 每个交互物实例独立配置 */
|
||||||
|
USTRUCT(BlueprintType)
|
||||||
|
struct FInteractableData
|
||||||
|
{
|
||||||
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
// === 基本信息 ===
|
||||||
|
|
||||||
|
/** 唯一ID（如 "fridge_home"），用于持久化存储和物品系统对接 */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Basic")
|
||||||
|
FName ItemId;
|
||||||
|
|
||||||
|
/** 显示名称（如 "旧冰箱"），用于提示UI */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Basic")
|
||||||
|
FString DisplayName;
|
||||||
|
|
||||||
|
/** 交互类型 */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Basic")
|
||||||
|
EInteractType Type = EInteractType::Examine;
|
||||||
|
|
||||||
|
/** 操作子类型，仅 Type==Operate 时可见可编辑 */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Basic",
|
||||||
|
meta = (EditCondition = "Type == EInteractType::Operate", EditConditionHides))
|
||||||
|
EOperateSubType OperateSubType = EOperateSubType::Door;
|
||||||
|
|
||||||
|
// === 触发 ===
|
||||||
|
|
||||||
|
/** 触发半径（cm），默认1.5m */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Trigger",
|
||||||
|
meta = (ClampMin = "50.0", ClampMax = "500.0"))
|
||||||
|
float TriggerRadius = 150.0f;
|
||||||
|
|
||||||
|
/** 是否一次性消耗（消耗后不再可交互） */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Trigger")
|
||||||
|
bool bOneShot = false;
|
||||||
|
|
||||||
|
// === 提示文本 ===
|
||||||
|
|
||||||
|
/** 动作词（如 "查看"、"拾取"、"打开"） */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Prompt")
|
||||||
|
FString InteractVerb;
|
||||||
|
|
||||||
|
/** 备选动词（如 "关上"），门打开时使用，仅 Operate+Door 时可见 */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Prompt",
|
||||||
|
meta = (EditCondition = "Type == EInteractType::Operate && OperateSubType == EOperateSubType::Door"))
|
||||||
|
FString InteractVerbAlt;
|
||||||
|
|
||||||
|
// === 叙事/对话文本 ===
|
||||||
|
|
||||||
|
/** 文本列表，随机选取，不重复上次 */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Text")
|
||||||
|
TArray<FString> NarrativeTexts;
|
||||||
|
|
||||||
|
// === 摄像机推镜 ===
|
||||||
|
|
||||||
|
/** 是否使用摄像机推镜 */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Camera")
|
||||||
|
bool bUseCameraPush = false;
|
||||||
|
|
||||||
|
/** 推镜距离（cm），仅 bUseCameraPush 时可编辑 */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Camera",
|
||||||
|
meta = (EditCondition = "bUseCameraPush", ClampMin = "10.0", ClampMax = "300.0"))
|
||||||
|
float CameraPushDistance = 80.0f;
|
||||||
|
|
||||||
|
/** 推镜过渡时长（秒），仅 bUseCameraPush 时可编辑 */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Camera",
|
||||||
|
meta = (EditCondition = "bUseCameraPush", ClampMin = "0.1", ClampMax = "2.0"))
|
||||||
|
float CameraPushDuration = 0.5f;
|
||||||
|
|
||||||
|
/** 相机回位时长（秒），仅 bUseCameraPush 时可编辑 */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Camera",
|
||||||
|
meta = (EditCondition = "bUseCameraPush", ClampMin = "0.1", ClampMax = "2.0"))
|
||||||
|
float CameraReturnDuration = 0.3f;
|
||||||
|
|
||||||
|
/** 推镜完成后到文本显示的等待时间（秒），仅 bUseCameraPush 时可编辑 */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Camera",
|
||||||
|
meta = (EditCondition = "bUseCameraPush", ClampMin = "0.0", ClampMax = "1.0"))
|
||||||
|
float PushWaitDelay = 0.2f;
|
||||||
|
|
||||||
|
// === 动画 ===
|
||||||
|
|
||||||
|
/** 交互动画蒙太奇（可选，为空时用计时器模拟） */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Anim")
|
||||||
|
TObjectPtr<UAnimMontage> InteractMontage;
|
||||||
|
|
||||||
|
/** 无蒙太奇时的动画持续时间（秒） */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Anim",
|
||||||
|
meta = (ClampMin = "0.1", ClampMax = "5.0"))
|
||||||
|
float AnimDuration = 1.0f;
|
||||||
|
|
||||||
|
/** 动画事件触发点（0-1比例），如0.6表示动画播放至60%时触发物品消失 */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Anim",
|
||||||
|
meta = (ClampMin = "0.0", ClampMax = "1.0"))
|
||||||
|
float AnimEventTimepoint = 0.6f;
|
||||||
|
|
||||||
|
// === 结束动作 ===
|
||||||
|
|
||||||
|
/** 交互结束后的动作 */
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Interact|Post")
|
||||||
|
EPostAction PostAction = EPostAction::Return;
|
||||||
|
};
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 委托
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
/** 物品拾取/获得事件 — 通知物品系统和收集系统 */
|
||||||
|
DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(
|
||||||
|
FMLocalItemEvent,
|
||||||
|
FName, ItemId,
|
||||||
|
const FString&, DisplayName,
|
||||||
|
const FName&, Category
|
||||||
|
);
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
// ChildHood Project - 文本底框 UI 基类 实现
|
||||||
|
|
||||||
|
#include "Interaction/NarrativeTextWidget.h"
|
||||||
|
#include "Components/TextBlock.h"
|
||||||
|
|
||||||
|
void UNarrativeTextWidget::NativeOnInitialized()
|
||||||
|
{
|
||||||
|
Super::NativeOnInitialized();
|
||||||
|
|
||||||
|
// 初始隐藏
|
||||||
|
SetVisibility(ESlateVisibility::Hidden);
|
||||||
|
}
|
||||||
|
|
||||||
|
void UNarrativeTextWidget::SetNarrativeText(const FString& Text)
|
||||||
|
{
|
||||||
|
if (NarrativeTextBlock)
|
||||||
|
{
|
||||||
|
NarrativeTextBlock->SetText(FText::FromString(Text));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void UNarrativeTextWidget::Show()
|
||||||
|
{
|
||||||
|
if (bIsVisible) return;
|
||||||
|
bIsVisible = true;
|
||||||
|
|
||||||
|
SetVisibility(ESlateVisibility::HitTestInvisible);
|
||||||
|
|
||||||
|
if (FadeInAnim)
|
||||||
|
{
|
||||||
|
PlayAnimation(FadeInAnim, 0.0f, 1, EUMGSequencePlayMode::Forward, 1.0f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void UNarrativeTextWidget::Hide()
|
||||||
|
{
|
||||||
|
if (!bIsVisible) return;
|
||||||
|
|
||||||
|
if (FadeOutAnim)
|
||||||
|
{
|
||||||
|
PlayAnimation(FadeOutAnim, 0.0f, 1, EUMGSequencePlayMode::Forward, 1.0f);
|
||||||
|
FTimerHandle TempHandle;
|
||||||
|
if (UWorld* World = GetWorld())
|
||||||
|
{
|
||||||
|
World->GetTimerManager().SetTimer(TempHandle, [this]()
|
||||||
|
{
|
||||||
|
bIsVisible = false;
|
||||||
|
SetVisibility(ESlateVisibility::Hidden);
|
||||||
|
}, 0.2f, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
bIsVisible = false;
|
||||||
|
SetVisibility(ESlateVisibility::Hidden);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
// ChildHood Project - 文本底框 UI 基类
|
||||||
|
// 对应技术方案: docs/technical/交互系统-技术方案.md 第6节（通用文本显示UI）
|
||||||
|
// 职责：半透明底框 + 一句话叙事/对话文本，带淡入淡出
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "CoreMinimal.h"
|
||||||
|
#include "Blueprint/UserWidget.h"
|
||||||
|
#include "NarrativeTextWidget.generated.h"
|
||||||
|
|
||||||
|
class UTextBlock;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* UNarrativeTextWidget
|
||||||
|
*
|
||||||
|
* 文本底框 UI 的 C++ 基类。蓝图子类（WBP_NarrativeText）继承此类，
|
||||||
|
* 在 UMG 编辑器中布局可视组件，并确保组件名与 BindWidget 匹配。
|
||||||
|
*
|
||||||
|
* 绑定要求：
|
||||||
|
* - TextBlock 名为 "NarrativeTextBlock" — 显示叙事/对话文字
|
||||||
|
* - WidgetAnimation 名为 "FadeInAnim" — 淡入动画（0.2s）
|
||||||
|
* - WidgetAnimation 名为 "FadeOutAnim" — 淡出动画（0.2s）
|
||||||
|
*
|
||||||
|
* 布局要求：
|
||||||
|
* - Anchors: Horizontal Center, Vertical ~0.6（屏幕中心偏下）
|
||||||
|
* - Border: 半透明黑色背景（~60%），圆角，SizeToContent
|
||||||
|
* - TextBlock: 白色文字，居中，自动换行
|
||||||
|
*/
|
||||||
|
UCLASS(Abstract, Blueprintable)
|
||||||
|
class UNarrativeTextWidget : public UUserWidget
|
||||||
|
{
|
||||||
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
/** 设置叙事文本内容 */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interaction|Narrative")
|
||||||
|
void SetNarrativeText(const FString& Text);
|
||||||
|
|
||||||
|
/** 显示文本（播放淡入动画） */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interaction|Narrative")
|
||||||
|
void Show();
|
||||||
|
|
||||||
|
/** 隐藏文本（播放淡出动画） */
|
||||||
|
UFUNCTION(BlueprintCallable, Category = "Interaction|Narrative")
|
||||||
|
void Hide();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
|
||||||
|
/** 叙事文字 TextBlock，蓝图子类必须有一个同名 TextBlock */
|
||||||
|
UPROPERTY(meta = (BindWidget))
|
||||||
|
UTextBlock* NarrativeTextBlock;
|
||||||
|
|
||||||
|
/** 淡入动画（0.2s），蓝图子类必须有同名 WidgetAnimation */
|
||||||
|
UPROPERTY(meta = (BindWidgetAnim), Transient)
|
||||||
|
UWidgetAnimation* FadeInAnim;
|
||||||
|
|
||||||
|
/** 淡出动画（0.2s），蓝图子类必须有同名 WidgetAnimation */
|
||||||
|
UPROPERTY(meta = (BindWidgetAnim), Transient)
|
||||||
|
UWidgetAnimation* FadeOutAnim;
|
||||||
|
|
||||||
|
/** 是否正在显示中 */
|
||||||
|
bool bIsVisible = false;
|
||||||
|
|
||||||
|
virtual void NativeOnInitialized() override;
|
||||||
|
};
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
// ChildHood Project - 推镜用临时摄像机 实现
|
||||||
|
|
||||||
|
#include "Interaction/PushCameraActor.h"
|
||||||
|
|
||||||
|
#include "Camera/CameraComponent.h"
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// 构造函数
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
APushCameraActor::APushCameraActor()
|
||||||
|
{
|
||||||
|
PrimaryActorTick.bCanEverTick = false;
|
||||||
|
|
||||||
|
// 创建摄像机组件
|
||||||
|
CameraComp = CreateDefaultSubobject<UCameraComponent>(TEXT("CameraComp"));
|
||||||
|
// 不需要根组件的碰撞
|
||||||
|
SetRootComponent(CameraComp);
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
// ChildHood Project - 推镜用临时摄像机
|
||||||
|
// 对应技术方案: docs/technical/交互系统-技术方案.md 第3节（类设计）
|
||||||
|
// 职责：极简 Actor，仅持有一个 UCameraComponent，供 SetViewTargetWithBlend 使用
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "CoreMinimal.h"
|
||||||
|
#include "GameFramework/Actor.h"
|
||||||
|
#include "PushCameraActor.generated.h"
|
||||||
|
|
||||||
|
class UCameraComponent;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* APushCameraActor
|
||||||
|
*
|
||||||
|
* 交互系统推镜时使用的临时摄像机 Actor。
|
||||||
|
* 由 InteractionManager 在 BeginPlay 中 Spawn，随 Character 生命周期。
|
||||||
|
* InteractionManager 在推镜时设置其 Location/Rotation，
|
||||||
|
* 然后通过 PlayerController::SetViewTargetWithBlend 切换 ViewTarget。
|
||||||
|
*/
|
||||||
|
UCLASS()
|
||||||
|
class APushCameraActor : public AActor
|
||||||
|
{
|
||||||
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
APushCameraActor();
|
||||||
|
|
||||||
|
/** 推镜摄像机组件 */
|
||||||
|
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Components")
|
||||||
|
UCameraComponent* CameraComp;
|
||||||
|
};
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+767
-784
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,224 @@
|
|||||||
|
# 交互系统 · 拾取流程时序图（v1.0 Effect 驱动版）
|
||||||
|
|
||||||
|
## 场景
|
||||||
|
|
||||||
|
玩家进入地上某个交互物的交互范围，按 E 交互后，人物做动作，交互物消失，背包加一个新物品，UI 显示捡到一个物品。
|
||||||
|
|
||||||
|
## 架构层级
|
||||||
|
|
||||||
|
| 层级 | 实体 | 所在位置 |
|
||||||
|
|------|------|---------|
|
||||||
|
| **Logic** | `FInteractionManager` | ASystemDriver 持有 (普通C++, 纯事件驱动, 缓存 Presentation 数据) |
|
||||||
|
| **Logic** | `FEffectManager` | ASystemDriver 持有 (普通C++, Driver 提供Tick) |
|
||||||
|
| **World** | `ASystemDriver` | AInfo 全局唯一 (持有所有Manager, 显式控制创建/Tick顺序) |
|
||||||
|
| **Data** | `UInteractableComponent` | 关卡实例 |
|
||||||
|
| **Data** | `UPersistenceSubsystem` | GameInstanceSubsystem |
|
||||||
|
| **Data** | `BackpackSystem` | GameInstance |
|
||||||
|
| **Presentation** | `UInteractionPromptComponent` | Character |
|
||||||
|
|
||||||
|
## 数据流规则
|
||||||
|
|
||||||
|
- 表现层直接读数据层（Manager state / Component data / Backpack data）
|
||||||
|
- 逻辑事件仅在 A 影响 B 时使用（如 Consume Action → Persistence 写入）
|
||||||
|
- 两个表现实体之间不直接访问
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Effect 配置
|
||||||
|
|
||||||
|
```
|
||||||
|
Effect: "拾取地面物品"
|
||||||
|
TotalDuration: 1.5s, Cancellable: false
|
||||||
|
|
||||||
|
TriggerTime | Action | 说明
|
||||||
|
----------- | --------------------- | ----
|
||||||
|
0.0s | TurnToTarget | TurnDuration=0.2，转向交互物
|
||||||
|
0.0s | PlayMontage | Montage=AM_Pickup，弯腰拾取动画
|
||||||
|
0.6s | Consume | 标记消耗，禁用检测球
|
||||||
|
0.6s | HideActor | 隐藏交互物 Actor
|
||||||
|
0.6s | AddToBackpack | 物品进背包 + 持久化
|
||||||
|
1.0s | ShowPickupNotification| 显示 "捡到了 [旧橡皮]!"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 时序图
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
sequenceDiagram
|
||||||
|
autonumber
|
||||||
|
|
||||||
|
actor Player as 玩家
|
||||||
|
participant Char as AChildHoodCharacter
|
||||||
|
participant Mgr as FInteractionManager<br/>(普通C++ · ASystemDriver持有)
|
||||||
|
participant Comp as UInteractableComponent<br/>(Data · 关卡实例)
|
||||||
|
participant Actor as AInteractableActor
|
||||||
|
participant EFM as FEffectManager<br/>(普通C++ · ASystemDriver持有)
|
||||||
|
participant Persist as UPersistenceSubsystem<br/>(Data · GameInstance)
|
||||||
|
participant Bag as BackpackSystem
|
||||||
|
participant Pres as UInteractionPromptComponent<br/>(Presentation · Character)
|
||||||
|
participant Driver as ASystemDriver<br/>(AInfo · 持有所有Manager)
|
||||||
|
|
||||||
|
rect rgb(230, 245, 255)
|
||||||
|
Note over Player,Driver: ═══ Phase 0 · 进入检测范围 ═══
|
||||||
|
Player->>Char: WASD 移动进入 TriggerRadius
|
||||||
|
Comp->>Mgr: DetectionSphere OnOverlapBegin<br/>ASystemDriver::Get(World)->GetInteractionManager().RegisterInteractable(this)
|
||||||
|
Mgr->>Mgr: NearbyInteractables.Add(Comp)<br/>Sort by Dist2D → SelectedIndex = 0
|
||||||
|
Mgr->>Mgr: RefreshCachedSelection()<br/>缓存 PromptText + WorldPosition
|
||||||
|
end
|
||||||
|
|
||||||
|
rect rgb(255, 250, 230)
|
||||||
|
Note over Player,Driver: ═══ Phase 1 · Prompt 显示（Pres 每帧读 Manager 缓存）═══
|
||||||
|
loop 每帧 Pres TickComponent
|
||||||
|
Pres->>Mgr: GetState() → Free
|
||||||
|
Pres->>Mgr: HasSelection() → true
|
||||||
|
Pres->>Mgr: GetSelectedPromptText() → "[E] 拾取 旧橡皮"
|
||||||
|
Pres->>Mgr: GetSelectedWorldPosition() → FVector
|
||||||
|
Pres->>Pres: PromptWidget.SetText + SetScreenPosition
|
||||||
|
end
|
||||||
|
Note right of Pres: Pres 不碰 Component<br/>只读 Manager 缓存
|
||||||
|
end
|
||||||
|
|
||||||
|
rect rgb(230, 255, 230)
|
||||||
|
Note over Player,Driver: ═══ Phase 2 · 按 E，Character 通过 Driver 协调两个 Manager ═══
|
||||||
|
Player->>Char: 按 E (IA_Interact)
|
||||||
|
Char->>Mgr: Driver->GetInteractionManager().BeginInteract() → 返回 Comp
|
||||||
|
Mgr->>Mgr: State = Executing, CurrentInteractable = Comp
|
||||||
|
Char->>Char: SetInteracting(true) → 屏蔽移动
|
||||||
|
|
||||||
|
Char->>EFM: Driver->GetEffectManager().PlayEffect(Comp.Data.InteractEffect, Context)<br/>Context = {Char, Comp, Actor}
|
||||||
|
Note right of EFM: Effect "拾取地面物品"<br/>T=0.0 TurnToTarget + PlayMontage<br/>T=0.6 Consume+Hide+Backpack<br/>T=1.0 PickupNotification<br/>Total=1.5s
|
||||||
|
end
|
||||||
|
|
||||||
|
rect rgb(255, 240, 245)
|
||||||
|
Note over Player,Driver: ═══ Phase 3 · Presentation 检测状态变化 ═══
|
||||||
|
Pres->>Mgr: Tick: GetState() → Executing (变化!)
|
||||||
|
Pres->>Pres: PromptWidget.Hide()
|
||||||
|
end
|
||||||
|
|
||||||
|
rect rgb(240, 240, 255)
|
||||||
|
Note over Player,Driver: ═══ Phase 4 · Effect 执行（ASystemDriver Tick → EffectManager）═══
|
||||||
|
|
||||||
|
Note over Driver: T=0.0: TurnToTarget + PlayMontage
|
||||||
|
Driver->>EFM: Driver::Tick → EffectManager.Update(DeltaTime)
|
||||||
|
EFM->>EFM: ElapsedTime=0.0 → 触发 TurnToTarget Action
|
||||||
|
EFM->>Char: RInterpTo 转向 Comp（持续帧）
|
||||||
|
EFM->>EFM: 触发 PlayMontage Action
|
||||||
|
EFM->>Char: GetMesh()->GetAnimInstance()->Montage_Play(AM_Pickup)
|
||||||
|
Note right of Char: 播放弯腰拾取动画
|
||||||
|
|
||||||
|
Note over Driver: T=0.0→0.6: 持续转向 + 动画播放
|
||||||
|
loop 每帧 Driver Tick
|
||||||
|
Driver->>EFM: Tick → Update(DeltaTime)
|
||||||
|
EFM->>EFM: ElapsedTime += DeltaTime
|
||||||
|
EFM->>Char: TurnToTarget: RInterpTo 插值
|
||||||
|
end
|
||||||
|
|
||||||
|
Note over Driver: T=0.6: Consume + HideActor + AddToBackpack
|
||||||
|
Driver->>EFM: Tick → Update → ElapsedTime=0.6 触发
|
||||||
|
EFM->>Comp: Consume() — 数据变更
|
||||||
|
Comp-->>Comp: bIsConsumed=true<br/>DetectionSphere → NoCollision
|
||||||
|
Note right of Comp: 禁用碰撞同步触发 EndOverlap<br/>→ UnregisterInteractable<br/>Manager 标记延迟清理
|
||||||
|
|
||||||
|
EFM->>Persist: MarkItemCollected("rubber_01")
|
||||||
|
Persist-->>Persist: CollectedItemIDs.Add("rubber_01")
|
||||||
|
|
||||||
|
EFM->>Actor: SetActorHiddenInGame(true)
|
||||||
|
|
||||||
|
EFM->>Bag: AddItem("rubber_01", "旧橡皮")
|
||||||
|
Bag-->>Bag: Items.Add({Id:"rubber_01", Name:"旧橡皮"})
|
||||||
|
|
||||||
|
Pres->>Comp: Tick: IsConsumed() → true (变化!)
|
||||||
|
Pres->>Actor: SetActorHiddenInGame(true)
|
||||||
|
|
||||||
|
Note over Driver: T=1.0: ShowPickupNotification
|
||||||
|
Driver->>EFM: Tick → Update → ElapsedTime=1.0 触发
|
||||||
|
EFM->>Pres: 显示拾取通知 "捡到了 [旧橡皮]!"
|
||||||
|
end
|
||||||
|
|
||||||
|
rect rgb(230, 255, 255)
|
||||||
|
Note over Player,Driver: ═══ Phase 5 · Effect 完成，回到 Free ═══
|
||||||
|
Driver->>EFM: Tick → Update → ElapsedTime >= TotalDuration(1.5s)
|
||||||
|
EFM->>EFM: FinishEffect()
|
||||||
|
EFM->>Mgr: OnEffectComplete 回调
|
||||||
|
Mgr->>Mgr: State = Free, CurrentInteractable = nullptr
|
||||||
|
Mgr->>Char: SetInteracting(false) → 恢复移动
|
||||||
|
|
||||||
|
Pres->>Mgr: Tick: GetState() → Free (变化!)
|
||||||
|
Pres->>Mgr: GetSelectedInteractable() → null (已注销)
|
||||||
|
Note over Pres: 无其他交互物在范围，不显示 Prompt
|
||||||
|
|
||||||
|
Player->>Char: WASD 继续移动
|
||||||
|
end
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 关键数据流说明
|
||||||
|
|
||||||
|
### 表现层读数据（只读 Manager 缓存，不碰 Component）
|
||||||
|
|
||||||
|
| 读取时机 | PromptComponent 读谁 | 读什么 |
|
||||||
|
|----------|---------------------|--------|
|
||||||
|
| 每帧 Tick | Manager | `GetState()` |
|
||||||
|
| Free 状态 | Manager | `HasSelection()` |
|
||||||
|
| Free 状态 | Manager | `GetSelectedPromptText()` |
|
||||||
|
| Free 状态 | Manager | `GetSelectedWorldPosition()` |
|
||||||
|
|
||||||
|
### Manager 缓存更新（选择变化时从 Component 读一次）
|
||||||
|
|
||||||
|
| 触发时机 | Manager 方法 | 缓存内容 |
|
||||||
|
|----------|-------------|---------|
|
||||||
|
| RegisterInteractable | RefreshCachedSelection() | PromptText + WorldPosition |
|
||||||
|
| UnregisterInteractable | RefreshCachedSelection() | PromptText + WorldPosition |
|
||||||
|
| SwitchTarget | RefreshCachedSelection() | PromptText + WorldPosition |
|
||||||
|
|
||||||
|
### Effect 内 Action 执行（直接操作）
|
||||||
|
|
||||||
|
| Action | 操作对象 | 说明 |
|
||||||
|
|--------|---------|------|
|
||||||
|
| TurnToTarget | Char->SetActorRotation | RInterpTo 跨帧插值 |
|
||||||
|
| PlayMontage | Char->GetMesh()->GetAnimInstance() | 播放蒙太奇 |
|
||||||
|
| Consume | Component->Consume() | 标记消耗+禁用检测 |
|
||||||
|
| HideActor | Actor->SetActorHiddenInGame(true) | 隐藏 |
|
||||||
|
| AddToBackpack | PersistenceSubsystem + BackpackSystem | 写入持久层+背包 |
|
||||||
|
| ShowPickupNotification | PromptComponent / Widget | 显示通知 |
|
||||||
|
|
||||||
|
### 逻辑事件（仅 A 影响 B）
|
||||||
|
|
||||||
|
| 事件 | 触发者 | 订阅者 |
|
||||||
|
|------|--------|--------|
|
||||||
|
| OnItemConsumed | Manager（由 Consume Action 触发） | PersistenceSubsystem |
|
||||||
|
| OnDoorToggled | Manager（由 ToggleDoor Action 触发） | PersistenceSubsystem + DoorComponent |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 注意事项
|
||||||
|
|
||||||
|
### EndOverlap 时序问题
|
||||||
|
|
||||||
|
Phase 4 中 `Consume()` 禁用 DetectionSphere 会**同步触发** `EndOverlap`，进而调用 `Manager->UnregisterInteractable()`。此时 Manager 处于 Executing 状态且 Effect 仍在使用 CurrentInteractable。
|
||||||
|
|
||||||
|
**解决方案**：Manager 的 `UnregisterInteractable` 中，当 `State == Executing` 且移除的正是 `CurrentInteractable` 时，仅从 NearbyInteractables 列表移除，**不清除 CurrentInteractable 引用**，等 Effect 完成回调中统一清理。
|
||||||
|
|
||||||
|
### ASystemDriver 生命周期
|
||||||
|
|
||||||
|
- `ASystemDriver` 是 AInfo 全局唯一，持有所有 World 级 Manager（普通 C++ 对象）
|
||||||
|
- 关卡加载完成 → `GameInstance` Spawn `ASystemDriver`
|
||||||
|
- `Driver::BeginPlay` 显式创建 `FInteractionManager` + `FEffectManager`，控制顺序
|
||||||
|
- `Driver::BeginPlay` 中用 `TFunction` 连线 `EffectManager.OnEffectComplete → Manager.OnInteractionFinished`
|
||||||
|
- `Driver::Tick` 显式调用 `EffectManager.Update(Delta)`，控制 Tick 顺序
|
||||||
|
- 关卡卸载 → World 销毁 → Driver 自动销毁 → Manager 随 Driver 析构
|
||||||
|
- 新关卡加载 → 重新 Spawn + 创建
|
||||||
|
|
||||||
|
### 系统协调关系
|
||||||
|
|
||||||
|
- `FInteractionManager` 和 `FEffectManager` 是普通 C++ 类，由 `ASystemDriver` 持有
|
||||||
|
- `AChildHoodCharacter` 输入回调通过 `ASystemDriver::Get(World)` 访问两个 Manager
|
||||||
|
- `Driver::BeginPlay` 中通过 `TFunction<void()>` 连接 EffectManager 完成回调到 Manager
|
||||||
|
- `FInteractionManager` 纯事件驱动，无 Tick/Update
|
||||||
|
- `UChildHoodGameInstance` 不持有任何交互系统对象，仅 `UPersistenceSubsystem` 跨 World 存活
|
||||||
|
|
||||||
|
### TurnToTarget 跨帧插值
|
||||||
|
|
||||||
|
TurnToTarget Action 不是瞬时完成的。EffectManager 在 Update 中维护 `FTurnState`（起始旋转、目标旋转、已用时间），每帧调用 `FMath::RInterpTo` 直到转向完成。多个 Action 可以并行执行。
|
||||||
+159
-14
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
> 任务ID: P-009
|
> 任务ID: P-009
|
||||||
> 对应执行案: `docs/design/收集系统-执行案.md` (v0.1.1)
|
> 对应执行案: `docs/design/收集系统-执行案.md` (v0.1.1)
|
||||||
> 关联系统: 物品系统（上游单向接收）、交互系统（间接，通过物品系统委托）
|
> 关联系统: 物品系统（上游单向接收）、交互系统（间接，通过物品系统委托）、GameInstance 持久化层
|
||||||
> 日期: 2026-06-07
|
> 日期: 2026-06-07（2026-06-11 更新：加入多场景持久化架构）
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -15,6 +15,16 @@
|
|||||||
**预估工期**：2-3 天
|
**预估工期**：2-3 天
|
||||||
**新增/修改代码量**：约 250-350 行 C++ + 3 个 UMG 蓝图
|
**新增/修改代码量**：约 250-350 行 C++ + 3 个 UMG 蓝图
|
||||||
|
|
||||||
|
### 跨场景持久化架构
|
||||||
|
|
||||||
|
> 收集进度是玩家核心持久数据。当前设计中 `UCollectionManager` 将「行为控制」（UI、通知、动画）和「持久数据」（CollectedIDs、Progress）混在同一组件，随 Character 销毁而丢失。需要通过数据层分离解决：
|
||||||
|
|
||||||
|
- **持久数据层**：收集状态（CollectedIDs、Progress、bIsComplete）存储在 `UChildHoodGameInstance` 中（跨关卡存活）
|
||||||
|
- **行为层**：`UCollectionManager` 仅负责运行时 UI 控制和委托监听，BeginPlay 时从 GameInstance 恢复状态
|
||||||
|
- **交互物恢复**：场景中的已收集物品由交互系统通过 `InteractableComponent::RestorePersistentState()` 处理（见交互系统技术方案第 12 节）
|
||||||
|
|
||||||
|
v0.1 为单场景原型，此架构以接口预留形式存在，不影响当前功能。详见 [第 12 节：跨场景持久化设计](#12-跨场景持久化设计)。
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 1. 需求功能点罗列
|
## 1. 需求功能点罗列
|
||||||
@@ -123,6 +133,17 @@ classDiagram
|
|||||||
-CheckCompletion() void
|
-CheckCompletion() void
|
||||||
-ShowCompletionPrompt() void
|
-ShowCompletionPrompt() void
|
||||||
-UpdateProgressUI() void
|
-UpdateProgressUI() void
|
||||||
|
-LoadStateFromGameInstance() void
|
||||||
|
-SaveStateToGameInstance() void
|
||||||
|
}
|
||||||
|
|
||||||
|
class UChildHoodGameInstance {
|
||||||
|
-TSet~FName~ CollectedItemIDs
|
||||||
|
-int32 CollectionProgress
|
||||||
|
-bool bCollectionComplete
|
||||||
|
+GetCollectionState(TSet_FName_&, int32&, bool&) void
|
||||||
|
+SetCollectionState(TSet_FName_&, int32, bool) void
|
||||||
|
+ResetAll() void
|
||||||
}
|
}
|
||||||
|
|
||||||
class UCollectionNotifWidget {
|
class UCollectionNotifWidget {
|
||||||
@@ -175,6 +196,7 @@ classDiagram
|
|||||||
|
|
||||||
AChildHoodCharacter *-- UCollectionManager : 组合
|
AChildHoodCharacter *-- UCollectionManager : 组合
|
||||||
UCollectionManager --> UInteractionManager : 关联（绑定委托）
|
UCollectionManager --> UInteractionManager : 关联（绑定委托）
|
||||||
|
UCollectionManager ..> UChildHoodGameInstance : 读取/写入持久状态
|
||||||
UCollectionManager o-- UCollectionNotifWidget : 聚合（管理生命周期）
|
UCollectionManager o-- UCollectionNotifWidget : 聚合（管理生命周期）
|
||||||
UCollectionManager o-- UCollectionProgressWidget : 聚合（管理生命周期）
|
UCollectionManager o-- UCollectionProgressWidget : 聚合（管理生命周期）
|
||||||
UCollectionManager ..> UCollectionCompleteWidget : 按需创建
|
UCollectionManager ..> UCollectionCompleteWidget : 按需创建
|
||||||
@@ -188,7 +210,7 @@ classDiagram
|
|||||||
| 组合 `*--` | 生命周期绑定 | Character 持有 CollectionManager；CollectionManager 内含 Config |
|
| 组合 `*--` | 生命周期绑定 | Character 持有 CollectionManager；CollectionManager 内含 Config |
|
||||||
| 聚合 `o--` | 引用但非拥有 | CollectionManager 管理通知/进度 Widget 的创建和销毁 |
|
| 聚合 `o--` | 引用但非拥有 | CollectionManager 管理通知/进度 Widget 的创建和销毁 |
|
||||||
| 关联 `-->` | 持久引用 | CollectionManager 绑定 InteractionManager 的委托 |
|
| 关联 `-->` | 持久引用 | CollectionManager 绑定 InteractionManager 的委托 |
|
||||||
| 依赖 `..>` | 临时使用 | CollectionManager 按需创建完成提示 Widget |
|
| 依赖 `..>` | 临时使用 | CollectionManager 从 GameInstance 读取/写入持久状态；按需创建完成提示 Widget |
|
||||||
|
|
||||||
### 新增类
|
### 新增类
|
||||||
|
|
||||||
@@ -489,6 +511,8 @@ void UCollectionManager::ProcessNewCollection(FName ItemId)
|
|||||||
// 步骤 3: 记录
|
// 步骤 3: 记录
|
||||||
CollectedIDs.Add(ItemId);
|
CollectedIDs.Add(ItemId);
|
||||||
Progress = CollectedIDs.Num(); // 用 Set 大小作为权威进度值，避免状态不一致
|
Progress = CollectedIDs.Num(); // 用 Set 大小作为权威进度值，避免状态不一致
|
||||||
|
// 持久化到 GameInstance
|
||||||
|
SaveStateToGameInstance();
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -519,6 +543,7 @@ void UCollectionManager::ProcessNewCollection(FName ItemId)
|
|||||||
if (Progress >= Config.TotalCount && !bIsComplete)
|
if (Progress >= Config.TotalCount && !bIsComplete)
|
||||||
{
|
{
|
||||||
bIsComplete = true;
|
bIsComplete = true;
|
||||||
|
SaveStateToGameInstance(); // 持久化完成状态
|
||||||
CheckCompletion(); // 触发完成表现
|
CheckCompletion(); // 触发完成表现
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -637,10 +662,8 @@ void UCollectionManager::BeginPlay()
|
|||||||
{
|
{
|
||||||
Super::BeginPlay();
|
Super::BeginPlay();
|
||||||
|
|
||||||
// 初始化状态
|
// 从 GameInstance 恢复持久状态（v0.1 单场景等效于空数据初始化）
|
||||||
Progress = 0;
|
LoadStateFromGameInstance();
|
||||||
CollectedIDs.Empty();
|
|
||||||
bIsComplete = false;
|
|
||||||
|
|
||||||
// 创建进度 UI
|
// 创建进度 UI
|
||||||
if (ProgressWidgetClass)
|
if (ProgressWidgetClass)
|
||||||
@@ -652,7 +675,12 @@ void UCollectionManager::BeginPlay()
|
|||||||
if (ProgressWidget)
|
if (ProgressWidget)
|
||||||
{
|
{
|
||||||
ProgressWidget->AddToViewport(5);
|
ProgressWidget->AddToViewport(5);
|
||||||
ProgressWidget->UpdateProgress(0, Config.TotalCount);
|
ProgressWidget->UpdateProgress(Progress, Config.TotalCount);
|
||||||
|
// 已完成时恢复完成样式
|
||||||
|
if (bIsComplete)
|
||||||
|
{
|
||||||
|
ProgressWidget->SetCompleteStyle();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -772,20 +800,34 @@ void UCollectionManager::ShowCompletionPrompt()
|
|||||||
|
|
||||||
#### 重启状态处理
|
#### 重启状态处理
|
||||||
|
|
||||||
**实现**：v0.1 无持久化。CollectionManager::BeginPlay() 中完全重置：
|
**实现**：收集状态通过 `UChildHoodGameInstance` 跨场景持久化。CollectionManager::BeginPlay() 中从 GameInstance 恢复：
|
||||||
|
|
||||||
```cpp
|
```cpp
|
||||||
void UCollectionManager::BeginPlay()
|
void UCollectionManager::LoadStateFromGameInstance()
|
||||||
{
|
{
|
||||||
Super::BeginPlay();
|
if (UChildHoodGameInstance* GI = GetWorld()->GetGameInstance<UChildHoodGameInstance>())
|
||||||
|
{
|
||||||
|
GI->GetCollectionState(CollectedIDs, Progress, bIsComplete);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// 回退：无 GameInstance 时初始化为空（编辑器预览等场景）
|
||||||
Progress = 0;
|
Progress = 0;
|
||||||
CollectedIDs.Empty();
|
CollectedIDs.Empty();
|
||||||
bIsComplete = false;
|
bIsComplete = false;
|
||||||
// ... 创建 UI、绑定委托
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void UCollectionManager::SaveStateToGameInstance()
|
||||||
|
{
|
||||||
|
if (UChildHoodGameInstance* GI = GetWorld()->GetGameInstance<UChildHoodGameInstance>())
|
||||||
|
{
|
||||||
|
GI->SetCollectionState(CollectedIDs, Progress, bIsComplete);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
重启后进度 UI 恢复显示 `📦 杂物 0/10`。
|
v0.1 单场景下：GameInstance 以空数据初始化，等效于 `📦 杂物 0/10`。场景内正常收集后状态写入 GameInstance，若通过 Seamless Travel 切换关卡则自动恢复。非无缝跳转（OpenLevel）时 GameInstance 仍存活，新场景的 CollectionManager 可读取之前的数据。
|
||||||
|
|
||||||
#### 收集通知与拾取通知时序
|
#### 收集通知与拾取通知时序
|
||||||
|
|
||||||
@@ -819,6 +861,7 @@ void UCollectionManager::BeginPlay()
|
|||||||
### 注意事项
|
### 注意事项
|
||||||
|
|
||||||
1. **委托绑定时机**：CollectionManager 在 BeginPlay() 中通过 `GetOwner()->GetComponentByClass<UInteractionManager>()` 获取引用并绑定。需确保 InteractionManager 已初始化。若为 nullptr 则在 Tick 中延迟绑定（最多重试 N 帧后报错）。
|
1. **委托绑定时机**：CollectionManager 在 BeginPlay() 中通过 `GetOwner()->GetComponentByClass<UInteractionManager>()` 获取引用并绑定。需确保 InteractionManager 已初始化。若为 nullptr 则在 Tick 中延迟绑定（最多重试 N 帧后报错）。
|
||||||
|
2. **持久化读写时机**：`SaveStateToGameInstance()` 在每次 ProcessNewCollection 记录后和完成判定后调用，保证 GameInstance 中的数据始终最新。`LoadStateFromGameInstance()` 仅在 BeginPlay 中调用一次。
|
||||||
2. **v0.1 无拾取通知 UI**：执行文档中拾取通知由物品系统负责，但 v0.1 物品系统仅为委托层（InteractionManager 上的委托）。收集通知的 0.3s 延迟仍按设计实现（为拾取通知预留时间窗口），即使拾取通知 UI 暂未实现。
|
2. **v0.1 无拾取通知 UI**：执行文档中拾取通知由物品系统负责，但 v0.1 物品系统仅为委托层（InteractionManager 上的委托）。收集通知的 0.3s 延迟仍按设计实现（为拾取通知预留时间窗口），即使拾取通知 UI 暂未实现。
|
||||||
3. **通知移除回调**：UCollectionNotifWidget 淡出完成后需通知 CollectionManager 从 ActiveNotifications 中移除自身引用。使用委托或弱引用回调实现，避免循环引用。
|
3. **通知移除回调**：UCollectionNotifWidget 淡出完成后需通知 CollectionManager 从 ActiveNotifications 中移除自身引用。使用委托或弱引用回调实现，避免循环引用。
|
||||||
4. **FName 作为 ID**：收集系统使用 FName（ItemId）作为去重键，与 InteractionManager 委托广播的 ItemId 类型一致。
|
4. **FName 作为 ID**：收集系统使用 FName（ItemId）作为去重键，与 InteractionManager 委托广播的 ItemId 类型一致。
|
||||||
@@ -847,14 +890,33 @@ InteractionManager (ExecuteAnimEvent)
|
|||||||
├─ 查品类 (Category == TrackedCategory?) → 不匹配则忽略
|
├─ 查品类 (Category == TrackedCategory?) → 不匹配则忽略
|
||||||
├─ 查重复 (CollectedIDs.Contains?) → 已存在则忽略
|
├─ 查重复 (CollectedIDs.Contains?) → 已存在则忽略
|
||||||
├─ 记录 (CollectedIDs.Add + Progress = Num())
|
├─ 记录 (CollectedIDs.Add + Progress = Num())
|
||||||
|
├─ SaveStateToGameInstance() → UChildHoodGameInstance (持久化)
|
||||||
├─ UpdateProgressUI() → WBP_CollectionProgress (文本 + 弹性动画)
|
├─ UpdateProgressUI() → WBP_CollectionProgress (文本 + 弹性动画)
|
||||||
├─ SetTimer(NotifDelay) → ShowCollectionNotification() → WBP_CollectionNotification
|
├─ SetTimer(NotifDelay) → ShowCollectionNotification() → WBP_CollectionNotification
|
||||||
└─ 完成判定 (Progress >= TotalCount)
|
└─ 完成判定 (Progress >= TotalCount)
|
||||||
→ bIsComplete = true
|
→ bIsComplete = true
|
||||||
|
→ SaveStateToGameInstance() (持久化完成状态)
|
||||||
→ SetCompleteStyle() → WBP_CollectionProgress (金色)
|
→ SetCompleteStyle() → WBP_CollectionProgress (金色)
|
||||||
→ SetTimer(TotalDelay) → ShowCompletionPrompt() → WBP_CollectionComplete
|
→ SetTimer(TotalDelay) → ShowCompletionPrompt() → WBP_CollectionComplete
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### 跨场景恢复流
|
||||||
|
|
||||||
|
```
|
||||||
|
场景切换 (OpenLevel / Seamless Travel)
|
||||||
|
→ 新场景加载
|
||||||
|
→ AChildHoodCharacter::BeginPlay()
|
||||||
|
→ UCollectionManager::BeginPlay()
|
||||||
|
→ LoadStateFromGameInstance()
|
||||||
|
→ UChildHoodGameInstance::GetCollectionState(OutIDs, OutProgress, OutComplete)
|
||||||
|
→ 恢复 CollectedIDs / Progress / bIsComplete
|
||||||
|
→ 创建进度 UI（显示已恢复的进度值）
|
||||||
|
→ 若 bIsComplete → 恢复完成样式
|
||||||
|
→ 场景中 AInteractableActor::BeginPlay()
|
||||||
|
→ UInteractableComponent::RestorePersistentState(GI)
|
||||||
|
→ GI->IsItemCollected(ItemId) → 已收集则隐藏 + 禁用
|
||||||
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 10. 可调参数汇总
|
## 10. 可调参数汇总
|
||||||
@@ -886,10 +948,11 @@ InteractionManager (ExecuteAnimEvent)
|
|||||||
Source/ChildHood/
|
Source/ChildHood/
|
||||||
├── Collection/
|
├── Collection/
|
||||||
│ ├── CollectionTypes.h # FCollectionConfig 结构体定义
|
│ ├── CollectionTypes.h # FCollectionConfig 结构体定义
|
||||||
│ ├── CollectionManager.h/.cpp # 收集系统核心组件
|
│ ├── CollectionManager.h/.cpp # 收集系统核心组件（含 GameInstance 读写）
|
||||||
│ ├── CollectionNotifWidget.h/.cpp # 收集通知 UI 基类
|
│ ├── CollectionNotifWidget.h/.cpp # 收集通知 UI 基类
|
||||||
│ ├── CollectionProgressWidget.h/.cpp # 收集进度 UI 基类
|
│ ├── CollectionProgressWidget.h/.cpp # 收集进度 UI 基类
|
||||||
│ └── CollectionCompleteWidget.h/.cpp # 完成提示 UI 基类
|
│ └── CollectionCompleteWidget.h/.cpp # 完成提示 UI 基类
|
||||||
|
├── ChildHoodGameInstance.h/.cpp # 新增：跨关卡持久数据持有者（收集状态在此持久化）
|
||||||
├── ChildHoodCharacter.h/.cpp # 修改：添加 CollectionManager 成员和访问器
|
├── ChildHoodCharacter.h/.cpp # 修改：添加 CollectionManager 成员和访问器
|
||||||
|
|
||||||
Content/
|
Content/
|
||||||
@@ -928,3 +991,85 @@ Content/
|
|||||||
|
|
||||||
> **关键路径**：6b-1 → 6b-2 → 6b-4 → 6b-5 → 6b-6。6b-3（进度 UI）可在 6b-1 完成后并行。总关键路径约 3 天。
|
> **关键路径**：6b-1 → 6b-2 → 6b-4 → 6b-5 → 6b-6。6b-3（进度 UI）可在 6b-1 完成后并行。总关键路径约 3 天。
|
||||||
> **前置依赖**：交互系统的 InteractionManager 组件需已完成（特别是 OnItemPickedUp/OnItemFound 委托），方可进行 6b-2 的委托绑定测试。
|
> **前置依赖**：交互系统的 InteractionManager 组件需已完成（特别是 OnItemPickedUp/OnItemFound 委托），方可进行 6b-2 的委托绑定测试。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 12. 跨场景持久化设计
|
||||||
|
|
||||||
|
> 收集进度是玩家的核心持久数据，必须在场景切换时保留。本节定义收集系统如何通过 `UChildHoodGameInstance` 实现跨场景数据持久化。
|
||||||
|
|
||||||
|
### 架构原则
|
||||||
|
|
||||||
|
```
|
||||||
|
┌──────────────────────────────────────────────────┐
|
||||||
|
│ UChildHoodGameInstance │ ← 跨关卡存活
|
||||||
|
│ ├── CollectedItemIDs: TSet<FName> │ 所有场景共享
|
||||||
|
│ ├── CollectionProgress: int32 │
|
||||||
|
│ └── bCollectionComplete: bool │
|
||||||
|
└──────────────────────────────────────────────────┘
|
||||||
|
↕ BeginPlay 加载 / 收集时回写
|
||||||
|
┌──────────────────────────────────────────────────┐
|
||||||
|
│ UCollectionManager (每个场景重建) │ ← 行为层
|
||||||
|
│ ├── 从 GameInstance 读取恢复进度 │ 不持有持久数据所有权
|
||||||
|
│ ├── 收集时写入 GameInstance │
|
||||||
|
│ └── 控制 UI / 通知 / 动画 │
|
||||||
|
└──────────────────────────────────────────────────┘
|
||||||
|
↕ 场景恢复
|
||||||
|
┌──────────────────────────────────────────────────┐
|
||||||
|
│ 场景中的 AInteractableActor │ ← 由交互系统负责恢复
|
||||||
|
│ └── RestorePersistentState() │ (见交互系统技术方案第 12 节)
|
||||||
|
└──────────────────────────────────────────────────┘
|
||||||
|
```
|
||||||
|
|
||||||
|
### UChildHoodGameInstance 收集相关接口
|
||||||
|
|
||||||
|
```cpp
|
||||||
|
UCLASS()
|
||||||
|
class UChildHoodGameInstance : public UGameInstance
|
||||||
|
{
|
||||||
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
public:
|
||||||
|
// === 收集状态 ===
|
||||||
|
void GetCollectionState(TSet<FName>& OutIDs, int32& OutProgress, bool& OutComplete) const;
|
||||||
|
void SetCollectionState(const TSet<FName>& IDs, int32 Progress, bool bComplete);
|
||||||
|
|
||||||
|
// === 物品消耗状态（交互系统也使用）===
|
||||||
|
bool IsItemCollected(FName ItemId) const;
|
||||||
|
void MarkItemCollected(FName ItemId);
|
||||||
|
|
||||||
|
// === 门状态（交互系统也使用）===
|
||||||
|
bool IsDoorOpen(FName DoorId) const;
|
||||||
|
void SetDoorOpen(FName DoorId, bool bIsOpen);
|
||||||
|
|
||||||
|
// === 重置 ===
|
||||||
|
void ResetAll();
|
||||||
|
|
||||||
|
private:
|
||||||
|
// 收集系统
|
||||||
|
TSet<FName> CollectedItemIDs;
|
||||||
|
int32 CollectionProgress = 0;
|
||||||
|
bool bCollectionComplete = false;
|
||||||
|
// 交互系统
|
||||||
|
TMap<FName, bool> DoorStates;
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
|
> **注意**：`CollectedItemIDs` 同时被 `IsItemCollected()`（交互物恢复）和 `GetCollectionState()`（收集进度恢复）使用，确保两系统数据一致性。
|
||||||
|
|
||||||
|
### 读写时机
|
||||||
|
|
||||||
|
| 时机 | 方法 | 说明 |
|
||||||
|
|------|------|------|
|
||||||
|
| CollectionManager::BeginPlay | `LoadStateFromGameInstance()` | 场景加载时恢复进度 |
|
||||||
|
| ProcessNewCollection 记录后 | `SaveStateToGameInstance()` | 每次新收集时同步写入 |
|
||||||
|
| 完成判定后 | `SaveStateToGameInstance()` | 完成状态立即持久化 |
|
||||||
|
| InteractableComponent::Consume | `GI->MarkItemCollected()` | 交互物消耗状态写入（由交互系统调用） |
|
||||||
|
|
||||||
|
### v0.1 行为
|
||||||
|
|
||||||
|
- v0.1 为单场景原型，不存在跨场景切换
|
||||||
|
- `UChildHoodGameInstance` 在 v0.1 中以空数据初始化，所有查询返回默认值
|
||||||
|
- `LoadStateFromGameInstance()` 等效于初始化为 0
|
||||||
|
- 后续多场景版本只需在 Project Settings 中将 GameInstance Class 设为 `UChildHoodGameInstance`，收集系统代码无需修改
|
||||||
|
- 后续版本可通过 USaveGame 将 GameInstance 数据序列化到磁盘，实现跨会话持久化
|
||||||
|
|||||||
Reference in New Issue
Block a user