Merge tag 'v100121' into pandora31

[Bot] v100121 # Conflicts: # nekoyume/Assets/Resources/UI/Prefabs/UI_EventBanner.prefab # nekoyume/Assets/Resources/UI/Prefabs/UI_RankingBoard.prefab # nekoyume/Assets/_Scripts/Lib9c/lib9c
osamadeep · Mar 5, 2022 · 8c2daef · 8c2daef
1 parent c9b2b91
commit 8c2daef
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_FriendInfoPopupPandora.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_FriendInfoPopupPandora.prefab
@@ -1795,7 +1795,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &748416158022382455
 RectTransform:
   m_ObjectHideFlags: 0
@@ -7201,12 +7201,12 @@ PrefabInstance:
     - target: {fileID: 353101610105321883, guid: 628bcb97c1589b84d88538f3fd548a8e,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 158.8
+      value: -186.7
       objectReference: {fileID: 0}
     - target: {fileID: 353101610105321883, guid: 628bcb97c1589b84d88538f3fd548a8e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 126.901634
+      value: -99.2
       objectReference: {fileID: 0}
     - target: {fileID: 953981284556268286, guid: 628bcb97c1589b84d88538f3fd548a8e,
         type: 3}
@@ -7266,12 +7266,12 @@ PrefabInstance:
     - target: {fileID: 1753508184598535561, guid: 628bcb97c1589b84d88538f3fd548a8e,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 281.3073
+      value: -64.19266
       objectReference: {fileID: 0}
     - target: {fileID: 1753508184598535561, guid: 628bcb97c1589b84d88538f3fd548a8e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 126.9
+      value: -99.20162
       objectReference: {fileID: 0}
     - target: {fileID: 2150880254777676577, guid: 628bcb97c1589b84d88538f3fd548a8e,
         type: 3}
@@ -7296,7 +7296,7 @@ PrefabInstance:
     - target: {fileID: 2448447002953495960, guid: 628bcb97c1589b84d88538f3fd548a8e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 384.4
+      value: 378.6
       objectReference: {fileID: 0}
     - target: {fileID: 3815087675699317452, guid: 628bcb97c1589b84d88538f3fd548a8e,
         type: 3}
@@ -7311,12 +7311,12 @@ PrefabInstance:
     - target: {fileID: 3815087675699317452, guid: 628bcb97c1589b84d88538f3fd548a8e,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 110.57
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3815087675699317452, guid: 628bcb97c1589b84d88538f3fd548a8e,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 15.24
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3815087675699317452, guid: 628bcb97c1589b84d88538f3fd548a8e,
         type: 3}
@@ -7341,7 +7341,7 @@ PrefabInstance:
     - target: {fileID: 5901008833439256934, guid: 628bcb97c1589b84d88538f3fd548a8e,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6475683220073692115, guid: 628bcb97c1589b84d88538f3fd548a8e,
         type: 3}

diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Popup/FriendInfoPopupPandora.cs b/nekoyume/Assets/_Scripts/UI/Widget/Popup/FriendInfoPopupPandora.cs
@@ -97,12 +97,13 @@ protected override void Awake()
         //|||||||||||||| PANDORA START CODE |||||||||||||||||||
         public void ResetAllNemesis()
         {
-            PandoraBoxMaster.ArenaFavTargets.Clear();
-            for (int i = 0; i < 3; i++)
+            for (int i = 0; i < PandoraBoxMaster.ArenaFavTargets.Count; i++)
             {
                 string key = "_PandoraBox_PVP_FavTarget0" + i + "_" + States.Instance.CurrentAvatarState.address;
                 PlayerPrefs.DeleteKey(key);
             }
+            PandoraBoxMaster.ArenaFavTargets.Clear();
+
             OneLineSystem.Push(MailType.System, "<color=green>Pandora Box</color>: <color=red>Nemesis</color> list is clear Successfully!"
                 , NotificationCell.NotificationType.Information);
         }