加入恶魔动画资源 - #16
Merged
Hidden character warning
The head ref may contain hidden characters: "\u52a0\u5165\u6076\u9b54\u52a8\u753b\u8d44\u6e90"
Merged
Conversation
- 6个侧栏面板(Panel_Garden/Panel_Inventory/Panel_Collection/Panel_PetStatus/SidebarOverlay/Panel_Tarot)从upstream/main合并 - 家具和桌宠(Pet_Angel/Pet_Devil)的场景文档、脚本、动画恢复到完成恶魔及天使动画分支状态 - 恢复PetInteractionVisualStrategy.cs和恶魔交互动画文件 - 恢复恶魔动画姿态GameObject(Pose_恶魔_睡觉/玩掌机/画画) Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
桌宠(Pet_Angel/Pet_Devil)及其动画、家具保持本地版本，其余内容合并自upstream/main。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
habhab783124-lab
added a commit
to habhab783124-lab/Gemini-Lab
that referenced
this pull request
May 31, 2026
上游已合并了PR ULookup#16，此次合并确保场景文件完整正确。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
ULookup
added a commit
that referenced
this pull request
May 31, 2026
Scene conflict resolved with --theirs (remote) per user request: space system changes from PR #16 take priority.
ULookup
added a commit
that referenced
this pull request
May 31, 2026
ULookup
added a commit
that referenced
this pull request
May 31, 2026
PR #16 scene file is incompatible with current Unity version (reports corrupted). Restore our working scene which has Pet_Angel + StatusPanel bars. Pet_Devil needs to be created by duplicating Pet_Angel via MCP.
ULookup
added a commit
that referenced
this pull request
May 31, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.