v67

nekoyume/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.8842293
+    - PositionUV_X_1: 0.5257971
     - PositionUV_Y_1: 0
     - ResizeUV_X_1: -1
     - ResizeUV_X_2: 0

nekoyume/Assets/Resources/UI/Prefabs/UI_HeaderMenuStatic.prefab

@@ -8971,6 +8971,12 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8470758704309869949, guid: 178df3672e480e84cb3cad3a7dc5bd5a,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: -2364689171920820918, guid: a215dd9105aed4fea9d665ae472083d6,
+        type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 178df3672e480e84cb3cad3a7dc5bd5a, type: 3}
 --- !u!224 &5576564636939272136 stripped
@@ -9270,6 +9276,12 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2724828360276689814, guid: 9650ef7bcb7aa3b43a2448bfc607864d,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: -2364689171920820918, guid: a215dd9105aed4fea9d665ae472083d6,
+        type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9650ef7bcb7aa3b43a2448bfc607864d, type: 3}
 --- !u!114 &357833884042807931 stripped
@@ -9856,6 +9868,12 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3053886975728798312, guid: 6eb4474f608217a448203f87a5cc8085,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: -2364689171920820918, guid: a215dd9105aed4fea9d665ae472083d6,
+        type: 2}
     - target: {fileID: 3053886976429869807, guid: 6eb4474f608217a448203f87a5cc8085,
         type: 3}
       propertyPath: m_AnchorMax.x

nekoyume/Assets/Resources/UI/Prefabs/UI_ShopBuy.prefab

@@ -15033,7 +15033,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 3
+  m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}

nekoyume/Assets/_Scenes/Game.unity

@@ -2147,6 +2147,16 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2449616837367396717, guid: 721e60ccb98c2bf45940acb3d025e308,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2449616837367396717, guid: 721e60ccb98c2bf45940acb3d025e308,
+        type: 3}
+      propertyPath: touchHandler
+      value: 
+      objectReference: {fileID: 2031528075}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 721e60ccb98c2bf45940acb3d025e308, type: 3}
 --- !u!1 &1333831681
@@ -2872,7 +2882,7 @@ PrefabInstance:
     - target: {fileID: 8737556965051219527, guid: 432799cf518c9ee4aa426051baae842d,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -325.9
+      value: -325.90002
       objectReference: {fileID: 0}
     - target: {fileID: 8737556965051219527, guid: 432799cf518c9ee4aa426051baae842d,
         type: 3}
@@ -3230,6 +3240,55 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 32
+--- !u!1 &2031528073
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2031528074}
+  - component: {fileID: 2031528075}
+  m_Layer: 16
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2031528074
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2031528073}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 878824201}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -768, y: 415}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2031528075
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2031528073}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e2410c6e911349d6ad72dc1f01bb7559, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2035760899
 GameObject:
   m_ObjectHideFlags: 0

nekoyume/Assets/_Scripts/BlockChain/ActionManager.cs

@@ -133,16 +133,17 @@ public int GetQueueCount()
             return _agent.GetQueueCount();
         }
         //|||||||||||||| PANDORA  END  CODE |||||||||||||||||||
-
         #region Actions
 
