case bug fix and translation update

a6596322 · SherryChaos · edcd3c7c · a6596322 · a6596322 · a6596322
Commit a6596322 authored May 12, 2025 by SherryChaos
14 changed files
--- a/Assets/Fonts/SourceHanSansSC-Medium.asset
+++ b/Assets/Fonts/SourceHanSansSC-Medium.asset
@@ -143,6 +143,96 @@ MonoBehaviour:
          m_XAdvance: 0
          m_YAdvance: 0
      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 18
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -0.09
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 14
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 18
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -0.18
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 16
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 19
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0.09
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 18
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 18
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0.18
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 19
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 18
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -0.36
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 22
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 18
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -0.09
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 25
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
    m_MarkToBaseAdjustmentRecords: []
    m_MarkToMarkAdjustmentRecords: []
  m_ShouldReimportFontFeatures: 0

--- a/Assets/Plugins/Windows/ocgcore.dll
+++ b/Assets/Plugins/Windows/ocgcore.dll
--- a/Assets/Plugins/Windows/sqlite3.dll
+++ b/Assets/Plugins/Windows/sqlite3.dll
--- a/Assets/Plugins/Windows/ygoserver.dll
+++ b/Assets/Plugins/Windows/ygoserver.dll
--- a/Assets/Prefabs/ServantUI/OcgCoreUI.prefab
+++ b/Assets/Prefabs/ServantUI/OcgCoreUI.prefab
@@ -1425,7 +1425,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
@@ -4463,7 +4463,7 @@ MonoBehaviour:
  m_HandleRect: {fileID: 3411319760472490572}
  m_Direction: 2
  m_Value: 0
-  m_Size: 1
+  m_Size: 0.6103896
  m_NumberOfSteps: 0
  m_OnValueChanged:
    m_PersistentCalls:
@@ -5388,7 +5388,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
@@ -5613,7 +5613,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
@@ -9288,7 +9288,7 @@ CanvasGroup:
  m_Enabled: 1
  m_Alpha: 1
  m_Interactable: 1
-  m_BlocksRaycasts: 1
+  m_BlocksRaycasts: 0
  m_IgnoreParentGroups: 0
 --- !u!1 &8422267094097420899
 GameObject:

--- a/Assets/ScriptableObjects/Items.asset
+++ b/Assets/ScriptableObjects/Items.asset
@@ -4615,112 +4615,112 @@ MonoBehaviour:
  - id: 1000002
    m_name: 
    m_description: 
-    path: Mate/m07188_model
+    path: Mate/M07188_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000003
    m_name: 
    m_description: 
-    path: Mate/m04041_model
+    path: Mate/M04041_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000005
    m_name: 
    m_description: 
-    path: Mate/m13258_sd_model
+    path: Mate/M13258_SD_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000006
    m_name: 
    m_description: 
-    path: Mate/m11765_sd_model
+    path: Mate/M11765_SD_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000007
    m_name: 
    m_description: 
-    path: Mate/m06784_model
+    path: Mate/M06784_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000008
    m_name: 
    m_description: 
-    path: Mate/m12678_model
+    path: Mate/M12678_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000009
    m_name: 
    m_description: 
-    path: Mate/m04054_model
+    path: Mate/M04054_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000010
    m_name: 
    m_description: 
-    path: Mate/m13060_model
+    path: Mate/M13060_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000011
    m_name: 
    m_description: 
-    path: Mate/m14240_model
+    path: Mate/M14240_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000012
    m_name: 
    m_description: 
-    path: Mate/m04844_model
+    path: Mate/M04844_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000013
    m_name: 
    m_description: 
-    path: Mate/m12950_model
+    path: Mate/M12950_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000014
    m_name: 
    m_description: 
-    path: Mate/m09647_model
+    path: Mate/M09647_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000015
    m_name: 
    m_description: 
-    path: Mate/m09285_model
+    path: Mate/M09285_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000016
    m_name: 
    m_description: 
-    path: Mate/m15726_model
+    path: Mate/M15726_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000017
    m_name: 
    m_description: 
-    path: Mate/m09903_model
+    path: Mate/M09903_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000018
    m_name: 
    m_description: 
-    path: Mate/m10747_model
+    path: Mate/M10747_Model
    functional: 0
    secondFace: 0
    diy: 0
@@ -4734,49 +4734,49 @@ MonoBehaviour:
  - id: 1000020
    m_name: 
    m_description: 
-    path: Mate/m14759_model
+    path: Mate/M14759_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000021
    m_name: 
    m_description: 
-    path: Mate/m14760_model
+    path: Mate/M14760_Model
    functional: 0
    secondFace: 1
    diy: 0
  - id: 1000022
    m_name: 
    m_description: 
-    path: Mate/m13208_model
+    path: Mate/M13208_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000023
    m_name: 
    m_description: 
-    path: Mate/m12642_model
+    path: Mate/M12642_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000024
    m_name: 
    m_description: 
-    path: Mate/m04007_model
+    path: Mate/M04007_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000026
    m_name: 
    m_description: 
-    path: Mate/m17405_model
+    path: Mate/M17405_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000027
    m_name: 
    m_description: 
