new ygo assets and ocgcore wrapper update

Assets/AddressableAssetsData/link.xml.meta

+fileFormatVersion: 2
+guid: 43bcb09370d98bf418d3b4b4fc18e08e
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Addressables/Text/UpdateContent.txt

@@ -8,6 +8,7 @@ MDPro3 v1.3.1更新：
 5.修复安卓端和Linux端中，外观设置中CrossDuel的宠物选项不显示图标的错误。
 6.修复游戏启动后不同步在线卡组的错误。
 7.修复观战时，若服务器已经断连，保存或放弃当前局录像后会直接退出，无法继续观战下一局的错误。
+8.修复在部分残局中，决斗无法进行的错误。
 
 MDPro3 v1.3.0更新：
 0.本次更新跳过了v1.2.8版本，仅提供完整包安装。

Assets/Resources/Settings/URPAsset.asset

@@ -26,7 +26,7 @@ MonoBehaviour:
   m_SupportsHDR: 1
   m_HDRColorBufferPrecision: 0
   m_MSAA: 1
-  m_RenderScale: 0.92
+  m_RenderScale: 0.929
   m_UpscalingFilter: 3
   m_FsrOverrideSharpness: 0
   m_FsrSharpness: 0.92

Assets/Resources/Settings/UniversalRenderPipelineGlobalSettings.asset

@@ -36,21 +36,21 @@ MonoBehaviour:
       - rid: 5650211206403981510
       - rid: 5650211206403981511
       - rid: 5650211206403981512
-      - rid: 344413244449620118
+      - rid: 3374009793184006217
       - rid: 5650211206403981514
       - rid: 5650211206403981515
-      - rid: 344413244449620119
-      - rid: 344413244449620120
+      - rid: 3374009793184006218
+      - rid: 3374009793184006219
       - rid: 5650211206403981518
-      - rid: 344413244449620121
+      - rid: 3374009793184006220
       - rid: 5650211206403981520
-      - rid: 344413244449620122
-      - rid: 344413244449620123
-      - rid: 344413244449620124
-      - rid: 344413244449620125
-      - rid: 344413244449620126
-      - rid: 344413244449620127
-      - rid: 344413244449620128
+      - rid: 3374009793184006221
+      - rid: 3374009793184006222
+      - rid: 3374009793184006223
+      - rid: 3374009793184006224
+      - rid: 3374009793184006225
+      - rid: 3374009793184006226
+      - rid: 3374009793184006227
       - rid: 5650211206403981528
       - rid: 5650211206403981529
       - rid: 5650211206403981530
@@ -96,7 +96,7 @@ MonoBehaviour:
       type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
-    - rid: 344413244449620118
+    - rid: 3374009793184006217
       type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_Version: 0
@@ -111,14 +111,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: 344413244449620119
+    - rid: 3374009793184006218
       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: 344413244449620120
+    - rid: 3374009793184006219
       type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
@@ -126,7 +126,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: 344413244449620121
+    - rid: 3374009793184006220
       type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -138,7 +138,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: 344413244449620122
+    - rid: 3374009793184006221
       type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
       data:
         m_Version: 0
@@ -151,13 +151,13 @@ 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: 344413244449620123
+    - rid: 3374009793184006222
       type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
         m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
         m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
-    - rid: 344413244449620124
+    - rid: 3374009793184006223
       type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
@@ -170,12 +170,12 @@ MonoBehaviour:
         skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
         renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
         renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
-    - rid: 344413244449620125
+    - rid: 3374009793184006224
       type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
         m_ProbeVolumeDisableStreamingAssets: 0
-    - rid: 344413244449620126
+    - rid: 3374009793184006225
       type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
@@ -185,14 +185,14 @@ MonoBehaviour:
         probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
         probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
         numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
-    - rid: 344413244449620127
+    - rid: 3374009793184006226
       type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_version: 0
         m_IncludeReferencedInScenes: 0
         m_IncludeAssetsByLabel: 0
         m_LabelToInclude: 
-    - rid: 344413244449620128
+    - rid: 3374009793184006227
       type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1

Assets/Scripts/MDPro3/Duel/CoreWrapper.cs

 using MDPro3.Net;
+using MDPro3.Servant;
 using Meisui.Random;
 using System;
 using System.Collections.Generic;
@@ -400,7 +401,7 @@ namespace Percy
         private readonly ChatHandler cast;
         public Action<string> m_log;
 
-        private readonly IntPtr _buffer = Marshal.AllocHGlobal(4096);
+        private readonly IntPtr _buffer = Marshal.AllocHGlobal(0x2000);
         private IntPtr duel;
         private Action<byte[]> sendToPlayer;
         private bool godMode;
