bug fix

Assets/AddressableAssetsData/link.xml.meta

+fileFormatVersion: 2
+guid: 78900b3e3b82fdc4e929b3af45506c66
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Settings/UniversalRenderPipelineGlobalSettings.asset

@@ -36,21 +36,21 @@ MonoBehaviour:
       - rid: 5650211206403981510
       - rid: 5650211206403981511
       - rid: 5650211206403981512
-      - rid: 5798534189433487525
+      - rid: 5798534189433487584
       - rid: 5650211206403981514
       - rid: 5650211206403981515
-      - rid: 5798534189433487526
-      - rid: 5798534189433487527
+      - rid: 5798534189433487585
+      - rid: 5798534189433487586
       - rid: 5650211206403981518
-      - rid: 5798534189433487528
+      - rid: 5798534189433487587
       - rid: 5650211206403981520
-      - rid: 5798534189433487529
+      - rid: 5798534189433487588
       - rid: 5650211206403981522
-      - rid: 5798534189433487530
-      - rid: 5798534189433487531
-      - rid: 5798534189433487532
-      - rid: 5798534189433487533
-      - rid: 5798534189433487534
+      - rid: 5798534189433487589
+      - rid: 5798534189433487590
+      - rid: 5798534189433487591
+      - rid: 5798534189433487592
+      - rid: 5798534189433487593
       - rid: 5650211206403981528
       - rid: 5650211206403981529
       - rid: 5650211206403981530
@@ -159,7 +159,7 @@ MonoBehaviour:
         m_version: 0
         m_EnableCompilationCaching: 1
         m_EnableValidityChecks: 1
-    - rid: 5798534189433487525
+    - rid: 5798534189433487584
       type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_Version: 0
@@ -174,14 +174,14 @@ MonoBehaviour:
         m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
         m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
         m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
-    - rid: 5798534189433487526
+    - rid: 5798534189433487585
       type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_Version: 0
         m_StripUnusedPostProcessingVariants: 0
         m_StripUnusedVariants: 1
         m_StripScreenCoordOverrideVariants: 1
-    - rid: 5798534189433487527
+    - rid: 5798534189433487586
       type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
@@ -189,7 +189,7 @@ MonoBehaviour:
         m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
         m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
         m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
-    - rid: 5798534189433487528
+    - rid: 5798534189433487587
       type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -201,7 +201,7 @@ MonoBehaviour:
         m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
         m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
         m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
-    - rid: 5798534189433487529
+    - rid: 5798534189433487588
       type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
       data:
         m_Version: 0
@@ -214,7 +214,7 @@ MonoBehaviour:
         m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
         m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
         m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
-    - rid: 5798534189433487530
+    - rid: 5798534189433487589
       type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
@@ -225,12 +225,12 @@ MonoBehaviour:
         traceVirtualOffsetRT: {fileID: 4807578003741378534, guid: b60511f4aa1443f4d8c0b18f4fec92f4, type: 3}
         skyOcclusionCS: {fileID: 7200000, guid: 798f52ec82fa04048a12826bbbbcf7b4, type: 3}
         skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3}
-    - rid: 5798534189433487531
+    - rid: 5798534189433487590
       type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
         m_ProbeVolumeDisableStreamingAssets: 0
-    - rid: 5798534189433487532
+    - rid: 5798534189433487591
       type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
@@ -240,14 +240,14 @@ MonoBehaviour:
         probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
         probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
         numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
-    - rid: 5798534189433487533
+    - rid: 5798534189433487592
       type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_version: 0
         m_IncludeReferencedInScenes: 0
         m_IncludeAssetsByLabel: 0
         m_LabelToInclude: 
-    - rid: 5798534189433487534
+    - rid: 5798534189433487593
       type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1

Assets/Scripts/MDPro3/Helper/OnlineDeck.cs

@@ -105,7 +105,7 @@ namespace MDPro3
                 }
                 else
                 {
-                    MessageManager.Cast(InterString.Get("上传卡组「[?]」失败：", responseData.data.deckName) + InterString.Get(responseData.message));
+                    MessageManager.Cast(InterString.Get("上传卡组「[?]」失败：", responseData.data.deckName) + InterString.Get(responseData.message, responseData.messageValue));
                 }
             }
             else
@@ -139,7 +139,7 @@ namespace MDPro3
                 }
                 else
                 {
-                    MessageManager.Cast(InterString.Get("更新卡组「[?]」失败：", responseData.data.deckName) + InterString.Get(responseData.message));
+                    MessageManager.Cast(InterString.Get("更新卡组「[?]」失败：", responseData.data.deckName) + InterString.Get(responseData.message, responseData.messageValue));
                 }
             }
             else
@@ -203,7 +203,7 @@ namespace MDPro3
                 if (responseData.code == 0)
                     MessageManager.Cast(InterString.Get("点赞卡组成功。"));
                 else
-                    MessageManager.Cast(InterString.Get("点赞卡组失败：") + InterString.Get(responseData.message));
+                    MessageManager.Cast(InterString.Get("点赞卡组失败：") + InterString.Get(responseData.message, responseData.messageValue));
             }
             else
                 MessageManager.Cast(InterString.Get("点赞卡组失败：") + request.error);
