Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BackMerge Release/260.0.5 to Dev #6637

Merged
merged 81 commits into from
Dec 19, 2024
Merged

BackMerge Release/260.0.5 to Dev #6637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
85d1219
[Design]EventDungeon_06_01-03_Prefabs_Add
boramqo83 Nov 29, 2024
a1a4101
update bundle version to 260.0.0 (272)
eugene-doobu Dec 11, 2024
9f58092
fix iap list popup
jonny-jeahyunchoi Dec 5, 2024
bcbbd5f
add product info iap list cellview, and mileage
jonny-jeahyunchoi Dec 6, 2024
dc1e9ad
update iap service api schema
jonny-jeahyunchoi Dec 10, 2024
d953347
add iap shop resource image path rule
jonny-jeahyunchoi Dec 10, 2024
7c24221
change iap image download path
jonny-jeahyunchoi Dec 11, 2024
16bb611
fix adventureboss reward popup scroll change
jonny-jeahyunchoi Dec 3, 2024
044da8f
Merge branch 'development' into ui/ragnarok_event_dungeon_add
jonny-jeahyunchoi Dec 11, 2024
a28ae66
fix register button state(6568)
eugene-doobu Dec 12, 2024
3030865
change strong item check timing(6569)
eugene-doobu Dec 12, 2024
e008fe5
sort item result (6578)
eugene-doobu Dec 12, 2024
be6710d
add event resource and setting
jonny-jeahyunchoi Dec 12, 2024
8c5aa09
check inventory ap portion count(6570)
eugene-doobu Dec 12, 2024
16c3eb7
refresh tap buttons on enable (6574)
eugene-doobu Dec 12, 2024
6cb6ff0
add l10n for synthesis registration popup(6567)
eugene-doobu Dec 12, 2024
e5e55e3
add exception handle
jonny-jeahyunchoi Dec 12, 2024
ebaac23
auto select item on enable registration popup(6573)
eugene-doobu Dec 12, 2024
2966c0e
add help text(6565)
eugene-doobu Dec 12, 2024
a7dfe90
Update Title 49900029, 49900030 Add
NineSyu Dec 12, 2024
6839519
Merge pull request #6587 from planetarium/development
jonny-jeahyunchoi Dec 12, 2024
e696b78
add minus button to selected item
eugene-doobu Dec 12, 2024
653672e
add GetCanAutoSelectCount method
eugene-doobu Dec 12, 2024
9010b4e
Merge pull request #6547 from planetarium/feature/adventureboss-floor…
jonny-jeahyunchoi Dec 12, 2024
005b8b6
Merge pull request #6528 from planetarium/ui/ragnarok_event_dungeon_add
jonny-jeahyunchoi Dec 12, 2024
fb2e766
Merge pull request #6564 from planetarium/feature/iap-resource-pipeli…
jonny-jeahyunchoi Dec 12, 2024
401c838
Merge pull request #6586 from planetarium/v200260-title-icon
jonny-jeahyunchoi Dec 12, 2024
df06498
fix arenaboard notch handle
jonny-jeahyunchoi Dec 12, 2024
d334fab
add ap portion refresh logic(6585)
eugene-doobu Dec 12, 2024
82b3522
Merge pull request #6588 from planetarium/fix/arenaboard-notch-handle
jonny-jeahyunchoi Dec 12, 2024
01c24ee
Merge pull request #6583 from planetarium/feature/fix-synthesis-ui
eugene-doobu Dec 12, 2024
bc49cf5
refresh synthesis button on charge ap
eugene-doobu Dec 12, 2024
a9b5017
Merge pull request #6590 from planetarium/feature/synthesis-new-feature
eugene-doobu Dec 12, 2024
6a93ae6
Use StateRootHash instead of BlockHash
ipdae Dec 12, 2024
3967e2c
Merge pull request #6591 from planetarium/improve/issue-6582
ipdae Dec 13, 2024
484904e
Update Event Iten Icon
NineSyu Dec 13, 2024
bc59342
Merge pull request #6592 from planetarium/event-item-icon
eugene-doobu Dec 13, 2024
60aafef
bump lib9c
eugene-doobu Dec 13, 2024
c789051
update bundle version to 260.0.1 (273)
eugene-doobu Dec 13, 2024
d582ebe
Update Event Item Icon ID Change
NineSyu Dec 13, 2024
181093d
Merge branch 'release/260.0.1' into change-event-icon-id
eugene-doobu Dec 13, 2024
1c67313
Merge pull request #6593 from planetarium/change-event-icon-id
eugene-doobu Dec 13, 2024
ffd0ef8
add noti on click disable button (6596)
eugene-doobu Dec 13, 2024
a44898c
add filter tor result pool(6595)
eugene-doobu Dec 13, 2024
9629257
change scroll bar mode to top to bottom (6594)
eugene-doobu Dec 13, 2024
f304d1a
update ap portion on synthesize action render (6585)
eugene-doobu Dec 13, 2024
a2596a7
apply l10n to synthesising (6579)
eugene-doobu Dec 13, 2024
ab4cd53
change sort order (6578)
eugene-doobu Dec 13, 2024
e58cf3e
bump: Bump libplanet to 5.4.2
s2quake Dec 13, 2024
11d3e26
add check message on chagne material (6575)
eugene-doobu Dec 16, 2024
b380a39
show ap portion tooltip (6566)
eugene-doobu Dec 16, 2024
d6e0613
Merge pull request #6597 from planetarium/feature/synthesis-ui-2
eugene-doobu Dec 16, 2024
8fd0a4b
fix iap product name rule
jonny-jeahyunchoi Dec 16, 2024
96df9bd
Merge pull request #6598 from planetarium/bump/libplanet-to-5.4.2
eugene-doobu Dec 16, 2024
b825cc9
Merge pull request #6601 from planetarium/fix/iap-product-name-rule
jonny-jeahyunchoi Dec 16, 2024
90e5d29
update bundle version to 260.0.2 (274)
eugene-doobu Dec 16, 2024
e4131be
fix event dungeon image ratio
jonny-jeahyunchoi Dec 16, 2024
be2f871
link recipe icon
jonny-jeahyunchoi Dec 16, 2024
94f9cf8
change stage icon
jonny-jeahyunchoi Dec 16, 2024
cd0ef04
add InvalidMaterialItemId
eugene-doobu Dec 16, 2024
65419cc
Merge pull request #6602 from planetarium/fix/event-dungeon-resource
jonny-jeahyunchoi Dec 16, 2024
ccf72cd
add statge limit to synthesis
eugene-doobu Dec 16, 2024
63460fe
Add Tutorial
eugene-doobu Dec 16, 2024
ed11863
update lib9c
eugene-doobu Dec 17, 2024
3f2affa
fix ranking board exception handle
jonny-jeahyunchoi Dec 17, 2024
ba3ef33
remove define symbol 'TEST_LOG'
sonohoshi Dec 17, 2024
023aee8
Merge pull request #6619 from planetarium/bugfix/remove-define-symbol
eugene-doobu Dec 17, 2024
1eefdd0
Merge pull request #6605 from planetarium/feature/synthesis-new-features
eugene-doobu Dec 17, 2024
663a6b4
Merge pull request #6617 from planetarium/fix/ranking-exception-handle
jonny-jeahyunchoi Dec 17, 2024
5fb7de9
update lib9c
eugene-doobu Dec 17, 2024
568fbc4
update bundle version to 260.0.3 (275)
eugene-doobu Dec 17, 2024
547441f
prevent edit selectedItems
eugene-doobu Dec 18, 2024
f7c956a
Merge pull request #6622 from planetarium/issue/6612
eugene-doobu Dec 18, 2024
f1c05b8
add synthesize tutorial id
eugene-doobu Dec 18, 2024
66a6f5a
Merge pull request #6624 from planetarium/issue/6623
eugene-doobu Dec 18, 2024
642eab3
update bundle version to 260.0.4 (276)
eugene-doobu Dec 18, 2024
fc0670c
log level down
jonny-jeahyunchoi Dec 18, 2024
38dd699
add synthesis tutorial for old user
eugene-doobu Dec 18, 2024
7fbf37a
Merge pull request #6631 from planetarium/feature/synthesis-tutorial-…
eugene-doobu Dec 18, 2024
31146f8
Merge pull request #6630 from planetarium/fix/log-level-down
jonny-jeahyunchoi Dec 18, 2024
2840c53
update bundle version to 260.0.5 (277)
eugene-doobu Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
480 changes: 480 additions & 0 deletions nekoyume/Assets/AddressableAssets/UI/Module/CellView/IAPRewardCell.prefab
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions nekoyume/Assets/AddressableAssets/UI/Module/CellView/IAPRewardCell.prefab.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading