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

Jump to bottom

fix tutorial 5 bugs #5360

Merged
merged 2 commits into from
Jul 5, 2024
Merged

fix tutorial 5 bugs #5360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a126bd
fix tutorial 5 RewardScreen l10n
tyrosine1153 Jul 5, 2024
a61db41
fix tutorial 5 summon button
tyrosine1153 Jul 5, 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
3 changes: 2 additions & 1 deletion nekoyume/Assets/StreamingAssets/Localization/common.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2016,4 +2016,5 @@ UI_KEY_IMPORT_GALLERY,QR on this deivce,현재 기기의 QR로 가져오기,,,,,
UI_INVALID_UNIT_PRICE_MESSAGE,<sprite name=UI_main_icon_quest_02> The unit price should not include decimal points.,<sprite name=UI_main_icon_quest_02> 개별 아이템 판매가격에 소수점이 포함되지 않아야 합니다.,,,,,,,,,,
UI_Dummy,,핫썸머,,,,,,,,,,
UI_SUMMON_GRIMOIRE_PHRASE_1,UI_SUMMON_GRIMOIRE_PHRASE_1,UI_SUMMON_GRIMOIRE_PHRASE_1,,,,,,,,,,
UI_SUMMON_GRIMOIRE_PHRASE_2,UI_SUMMON_GRIMOIRE_PHRASE_2,UI_SUMMON_GRIMOIRE_PHRASE_2,,,,,,,,,,
UI_SUMMON_GRIMOIRE_PHRASE_2,UI_SUMMON_GRIMOIRE_PHRASE_2,UI_SUMMON_GRIMOIRE_PHRASE_2,,,,,,,,,,
UI_TUTORIAL_5_CLAIM_REWARD,First Tutorial Rewards!,,,,,,,,,,,
2 changes: 1 addition & 1 deletion nekoyume/Assets/_Scripts/UI/Tutorial/TutorialController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ private IEnumerator CoShowTutorialRewardScreen()
TableSheets.Instance.CreateAvatarFavSheet.Values
.Select(row =>
new MailReward(row.Currency * row.Quantity, row.Quantity)));
Widget.Find<RewardScreen>().Show(mailRewards, "First Tutorial Rewards!");
Widget.Find<RewardScreen>().Show(mailRewards, "UI_TUTORIAL_5_CLAIM_REWARD");
}

public void RegisterWidget(Widget widget)
Expand Down
14 changes: 11 additions & 3 deletions nekoyume/Assets/_Scripts/UI/Widget/Summon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,11 +416,19 @@ private static void GoToMarket()
// Do not use with Aura summon tutorial. this logic is fake.
public void SetCostUIForTutorial()
{
summonInfos[2].tabToggle.isOn = true;
SetSummonInfo(summonInfos[2]);
const int normalAuraId = 10001;
var summonInfo = summonInfos.FirstOrDefault(info => info.summonSheetId == normalAuraId);
if (summonInfo is null)
{
NcDebug.LogError($"SummonInfo for tutorial not found. id : {normalAuraId}");
return;
}

summonInfo.tabToggle.isOn = true;
SetSummonInfo(summonInfo);

var costButton = summonItem.normalButtonGroup.draw1Button;
if (costButton != null)
if (costButton)
{
costButton.SetFakeUI(CostType.SilverDust, 0);
}
Expand Down
Loading