genesys deck build

.gitignore

@@ -60,3 +60,4 @@ Data/ur.ydk
 /Assets/SpineWallpaper/
 /Assets/StreamingAssets/
 /Assets/Wallpaper/
+Data/lflist_genesys.conf

Assets/Prefabs/ServantUI/Parts.meta

+fileFormatVersion: 2
+guid: 8efa02b7086d6b840bfc2739a2e5e9b1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/ServantUI/Parts/CardDetailView.prefab.meta

+fileFormatVersion: 2
+guid: c8b55b8100101c346ae54301da219210
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/ServantUI/Parts/DeckView.prefab.meta

+fileFormatVersion: 2
+guid: 3f6be77aa7e0fd945b3974b2ecc5dc23
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/ServantUI/Parts/DeckViewMobile.prefab.meta

+fileFormatVersion: 2
+guid: d4403fd2f98246942bb4edbb4b732ea1
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Editor/ClampedContentSizeFitterEditor.cs

+using MDPro3.UI;
+using UnityEditor;
+using UnityEditor.UI;
+using UnityEngine;
+
+[CustomEditor(typeof(ClampedContentSizeFitter))]
+public class ClampedContentSizeFitterEditor : ContentSizeFitterEditor
+{
+    SerializedProperty m_MinWidth;
+    SerializedProperty m_MaxWidth;
+
+    protected override void OnEnable()
+    {
+        base.OnEnable();
+        m_MinWidth = serializedObject.FindProperty("m_MinWidth");
+        m_MaxWidth = serializedObject.FindProperty("m_MaxWidth");
+    }
+
+    public override void OnInspectorGUI()
+    {
+        serializedObject.Update();
+        EditorGUILayout.PropertyField(m_MinWidth, new GUIContent("Min Width"));
+        EditorGUILayout.PropertyField(m_MaxWidth, new GUIContent("Max Width"));
+        serializedObject.ApplyModifiedProperties();
+
+        base.OnInspectorGUI(); // 绘制原生设置
+
+    }
+}
\ No newline at end of file

Assets/Scripts/Editor/ClampedContentSizeFitterEditor.cs.meta

+fileFormatVersion: 2
+guid: 00e11161ead564f408a263b8e8a422eb
\ No newline at end of file

Assets/Scripts/MDPro3/Boot.cs

@@ -156,7 +156,10 @@ namespace MDPro3
             Program.SetRoot();
             _ = ABLoader.CacheMasterDuelBundles();
             while (!ABLoader.mdCached)
+            {
+                progressBar.value = ABLoader.mdCachedProgress;
                 yield return null;
+            }
 
             Config.Initialize(Program.PATH_CONFIG);
             Config.Set("Version", Application.version[..5]);

Assets/Scripts/MDPro3/Helper/ABLoader.cs

@@ -420,6 +420,7 @@ namespace MDPro3
         #region MasterDuel
 
         public static bool mdCached;
+        public static float mdCachedProgress;
 
         private static AssetBundle mdBundleDuel;
         private static AssetBundle mdBundleMaterials;
@@ -428,11 +429,17 @@ namespace MDPro3
 
         public static async UniTask CacheMasterDuelBundles()
         {
+            mdCachedProgress = 0;
             await CacheFromFileAsync(Program.root + "MasterDuel/Built-in/shaders");
+            mdCachedProgress = 0.2f;
             mdBundleMaterials = await CacheFromFileAsync(Program.root + "MasterDuel/Built-in/materials");
+            mdCachedProgress = 0.4f;
             mdBundleSprites = await CacheFromFileAsync(Program.root + "MasterDuel/Built-in/sprites");
+            mdCachedProgress = 0.6f;
             mdBundleTextures = await CacheFromFileAsync(Program.root + "MasterDuel/Built-in/textures");
+            mdCachedProgress = 0.8f;
             mdBundleDuel = await CacheFromFileAsync(Program.root + "MasterDuel/Built-in/duel");
+            mdCachedProgress = 1f;
             mdCached = true;
         }
 

