合并 upstream/main：侧栏面板 + 本地内容完整保留 - #17
Merged
Hidden character warning
The head ref may contain hidden characters: "\u52a0\u5165\u6076\u9b54\u52a8\u753b\u8d44\u6e90"
Merged
Conversation
场景文件与本地完全一致（e9d05af已包含upstream侧栏面板），仅asmdef采用upstream版本。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
上游已合并了PR ULookup#16，此次合并确保场景文件完整正确。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
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.
场景文件与本地完全一致（e9d05af已包含upstream侧栏面板），仅asmdef采用upstream版本。