add search filter and sort condition for genesys points

.gitignore

@@ -62,3 +62,4 @@ Data/ur.ydk
 /Assets/Wallpaper/
 Data/lflist_genesys.conf
 Data/mycard_apps.json
+Data/Rarity.json

Assets/Addressables/Text/UpdateContent.txt

+MDPro3 v1.3.5更新：
+1.修复除外区域的决斗按钮无法被点击的错误。
+
 MDPro3 v1.3.4更新：
 1.组卡界面新增Info类型（上方第一个按钮）：Genesys积分模式。
 2.决斗链接更新：

Assets/Prefabs/ServantUI/OcgCoreUI.prefab

@@ -2582,11 +2582,6 @@ MonoBehaviour:
   baseRect: {fileID: 5484811793682048071}
   scrollRect: {fileID: 2740834218755119401}
   showing: 0
-  chainSolving: 0
-  lastMoveReason: 0
-  lastSpSummonReason: 0
-  psum: 0
-  cacheLp: 0
 --- !u!1 &2680087416863519693
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/MDPro3/Duel/YGOSharp/Card.cs

@@ -4,6 +4,7 @@ using MDPro3.Utility;
 using MDPro3.Duel.YGOSharp;
 using System.Diagnostics;
 using static YgomSystem.UI.ViewController;
+using MDPro3.Net;
 
 namespace MDPro3.Duel.YGOSharp
 {
@@ -217,6 +218,11 @@ namespace MDPro3.Duel.YGOSharp
             return (Attribute & (uint)attribute) > 0;
         }
 
+        public int GetGenesysPoint()
+        {
+            return OnlineService.GetGenesysPoint(GetOriginalID());
+        }
+
         #endregion
 
         #region String

Assets/Scripts/MDPro3/UI/Popup/PopupSearchFilter.cs

@@ -19,6 +19,8 @@ namespace MDPro3.UI.Popup
         public TMP_InputField inputDefenceTo;
         public TMP_InputField inputScaleFrom;
         public TMP_InputField inputScaleTo;
+        public TMP_InputField inputGPFrom;
+        public TMP_InputField inputGPTo;
         public TMP_InputField inputYearFrom;
         public TMP_InputField inputYearTo;
 
@@ -69,10 +71,14 @@ namespace MDPro3.UI.Popup
                     inputScaleFrom.text = f[17].ToString();
                 if (f[18] > 0)
                     inputScaleTo.text = f[18].ToString();
-                if (f[19] > 0)
-                    inputYearFrom.text = f[19].ToString();
-                if (f[20] > 0)
-                    inputYearTo.text = f[20].ToString();
+                if (f[19] >= 0)
+                    inputGPFrom.text = f[19].ToString();
+                if (f[20] >= 0)
+                    inputGPTo.text = f[20].ToString();
+                if (f[21] > 0)
+                    inputYearFrom.text = f[21].ToString();
+                if (f[22] > 0)
+                    inputYearTo.text = f[22].ToString();
             }
             Manager.GetElement<SelectionButton>("ButtonPack")
                 .SetButtonText(CardCollectionView.packName == string.Empty 
@@ -203,6 +209,20 @@ namespace MDPro3.UI.Popup
                 dirty = true;
                 filters.Add(long.Parse(inputScaleTo.text));
             }
+            else
+                filters.Add(-233);
+            if (inputGPFrom.text.Length > 0)
+            {
+                dirty = true;
+                filters.Add(long.Parse(inputGPFrom.text));
+            }
+            else
+                filters.Add(-233);
+            if (inputGPTo.text.Length > 0)
+            {
+                dirty = true;
+                filters.Add(long.Parse(inputGPTo.text));
+            }
             else
                 filters.Add(-233);
             if (inputYearFrom.text.Length > 0)
@@ -252,6 +272,8 @@ namespace MDPro3.UI.Popup
             inputDefenceTo.text = string.Empty;
             inputScaleFrom.text = string.Empty;
             inputScaleTo.text = string.Empty;
+            inputGPFrom.text = string.Empty;
+            inputGPTo.text = string.Empty;
             inputYearFrom.text = string.Empty;
             inputYearTo.text = string.Empty;
             Manager.GetElement<SelectionButton>("ButtonPack").SetButtonText(InterString.Get("所有卡包"));

Assets/Scripts/MDPro3/UI/SelectionButton/SelectionButton_CardInCollection.cs

@@ -179,6 +179,8 @@ namespace MDPro3.UI
             Manager.GetElement("IconPool").SetActive(DeckEditorUI.cardInfoType == DeckEditorUI.CardInfoType.Pool);
 
             CardPoint.SetActive(DeckEditorUI.cardInfoType == DeckEditorUI.CardInfoType.Genesys);
+            Manager.GetElement("IconLimit").SetActive(DeckEditorUI.cardInfoType != DeckEditorUI.CardInfoType.Genesys);
+
         }
 
         public void RefreshCountIcon()

Assets/Scripts/MDPro3/UI/SelectionButton/SelectionToggle_SearchOrder.cs

@@ -57,6 +57,8 @@ namespace MDPro3.UI
                 SortOrder.ByDefenceDown => InterString.Get("守备力"),
                 SortOrder.ByRarityUp => InterString.Get("稀有度"),
                 SortOrder.ByRarityDown => InterString.Get("稀有度"),
+                SortOrder.ByGPUp => InterString.Get("Genesys分数"),
+                SortOrder.ByGPDown => InterString.Get("Genesys分数"),
                 _ => string.Empty
             };
         }

Assets/Scripts/MDPro3/UI/UIWidget/Deck/CardCollectionView.cs

@@ -193,7 +193,9 @@ namespace MDPro3.UI
             ByDefenceUp = 7,
             ByDefenceDown = 8,
             ByRarityUp = 9,
