voice bug fix and new en-US voice data json

Assets/Addressables/Text/UpdateContent.txt

@@ -4,7 +4,8 @@ MDPro3 v1.1.8.2更新：
 1.语音功能新增全卡语音。
 2.修复在更改语言或卡图语言后，按卡包筛选结果始终为0的错误。
 3.新的SR效果降低了识别卡片的效率，暂时恢复原版效果。
-4.多语言翻译更新。
+4.修复安卓端分辨率设置重启后恢复默认的错误。
+5.多语言翻译更新。
 
 MDPro3 v1.1.8.1更新：
 1.修复游戏处理YGOCORE消息出错时，无限重复当前消息的错误。

Assets/Resources/Settings/UniversalRenderPipelineGlobalSettings.asset

@@ -36,21 +36,21 @@ MonoBehaviour:
       - rid: 5650211206403981510
       - rid: 5650211206403981511
       - rid: 5650211206403981512
-      - rid: 3815380325689458762
+      - rid: 3815380374186098762
       - rid: 5650211206403981514
       - rid: 5650211206403981515
-      - rid: 3815380325689458763
-      - rid: 3815380325689458764
+      - rid: 3815380374186098763
+      - rid: 3815380374186098764
       - rid: 5650211206403981518
-      - rid: 3815380325689458765
+      - rid: 3815380374186098765
       - rid: 5650211206403981520
-      - rid: 3815380325689458766
+      - rid: 3815380374186098766
       - rid: 5650211206403981522
-      - rid: 3815380325689458767
-      - rid: 3815380325689458768
-      - rid: 3815380325689458769
-      - rid: 3815380325689458770
-      - rid: 3815380325689458771
+      - rid: 3815380374186098767
+      - rid: 3815380374186098768
+      - rid: 3815380374186098769
+      - rid: 3815380374186098770
+      - rid: 3815380374186098771
       - rid: 5650211206403981528
       - rid: 5650211206403981529
       - rid: 5650211206403981530
@@ -90,7 +90,7 @@ MonoBehaviour:
   references:
     version: 2
     RefIds:
-    - rid: 3815380325689458762
+    - rid: 3815380374186098762
       type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_Version: 0
@@ -106,14 +106,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: 3815380325689458763
+    - rid: 3815380374186098763
       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: 3815380325689458764
+    - rid: 3815380374186098764
       type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
@@ -121,7 +121,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: 3815380325689458765
+    - rid: 3815380374186098765
       type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -133,7 +133,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: 3815380325689458766
+    - rid: 3815380374186098766
       type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
       data:
         m_Version: 0
@@ -146,7 +146,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: 3815380325689458767
+    - rid: 3815380374186098767
       type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
@@ -159,12 +159,12 @@ MonoBehaviour:
         skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3}
         renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3}
         renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3}
-    - rid: 3815380325689458768
+    - rid: 3815380374186098768
       type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
         m_ProbeVolumeDisableStreamingAssets: 0
-    - rid: 3815380325689458769
+    - rid: 3815380374186098769
       type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
@@ -174,14 +174,14 @@ MonoBehaviour:
         probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
         probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
         numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
-    - rid: 3815380325689458770
+    - rid: 3815380374186098770
       type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_version: 0
         m_IncludeReferencedInScenes: 0
         m_IncludeAssetsByLabel: 0
         m_LabelToInclude: 
-    - rid: 3815380325689458771
+    - rid: 3815380374186098771
       type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1

Assets/Scripts/MDPro3/Helper/Cid2Ydk.cs

@@ -58,7 +58,7 @@ namespace MDPro3
             if(card.Alias != 0)
                 ydk = card.Alias;
             foreach(var value in dic.Values)
-                if(value.id == ydk)
+                if(value.id == ydk || value.id == card.Id)
                     return value.cid;
             return ydk;
         }

Assets/Scripts/MDPro3/Helper/VoiceHelper.cs

 using System;
 using System.IO;
+using System.Linq;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using UnityEngine;
 using MDPro3.YGOSharp.OCGWrapper.Enums;
 using MDPro3.YGOSharp;
 using static MDPro3.VoiceController;
-using System.Linq;
-using static UnityEngine.EventSystems.EventTrigger;
-using System.Threading;
-using static YgomGame.Duel.Engine;
 
 namespace MDPro3
 {
@@ -373,15 +370,15 @@ namespace MDPro3
                             subCategory = (int)SummonSub.Normal;
 
                             isMe = from.controller == 0;
-                            returnValue.Add(GetBeforeSummonData(isMe ? heroVoices : rivalVoices, isMe));
-
                             target = isMe ? heroVoices : rivalVoices;
                             data = GetVoiceByCard(isMe ? heroVoices : rivalVoices, target.MainMonsterSummon, code, 0, isMe);
-                            if(data.name != string.Empty)
+                            if (data.name != string.Empty)
                             {
                                 returnValue.Add(data);
                                 break;
                             }
+
+                            returnValue.Add(GetBeforeSummonData(target, isMe));
                         }
 
                         if ((GameMessage)nextPack.Function == GameMessage.SpSummoning)
