fix: SpaceSys sidebar button and apartment viewport setup - #15
Merged
Conversation
冲突处理: - StubPanelBase.cs → 取 PR 的 ResolveOrCreateRouter() 方案 - TarotPanelStub.cs → 保留 main(PR 版本较旧,缺少历史记录功能) - Apartment_Main.unity → 保留 main(场景 YAML 冲突过多,需编辑器重建) - .asmdef → 合并两边引用(Tarot + HubUI) 导入内容: - 恶魔动画:PlayingMusic / Write anim + Pet_Devil.controller 更新 - 恶魔精灵图:玩掌机 + 画画 序列帧(~68 PNG) - 空间系统代码:ApartmentViewportInputBridge / BuildModeController / PetClickReactionController / PetPlayerFurnitureInteractionController - SidebarController 新增 SpaceSys 标签页 - 删除旧 SpaceSystemPrototypeView.cs - MCP skills 同步、RenderTexture 资源、Prefab 目录等
- Fix _tabSpaceSys null reference on SidebarController that prevented the SpaceSys panel from opening when the sidebar button was clicked - Add ApartmentViewportCamera with orthographic projection targeting the ApartmentViewport_RT RenderTexture - Add ApartmentViewportImage (RawImage) bound to the RenderTexture - Add ApartmentViewportInputBridge for routing viewport clicks to world-space interaction (pet click, furniture, build mode)
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
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.
Summary
This PR merges the integrated work from PR #14 (恶魔动画资源 + 空间系统代码) with scene-level fixes for the Apartment_Main.unity:
_tabSpaceSysnull reference on SidebarController that prevented the SpaceSys panel from openingRoot Cause
The
_tabSpaceSysfield on the SidebarController component (on theSidebarchild object) was set to{fileID: 0}(null). The SidebarController's null checkif (_tabSpaceSys is not null)skipped registering the click listener, so the button had no effect.Changes
Apartment_Main.unity_tabSpaceSysfixTest Plan