Unity 커스텀 도형 authoring과 반응층 레퍼런스 통합#107
Open
sw1029 wants to merge 15 commits into
Open
Conversation
# Conflicts: # unity/MagicExamHall/Assets/MagicExamHall/Scripts/Runtime/ExamGameController.cs # unity/MagicExamHall/Assets/MagicExamHall/Scripts/Runtime/WorldDrawingController.cs
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.
작업 범위
codex/unity-source-port-06) 위에 통합한.8스택을 유지했습니다.8238133)은Assets/**/*.cs와 신규CustomShapeEvents.cs.meta만 포함했고,Packages,ProjectSettings, 폴더.meta는 커밋하지 않았습니다.팀원 확인 포인트
들여오기버튼의 슬롯 저장 흐름이 의도대로 보이는지 확인 부탁드립니다.커스텀명 (기본도형), custom score, default similarity, custom event label이 의도대로 표시되는지 확인 부탁드립니다.충돌 해소 방식
ExamGameControllerpublic API는 Unity 게임 계층에 외부 인식 결과 handoff 추가 #104 external handoff API와 custom shape/test helper API를 모두 보존했습니다.WorldDrawingController는 새StrokeSessionCompleted입력 경로를 primary로 유지하고, legacySpellBuffered는 호환 이벤트로만 남겼습니다.activeStroke,bufferedStrokes,visuals,drawing,waitingForBuffer)는 복원하지 않았습니다.WorldPointerInputSource.CancelActiveStroke(),StrokeSessionBuffer.Cancel(),WorldStrokeVisuals.ClearAll(),WorldDrawingController.CancelBufferedInput()로 재구성했습니다.requiresCustomShape/CustomRequired를 추가해 floor 2 custom-only 목표와 기존 floor의 base/combo 목표가 분리되도록 했습니다.검증
git diff --cached --check: 통과Assets/Refresh: 성공FloorTwoReferenceShelfImportsCustomBaseSlotsPassed비고
Packages/*,ProjectSettings/PackageManagerSettings.asset, 폴더.meta가 unstaged로 남아 있습니다. 이번 PR 갱신 범위에서는 제외했습니다.