Assets/Scripts/MDPro3/Net/MyCard.cs

@@ -21,7 +21,7 @@ namespace MDPro3.Net
 
         const string loginUrl = "https://sapi.moecube.com:444/accounts/signin";
         const string authUrl = "https://sapi.moecube.com:444/accounts/authUser";
-        const string appsUrl = "https://sapi.moecube.com:444/release/update/apps.json";
+        const string appsUrl = "https://cdntx.moecube.com/apps.json";
         const string expUrl = "https://sapi.moecube.com:444/ygopro/arena/user?username=";
         const string matchUrl = "https://sapi.moecube.com:444/ygopro/match";
         const string userUrl = "https://sapi.moecube.com:444/accounts/users/{username}.json";

Assets/Scripts/MDPro3/Net/OnlineService.cs

+using Cysharp.Threading.Tasks;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace MDPro3.Net
+{
+    public static class OnlineService
+    {
+
+        public static void Initialize()
+        {
+            _ = InitializeGenesysLflist();
+        }
+
+        #region Genesys lflist
+
+        private const string URL_GENESYS_LFLIST = "https://cdntx.moecube.com/ygopro-genesys/lflist.conf";
+        private const string PATH_GENESYS_LFLIST = "Data/lflist_genesys.conf";
+        private static readonly List<int> genesysBannedCards = new();
+        private static readonly List<GenesysPoint> genesysPoints = new();
+
+        private static async UniTask InitializeGenesysLflist()
+        {
+            var eTag = await GetETagAsync(URL_GENESYS_LFLIST);
+            if (!string.IsNullOrEmpty(eTag))
+            {
+                var configTag = Config.Get(GetLocalETagKey(URL_GENESYS_LFLIST), Config.EMPTY_STRING);
+                if(!string.Equals(eTag, configTag, StringComparison.Ordinal))
+                {
+                    Program.Debug("Update Genesys Lflist.");
+                    await DownloadGenesysLflist(eTag);
+                }
+                else
+                {
+                    Program.Debug("Genesys Lflist do not need update.");
+                }
+            }
+
+            ParseGenesysLflist();
+        }
+
+        private static bool GenesysRequiresDownload()
+        {
+            if (!File.Exists(PATH_GENESYS_LFLIST))
+                return true;
+
+            var lastWriteTime = File.GetLastWriteTimeUtc(PATH_GENESYS_LFLIST);
+            var now = DateTime.UtcNow;
+            var updateTime = new DateTime(now.Year, now.Month, now.Day, 20, 0, 0, DateTimeKind.Utc);
+
+            return now > updateTime && lastWriteTime < updateTime;
+        }
+
+        private static async UniTask DownloadGenesysLflist(string ETag)
+        {
+            using var request = UnityWebRequest.Get(URL_GENESYS_LFLIST);
+            request.timeout = 15;
+
+            await request.SendWebRequest();
+            if (request.result == UnityWebRequest.Result.Success)
+            {
+                File.WriteAllText(PATH_GENESYS_LFLIST, request.downloadHandler.text);
+                Config.Set(GetLocalETagKey(URL_GENESYS_LFLIST), ETag);
+                Config.Save();
+            }
+            else
+                MessageManager.Cast(InterString.Get("下载Genesys禁卡表失败。"));
+        }
+
+        private static void ParseGenesysLflist()
+        {
+            if (!File.Exists(PATH_GENESYS_LFLIST))
+                return;
+
+            try
+            {
+                var lines = File.ReadAllLines(PATH_GENESYS_LFLIST);
+                var currentType = string.Empty;
+
+                foreach(var rawLine in lines)
+                {
+                    var line = rawLine.Trim();
+                    if(string.IsNullOrEmpty(line) || line.StartsWith("#")) continue;
+                    if (line.StartsWith("$"))
+                    {
+                        currentType = line;
+                        continue;
+                    }
+
+                    var parts = line.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+
+                    if(parts.Length == 2 && parts[1] == "0")
+                    {
+                        if (int.TryParse(parts[0], out int code))
+                            genesysBannedCards.Add(code);
+                    }
+                    else if(parts.Length >= 3)
+                    {
+                        var commentIndex = Array.FindIndex(parts, p => p.StartsWith("--"));
+                        var dataLength = commentIndex > 0 ? commentIndex : parts.Length;
+
+                        if(dataLength >= 3 && int.TryParse(parts[0], out var code))
+                        {
+                            var gp = new GenesysPoint
+                            {
+                                code = code,
+                                banType = currentType,
+                            };
+                            if(int.TryParse(parts[2], out var result))
+                                gp.point = result;
+                            else
+                                gp.point = 0;
+                            genesysPoints.Add(gp);
+                        }
+                    }
+                }
+
+            }
+            catch (Exception e) 
+            {
+                Program.Debug(e.Message);
+            }
+        }
+
+        public static int GetGenesysPoint(int code)
+        {
+            if (genesysBannedCards.Contains(code))
+                return -1;
+            foreach(var gp in genesysPoints)
+                if(gp.code == code)
+                    return gp.point;
+            return 0;
+        }
+
+        /// <summary>
+        /// color for Genesys Points one card score
+        /// </summary>
+        /// <param name="gp"></param>
+        /// <returns></returns>
+        public static Color GetGenesysPointColor(int gp)
+        {
+            if (gp < 0)
+                return Color.red;
+            if (gp == 0)
+                return Color.gray;
+            if (gp < 10)
+                return Color.green;
+            if (gp < 50)
+                return Color.yellow;
+            if (gp < 100)
+                return Color.magenta;
+            return Color.red;
+        }
+
+        /// <summary>
+        /// color for Genesys Points total score
+        /// </summary>
+        /// <param name="gp"></param>
+        /// <returns></returns>
+        public static Color GetGenesysPointsColor(int gp)
+        {
+            if (gp < 100)
+                return Color.white;
+            return Color.red;
+        }
+
+        #endregion
+
+        #region Online Tools
+
+        private static string GetLocalETagKey(string url) => $"ETag_{url.GetHashCode()}";
+
+        public static async UniTask<string> GetETagAsync(string url)
+        {
+            using var headRequest = UnityWebRequest.Head(url);
+            await headRequest.SendWebRequest();
+
+            if(headRequest.result != UnityWebRequest.Result.Success)
+            {
+                Program.Debug($"HEAD({url})请求失败：{headRequest.error}");
+                return null;
+            }
+
+            var onlineETag = headRequest.GetResponseHeader("ETag")?.Trim();
+            if (string.IsNullOrEmpty(onlineETag))
+            {
+                Program.Debug($"未找到ETag({url})，服务器可能未启用缓存");
+                return null;
+            }
+            return onlineETag;
+        }
+
+        #endregion
+
+    }
+
+    public struct GenesysPoint
+    {
+        public int code;
+        public string banType;
+        public int point;
+    }
+}
\ No newline at end of file

