Skip to content

Commit

Permalink
Merge pull request #5360 from planetarium/bugfix/tutorial-5
Browse files Browse the repository at this point in the history
fix tutorial 5 bugs
  • Loading branch information
tyrosine1153 authored Jul 5, 2024
2 parents 198887f + a61db41 commit 12f46c6
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
3 changes: 2 additions & 1 deletion nekoyume/Assets/StreamingAssets/Localization/common.csv
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
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
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

0 comments on commit 12f46c6

Please sign in to comment.