-            ByRarityDown = 10
+            ByRarityDown = 10,
+            ByGPUp = 11,
+            ByGPDown = 12
         }
         public static SortOrder _SortOrder = SortOrder.ByType;
 
@@ -240,39 +242,7 @@ namespace MDPro3.UI
         {
             var cards = new List<int>();
             var results = CardsManager.Search(InputSearch.InputField.text, filters, DeckEditor.banlist, packName);
-            switch (_SortOrder)
-            {
-                case SortOrder.ByType:
-                    results.Sort(CardsManager.ComparisonOfCard());
-                    break;
-                case SortOrder.ByTypeReverse:
-                    results.Sort(CardsManager.ComparisonOfCardReverse());
-                    break;
-                case SortOrder.ByLevelUp:
-                    results.Sort(CardsManager.ComparisonOfCard_LV_Up());
-                    break;
-                case SortOrder.ByLevelDown:
-                    results.Sort(CardsManager.ComparisonOfCard_LV_Down());
-                    break;
-                case SortOrder.ByAttackUp:
-                    results.Sort(CardsManager.ComparisonOfCard_ATK_Up());
-                    break;
-                case SortOrder.ByAttackDown:
-                    results.Sort(CardsManager.ComparisonOfCard_ATK_Down());
-                    break;
-                case SortOrder.ByDefenceUp:
-                    results.Sort(CardsManager.ComparisonOfCard_DEF_Up());
-                    break;
-                case SortOrder.ByDefenceDown:
-                    results.Sort(CardsManager.ComparisonOfCard_DEF_Down());
-                    break;
-                case SortOrder.ByRarityUp:
-                    results.Sort(CardsManager.ComparisonOfCard_Rarity_Up());
-                    break;
-                case SortOrder.ByRarityDown:
-                    results.Sort(CardsManager.ComparisonOfCard_Rarity_Down());
-                    break;
-            }
+            SortCards(results);
             foreach(var card in results)
                 cards.Add(card.Id);
 
@@ -287,55 +257,66 @@ namespace MDPro3.UI
             relatedCardData = data;
             var cards = new List<int>();
             var results = CardsManager.RelatedSearch(data.Id);
+            SortCards(results);
+            foreach (var card in results)
+                cards.Add(card.Id);
+
+            ButtonSearch.SetButtonText(cards.Count == 0 ? InterString.Get("搜索") : cards.Count.ToString());
+
+            PrintCards(cards);
+        }
+
+        public void PrintBookmarkCards()
+        {
+            PrintCards(CardRarity.GetBookCards());
+        }
+
+        public void PrintHistoryCards()
+        {
+            PrintCards(historyCards);
+        }
+
+        private void SortCards(List<Card> cards)
+        {
             switch (_SortOrder)
             {
                 case SortOrder.ByType:
-                    results.Sort(CardsManager.ComparisonOfCard());
+                    cards.Sort(CardsManager.ComparisonOfCard());
                     break;
                 case SortOrder.ByTypeReverse:
-                    results.Sort(CardsManager.ComparisonOfCardReverse());
+                    cards.Sort(CardsManager.ComparisonOfCardReverse());
                     break;
                 case SortOrder.ByLevelUp:
-                    results.Sort(CardsManager.ComparisonOfCard_LV_Up());
+                    cards.Sort(CardsManager.ComparisonOfCard_LV_Up());
                     break;
                 case SortOrder.ByLevelDown:
-                    results.Sort(CardsManager.ComparisonOfCard_LV_Down());
+                    cards.Sort(CardsManager.ComparisonOfCard_LV_Down());
                     break;
                 case SortOrder.ByAttackUp:
-                    results.Sort(CardsManager.ComparisonOfCard_ATK_Up());
+                    cards.Sort(CardsManager.ComparisonOfCard_ATK_Up());
                     break;
                 case SortOrder.ByAttackDown:
-                    results.Sort(CardsManager.ComparisonOfCard_ATK_Down());
+                    cards.Sort(CardsManager.ComparisonOfCard_ATK_Down());
                     break;
                 case SortOrder.ByDefenceUp:
-                    results.Sort(CardsManager.ComparisonOfCard_DEF_Up());
+                    cards.Sort(CardsManager.ComparisonOfCard_DEF_Up());
                     break;
                 case SortOrder.ByDefenceDown:
-                    results.Sort(CardsManager.ComparisonOfCard_DEF_Down());
+                    cards.Sort(CardsManager.ComparisonOfCard_DEF_Down());
                     break;
                 case SortOrder.ByRarityUp:
-                    results.Sort(CardsManager.ComparisonOfCard_Rarity_Up());
+                    cards.Sort(CardsManager.ComparisonOfCard_Rarity_Up());
                     break;
                 case SortOrder.ByRarityDown:
-                    results.Sort(CardsManager.ComparisonOfCard_Rarity_Down());
+                    cards.Sort(CardsManager.ComparisonOfCard_Rarity_Down());
+                    break;
+                case SortOrder.ByGPUp:
+                    cards.Sort(CardsManager.ComparisonOfCard_GP_Up());
+                    break;
+                case SortOrder.ByGPDown:
+                    cards.Sort(CardsManager.ComparisonOfCard_GP_Down());
                     break;
             }
-            foreach (var card in results)
-                cards.Add(card.Id);
-
-            ButtonSearch.SetButtonText(cards.Count == 0 ? InterString.Get("搜索") : cards.Count.ToString());
-
-            PrintCards(cards);
-        }
-
-        public void PrintBookmarkCards()
-        {
-            PrintCards(CardRarity.GetBookCards());
-        }
-
-        public void PrintHistoryCards()
-        {
-            PrintCards(historyCards);
         }
 
         public void AddHistoryCard(int code)