Assets/Scripts/MDPro3/Net/OnlineService.cs.meta

+fileFormatVersion: 2
+guid: 06e282f1417d98849a3cff625ab0a8ed
\ No newline at end of file

Assets/Scripts/MDPro3/Program.cs

@@ -111,6 +111,8 @@ namespace MDPro3
 
             Screen.sleepTimeout = SleepTimeout.NeverSleep;
 
+            OnlineService.Initialize();
+
             if(!ABLoader.mdCached)
                 await ABLoader.CacheMasterDuelBundles();
 
@@ -349,6 +351,13 @@ namespace MDPro3
 
         #region Tools
 
+        public static void Debug(string text)
+        {
+#if UNITY_EDITOR
+            UnityEngine.Debug.Log(text);
+#endif
+        }
+
         public void ShiftToServant(Servant.Servant servant)
         {
             currentServant = servant;

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

@@ -7,11 +7,28 @@ using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using MDPro3.Servant;
 using MDPro3.UI.ServantUI;
+using MDPro3.Net;
 
 namespace MDPro3.UI
 {
     public class SelectionButton_CardInCollection : SelectionButton, IBeginDragHandler, IEndDragHandler, IDragHandler
     {
+        #region Elements
+
+        private const string LABEL_GO_CARD_POINT = "CardPointRoot";
+        private GameObject m_CardPoint;
+        private GameObject CardPoint =>
+            m_CardPoint = m_CardPoint != null ? m_CardPoint
+            : Manager.GetElement(LABEL_GO_CARD_POINT);
+
+        private const string LABEL_TXT_CARD_POINT = "TextCardPointValue";
+        private TextMeshProUGUI m_TextCardPoint;
+        private TextMeshProUGUI TextCardPoint =>
+            m_TextCardPoint = m_TextCardPoint != null ? m_TextCardPoint
+            : Manager.GetElement<TextMeshProUGUI>(LABEL_TXT_CARD_POINT);
+
+        #endregion
+
         private int _cardCode;
         public int CardCode
         {
@@ -29,6 +46,7 @@ namespace MDPro3.UI
         }
         public Card card;
         public CardCollectionView cardCollectionView;
+        public int genesysPoint;
 
         private CardRawImageHandler m_ImageHandler;
         private CardRawImageHandler ImageHandler =>
@@ -131,6 +149,13 @@ namespace MDPro3.UI
             Manager.GetElement<TextMeshProUGUI>("TextLink").text = card.GetLinkCount().ToString();
             Manager.GetElement<TextMeshProUGUI>("TextPendulumScale").text = card.LScale.ToString();
 
+            genesysPoint = OnlineService.GetGenesysPoint(card.GetOriginalID());
+            var text = genesysPoint.ToString();
+            if (genesysPoint < 0)
+                text = "X";
+            TextCardPoint.text = text;
+            TextCardPoint.color = OnlineService.GetGenesysPointColor(genesysPoint);
+
             RefreshIcons();
             RefreshCountIcon();
         }
@@ -152,6 +177,8 @@ namespace MDPro3.UI
             Manager.GetElement("IconPendulumScale").SetActive(DeckEditorUI.cardInfoType == DeckEditorUI.CardInfoType.Detail
                 && card.HasType(CardType.Pendulum));
             Manager.GetElement("IconPool").SetActive(DeckEditorUI.cardInfoType == DeckEditorUI.CardInfoType.Pool);
+
+            CardPoint.SetActive(DeckEditorUI.cardInfoType == DeckEditorUI.CardInfoType.Genesys);
         }
 
         public void RefreshCountIcon()

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

@@ -11,6 +11,7 @@ using static MDPro3.UI.DeckView;
 using MDPro3.Servant;
 using MDPro3.UI.ServantUI;
 using MDPro3.UI.PropertyOverride;
+using MDPro3.Net;
 
 namespace MDPro3.UI
 {
@@ -120,6 +121,18 @@ namespace MDPro3.UI
             m_TextPickupCursor = m_TextPickupCursor != null ? m_TextPickupCursor
             : Manager.GetNestedElement<TextMeshProUGUI>(LABEL_TXT_PICKUP_CURSOR);
 
+        private const string LABEL_GO_CARD_POINT = "CardPointRoot";
+        private GameObject m_CardPoint;
+        private GameObject CardPoint =>
+            m_CardPoint = m_CardPoint != null ? m_CardPoint
+            : Manager.GetElement(LABEL_GO_CARD_POINT);
+
+        private const string LABEL_TXT_CARD_POINT = "TextCardPointValue";
+        private TextMeshProUGUI m_TextCardPoint;
+        private TextMeshProUGUI TextCardPoint =>
+            m_TextCardPoint = m_TextCardPoint != null ? m_TextCardPoint 
+            : Manager.GetElement<TextMeshProUGUI>(LABEL_TXT_CARD_POINT);
+
         #endregion
 
         [Header("SelectionButton CardInDeck")]
@@ -143,6 +156,7 @@ namespace MDPro3.UI
         public DeckLocation location;
         private Vector3 dragScale = new(1.7f, 1.7f, 1f);
         private RectTransform child;
+        public int genesysPoint;
 
         protected override void Awake()
         {
@@ -277,6 +291,13 @@ namespace MDPro3.UI
             TextLink.text = Card.GetLinkCount().ToString();
             TextPendulumScale.text = Card.LScale.ToString();
 
+            genesysPoint = OnlineService.GetGenesysPoint(Card.GetOriginalID());
+            var text = genesysPoint.ToString();
+            if (genesysPoint < 0)
+                text = "X";
+            TextCardPoint.text = text;
+            TextCardPoint.color = OnlineService.GetGenesysPointColor(genesysPoint);
+
             RefreshIcons();
         }
 
@@ -299,6 +320,8 @@ namespace MDPro3.UI
                 IconPendulumScale.gameObject.SetActive(DeckEditorUI.cardInfoType == DeckEditorUI.CardInfoType.Detail
                     && Card.HasType(CardType.Pendulum));
                 IconPool.gameObject.SetActive(DeckEditorUI.cardInfoType == DeckEditorUI.CardInfoType.Pool);
+                CardPoint.SetActive(DeckEditorUI.cardInfoType == DeckEditorUI.CardInfoType.Genesys);
+                IconLimit.gameObject.SetActive(DeckEditorUI.cardInfoType != DeckEditorUI.CardInfoType.Genesys);
             }
             else if (Program.instance.currentServant == Program.instance.deckBrowser)
             {
@@ -311,6 +334,7 @@ namespace MDPro3.UI
                 IconLink.gameObject.SetActive(false);
                 IconPendulumScale.gameObject.SetActive(false);
                 IconPool.gameObject.SetActive(false);
+                CardPoint.SetActive(false);
             }
         }
 
