Avoid unnecessary appearance asset reloads

Reduce redundant reloading of appearance assets and simplify loading logic. DuelBGManager now only reloads appearance assets for puzzles or non-duel conditions. OnlineServant no longer forces a reload when returning to the lobby. RoomServant reloads except returning from deck selector. Appearance.LoadSettingAssets was simplified.

Assets/Scripts/MDPro3/Duel/BG/DuelBGManager.cs

@@ -139,9 +139,8 @@ namespace MDPro3.Duel
             UIManager.UIBlackIn(Core.TransitionTime);
             await UniTask.WaitForSeconds(Core.TransitionTime);
             await UniTask.WaitUntil(() => Appearance.loaded);
-            // Rebuild appearance assets on each match load so random selections
-            // (icon / frame / protector) are re-rolled per duel.
-            await Program.instance.appearance.LoadSettingAssets();
+            if(inPuzzle || condition != Condition.Duel)
+                await Program.instance.appearance.LoadSettingAssets();
             await ABLoader.CacheMasterDuelBundles();
             Program.instance.ocgcore.LoadDuelButton();
 

Assets/Scripts/MDPro3/Servant/Appearance.cs

@@ -76,8 +76,6 @@ namespace MDPro3.Servant
         #endregion
 
         private const string FaceFrameMaterialCode = "1030001";
-        private static readonly object loadSettingAssetsLock = new();
-        private static Task loadSettingAssetsTask;
 
         public enum Condition
         {
@@ -187,19 +185,9 @@ namespace MDPro3.Servant
         public static bool loaded;
         public async UniTask LoadSettingAssets()
         {
-            Task taskToAwait;
-            lock (loadSettingAssetsLock)
-            {
-                if (loadSettingAssetsTask == null || loadSettingAssetsTask.IsCompleted)
-                {
-                    loaded = false;
-                    loadSettingAssetsTask = LoadSettingAssetsCore().AsTask();
-                }
-
-                taskToAwait = loadSettingAssetsTask;
-            }
-
-            await taskToAwait;
+            if (!loaded && matForFace != null) return;
+            loaded = false;
+            await LoadSettingAssetsCore();
         }
 
         private static void ApplyFrameTexture(Material material, Sprite sprite)

Assets/Scripts/MDPro3/Servant/OnlineServant.cs

@@ -51,8 +51,6 @@ namespace MDPro3.Servant
             if (servantUI != null)
                 RefreshDeckSelector();
 
-            // Re-roll random duel icon/frame/protector whenever returning to lobby.
-            _ = Program.instance.appearance.LoadSettingAssets();
             StartCoroutine(RefreshMyCardAssets());
         }
 

Assets/Scripts/MDPro3/Servant/RoomServant.cs

@@ -35,11 +35,12 @@ namespace MDPro3.Servant
         public static bool NeedSide;
         public static bool JoinWithReconnect;
         public static bool SideWaitingObserver;
-        public static bool FromSolo;
         public static bool SoloLockHand;
+        public static int CoreShowing = 0;
+
+        public static bool FromSolo;
         public static bool FromLocalHost;
         public static bool FromHandTest;
-        public static int CoreShowing = 0;
 
         public class Player
         {
@@ -68,8 +69,8 @@ namespace MDPro3.Servant
             CoreShowing = 0;
             Program.instance.ui_.chatPanel.Show(false);
             OcgCore.handler = Handler;
-            // Re-roll random duel/watch icon & frame whenever entering a room.
-            _ = Program.instance.appearance.LoadSettingAssets();
+            if(preDepth != Program.instance.deckSelector.Depth)
+                _ = Program.instance.appearance.LoadSettingAssets();
             GetUI<RoomServantUI>().RefreshDeckSelector();
         }