Merge/adventure boss #5213
Merged
Merge/adventure boss #5213
Conversation
This file contains 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
…e-to-prepare Feature/adventure boss merge to prepare
…d-log-test add build fail log for test
…r-progress-bar AdventureBoss Battle FloorProgressBar
…ing-screen add adventureboss loading screen type
…le-ui Feature/adventure boss battle UI
…ui-conflict fix UI conflict
…om/planetarium/NineChronicles into feature/adventure-boss-rpc-test-11
…test-9 Feature/adventure boss rpc test 9
…mRewardPopup.cs Co-authored-by: Kim sm. <dev.sonohoshi@gmail.com>
…test-10 Feature/adventure boss rpc test 10
…test-11 Feature/adventure boss rpc test 11
…nicles into merge/adventure-boss # Conflicts: # nekoyume/Assets/StreamingAssets/Localization/common.csv # nekoyume/Assets/_Scripts/Lib9c/lib9c
jonny-jeahyunchoi
requested review from
sonohoshi,
tyrosine1153 and
eugene-doobu
Closed
sonohoshi
approved these changes
Jun 28, 2024
|
충돌 났던 기록같은거 있을까요? |
| @@ -0,0 +1,22 @@ | |||
| fileFormatVersion: 2 | |||
| guid: 775403412d910224fb2b560d32efcbe7 | |||
| AudioImporter: | |||
There was a problem hiding this comment.
로드타입, 샘플링 등 셋팅이 다른 bgm하고 다른듯 하여 확인 부탁드리겠습니다!
There was a problem hiding this comment.
임포트설정따로 건드린적이없어서 기본세팅이어서 차이가발생한것같습니다.
사운드 전수조사해보니 이전거들중에서도 기본세팅으로 있는것들도있는데 따로 PR만들어서 일괄수정진행하면 될것같아요~!
There was a problem hiding this comment.
넵 별도 pr에서 리뷰때 말한 크리스마스 배경음악과 함께 한꺼번에 처리해두겠습니당!
| SUMMON_NAME_20002,Red Rune,레드 룬,-,-,-,-,-,-,-,-,-,- | ||
| SUMMON_NAME_40001,Grimoire,그리모어,,,,,,,,,, |
There was a problem hiding this comment.
그리무어랑 그리모어랑 한국어 단어가 섞여 쓰이는 느낌이 있는데 통일이 되어야 할 것 같네요
There was a problem hiding this comment.
@jaeho0103 @NineSyu 나중에 체크해주시면 좋을것같습니다~!
f068e12 |
eugene-doobu
approved these changes
Jun 28, 2024
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.
어드벤처보스 피쳐작업이 포함된 PR입니다.