@@ -490,7 +514,6 @@ namespace MDPro3.UI
 
         #endregion
 
-
         private int GetIndex()
         {
             int index = 0;

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

@@ -2,11 +2,47 @@ using UnityEngine;
 using UnityEngine.Events;
 using MDPro3.Servant;
 using MDPro3.UI.ServantUI;
+using TMPro;
+using MDPro3.Net;
 
 namespace MDPro3.UI
 {
     public class SelectionButton_CardInfoType : SelectionButton
     {
+        #region Elements
+
+        private const string LABEL_GO_INFO0 = "IconInfoSwitching0";
+        private GameObject m_Info0;
+        private GameObject Info0 =>
+            m_Info0 = m_Info0 != null ? m_Info0
+            : Manager.GetElement(LABEL_GO_INFO0);
+
+        private const string LABEL_GO_INFO1 = "IconInfoSwitching1";
+        private GameObject m_Info1;
+        private GameObject Info1 =>
+            m_Info1 = m_Info1 != null ? m_Info1
+            : Manager.GetElement(LABEL_GO_INFO1);
+
+        private const string LABEL_GO_INFO2 = "IconInfoSwitching2";
+        private GameObject m_Info2;
+        private GameObject Info2 =>
+            m_Info2 = m_Info2 != null ? m_Info2
+            : Manager.GetElement(LABEL_GO_INFO2);
+
+        private const string LABEL_GO_INFO3 = "IconInfoSwitching3";
+        private GameObject m_Info3;
+        private GameObject Info3 =>
+            m_Info3 = m_Info3 != null ? m_Info3
+            : Manager.GetElement(LABEL_GO_INFO3);
+
+        private const string LABEL_TXT_GP = "TextGenesysPoint";
+        private TextMeshProUGUI m_TextGP;
+        private TextMeshProUGUI TextGP =>
+            m_TextGP = m_TextGP != null ? m_TextGP
+            : Manager.GetElement<TextMeshProUGUI>(LABEL_TXT_GP);
+
+        #endregion
+
         public static SelectionButton_CardInfoType instance;
 
         protected override void Awake()
@@ -19,31 +55,26 @@ namespace MDPro3.UI
 
         private void ClickEvent()
         {
-            var type = (DeckEditorUI.CardInfoType)(((int)DeckEditorUI.cardInfoType + 1) % 3);
+            var type = (DeckEditorUI.CardInfoType)(((int)DeckEditorUI.cardInfoType + 1) % 4);
             Program.instance.deckEditor.GetUI<DeckEditorUI>().SetCardInfoType(type);
             SetCardInfoTypeIcon(type);
         }
 
         public void SetCardInfoTypeIcon(DeckEditorUI.CardInfoType type)
         {
-            switch (type)
-            {
-                case DeckEditorUI.CardInfoType.None:
-                    Manager.GetElement("IconInfoSwitching0").SetActive(true);
-                    Manager.GetElement("IconInfoSwitching1").SetActive(false);
-                    Manager.GetElement("IconInfoSwitching2").SetActive(false);
-                    break;
-                case DeckEditorUI.CardInfoType.Detail:
-                    Manager.GetElement("IconInfoSwitching0").SetActive(false);
-                    Manager.GetElement("IconInfoSwitching1").SetActive(true);
-                    Manager.GetElement("IconInfoSwitching2").SetActive(false);
-                    break;
-                case DeckEditorUI.CardInfoType.Pool:
-                    Manager.GetElement("IconInfoSwitching0").SetActive(false);
-                    Manager.GetElement("IconInfoSwitching1").SetActive(false);
-                    Manager.GetElement("IconInfoSwitching2").SetActive(true);
-                    break;                
+            Info0.SetActive(type == DeckEditorUI.CardInfoType.None);
+            Info1.SetActive(type == DeckEditorUI.CardInfoType.Detail);
+            Info2.SetActive(type == DeckEditorUI.CardInfoType.Pool);
+            Info3.SetActive(type == DeckEditorUI.CardInfoType.Genesys);
+            TextGP.gameObject.SetActive(type == DeckEditorUI.CardInfoType.Genesys);
         }
+
+        public static void SetGenesysPoints(int gp)
+        {
+            if (instance == null)
+                return;
+            instance.TextGP.text = gp.ToString();
+            instance.TextGP.color = OnlineService.GetGenesysPointsColor(gp);
         }
     }
 }

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

@@ -79,6 +79,8 @@ namespace MDPro3.UI
             else if (path.Length > 0)
             {
                 Icon.sprite = await Program.items.LoadItemIconAsync(itemID.ToString(), Items.ItemType.Unknown);
+                if (Manager == null)
+                    return;
                 Icon.color = Color.white;
                 if (path.StartsWith("ProfileFrame"))
                 {

Assets/Scripts/MDPro3/UI/ServantUI/DeckBrowserUI.cs

@@ -71,7 +71,6 @@ namespace MDPro3.UI.ServantUI
             }
         }
 
-
         private void Awake()
         {
             DeckView.PrintDeck(DeckEditor.Deck, DeckEditor.DeckName, DeckView.Condition.Pickup);
@@ -120,7 +119,7 @@ namespace MDPro3.UI.ServantUI
 
         public void SetCardInfoType()
         {
-            var type = (CardInfoType)(((int)cardInfoType + 1) % 3);
+            var type = (CardInfoType)(((int)cardInfoType + 1) % 4);
             SetCardInfoType(type);
             SelectionButton_CardInfoType.instance.SetCardInfoTypeIcon(type);
         }

Assets/Scripts/MDPro3/UI/ServantUI/DeckEditorUI.cs

@@ -69,6 +69,12 @@ namespace MDPro3.UI.ServantUI
             m_RectBack = m_RectBack != null ? m_RectBack
             : ButtonBack.GetComponent<RectTransform>();
 
+        private const string LABEL_SBN_INFO = "Header/ButtonInfoSwitching";
+        private SelectionButton m_ButtonInfo;
+        private SelectionButton ButtonInfo =>
+            m_ButtonInfo = m_ButtonInfo != null ? m_ButtonInfo
+            : Manager.GetNestedElement<SelectionButton>(LABEL_SBN_INFO);
+
         private const string LABEL_SBN_REGULATION = "Header/ButtonRegulation";
         private SelectionButton m_ButtonRegulation;
         private SelectionButton ButtonRegulation =>
@@ -151,7 +157,8 @@ namespace MDPro3.UI.ServantUI
         {
             None = 0,
             Detail = 1,
-            Pool = 2
+            Pool = 2,
+            Genesys = 3
         }
         public static CardInfoType cardInfoType = CardInfoType.None;
 
@@ -719,9 +726,6 @@ namespace MDPro3.UI.ServantUI
 
         #endregion
 
-
-
-
         #region Header
 
         private void InitializeHeader()
@@ -741,7 +745,7 @@ namespace MDPro3.UI.ServantUI
 
         public void SetCardInfoType()
         {
-            var type = (CardInfoType)(((int)cardInfoType + 1) % 3);
+            var type = (CardInfoType)(((int)cardInfoType + 1) % 4);
             SetCardInfoType(type);
             SelectionButton_CardInfoType.instance.SetCardInfoTypeIcon(type);
         }
@@ -761,10 +765,14 @@ namespace MDPro3.UI.ServantUI
                 case CardInfoType.Pool:
                     MessageManager.Toast(InterString.Get("切换到归属显示"));
                     break;
+                case CardInfoType.Genesys:
+                    MessageManager.Toast(InterString.Get("切换到Genesys积分显示"));
+                    break;
             }
 
             DeckView.SetCardInfoType(type);
             CardCollectionView.SetCardInfoType(type);
+
         }
 
         private void RefreshRegulationIcons()

Assets/Scripts/MDPro3/UI/UIExtensions/ClampedContentSizeFitter.cs

+using UnityEditor.UI;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace MDPro3.UI
+{
+    public class ClampedContentSizeFitter : ContentSizeFitter
+    {
+        [SerializeField] private float m_MaxWidth = -1f;
+        public float maxWidth { get => m_MaxWidth; set => m_MaxWidth = value; }
+
+        [SerializeField] private float m_MinWidth = 0f;
+        public float minWidth { get => m_MinWidth; set => m_MinWidth = value; }
+
+        private DrivenRectTransformTracker m_Tracker;
+        private RectTransform m_Rect;
+        private RectTransform RectTransform => m_Rect ??= GetComponent<RectTransform>();
+
+        protected override void OnEnable()
+        {
+            base.OnEnable();
+            SetDirty();
+        }
+
+        protected override void OnDisable()
+        {
+            m_Tracker.Clear();
+            base.OnDisable();
+        }
+
+        public override void SetLayoutHorizontal()
+        {
+            m_Tracker.Clear();
+
+            if (horizontalFit == FitMode.Unconstrained)
+            {
+                m_Tracker.Add(this, RectTransform, DrivenTransformProperties.None);
+                return;
+            }
+
+            m_Tracker.Add(this, RectTransform, DrivenTransformProperties.SizeDeltaX);
+
+            // 计算原始目标宽度
+            float targetWidth = horizontalFit == FitMode.MinSize ?
+                LayoutUtility.GetMinWidth(RectTransform) :
+                LayoutUtility.GetPreferredWidth(RectTransform);
+
+            // 应用最小和最大宽度约束
+            if (m_MinWidth > 0)
+                targetWidth = Mathf.Max(targetWidth, m_MinWidth); // 确保不小于最小值
+            if (m_MaxWidth > 0)
+                targetWidth = Mathf.Min(targetWidth, m_MaxWidth); // 确保不大于最大值
+
+            RectTransform.SetSizeWithCurrentAnchors(
+                RectTransform.Axis.Horizontal,
+                targetWidth
+            );
+        }
+    }
+}
\ No newline at end of file

Assets/Scripts/MDPro3/UI/UIExtensions/ClampedContentSizeFitter.cs.meta

+fileFormatVersion: 2
+guid: 3c928ce2642c9644b8060886466e7369
\ No newline at end of file

Assets/Texture/GUI_Used/GUI_CommonCardNumBase2.png.meta

+fileFormatVersion: 2
+guid: 7a5c4c4587d49184982a93011271b877
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 2, y: 2, z: 14, w: 14}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Texture/GUI_Used/GUI_DeckEdit_Icon_InfoSwitching3.png.meta