@@ -244,6 +244,7 @@ namespace MDPro3
         {
             public int code = 0;
             public string message = string.Empty;
+            public string messageValue = string.Empty;
             public OnlineDeckData data;
         }
 
@@ -252,6 +253,7 @@ namespace MDPro3
         {
             public int code = 0;
             public string message = string.Empty;
+            public string messageValue = string.Empty;
             public ResponseRecords data;
         }
 
@@ -260,6 +262,7 @@ namespace MDPro3
         {
             public int code = 0;
             public string message = string.Empty;
+            public string messageValue = string.Empty;
             public OnlineDeckData[] data;
         }
 

Assets/Scripts/MDPro3/Managers/MessageManager.cs

@@ -77,10 +77,25 @@ namespace MDPro3
             });
         }
 
+        static List<string> cachedMessage = new List<string>();
+
         public static void Cast(string message)
         {
-            if (items.Count > 10 || Program.I().message_.messageItem == null)
+            if (items.Count > 10)
+                return;
+            if (Program.I().message_.messageItem == null)
+            {
+                cachedMessage.Add(message);
                 return;
+            }
+
+            if(cachedMessage.Count > 0)
+            {
+                var ms = new List<string>(cachedMessage);
+                cachedMessage.Clear();
+                foreach(var m in ms)
+                    Cast(m);
+            }
 
             CameraManager.UIBlurPlus();
             var item = Instantiate(Program.I().message_.messageItem);

Assets/Scripts/MDPro3/Program.cs

@@ -125,7 +125,7 @@ namespace MDPro3
             //    "-p",
             //    "888",
             //    "-w",
-            //    "AI",
+            //    "M#1008611",
             //    "-j"
             //};
 
@@ -151,24 +151,13 @@ namespace MDPro3
                 if (args[i].ToLower() == "-p" && args.Length > i + 1) 
                     port = args[++i];
                 if (args[i].ToLower() == "-w" && args.Length > i + 1)
-                {
                     password = args[++i];
-                }
-
                 if (args[i].ToLower() == "-d" && args.Length > i + 1)
-                {
                     deck = args[++i];
-                }
-
                 if (args[i].ToLower() == "-r" && args.Length > i + 1)
-                {
                     replay = args[++i];
-                }
-
                 if (args[i].ToLower() == "-s" && args.Length > i + 1)
-                {
                     puzzle = args[++i];
-                }
 
                 if (args[i].ToLower() == "-j")
                 {
@@ -180,7 +169,6 @@ namespace MDPro3
 
             if (join)
             {
-                //ShiftToServant(online);
                 online.KF_OnlineGame(nick, host, port, password);
                 exitOnReturn = true;
             }

Assets/Scripts/MDPro3/Servants/EditDeck.cs

@@ -1683,6 +1683,14 @@ namespace MDPro3
 
         void ScrollViewInstall()
         {
+            StartCoroutine(ScrollViewInstallAsync());
+        }
+
+        IEnumerator ScrollViewInstallAsync()
+        {
+            while(itemOnList == null)
+                yield return null;
+
             superScrollView?.Clear();
 
             var defau = 1000f;
@@ -1719,6 +1727,9 @@ namespace MDPro3
 
         void PrintCards(List<int> codes)
         {
+            if (superScrollView == null)
+                return;
+
             var args = new List<string[]>();
             for (int i = 0; i < codes.Count; i++)
             {

Assets/Scripts/MDPro3/Servants/OcgCore.cs

@@ -1437,6 +1437,7 @@ namespace MDPro3
         private int Es_selectMSGHintType;
         private List<int> ES_searchCodes = new List<int>();
         private string ES_selectUnselectHint = "";
+        private bool ES_selectCardFromFieldFirstFlag = false;
         private int ES_sortSum;
         private string ES_turnString = "";
 
@@ -4701,6 +4702,8 @@ namespace MDPro3
                             data = (data >> 16) | (data << 16);
                         PrintDuelLog(InterString.Get("区域选择：[?]", StringHelper.Zone(data)));
                     }
+                    ES_selectCardFromFieldFirstFlag = (type == 3 && data == 575);
+
                     break;
                 case GameMessage.MissedEffect:
                     //TODO
@@ -5622,6 +5625,15 @@ namespace MDPro3
                             cardsInSelection.Add(card);
                         }
                     }
+                    if (ES_selectCardFromFieldFirstFlag && cancelable)
+                    {
+                        ES_selectCardFromFieldFirstFlag = false;
+                        binaryMaster = new BinaryMaster();
+                        binaryMaster.writer.Write(-1);
+                        SendReturn(binaryMaster.Get());
+                        break;
+                    }
+
                     if (ES_min == 1 && count == 1)
                     {
                         binaryMaster = new BinaryMaster();

Data/locales/zh-CN/translation.conf

@@ -578,3 +578,5 @@ Off->Off
 点赞卡组失败：->点赞卡组失败：
 点赞卡组成功。->点赞卡组成功。
 更新卡组错误->更新卡组错误
+上传卡组「[?]」失败：->上传卡组「[?]」失败：
+卡组或贡献者名称中包含敏感词「[?]」，不能上传->卡组或贡献者名称中包含敏感词「[?]」，不能上传