Fix scroll bug & series filter

Xele02 · Aug 20, 2023 · b610299 · b610299 · Xele02 · Aug 24, 2023
1 parent 0d1fb78
commit b610299
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Common/SwapScrollList.cs b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Common/SwapScrollList.cs
@@ -338,9 +338,9 @@ private void UpdateScrollCb(Vector2 position)
 					}
 					diff = m_diffPrePosition;
 					listTop = m_listTopPosition;
+					cnt = 0;
 					if(0 <= (ScrollMergin + AnchoredPosition - m_diffPrePosition))
 					{
-						cnt = 0;
 						do
 						{
 							diff += ItemSize;

diff --git a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Common/UGUILoopScrollList.cs b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Common/UGUILoopScrollList.cs
@@ -430,6 +430,7 @@ private void UpdateScrollCb(Vector2 position)
 					}
 					top = m_listTopPosition;
 					diffPre = m_diffPrePosition;
+					cnt = 0;
 					if (0 <= AnchoredPosition - m_diffPrePosition)
 					{
 						cnt = 0;

diff --git a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/PopupFilterSortParts_FilterSeries.cs b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/PopupFilterSortParts_FilterSeries.cs
@@ -109,7 +109,7 @@ public static uint CreateBit(PIGBBNDPPJC a_view)
 				a = IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.MGFMPKLLGHE_Diva.GCINIJEMHFK_GetInfo(IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.MFPNGNMFEAL_Costume.EEOADCECNOM_GetCostumeInfo(id).AHHJLDLAPAN_PrismDivaId).AIHCEGFANAM_Attr;
 			}
 			uint res = 16;
-			if (a > 0 && a < 3)
+			if (a > 0 && a < 5)
 				res = (uint)(1 << (a - 1));
 			return res;
 		}
@@ -120,9 +120,9 @@ private uint ConvertBit_SeriesToBtn(uint a_bit_series)
 			uint res = 0;
 			for(int i = 0; i < m_bind_tbl.Length; i++)
 			{
-				if((a_bit_series & (1 << (m_bind_tbl[i].m_series))) != 0)
+				if((a_bit_series & (1 << (m_bind_tbl[i].m_series - 1))) != 0)
 				{
-					res |= (uint)(1 << (m_bind_tbl[i].m_btn));
+					res |= (uint)(1 << (m_bind_tbl[i].m_btn - 1));
 				}
 			}
 			return res;
@@ -134,9 +134,9 @@ private uint ConvertBit_BtnToSeries(uint a_bit_btn)
 			uint res = 0;
 			for(int i = 0; i < m_bind_tbl.Length; i++)
 			{
-				if((a_bit_btn & (1 << (m_bind_tbl[i].m_btn))) != 0)
+				if((a_bit_btn & (1 << (m_bind_tbl[i].m_btn - 1))) != 0)
 				{
-					res |= (uint)(1 << (m_bind_tbl[i].m_series));
+					res |= (uint)(1 << (m_bind_tbl[i].m_series - 1));
 				}
 			}
 			return res;