+fileFormatVersion: 2
+guid: fd60d01041982c8428e0055b98c21437
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Texture/SpriteAtlas.spriteatlas

@@ -66,6 +66,7 @@ SpriteAtlas:
     - 02a9fa006db2d704a88e5625e0c7742f: 21300000
     - 212f3c00a7fa5024e8835b82c72db58a: 21300000
     - 7b76ce0056763d14c9097b50c9d4b138: 21300000
+    - fd60d01041982c8428e0055b98c21437: 21300000
     - a550611052e33f14ca86edd376fb9be3: 21300000
     - 660ef11066558a94f9749236687c37d3: 21300000
     - ba4724101d99f484d82b1e92a16791b8: 21300000
@@ -299,6 +300,7 @@ SpriteAtlas:
     - 9b5e0735b7fc0bf478bc70a055fea1c7: 21300000
     - c4dc57352ad56b34dbec17a57ccbadd2: 21300000
     - e466974582869b545afa5ad4f03b5d17: 21300000
+    - 7a5c4c4587d49184982a93011271b877: 21300000
     - dfa2b0552469cf0438ccbce71ee3a965: 21300000
     - 172bb355f7da22f488dc0791ae5eeafc: 21300000
     - f3a0375556492314e8e0b0c6c1ff51f4: 21300000