-    path: Mate/m14672_model
+    path: Mate/M14672_Model
    functional: 0
    secondFace: 0
    diy: 0
@@ -4790,14 +4790,14 @@ MonoBehaviour:
  - id: 1000029
    m_name: 
    m_description: 
-    path: Mate/m13011_model
+    path: Mate/M13011_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000030
    m_name: 
    m_description: 
-    path: Mate/m18003_model
+    path: Mate/M18003_Model
    functional: 0
    secondFace: 0
    diy: 0
@@ -4811,14 +4811,14 @@ MonoBehaviour:
  - id: 1000032
    m_name: 
    m_description: 
-    path: Mate/m06344_model
+    path: Mate/M06344_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1000033
    m_name: 
    m_description: 
-    path: Mate/m12487_model
+    path: Mate/M12487_Model
    functional: 0
    secondFace: 1
    diy: 0
@@ -4832,133 +4832,133 @@ MonoBehaviour:
  - id: 1000041
    m_name: 
    m_description: 
-    path: Mate/m13163_model
+    path: Mate/M13163_Model
    functional: 0
    secondFace: 1
    diy: 0
  - id: 1001001
    m_name: 
    m_description: 
-    path: Mate/m06901_model
+    path: Mate/M06901_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001002
    m_name: 
    m_description: 
-    path: Mate/m10468_model
+    path: Mate/M10468_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001003
    m_name: 
    m_description: 
-    path: Mate/m05432_model
+    path: Mate/M05432_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001004
    m_name: 
    m_description: 
-    path: Mate/m11540_model
+    path: Mate/M11540_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001005
    m_name: 
    m_description: 
-    path: Mate/m04818_model
+    path: Mate/M04818_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001006
    m_name: 
    m_description: 
-    path: Mate/m13029_model
+    path: Mate/M13029_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001007
    m_name: 
    m_description: 
-    path: Mate/m06323_model
+    path: Mate/M06323_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001008
    m_name: 
    m_description: 
-    path: Mate/m06018_model
+    path: Mate/M06018_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001009
    m_name: 
    m_description: 
-    path: Mate/m09775_model
+    path: Mate/M09775_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001010
    m_name: 
    m_description: 
-    path: Mate/m12929_model
+    path: Mate/M12929_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001011
    m_name: 
    m_description: 
-    path: Mate/m06000_model
+    path: Mate/M06000_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001012
    m_name: 
    m_description: 
-    path: Mate/m04064_model
+    path: Mate/M04064_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001013
    m_name: 
    m_description: 
-    path: Mate/m13981_model
+    path: Mate/M13981_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001014
    m_name: 
    m_description: 
-    path: Mate/m07701_model
+    path: Mate/M07701_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001015
    m_name: 
    m_description: 
-    path: Mate/m12070_model
+    path: Mate/M12070_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001016
    m_name: 
    m_description: 
-    path: Mate/m09723_model
+    path: Mate/M09723_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001017
    m_name: 
    m_description: 
-    path: Mate/m16201_model
+    path: Mate/M16201_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001018
    m_name: 
    m_description: 
-    path: Mate/m07807_model
+    path: Mate/M07807_Model
    functional: 0
    secondFace: 0
    diy: 0
@@ -4972,28 +4972,28 @@ MonoBehaviour:
  - id: 1001020
    m_name: 
    m_description: 
-    path: Mate/m13636_model
+    path: Mate/M13636_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001021
    m_name: 
    m_description: 
-    path: Mate/m13346_model
+    path: Mate/M13346_Model
    functional: 0
    secondFace: 1
    diy: 0
  - id: 1001022
    m_name: 
    m_description: 
-    path: Mate/m14856_model
+    path: Mate/M14856_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1001023
    m_name: 
    m_description: 
-    path: Mate/m04708_model
+    path: Mate/M04708_Model
    functional: 0
    secondFace: 0
    diy: 0
@@ -5056,112 +5056,112 @@ MonoBehaviour:
  - id: 1002001
    m_name: 
    m_description: 
-    path: Mate/v00001_model
+    path: Mate/V00001_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1002002
    m_name: 
    m_description: 
-    path: Mate/v00002_model
+    path: Mate/V00002_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1002003
    m_name: 
    m_description: 
-    path: Mate/v00003_model
+    path: Mate/V00003_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1002004
    m_name: 
    m_description: 
-    path: Mate/v00004_model
+    path: Mate/V00004_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1002005
    m_name: 
    m_description: 
-    path: Mate/v00005_model
+    path: Mate/V00005_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1002006
    m_name: 
    m_description: 
-    path: Mate/v00006_model
+    path: Mate/V00006_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1002007
    m_name: 
    m_description: 
-    path: Mate/v00007_model
+    path: Mate/V00007_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1002008
    m_name: 
    m_description: 
-    path: Mate/v00008_model
+    path: Mate/V00008_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1002009
    m_name: 
    m_description: 
-    path: Mate/v00009_model
+    path: Mate/V00009_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1002010
    m_name: 
    m_description: 
-    path: Mate/v00010_model
+    path: Mate/V00010_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1002011
    m_name: 
    m_description: 
