Merge pull request #6012 from planetarium/bugfix/custom-craft-tutorial

fix custom craft tutorial level limit
planetarium · Sep 25, 2024 · 0f2ed8b · 0f2ed8b
2 parents 63642ca + 6695762
commit 0f2ed8b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/nekoyume/Assets/Resources/Tutorial/Data/TutorialScenario.asset b/nekoyume/Assets/Resources/Tutorial/Data/TutorialScenario.asset
@@ -2572,13 +2572,13 @@ MonoBehaviour:
  fullScreenButton: 0
  noArrow: 0
  guideSprite: {fileID: 0}
- - title: Stage 201
+ - title: Stage 301
  description: CustomEquipmentCraft
  tutorialScenario:
  scenario:
- - id: 2010000
- nextId: 2010001
- checkPointId: 2010000
+ - id: 3010000
+ nextId: 3010001
+ checkPointId: 3010000
  data:
  presetId: 1
  arrowPositionOffset: {x: 0, y: 0}
@@ -2595,9 +2595,9 @@ MonoBehaviour:
  fullScreenButton: 0
  noArrow: 0
  guideSprite: {fileID: 0}
- - id: 2010001
- nextId: 2010002
- checkPointId: 2010000
+ - id: 3010001
+ nextId: 3010002
+ checkPointId: 3010000
  data:
  presetId: 1
  arrowPositionOffset: {x: 0, y: 0}
@@ -2609,14 +2609,14 @@ MonoBehaviour:
  guideType: 3
  emojiType: 2
  dialogPositionType: 2
- scriptKey: TUTORIAL_201_001
+ scriptKey: TUTORIAL_301_001
  arrowAdditionalDelay: 0
  fullScreenButton: 0
  noArrow: 0
  guideSprite: {fileID: 0}
- - id: 2010002
- nextId: 2010003
- checkPointId: 2010000
+ - id: 3010002
+ nextId: 3010003
+ checkPointId: 3010000
  data:
  presetId: 1
  arrowPositionOffset: {x: 0, y: 0}
@@ -2628,14 +2628,14 @@ MonoBehaviour:
  guideType: 1
  emojiType: 2
  dialogPositionType: 2
- scriptKey: TUTORIAL_201_002
+ scriptKey: TUTORIAL_301_002
  arrowAdditionalDelay: 0
  fullScreenButton: 0
  noArrow: 0
  guideSprite: {fileID: 0}
- - id: 2010003
- nextId: 2010004
- checkPointId: 2010000
+ - id: 3010003
+ nextId: 3010004
+ checkPointId: 3010000
  data:
  presetId: 1
  arrowPositionOffset: {x: 5, y: 5}
@@ -2647,14 +2647,14 @@ MonoBehaviour:
  guideType: 1
  emojiType: 2
  dialogPositionType: 1
- scriptKey: TUTORIAL_201_003
+ scriptKey: TUTORIAL_301_003
  arrowAdditionalDelay: 0
  fullScreenButton: 0
  noArrow: 0
  guideSprite: {fileID: 0}
- - id: 2010004
+ - id: 3010004
  nextId: 0
- checkPointId: -201
+ checkPointId: -301
  data:
  presetId: 1
  arrowPositionOffset: {x: 0, y: 0}
@@ -2666,7 +2666,7 @@ MonoBehaviour:
  guideType: 1
  emojiType: 2
  dialogPositionType: 2
- scriptKey: TUTORIAL_201_004
+ scriptKey: TUTORIAL_301_004
  arrowAdditionalDelay: 0
  fullScreenButton: 0
  noArrow: 0

diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_CombinationMain.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_CombinationMain.prefab
@@ -357,7 +357,7 @@ MonoBehaviour:
  requiredStageId: 40
  lockedButton: {fileID: 4868108788663917727}
  - lockObject: {fileID: 8843854341914765179}
- requiredStageId: 200
+ requiredStageId: 301
  lockedButton: {fileID: 601257163011505506}
 --- !u!225 &3856260509446582021
 CanvasGroup:
@@ -8058,7 +8058,7 @@ PrefabInstance:
  - target: {fileID: 8259376983496205467, guid: 0517f477e3636ed42aaab081c05cd889,
  type: 3}
  propertyPath: m_text
- value: Stage 200
+ value: Stage 301
  objectReference: {fileID: 0}
  - target: {fileID: 8322290979673836999, guid: 0517f477e3636ed42aaab081c05cd889,
  type: 3}

diff --git a/nekoyume/Assets/_Scripts/UI/Tutorial/TutorialController.cs b/nekoyume/Assets/_Scripts/UI/Tutorial/TutorialController.cs
@@ -30,7 +30,7 @@ public class TutorialController
  private static string CheckPointKey => $"Tutorial_Check_Point_{Game.Game.instance.States.CurrentAvatarKey}";
 
  // 튜토리얼이 실행될 스테이지를 넣는 배열입니다. 배열 요소에 해당하는 스테이지를 클리어하고나면 실행됩니다.
- public static readonly int[] TutorialStageArray = { 5, 7, 10, 15, 23, 35, 40, 45, 49, 201 };
+ public static readonly int[] TutorialStageArray = { 5, 7, 10, 15, 23, 35, 40, 45, 49, 301 };
 
  public bool IsPlaying => _tutorial.IsActive();
 

diff --git a/nekoyume/Assets/_Scripts/UI/Widget/CustomCraft.cs b/nekoyume/Assets/_Scripts/UI/Widget/CustomCraft.cs
@@ -226,7 +226,7 @@ public override void Initialize()
  public override void Show(bool ignoreShowAnimation = false)
  {
  AudioController.instance.PlayMusic(AudioController.MusicCode.CustomCraft);
- if (ReactiveAvatarState.Relationship > 0 &&
+ if (ReactiveAvatarState.Relationship == 0 &&
  PlayerPrefs.GetInt(TutorialKey, 0) == 0)
  {
  // Play Tutorial - Custom craft (for old user)