before 370

osamadeep · Mar 2, 2023 · d3b6700 · d3b6700
1 parent 148e2d1
commit d3b6700
Show file tree

Hide file tree

Showing 14 changed files with 155 additions and 55 deletions.
diff --git a/.../Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinSeasonInfoSessionProgressFill.mat b/.../Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinSeasonInfoSessionProgressFill.mat
@@ -128,7 +128,7 @@ Material:
     - OffsetUV_ZoomY_1: 1
     - PinchUV_Size_1: 0.25
     - PixelSnap: 0
-    - PositionUV_X_1: -0.58022964
+    - PositionUV_X_1: 0.25977445
     - PositionUV_Y_1: 0
     - ResizeUV_X_1: -1
     - ResizeUV_X_2: 0

diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_ChronoSettingsPopup.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_ChronoSettingsPopup.prefab
@@ -208,8 +208,8 @@ MonoBehaviour:
   CraftFillCrystalOffImage: {fileID: 3945192262050490926}
   craftIDInput: {fileID: 2499088356550524056}
   CraftIconIDImage: {fileID: 2683253423150997691}
-  PremiumCraftOnImage: {fileID: 1520204203447040727}
-  PremiumCraftOffImage: {fileID: 5077406376068622806}
+  PremiumCraftOnImage: {fileID: 5077406376068622806}
+  PremiumCraftOffImage: {fileID: 1520204203447040727}
   eventModule: {fileID: 7942195345694710592}
   eventOnImage: {fileID: 2661835468360354059}
   eventOffImage: {fileID: 4271979595519262278}
@@ -6276,7 +6276,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4036712308749684564
 RectTransform:
   m_ObjectHideFlags: 0
@@ -7977,8 +7977,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5232719873926403040}
-  - {fileID: 7316849210538695835}
   - {fileID: 3638842469721888199}
+  - {fileID: 7316849210538695835}
   m_Father: {fileID: 4186700801071807072}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -9310,7 +9310,7 @@ GameObject:
   - component: {fileID: 1520204203447040727}
   - component: {fileID: 5452853124039657211}
   m_Layer: 5
-  m_Name: OnButton
+  m_Name: OffButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -9330,11 +9330,11 @@ RectTransform:
   m_Children:
   - {fileID: 7563313629119266519}
   m_Father: {fileID: 5300096477861215189}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -95.182556, y: -20.000006}
+  m_AnchoredPosition: {x: -93.3, y: -20.000006}
   m_SizeDelta: {x: 65, y: 40}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &7791647216950446208
@@ -9429,7 +9429,7 @@ MonoBehaviour:
           m_IntArgument: 0
           m_FloatArgument: 0
           m_StringArgument: 
-          m_BoolArgument: 1
+          m_BoolArgument: 0
         m_CallState: 2
 --- !u!1 &4685316978088708534
 GameObject:
@@ -14551,7 +14551,7 @@ GameObject:
   - component: {fileID: 5077406376068622806}
   - component: {fileID: 6336439769612691507}
   m_Layer: 5
-  m_Name: OffButton
+  m_Name: OnButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -14571,11 +14571,11 @@ RectTransform:
   m_Children:
   - {fileID: 973742342656225715}
   m_Father: {fileID: 5300096477861215189}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -25, y: -20.000006}
+  m_AnchoredPosition: {x: -24.100006, y: -20.000006}
   m_SizeDelta: {x: 65, y: 40}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &2228443431663481048
@@ -14670,7 +14670,7 @@ MonoBehaviour:
           m_IntArgument: 1
           m_FloatArgument: 0
           m_StringArgument: 
-          m_BoolArgument: 0
+          m_BoolArgument: 1
         m_CallState: 2
 --- !u!1 &7264538906419280994
 GameObject:

diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_RunnerTown.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_RunnerTown.prefab
@@ -46437,7 +46437,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   tutorialTargets: []
   tutorialActions: 
-  inventory: {fileID: 0}
+  inventory: {fileID: 3691848307401020939}
   nameTxt: {fileID: 7536211674692513288}
   pgTxt: {fileID: 4847754676702937312}
   pcTxt: {fileID: 3583629799504636023}
@@ -87193,6 +87193,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dbd01b59bc7030441a9222caef37b9db, type: 3}
+--- !u!114 &3691848307401020939 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4369395645640927610, guid: dbd01b59bc7030441a9222caef37b9db,
+    type: 3}
+  m_PrefabInstance: {fileID: 1125656129378140017}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fac6182e39498eb49af636c9ee875838, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &5615315306324103876 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4788093640571366837, guid: dbd01b59bc7030441a9222caef37b9db,

