Merge branch 'patch' into 'master'

Patch

See merge request !29

Assets/Scripts/MDPro3/Servant/OnlineServant.cs

@@ -235,26 +235,42 @@ namespace MDPro3.Servant
 
         private IEnumerator RefreshMyCardAssets()
         {
+            var onlineUI = GetUI<OnlineServantUI>();
+            if (onlineUI == null || onlineUI.PageMyCard == null || onlineUI.PageMyCard.UserProfile == null)
+                yield break;
+
+            var userProfile = onlineUI.PageMyCard.UserProfile;
+
             var task = MyCard.GetExp();
             while (!task.IsCompleted)
                 yield return null;
 
-            GetUI<OnlineServantUI>().PageMyCard.UserProfile.SetProfile(task.Result);
+            MyCardUserExp expData = null;
+            if (!task.IsCanceled && task.Exception == null)
+                expData = task.Result;
+            userProfile.SetProfile(expData);
 
             while (!Appearance.loaded)
                 yield return null;
-            GetUI<OnlineServantUI>().PageMyCard.UserProfile.Avatar.material = Appearance.duelFrameMat0;
+            if (userProfile.Avatar != null)
+                userProfile.Avatar.material = Appearance.duelFrameMat0;
 
             if (MyCard.avatar == null)
             {
-                var avatarTask = Tools.DownloadImageAsync(MyCard.account.user.avatar);
+                var avatarAddress = MyCard.account?.user?.avatar;
+                if (!string.IsNullOrEmpty(avatarAddress))
+                {
+                    var avatarTask = Tools.DownloadImageAsync(avatarAddress);
                     while (!avatarTask.IsCompleted)
                         yield return null;
                     MyCard.avatar = avatarTask.Result;
-                GetUI<OnlineServantUI>().PageMyCard.UserProfile.Avatar.texture = MyCard.avatar;
                 }
+            }
+
+            if (userProfile.Avatar != null && MyCard.avatar != null)
+                userProfile.Avatar.texture = MyCard.avatar;
 
-            GetUI<OnlineServantUI>().PageMyCard.ActivePageFunction();
+            onlineUI.PageMyCard.ActivePageFunction();
         }
 
         private void RefreshDeckSelector()

Assets/Scripts/MDPro3/UI/Function/UserProfile.cs

@@ -111,22 +111,58 @@ namespace MDPro3.UI
 
         public void SetProfile(MyCardUserExp data)
         {
-            TextUserName.text = MyCard.account.user.name;
-
-            TextExpValue.text = data.exp.ToString();
-            TextDPValue.text = data.pt.ToString();
-            TextAthleticWinValue.text = data.athletic_win.ToString();
-            TextAthleticWinRatioValue.text = data.athletic_wl_ratio + "%";
-            TextAthleticRankValue.text = data.arena_rank.ToString();
-            TextEntertainCountValue.text = data.entertain_all.ToString();
-            TextEntertainRankValue.text = data.exp_rank.ToString();
-
-            var rankSprites = TextureManager.container.GetRankSprites(data.pt);
-            IconBG.sprite = rankSprites[0];
-            IconRank.sprite = rankSprites[1];
-            IconTier1.sprite = rankSprites[2];
-            IconTier2.sprite = rankSprites[3];
-            IconTier3.sprite = rankSprites[4];
+            if (data == null)
+                return;
+
+            var userInfo = MyCard.account?.user;
+            var userName = userInfo?.name;
+            if (string.IsNullOrEmpty(userName))
+                userName = userInfo?.username ?? string.Empty;
+
+            var textUserName = TextUserName;
+            if (textUserName != null)
+                textUserName.text = userName;
+            var textExpValue = TextExpValue;
+            if (textExpValue != null)
+                textExpValue.text = data.exp.ToString();
+            var textDPValue = TextDPValue;
+            if (textDPValue != null)
+                textDPValue.text = data.pt.ToString();
+            var textAthleticWinValue = TextAthleticWinValue;
+            if (textAthleticWinValue != null)
+                textAthleticWinValue.text = data.athletic_win.ToString();
+            var textAthleticWinRatioValue = TextAthleticWinRatioValue;
+            if (textAthleticWinRatioValue != null)
+                textAthleticWinRatioValue.text = data.athletic_wl_ratio + "%";
+            var textAthleticRankValue = TextAthleticRankValue;
+            if (textAthleticRankValue != null)
+                textAthleticRankValue.text = data.arena_rank.ToString();
+            var textEntertainCountValue = TextEntertainCountValue;
+            if (textEntertainCountValue != null)
+                textEntertainCountValue.text = data.entertain_all.ToString();
+            var textEntertainRankValue = TextEntertainRankValue;
+            if (textEntertainRankValue != null)
+                textEntertainRankValue.text = data.exp_rank.ToString();
+
+            var rankSprites = TextureManager.container?.GetRankSprites(data.pt);
+            if (rankSprites == null || rankSprites.Count < 5)
+                return;
+
+            var iconBG = IconBG;
+            if (iconBG != null)
+                iconBG.sprite = rankSprites[0];
+            var iconRank = IconRank;
+            if (iconRank != null)
+                iconRank.sprite = rankSprites[1];
+            var iconTier1 = IconTier1;
+            if (iconTier1 != null)
+                iconTier1.sprite = rankSprites[2];
+            var iconTier2 = IconTier2;
+            if (iconTier2 != null)
+                iconTier2.sprite = rankSprites[3];
+            var iconTier3 = IconTier3;
+            if (iconTier3 != null)
+                iconTier3.sprite = rankSprites[4];
         }
     }
 }

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

