Skip to content

fix(core): convert AsyncOperation to UniTask for Unity 6 compatibility #595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JasonXuDeveloper merged 2 commits into from
Jan 28, 2026
Merged

fix(core): convert AsyncOperation to UniTask for Unity 6 compatibility #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bfb39e
docs: add git workflow guidelines for branching and PRs
JasonXuDeveloper Jan 28, 2026
522902a
fix(core): convert AsyncOperation to UniTask for Unity 6 compatibility
JasonXuDeveloper Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion .claude/rules/commit-conventions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,32 @@
# Commit Message Format
# Git Workflow & Commit Conventions

## Branching

**Always create new branches from `master`** (the main branch), not from feature branches:

```bash
# Correct workflow
git checkout master
git pull origin master
git checkout -b fix/my-fix

# Wrong - creates branch from current branch which may not be master
git checkout -b fix/my-fix
```

Before creating a PR branch, always:
1. Switch to `master`
2. Pull latest changes
3. Then create the new branch

## Never Push Directly to Master

**All changes must go through pull requests.** Never push commits directly to master, even for documentation changes. This ensures:
- Code review for all changes
- CI checks run before merge
- Clean git history with traceable PRs

## Commit Message Format

All commits should follow the Conventional Commits specification to enable automatic changelog generation.

Expand Down
2 changes: 1 addition & 1 deletion UnityProject/Packages/com.jasonxudeveloper.jengine.core/Runtime/Bootstrap.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public static async UniTask<SceneHandle> LoadHotUpdateScene(ResourcePackage pack
// Call error callback
await callbacks.OnError(e);
// Switch back to previous scene
await SceneManager.LoadSceneAsync(previousSceneName);
await SceneManager.LoadSceneAsync(previousSceneName).ToUniTask();

return null;
}
Expand Down
Loading