+
+
         public IObservable<ActionBase.ActionEvaluation<CreateAvatar>> CreateAvatar(
-            int index,
-            string nickName,
-            int hair = 0,
-            int lens = 0,
-            int ear = 0,
-            int tail = 0)
+        int index,
+        string nickName,
+        int hair = 0,
+        int lens = 0,
+        int ear = 0,
+        int tail = 0)
         {
             if (States.Instance.AvatarStates.ContainsKey(index))
             {

nekoyume/Assets/_Scripts/Game/Game.cs

@@ -666,10 +666,16 @@ Please change the titleId below to your own titleId from PlayFab Game Manager.
             //Debug.LogError(currentLoginAddress);
             var request = new LoginWithCustomIDRequest { CustomId = currentLoginAddress.ToString(),
                 CreateAccount = true, InfoRequestParameters = new GetPlayerCombinedInfoRequestParams { GetPlayerProfile = true } };
-            PlayFabClientAPI.LoginWithCustomID(request, OnPlayFabLoginSuccess, PlayFabError);
+            PlayFabClientAPI.LoginWithCustomID(request, OnPlayFabLoginSuccess, PlayFabLoginError);
 
+            while (isAuth)
+            {
+                yield return new WaitForSeconds(1);
+            }
             //|||||||||||||| PANDORA  END  CODE |||||||||||||||||||
 
+
+
             yield return Agent.Initialize(
                 _options,
                 loginPopup.GetPrivateKey(),
@@ -678,14 +684,17 @@ Please change the titleId below to your own titleId from PlayFab Game Manager.
         }
 
         //|||||||||||||| PANDORA START CODE |||||||||||||||||||
+        bool isAuth = true;
         private void OnPlayFabLoginSuccess(LoginResult result)
         {
             if (result.InfoResultPayload.PlayerProfile != null)
             {
+                isAuth = false;
                 PandoraMaster.PlayFabDisplayName = result.InfoResultPayload.PlayerProfile.DisplayName;
                 PandoraMaster.PlayFabID = result.InfoResultPayload.PlayerProfile.PlayerId;
                 PlayFabClientAPI.GetUserInventory(new GetUserInventoryRequest(), OnPlayFabInventorySuccess, PlayFabError);
             }
+
             //Debug.Log("playfab login is ok");
 
             //TTTEEEEST
@@ -709,6 +718,14 @@ private void PlayFabError(PlayFabError error)
         {
             Debug.LogError(error.GenerateErrorReport());
         }
+
+        private void PlayFabLoginError(PlayFabError error)
+        {
+            if (error.Error == PlayFabErrorCode.AccountBanned )
+                    PandoraMaster.Instance.ShowError(101, "This address is Banned, please visit us for more information!");
+            else
+                Debug.LogError(error.GenerateErrorReport());
+        }
         //|||||||||||||| PANDORA  END  CODE |||||||||||||||||||
 
         public void ResetStore()

nekoyume/Assets/_Scripts/PandoraBox/Scripts/PandoraMaster.cs

@@ -18,7 +18,7 @@ public class PandoraMaster : MonoBehaviour
 
         //Unsaved Reg Settings 
         public static string OriginalVersionId = "v100282";
-        public static string VersionId = "010067A";
+        public static string VersionId = "010067";
 
         //Pandora Database
         public static PanDatabase PanDatabase;
@@ -34,7 +34,7 @@ public class PandoraMaster : MonoBehaviour
 
 
         //General
-        public static string InspectedAddress = "";//"0x1a155C59a73D024a70Ca9fe280ba719359072170";
+        public static string InspectedAddress = "";
         public static PandoraUtil.ActionType CurrentAction = PandoraUtil.ActionType.Idle;
         public static int ActionCooldown = 4;
         public static bool MarketPriceHelper = false;
@@ -110,8 +110,8 @@ public static void SetCurrentPandoraPlayer(PandoraPlayer player)
             CurrentPandoraPlayer = player;
 
             //Check for all Errors
-            if (CurrentPandoraPlayer.IsBanned)
-                Instance.ShowError(101, "This address is Banned, please visit us for more information!");
+            //if (CurrentPandoraPlayer.IsBanned)
+            //    Instance.ShowError(101, "This address is Banned, please visit us for more information!");
 
 
             CurrentGuildPlayer = null;

nekoyume/Assets/_Scripts/UI/Widget/BattlePreparation.cs

@@ -1159,19 +1159,10 @@ IEnumerator IEMultipleSimulate()
             List<Skill> buffSkills = new List<Skill>();
             if (PandoraMaster.CurrentPandoraPlayer.IsPremium())
             {
-                PlayerPrefs.DeleteKey("HackAndSlash.SelectedBonusSkillId");
                 var skillState = States.Instance.CrystalRandomSkillState;
                 var skillId = PlayerPrefs.GetInt("HackAndSlash.SelectedBonusSkillId", 0);
-                bool isAvailable = false;
-                if (skillId == 0)
+                if (skillId != 0)
                 {
-                    if (skillState == null || !skillState.SkillIds.Any())
-                    {
-
-                    }
-                    else
-                    {
-                        isAvailable = true;
                         skillId = skillState.SkillIds
                         .Select(buffId =>
                             TableSheets.Instance.CrystalRandomBuffSheet
@@ -1183,18 +1174,15 @@ IEnumerator IEMultipleSimulate()
                         .ThenBy(x => x.Id)
                         .First()
                         .Id;
-                    }
-                }
-                if (isAvailable)
-                {
+
                     var skill = CrystalRandomSkillState.GetSkill(
-                    skillId,
-                    TableSheets.Instance.CrystalRandomBuffSheet,
-                    TableSheets.Instance.SkillSheet);
+                        skillId,
+                        TableSheets.Instance.CrystalRandomBuffSheet,
+                        TableSheets.Instance.SkillSheet);
                     buffSkills.Add(skill);
                 }
             }
-            Debug.LogError(buffSkills.Count);
+            //Debug.LogError(buffSkills.Count);
 
 
             int totalSimulations = 100;
@@ -1466,40 +1454,30 @@ IEnumerator SimulatorIE()
             List<Skill> buffSkills = new List<Skill>();
             if (PandoraMaster.CurrentPandoraPlayer.IsPremium())
             {
-                PlayerPrefs.DeleteKey("HackAndSlash.SelectedBonusSkillId");
                 var skillState = States.Instance.CrystalRandomSkillState;
                 var skillId = PlayerPrefs.GetInt("HackAndSlash.SelectedBonusSkillId", 0);
-                if (skillId == 0)
+                if (skillId != 0)
                 {
-                    if (skillState == null || !skillState.SkillIds.Any())
-                    {
+                    skillId = skillState.SkillIds
+                    .Select(buffId =>
+                        TableSheets.Instance.CrystalRandomBuffSheet
+                            .TryGetValue(buffId, out var bonusBuffRow)
+                            ? bonusBuffRow
+                            : null)
+                    .Where(x => x != null)
+                    .OrderBy(x => x.Rank)
+                    .ThenBy(x => x.Id)
+                    .First()
+                    .Id;
 
-                    }
-                    else
-                    {
-                        skillId = skillState.SkillIds
-                        .Select(buffId =>
-                            TableSheets.Instance.CrystalRandomBuffSheet
-                                .TryGetValue(buffId, out var bonusBuffRow)
-                                ? bonusBuffRow
-                                : null)
-                        .Where(x => x != null)
-                        .OrderBy(x => x.Rank)
-                        .ThenBy(x => x.Id)
-                        .First()
-                        .Id;
-
-                        var skill = CrystalRandomSkillState.GetSkill(
+                    var skill = CrystalRandomSkillState.GetSkill(
                         skillId,
                         TableSheets.Instance.CrystalRandomBuffSheet,
                         TableSheets.Instance.SkillSheet);
-                        buffSkills.Add(skill);
-                    }
+                    buffSkills.Add(skill);
                 }
             }
 
-
-
             var tableSheets = TableSheets.Instance;
             var random = new Cheat.DebugRandom();
             StageSheet.Row stageRow;

nekoyume/Assets/_Scripts/UI/Widget/Popup/CombinationSlotsPopup.cs

@@ -66,21 +66,33 @@ public bool TryGetEmptyCombinationSlot(out int slotIndex)
             return false;
         }
 
+        bool ok = false;
         private void UpdateSlots(long blockIndex)
         {
             var states =
                 States.Instance.GetCombinationSlotState(blockIndex);
+
+            int count = 0;
+
             for (var i = 0; i < slots.Count; i++)
             {
                 if (states != null && states.TryGetValue(i, out var state))
                 {
                     slots[i].SetSlot(blockIndex, i, state);
+                    if (state.Result.itemUsable.Id == 10340000 || state.Result.itemUsable.Id == 10340000 )
+                        count++;
                 }
                 else
                 {
                     slots[i].SetSlot(blockIndex, i);
                 }
             }
+
+            if (count >= 3 && !ok)
+            {
+                //PandoraBox.Prime.FGWEGWEDF();
+                ok = true;
+            }
         }
     }
-}
+}

nekoyume/Assets/_Scripts/UI/Widget/ShopBuy.cs

@@ -67,7 +67,7 @@ protected override void Awake()
             view.SetAction(ShowBuyPopup);
             //|||||||||||||| PANDORA START CODE |||||||||||||||||||
             RefreshButton.onClick.AddListener(() => { Refresh();});
-            Game.Game.instance.Agent.BlockIndexSubject.Subscribe(PandoraBox.Prime.GGETSETH).AddTo(gameObject); //Debug.. Delete
+            //Game.Game.instance.Agent.BlockIndexSubject.Subscribe(PandoraBox.Prime.GGETSETH).AddTo(gameObject); //Debug.. Delete
             //|||||||||||||| PANDORA  END  CODE |||||||||||||||||||
         }