@@ -750,11 +751,11 @@ namespace Percy
                     Move(1);
                     count = Move(1);
                     Move(1);
-                    Move(1);
                     Move(4);
                     Move(4);
                     for (var i = 0; i < count; i++)
                     {
+                        Move(1);
                         Move(1);
                         Move(4);
                         Move(4);
@@ -791,6 +792,7 @@ namespace Percy
                     Move(Move(1) * 7);
                     break;
                 case GameMessage.ConfirmCards:
+                    Move(1);
                     Move(1);
                     Move(Move(1) * 7);
                     break;
@@ -1252,14 +1254,15 @@ namespace Percy
             if (yrp.ID == 0x32707279) // REPLAY_ID_YRP2
             {
                 duel = Dll.create_duel_v2(yrp.SeedsV2);
+                OcgCore.CurrentReplayUseYRP2 = true;
             }
             else
             {
                 var mtrnd = new MersenneTwister(yrp.Seed);
                 duel = Dll.create_duel(mtrnd.genrand_Int32());
+                OcgCore.CurrentReplayUseYRP2 = false;
             }
 
-
             godMode = true;
             isFirst = true;
             Dll.set_player_info(duel, 0, yrp.StartLp, yrp.StartHand, yrp.DrawCount);

Assets/Scripts/MDPro3/Duel/DuelLog.cs

@@ -483,6 +483,7 @@ namespace MDPro3.Duel
                     break;
                 case GameMessage.ConfirmCards:
                     player = core.LocalPlayer(r.ReadByte());
+                    r.ReadByte();
                     count = r.ReadByte();
                     for (int i = 0; i < count; i++)
                     {

Assets/Scripts/MDPro3/Duel/GameCard.cs

@@ -29,6 +29,7 @@ namespace MDPro3
         public string desc;
         public int flag;
         public int ptr;
+        public bool forced;
     }
 
     public class GameCard : MonoBehaviour

Assets/Scripts/MDPro3/Duel/TcpHelper.cs

@@ -29,8 +29,6 @@ namespace MDPro3
         static Thread senderThread;
         static Thread linkThread;
 
-        public static int version = 0x1361;
-
         public static string joinedAddress;
         public static string joinedPort;
         public static string joinedPassword;
@@ -91,6 +89,7 @@ namespace MDPro3
                 t.Start();
                 messageQueue.Clear();
                 InitializeSender();
+                CtosMessage_ExternalAddress(ipString);
                 CtosMessage_PlayerInfo(name);
                 CtosMessage_JoinGame(pswString);
                 joinedAddress = ipString;
@@ -393,6 +392,15 @@ namespace MDPro3
             Send(message);
         }
 
+        public static void CtosMessage_ExternalAddress(string hostname)
+        {
+            var message = new Package();
+            message.Function = (int)CtosMessage.ExternalAddress;
+            message.Data.writer.Write((UInt32)0);
+            message.Data.writer.WriteUnicode(hostname, hostname.Length + 1);
+            Send(message);
+        }
+
         public static void CtosMessage_PlayerInfo(string name)
         {
             var message = new Package();

Assets/Scripts/MDPro3/Duel/YGOSharp/YGOSharpNetworkEnums.cs

@@ -13,6 +13,7 @@ namespace MDPro3.Duel.YGOSharp
         Surrender = 0x14,
         TimeConfirm = 0x15,
         Chat = 0x16,
+        ExternalAddress = 0x17,
         HsToDuelist = 0x20,
         HsToObserver = 0x21,
         HsReady = 0x22,

Assets/Scripts/MDPro3/Helper/Config.cs

@@ -15,7 +15,7 @@ namespace MDPro3
         public const string STRING_YES = "1";
         public const string STRING_NO = "0";
 
-        public static uint ClientVersion = 0x1361;
+        public static uint ClientVersion = 0x1362;
 
         private static readonly List<OneString> translations = new List<OneString>();
         private static string path;

Assets/Scripts/MDPro3/Managers/AudioManager.cs

@@ -188,7 +188,7 @@ namespace MDPro3
             CLIMAX
         }
 
-        private static List<string> currentBGMs;
+        private static List<string> currentBGMs = new();
         private static string currentBGM = string.Empty;
         private static int bgmState = 0;
         private static float loopStart = 0;

Assets/Scripts/MDPro3/UI/Popup/Old/PopupDuelSelectCard.cs

@@ -133,7 +133,7 @@ namespace MDPro3.UI
                 Program.instance.currentServant.returnAction = OnFinish;
         }
 