diff --git a/nekoyume/Assets/_Scenes/Game.unity b/nekoyume/Assets/_Scenes/Game.unity
@@ -138,7 +138,6 @@ GameObject:
   - component: {fileID: 76870001}
   - component: {fileID: 76870002}
   - component: {fileID: 76869997}
-  - component: {fileID: 76870004}
   m_Layer: 0
   m_Name: Game
   m_TagString: Untagged
@@ -464,18 +463,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &76870004
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 76869996}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 60264dee9c68ecf4db94bd66c8affe37, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &98550335
 GameObject:
   m_ObjectHideFlags: 0
@@ -3177,7 +3164,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1839423130}
   - component: {fileID: 1839423131}
-  - component: {fileID: 1839423132}
   m_Layer: 0
   m_Name: Pandora
   m_TagString: Untagged
@@ -3212,18 +3198,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 04d7fd4db10e16e47bb28505220b6d9d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &1839423132
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1839423129}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 58f67e6dce7cd8044aeb3ce19a2c624c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1933286906
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/nekoyume/Assets/_Scripts/PandoraBox/Scripts/PandoraMaster.cs b/nekoyume/Assets/_Scripts/PandoraBox/Scripts/PandoraMaster.cs
@@ -33,7 +33,6 @@ public class PandoraMaster : MonoBehaviour
         public static GuildPlayer CurrentGuildPlayer; //data for local player since we use it alot
 
         //Playfab
-        public static PlayerProfileModel PlayFabPlayerProfile = new PlayerProfileModel();
         public static Dictionary<string, UserDataRecord> PlayFabUserData = new Dictionary<string, UserDataRecord>();
 
         //General