@@ -795,6 +797,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 02a9fa006db2d704a88e5625e0c7742f, type: 3}
   - {fileID: 21300000, guid: 212f3c00a7fa5024e8835b82c72db58a, type: 3}
   - {fileID: 21300000, guid: 7b76ce0056763d14c9097b50c9d4b138, type: 3}
+  - {fileID: 21300000, guid: fd60d01041982c8428e0055b98c21437, type: 3}
   - {fileID: 21300000, guid: a550611052e33f14ca86edd376fb9be3, type: 3}
   - {fileID: 21300000, guid: 660ef11066558a94f9749236687c37d3, type: 3}
   - {fileID: 21300000, guid: ba4724101d99f484d82b1e92a16791b8, type: 3}
@@ -1028,6 +1031,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 9b5e0735b7fc0bf478bc70a055fea1c7, type: 3}
   - {fileID: 21300000, guid: c4dc57352ad56b34dbec17a57ccbadd2, type: 3}
   - {fileID: 21300000, guid: e466974582869b545afa5ad4f03b5d17, type: 3}
+  - {fileID: 21300000, guid: 7a5c4c4587d49184982a93011271b877, type: 3}
   - {fileID: 21300000, guid: dfa2b0552469cf0438ccbce71ee3a965, type: 3}
   - {fileID: 21300000, guid: 172bb355f7da22f488dc0791ae5eeafc, type: 3}
   - {fileID: 21300000, guid: f3a0375556492314e8e0b0c6c1ff51f4, type: 3}
@@ -1523,6 +1527,7 @@ SpriteAtlas:
   - GUI_Attack_Arrow
   - button006_PlayStation
   - GUI_DeckEdit_Icon_InfoSwitching1
+  - GUI_DeckEdit_Icon_InfoSwitching3
   - GUI_T_DuelButtonActIcon09_3
   - GUI_Log_Summon
   - GUI_T_Icon1_Counter_YOSEN
@@ -1756,6 +1761,7 @@ SpriteAtlas:
   - GUI_T_Icon1_State07
   - GUI_T_Icon1_Type13
   - GUI_T_Icon1_Type04
+  - GUI_CommonCardNumBase2
   - GUI_DeckEdit_CardActionMenu_IconCardRelated
   - GUI_DeckEdit_CardActionMenu_IconFavorite
   - GUI_T_Icon1_Attr06_Ruby