-        void Refresh()
+        private void Refresh()
         {
             if (core.currentMessage == GameMessage.SelectSum)
             {
@@ -210,7 +210,7 @@ namespace MDPro3.UI
                 mono.RemoveOrder(i);
         }
 
-        List<GameCard> GetSelected()
+        private List<GameCard> GetSelected()
         {
             var list = new List<GameCard>();
             foreach (var mono in monos)
@@ -218,7 +218,7 @@ namespace MDPro3.UI
                     list.Add(mono.card);
             return list;
         }
-        bool CheckSelectable(GameCard card, List<GameCard> addedCards = null)
+        private bool CheckSelectable(GameCard card, List<GameCard> addedCards = null)
         {
             bool returnValue = false;
 

Data/locales/en-US/strings.conf

@@ -1252,4 +1252,6 @@
 !setname 0x1cb K9
 !setname 0x1cc Teleport
 !setname 0x1cd Artmage
-!setname 0x1ce Imprisoned Deity
+!setname 0x1ce Power Patron
\ No newline at end of file
+!setname 0x1cf Koala
+!setname 0x1d2 R.B.
\ No newline at end of file

Data/locales/fr-FR/strings.conf

@@ -663,7 +663,7 @@
 !counter 0x106b Compteur Dérangé
 !counter 0x6c Compteur Accès
 !counter 0x6d Compteur Devoirs
-!counter 0x106e Compteur Jeune Fille
+!counter 0x6e Compteur Saison
 #setnames, using tab for comment
 !setname 0x1 Allié de la Justice
 !setname 0x2 Genex
@@ -1252,4 +1252,6 @@
 !setname 0x1cb K9
 !setname 0x1cc Téléporteur
 !setname 0x1cd Artmage
-!setname 0x1ce Divinité Emprisonnée
+!setname 0x1ce Mécène du Pouvoir
\ No newline at end of file
+!setname 0x1cf Koala
+!setname 0x1d2 R.B.
\ No newline at end of file

Data/locales/ge-DE/strings.conf

@@ -155,7 +155,7 @@
 !system 1012 Feuer
 !system 1013 Wind
 !system 1014 Licht
-!system 1015 Dunkelheit
+!system 1015 Finsternis
 !system 1016 Göttlich
 !system 1020 Krieger
 !system 1021 Hexer
@@ -1252,4 +1252,6 @@
 !setname 0x1cb K9
 !setname 0x1cc Teleport
 !setname 0x1cd Kunstmagus
-!setname 0x1ce Gefangene Gottheit
+!setname 0x1ce Machtpatron
\ No newline at end of file
+!setname 0x1cf Koala
+!setname 0x1d2 R.B.
\ No newline at end of file

Data/locales/it-IT/strings.conf

@@ -1252,4 +1252,6 @@
 !setname 0x1cb K9
 !setname 0x1cc Teletrasporto
 !setname 0x1cd Artmage
-!setname 0x1ce Divinità Imprigionata
+!setname 0x1ce Patrono Potente
\ No newline at end of file
+!setname 0x1cf Koala
+!setname 0x1d2 R.B.
\ No newline at end of file

Data/locales/ko-KR/strings.conf

@@ -1262,4 +1262,6 @@
 !setname 0x1cb K9
 !setname 0x1cc 텔레포트
 !setname 0x1cd 아르토메기아
-!setname 0x1ce 옥신
+!setname 0x1ce 옥신
\ No newline at end of file
+!setname 0x1cf 코알라
+!setname 0x1d2 R.B.(리볼 봇)
\ No newline at end of file

Data/locales/pt-PT/strings.conf

@@ -1252,4 +1252,6 @@
 !setname 0x1cb K9
 !setname 0x1cc Teleporte
 !setname 0x1cd Artmage
-!setname 0x1ce Divindade Aprisionada
+!setname 0x1ce Patrono do Poder
\ No newline at end of file
+!setname 0x1cf Coala
+!setname 0x1d2 R.B.
\ No newline at end of file

Data/locales/zh-CN/strings.conf

@@ -493,6 +493,9 @@
 !system 1475 已存在同名卡组
 !system 1476 删除失败
 !system 1477 卡片数：
+!system 1478 导入卡组码
+!system 1479 导出卡组码
+!system 1480 已导出到剪贴板
 !system 1481 ＯＣＧ
 !system 1482 ＴＣＧ
 !system 1483 简体中文

ProjectSettings/ProjectSettings.asset

@@ -551,7 +551,7 @@ PlayerSettings:
     m_APIs: 0b000000
     m_Automatic: 1
   - m_BuildTarget: WindowsStandaloneSupport
-    m_APIs: 0b00000002000000
+    m_APIs: 020000000b000000
     m_Automatic: 0
   - m_BuildTarget: LinuxStandaloneSupport
     m_APIs: 1500000011000000