-    path: Mate/v00011_model
+    path: Mate/V00011_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1002012
    m_name: 
    m_description: 
-    path: Mate/v00012_model
+    path: Mate/V00012_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1003001
    m_name: 
    m_description: 
-    path: Mate/m04044_model
+    path: Mate/M04044_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1003101
    m_name: 
    m_description: 
-    path: Mate/m04043_model
+    path: Mate/M04043_Model
    functional: 0
    secondFace: 1
    diy: 0
  - id: 1003002
    m_name: 
    m_description: 
-    path: Mate/m15527_model
+    path: Mate/M15527_Model
    functional: 0
    secondFace: 0
    diy: 0
  - id: 1003102
    m_name: 
    m_description: 
-    path: Mate/M18193_model
+    path: Mate/M18193_Model
    functional: 0
    secondFace: 0
    diy: 0

--- a/Assets/Scripts/MDPro3/Duel/YgoServer.cs
+++ b/Assets/Scripts/MDPro3/Duel/YgoServer.cs
@@ -6,9 +6,9 @@ namespace MDPro3.Net
 {
    internal static unsafe class Dll
    {
-        [DllImport("ygoserver", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int start_server([MarshalAs(UnmanagedType.LPStr)] string args);
-        [DllImport("ygoserver", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("ygoserver", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int start_server([MarshalAs(UnmanagedType.LPUTF8Str)] string args);
+        [DllImport("ygoserver", CallingConvention = CallingConvention.Cdecl)]
        public static extern void stop_server();
    }


--- a/Assets/Scripts/MDPro3/Servant/CutinViewer.cs
+++ b/Assets/Scripts/MDPro3/Servant/CutinViewer.cs
@@ -286,9 +286,9 @@ namespace MDPro3.Servant
            //Name Bar
            GameObject nameBar;
            if (controller == 0)
-                nameBar = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/summonmonster/01Text/SummonMonster_Name_near", true);
+                nameBar = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonMonster/01Text/SummonMonster_Name_near", true);
            else
-                nameBar = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/summonmonster/01Text/SummonMonster_Name_far", true);
+                nameBar = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonMonster/01Text/SummonMonster_Name_far", true);

            nameBar.transform.SetParent(Program.instance.container_2D, false);
            var manager = nameBar.GetComponent<ElementObjectManager>();
@@ -370,7 +370,7 @@ namespace MDPro3.Servant
            Destroy(nameBar, CUTIN_PLAY_TIME);

            //front Effect
-            var frontEffect = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/summonmonster/02FrontEff/SummonMonster_Thunder_power", true);
+            var frontEffect = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonMonster/02FrontEff/SummonMonster_Thunder_power", true);
            frontEffect.transform.SetParent(Program.instance.container_2D, false);
            Destroy(frontEffect, CUTIN_PLAY_TIME);
        }

--- a/Assets/Scripts/Tools/AssetBundleRobber.cs
+++ b/Assets/Scripts/Tools/AssetBundleRobber.cs
@@ -16,6 +16,7 @@ public class AssetBundleRobber : MonoBehaviour
 {
    public Text text;
    private static Text sText;
+    public TMP_InputField input;

    private string pathAB;
    private string pathStore;
@@ -63,14 +64,14 @@ public class AssetBundleRobber : MonoBehaviour

        Application.targetFrameRate = 0;

-        //masterDuelAssetBundlePath = masterDuelWindowsAssetBundlePath;
-        //workingPlace = windowsWorkingPlace;
+        pathAB = PATH_AB_WINDOWS;
+        pathStore = PATH_STORE_WINDOWS;

        //pathAB = PATH_AB_ANDROID;
        //pathStore = PATH_STORE_ANDROID;

-        pathAB = PATH_AB_IOS;
-        pathStore = PATH_STORE_IOS;
+        //pathAB = PATH_AB_IOS;
+        //pathStore = PATH_STORE_IOS;

        fullCopy = true;
        //fullCopy = false;
@@ -81,7 +82,6 @@ public class AssetBundleRobber : MonoBehaviour
        //Copy("531fb6fa");
    }

-    public TMP_InputField input;

    public void CopyAB()
    {

--- a/Data/Rarity.json
+++ b/Data/Rarity.json
@@ -19,7 +19,8 @@
    65957473,
    10045474,
    26973555,
-    29587993
+    29587993,
+    5405695
  ],
  "BookCards": [
    5405695,

--- a/Data/cards.json
+++ b/Data/cards.json
--- a/Data/cards_Lite.json
+++ b/Data/cards_Lite.json
--- a/Data/locales/zh-CN/translation.conf
+++ b/Data/locales/zh-CN/translation.conf
@@ -697,3 +697,4 @@ YDK 内容不合法，主卡组必须满 40 张->YDK 内容不合法，主卡组
 可以设置三大代表卡在卡组菜单中显示。
 ※更改三大代表卡不会影响决斗。->可以设置三大代表卡在卡组菜单中显示。
 ※更改三大代表卡不会影响决斗。
+悠悠王->悠悠王
--- a/Tools/Translations/translations.csv
+++ b/Tools/Translations/translations.csv