@@ -2,6 +2,7 @@ using Cysharp.Threading.Tasks;
 using DG.Tweening;
 using MDPro3.Duel.YGOSharp;
 using MDPro3.Utility;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -101,8 +102,7 @@ namespace MDPro3.UI
         protected override void OnDisable()
         {
             base.OnDisable();
-            cts?.Cancel();
-            cts?.Dispose();
+            DisposeRefreshCts();
         }
 
         public void SetConfigDeck(string hint)
@@ -147,9 +147,15 @@ namespace MDPro3.UI
         {
             refreshed = false;
 
-            cts = new();
-            await UniTask.WaitUntil(() => Items.initialized, cancellationToken : cts.Token);
-            await UniTask.WaitWhile(() => TextureManager.container == null, cancellationToken: cts.Token);
+            DisposeRefreshCts();
+            var refreshCts = new CancellationTokenSource();
+            cts = refreshCts;
+            var token = refreshCts.Token;
+
+            try
+            {
+                await UniTask.WaitUntil(() => Items.initialized, cancellationToken: token);
+                await UniTask.WaitWhile(() => TextureManager.container == null, cancellationToken: token);
 
                 ImageDeck.color = Color.clear;
                 ImageCard0.color =Color.clear;
@@ -162,7 +168,7 @@ namespace MDPro3.UI
                 if (card0 == 0)
                 {
                     ImageCard0.texture = null;
-                ImageCard0.material = await ABLoader.LoadProtectorMaterial(protector.ToString(), cts.Token);
+                    ImageCard0.material = await ABLoader.LoadProtectorMaterial(protector.ToString(), token);
                 }
                 else
                 {
@@ -174,7 +180,7 @@ namespace MDPro3.UI
                 if (card1 == 0)
                 {
                     ImageCard1.texture = null;
-                ImageCard1.material = await ABLoader.LoadProtectorMaterial(protector.ToString(), cts.Token);
+                    ImageCard1.material = await ABLoader.LoadProtectorMaterial(protector.ToString(), token);
                 }
                 else
                 {
@@ -186,7 +192,7 @@ namespace MDPro3.UI
                 if (card2 == 0)
                 {
                     ImageCard2.texture = null;
-                ImageCard2.material = await ABLoader.LoadProtectorMaterial(protector.ToString(), cts.Token);
+                    ImageCard2.material = await ABLoader.LoadProtectorMaterial(protector.ToString(), token);
                 }
                 else
                 {
@@ -197,6 +203,49 @@ namespace MDPro3.UI
 
                 refreshed = true;
             }
+            catch (OperationCanceledException)
+            {
+            }
+            finally
+            {
+                if (ReferenceEquals(cts, refreshCts))
+                {
+                    cts = null;
+                    try
+                    {
+                        refreshCts.Dispose();
+                    }
+                    catch (ObjectDisposedException)
+                    {
+                    }
+                }
+            }
+        }
+
+        private void DisposeRefreshCts()
+        {
+            var refreshCts = cts;
+            if (refreshCts == null)
+                return;
+
+            cts = null;
+
+            try
+            {
+                refreshCts.Cancel();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+
+            try
+            {
+                refreshCts.Dispose();
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
 
         protected override void CallHoverOnEvent()
         {

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

@@ -65,10 +65,7 @@ namespace MDPro3.UI
             {
                 if(InputField.isFocused) 
                 {
-                    if (int.TryParse(InputField.text, out int num))
-                    {
-                        InputField.text = (num + upNum).ToString();
-                    }
+                    TryAdjustFocusedIntegerValue(upNum);
                     return;
                 }
                 else if (navigationEvent.onUpNavigation.GetPersistentEventCount() > 0)
@@ -81,10 +78,7 @@ namespace MDPro3.UI
             {
                 if (InputField.isFocused)
                 {
-                    if (int.TryParse(InputField.text, out int num))
-                    {
-                        InputField.text = (num - upNum).ToString();
-                    }
+                    TryAdjustFocusedIntegerValue(-upNum);
                     return;
                 }
                 else if (navigationEvent.onDownNavigation.GetPersistentEventCount() > 0)
@@ -97,10 +91,7 @@ namespace MDPro3.UI
             {
                 if (InputField.isFocused)
                 {
-                    if (int.TryParse(InputField.text, out int num))
-                    {
-                        InputField.text = (num - rightNum).ToString();
-                    }
+                    TryAdjustFocusedIntegerValue(-rightNum);
                     return;
                 }
                 else if (navigationEvent.onLeftNavigation.GetPersistentEventCount() > 0)
@@ -113,10 +104,7 @@ namespace MDPro3.UI
             {
                 if (InputField.isFocused)
                 {
-                    if (int.TryParse(InputField.text, out int num))
-                    {
-                        InputField.text = (num + rightNum).ToString();
-                    }
+                    TryAdjustFocusedIntegerValue(rightNum);
                     return;
                 }
                 else if (navigationEvent.onRightNavigation.GetPersistentEventCount() > 0)
@@ -128,5 +116,19 @@ namespace MDPro3.UI
 
             base.OnNavigation(eventData);
         }
+
+        private void TryAdjustFocusedIntegerValue(int delta)
+        {
+            if (!AllowArrowAdjustForFocusedInput())
+                return;
+            if (int.TryParse(InputField.text, out int num))
+                InputField.text = (num + delta).ToString();
+        }
+
+        private bool AllowArrowAdjustForFocusedInput()
+        {
+            return InputField.contentType == TMP_InputField.ContentType.IntegerNumber
+                || InputField.characterValidation == TMP_InputField.CharacterValidation.Integer;
+        }
     }
 }

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

@@ -3,6 +3,8 @@ using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 using System.Collections;
+using System.Collections.Generic;
+using System.Text;
 using UnityEngine.EventSystems;
 using MDPro3.Servant;
 using MDPro3.UI.ServantUI;
@@ -25,8 +27,36 @@ namespace MDPro3.UI
         {
             base.Refresh();
 
-            Manager.GetElement<TextMeshProUGUI>("Player0Name").text = player0Name;
-            Manager.GetElement<TextMeshProUGUI>("Player1Name").text = player1Name;
+            var player0Label = Manager.GetElement<TextMeshProUGUI>("Player0Name");
+            var player1Label = Manager.GetElement<TextMeshProUGUI>("Player1Name");
+
+            if (player0Label != null)
+                player0Label.text = GetSafeDisplayName(player0Name, player0Label);
+            if (player1Label != null)
+                player1Label.text = GetSafeDisplayName(player1Name, player1Label);
+        }
+
+        private static string GetSafeDisplayName(string name, TextMeshProUGUI label)
+        {
+            if (string.IsNullOrEmpty(name))
+                return string.Empty;
+            if (label == null || label.font == null)
+                return name;
+
+            if (label.font.HasCharacters(name, out uint[] missingCharacters, true, true))
+                return name;
+
+            if (missingCharacters == null || missingCharacters.Length == 0)
+                return name;
+
+            var missingSet = new HashSet<uint>(missingCharacters);
+            var builder = new StringBuilder(name.Length);
+            for (int i = 0; i < name.Length; i++)
+            {
+                var code = name[i];
+                builder.Append(missingSet.Contains(code) ? '?' : name[i]);
+            }
+            return builder.ToString();
         }
 
         protected override async UniTask RefreshAsync()