@@ -471,13 +468,13 @@ namespace MDPro3
                             gps = nextPack.Data.reader.ReadGPS();
 
                             target = gps.controller == 0 ? heroVoices : rivalVoices;
-                            data = GetVoiceByCard(gps.controller == 0 ? heroVoices : rivalVoices, target.MainMonsterEffect, code, 0, gps.controller == 0);
+                            data = GetVoiceByCard(target, target.MainMonsterEffect, code, 0, gps.controller == 0);
                             if (data.name != string.Empty)
                             {
                                 returnValue.Add(data);
                                 break;
                             }
-                            data = GetVoiceByCard(gps.controller == 0 ? heroVoices : rivalVoices, target.MainMagicTrap, code, 0, gps.controller == 0);
+                            data = GetVoiceByCard(target, target.MainMagicTrap, code, 0, gps.controller == 0);
                             if (data.name != string.Empty)
                             {
                                 returnValue.Add(data);
@@ -542,28 +539,28 @@ namespace MDPro3
                         if (NeedBeforeCardEffect(simple.isMe))
                             returnValue.Add(GetBeforeCardEffectData(target, simple.isMe));
 
-                        if (simple.inHand)
+                        data = GetVoiceByCard(target, target.MainMonsterEffect, code, 0, simple.isMe);
+                        if (data.name != string.Empty)
                         {
-                            data = new VoiceData();
-                            data.name = GetVoiceBySubCategory(target.CardEffect, (int)CardEffectSub.FromHand, (int)CardEffectSub.FromHand, 0);
-                            data.num = GetVoiceNum(target, data.name);
-                            data.me = simple.isMe;
-                            data.wait = true;
-                            data.delay = 0f;
                             returnValue.Add(data);
+                            break;
                         }
-
-                        data2 = GetVoiceByCard(simple.isMe ? heroVoices : rivalVoices, target.MainMonsterEffect, code, 0, gps.controller == 0);
-                        if (data2.name != string.Empty)
+                        data = GetVoiceByCard(target, target.MainMagicTrap, code, 0, simple.isMe);
+                        if (data.name != string.Empty)
                         {
-                            returnValue.Add(data2);
+                            returnValue.Add(data);
                             break;
                         }
-                        data2 = GetVoiceByCard(simple.isMe ? heroVoices : rivalVoices, target.MainMagicTrap, code, 0, simple.isMe);
-                        if (data2.name != string.Empty)
+
+                        if (simple.inHand)
                         {
+                            data2 = new VoiceData();
+                            data2.name = GetVoiceBySubCategory(target.CardEffect, (int)CardEffectSub.FromHand, (int)CardEffectSub.FromHand, 0);
+                            data2.num = GetVoiceNum(target, data2.name);
+                            data2.me = simple.isMe;
+                            data2.wait = true;
+                            data2.delay = 0f;
                             returnValue.Add(data2);
-                            break;
                         }
 
                         data3 = new VoiceData();
@@ -996,12 +993,14 @@ namespace MDPro3
                 if (value.cards == null)
                     continue;
                 if (value.cards.Contains(cid))
-                    tempStrings.Add(value.shortName);
-                if (value.engineparams != null && value.engineparams.Contains(engineparam))
                 {
-                    tempStrings.Clear();
                     tempStrings.Add(value.shortName);
-                    break;
+                    if (value.engineparams != null && value.engineparams.Contains(engineparam))
+                    {
+                        tempStrings.Clear();
+                        tempStrings.Add(value.shortName);
+                        break;
+                    }
                 }
             }
             if(tempStrings.Count > 0)

Data/locales/en-US/voice/SN0018.json

+{
+    "_GRP_": "SN0018",
+    "_LNG_": "en-US",
+    "info": {}
+}
\ No newline at end of file

Data/locales/en-US/voice/SN0035.json

+{
+    "_GRP_": "SN0035",
+    "_LNG_": "en-US",
+    "info": {}
+}
\ No newline at end of file

Data/locales/en-US/voice/SN0132.json

+{
+    "_GRP_": "SN0132",
+    "_LNG_": "en-US",
+    "info": {}
+}
\ No newline at end of file

Data/locales/en-US/voice/SN0134.json

+{
+    "_GRP_": "SN0134",
+    "_LNG_": "en-US",
+    "info": {}
+}
\ No newline at end of file

Data/locales/en-US/voice/SN0135.json

+{
+    "_GRP_": "SN0135",
+    "_LNG_": "en-US",
+    "info": {}
+}
\ No newline at end of file