v82

osamadeep · Jan 18, 2023 · 3a127e2 · 3a127e2
1 parent 7291358
commit 3a127e2
Show file tree

Hide file tree

Showing 35 changed files with 1,895 additions and 1,008 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.8588693
+    - PositionUV_X_1: -0.60946596
     - PositionUV_Y_1: 0
     - ResizeUV_X_1: -1
     - ResizeUV_X_2: 0

diff --git a/nekoyume/Assets/AddressableAssetsData/link.xml b/nekoyume/Assets/AddressableAssetsData/link.xml
diff --git a/nekoyume/Assets/AddressableAssetsData/link.xml.meta b/nekoyume/Assets/AddressableAssetsData/link.xml.meta
diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_ChronoSettingsPopup.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_ChronoSettingsPopup.prefab
@@ -191,6 +191,8 @@ MonoBehaviour:
   collectOffImage: {fileID: 7298765884402435231}
   spendOnImage: {fileID: 969537735218642756}
   spendOffImage: {fileID: 2854352182240252586}
+  sweepOnImage: {fileID: 565995738742260396}
+  sweepOffImage: {fileID: 4579684357541960451}
   sweepStageInput: {fileID: 6323229227522834357}
   craftModule: {fileID: 1404212856026150416}
   craftOnImage: {fileID: 1250911286662095980}
@@ -2430,9 +2432,9 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: Nekoyume.UI.PandoraSettingPopup, Nekoyume
-        m_MethodName: ChangeMultipleLogin
+      - m_Target: {fileID: 7407895453931944160}
+        m_TargetAssemblyTypeName: Nekoyume.UI.ChronoSettingsPopup, Nekoyume
+        m_MethodName: ChangeSweep
         m_Mode: 6
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -3850,7 +3852,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3243591504461266275
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5658,7 +5660,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4036712308749684564
 RectTransform:
   m_ObjectHideFlags: 0
@@ -13366,9 +13368,9 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: Nekoyume.UI.PandoraSettingPopup, Nekoyume
-        m_MethodName: ChangeMultipleLogin
+      - m_Target: {fileID: 7407895453931944160}
+        m_TargetAssemblyTypeName: Nekoyume.UI.ChronoSettingsPopup, Nekoyume
+        m_MethodName: ChangeSweep
         m_Mode: 6
         m_Arguments:
           m_ObjectArgument: {fileID: 0}

diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_ChronoSlotsPopup.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_ChronoSlotsPopup.prefab
@@ -1826,11 +1826,51 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -9.700012
       objectReference: {fileID: 0}
+    - target: {fileID: 3400444908460524209, guid: fc24ce4f14eae6841881a10ece115a81,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3400444908460524209, guid: fc24ce4f14eae6841881a10ece115a81,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3400444908460524209, guid: fc24ce4f14eae6841881a10ece115a81,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3400444908460524209, guid: fc24ce4f14eae6841881a10ece115a81,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3787858095262186575, guid: fc24ce4f14eae6841881a10ece115a81,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -9.700012
       objectReference: {fileID: 0}
+    - target: {fileID: 7305666656154174503, guid: fc24ce4f14eae6841881a10ece115a81,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7305666656154174503, guid: fc24ce4f14eae6841881a10ece115a81,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7305666656154174503, guid: fc24ce4f14eae6841881a10ece115a81,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7305666656154174503, guid: fc24ce4f14eae6841881a10ece115a81,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7778286864631315859, guid: fc24ce4f14eae6841881a10ece115a81,
         type: 3}
       propertyPath: m_Pivot.x