diff --git a/nekoyume/Assets/_Scripts/PandoraBox/Scripts/Prime/Premium.cs b/nekoyume/Assets/_Scripts/PandoraBox/Scripts/Prime/Premium.cs
@@ -469,7 +469,7 @@ public static void CRAFT_AutoCraftEventConsumable(AvatarState currentAvatarState
         }
 
         public static async UniTask CRAFT_AutoCraftEquipment(AvatarState currentAvatarState, int slotIndex,
-            EquipmentItemRecipeSheet.Row recipeRow, bool payByCrystal, bool isPremium)
+            EquipmentItemRecipeSheet.Row recipeRow, bool payByCrystal, bool isPremium, int avatarSlotIndex)
         {
             if (!PandoraProfile.IsPremium())
                 return;
@@ -537,11 +537,11 @@ public static async UniTask CRAFT_AutoCraftEquipment(AvatarState currentAvatarSt
             try //in case actionManager is not ready yet
             {
                 var itemName = L10nManager.Localize($"ITEM_NAME_{recipeRow.ResultEquipmentId}");
-                string basicCraft = indexSub == 0 ? "Basic" : "Premium";
+                string premiumCraft = indexSub == 0 ? "Basic" : "Premium";
                 string hammerCraft = isHammerCraft ? "Super Craft" : "";
                 string crystal = payByCrystal ? ", With Crystal!" : "";
                 string analyzeText =
-                    $"CombinationEquipment > **{hammerCraft} {basicCraft}** {itemName} > {slotIndex}{crystal} " +
+                    $"CombinationEquipment > **{hammerCraft} {premiumCraft}** {itemName} > {slotIndex}{crystal} " +
                     $"> hammer:{hammerData.HammerPoint + 1}/{max}";
 
                 if (currentAvatarState.address == States.Instance.CurrentAvatarState.address)
@@ -583,7 +583,7 @@ public static async UniTask CRAFT_AutoCraftEquipment(AvatarState currentAvatarSt
                     ActionManager.Instance.PreProcessAction(action, currentAvatarState, analyzeText);
                 }
 
-                Widget.Find<ChronoSlotsPopup>().slots[slotIndex].stageCooldown = 0; //force reset avatar?
+                Widget.Find<ChronoSlotsPopup>().slots[avatarSlotIndex].stageCooldown = 0; //force reset avatar?
                 OneLineSystem.Push(MailType.System,
                     $"<color=green>Pandora Box</color>: {currentAvatarState.NameWithHash} " +
                     $"start Auto Craft <color=green>{itemName}</color> on Slot <color=green>{slotIndex + 1}</color> hammer points: <color=green>{hammerData.HammerPoint + 1}</color>/{max}!",
@@ -826,6 +826,7 @@ public static async UniTask<string> PVE_AutoStageRepeat(AvatarState currentAvata
             if (!PandoraProfile.IsPremium())
                 return "This is not <b>Premium</b> account!";
 
+
             int _stageId = 1;
             currentAvatarState.worldInformation.TryGetLastClearedStageId(out _stageId);
             _stageId = Math.Clamp(_stageId + 1, 1, 300);

diff --git a/nekoyume/Assets/_Scripts/PandoraBox/Sprites/boots.png b/nekoyume/Assets/_Scripts/PandoraBox/Sprites/boots.png
diff --git a/nekoyume/Assets/_Scripts/PandoraBox/Sprites/boots.png.meta b/nekoyume/Assets/_Scripts/PandoraBox/Sprites/boots.png.meta
diff --git a/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/Runner.cs b/nekoyume/Assets/_Scripts/PandoraBox/_Runner/Scripts/Runner.cs
@@ -86,7 +86,7 @@ public void RestartGame()
 
         public IEnumerator ShowStartBooster()
         {
-            playerName.text = PandoraMaster.PlayFabPlayerProfile.DisplayName;
+            playerName.text = Premium.PandoraProfile.Profile.DisplayName;
             pcBalance.text = Premium.PandoraProfile.Currencies["PC"].ToString();
             pgBalance.text = Premium.PandoraProfile.Currencies["PG"].ToString();
             startCounterText.text = "";

diff --git a/nekoyume/Assets/_Scripts/UI/Module/ChronoSlot.cs b/nekoyume/Assets/_Scripts/UI/Module/ChronoSlot.cs
@@ -516,13 +516,19 @@ async UniTask UpdateStage()
                     {
                         var result = await Premium.PVE_AutoStageRepeat(currentAvatarState);
                         if (string.IsNullOrEmpty(result))
+                        {
+                            int _stageId = 1;
+                            currentAvatarState.worldInformation.TryGetLastClearedStageId(out _stageId);
+                            _stageId = Math.Clamp(_stageId + 1, 1, 300);
                             OneLineSystem.Push(MailType.System,
-                                $"<color=green>Pandora Box</color>: {currentAvatarState.NameWithHash} Repeat <color=green>{currentAvatarState.actionPoint}</color> AP for stage {currentChronoAvatarSetting.StageSweepLevelIndex}!",
+                                $"<color=green>Pandora Box</color>: {currentAvatarState.NameWithHash} Repeat <color=green>{currentAvatarState.actionPoint}</color> AP for stage {_stageId}!",
                                 NotificationCell.NotificationType.Information);
+                        }
                         else
                             OneLineSystem.Push(MailType.System,
                                 $"<color=green>Pandora Box</color>: {currentAvatarState.NameWithHash} <b>Failed</b> to send Repeat because {result}",
                                 NotificationCell.NotificationType.Alert);
+
                         stageCooldown = currentBlockIndex + urgentUpdateInterval;
                     }
                     catch (Exception ex)
@@ -640,9 +646,12 @@ public async UniTask SetCombinationSlotStatesAsync()
                             out var equipRow))
                     {
                         if (equipRow != null)
+                        {
                             await Premium.CRAFT_AutoCraftEquipment(currentAvatarState, i, equipRow,
                                 Convert.ToBoolean(currentChronoAvatarSetting.CraftIsUseCrystal),
-                                Convert.ToBoolean(currentChronoAvatarSetting.CraftIsPremium));
+                                Convert.ToBoolean(currentChronoAvatarSetting.CraftIsPremium), _slotIndex);
+                        }
+
                         break; //enforce break to wait new craft count the hammer points
                     }
                     else if (tableSheets.ConsumableItemRecipeSheet.TryGetValue(currentChronoAvatarSetting.CraftItemID,

diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Menu.cs b/nekoyume/Assets/_Scripts/UI/Widget/Menu.cs
@@ -549,7 +549,7 @@ public override void Show(bool ignoreShowAnimation = false)
                                     "_DisplayText";
             var currentName = States.Instance.CurrentAvatarState.name + " #" +
                               States.Instance.CurrentAvatarState.address.ToHex().Substring(0, 5);
-            PlayerPrefs.SetString(displayNameKey, currentName); //save profile name
+
 
             if (string.IsNullOrEmpty(Premium.PandoraProfile.Profile.DisplayName))
             {
@@ -562,6 +562,10 @@ public override void Show(bool ignoreShowAnimation = false)
                             NotificationCell.NotificationType.Alert);
                     });
             }
+
+            if (!string.IsNullOrEmpty(Premium.PandoraProfile.Profile.DisplayName))
+                currentName = Premium.PandoraProfile.Profile.DisplayName;
+            PlayerPrefs.SetString(displayNameKey, currentName); //save profile name
             //|||||||||||||| PANDORA  END  CODE |||||||||||||||||||
 
             //load favorite items