bug fix

baddce33 · SherryChaos · 7fcc8361 · baddce33 · baddce33 · baddce33
Commit baddce33 authored Mar 03, 2025 by SherryChaos
18 changed files
--- a/Assets/Addressables/Text/UpdateContent.txt
+++ b/Assets/Addressables/Text/UpdateContent.txt

+MDPro3 v1.2.5.1更新：
+1.修复系统语言为非中文时，主菜单字体不显示的错误。
+2.修复分辨率比例16:9以下时，编辑卡组界面在编辑副卡组时显示不全的错误。
+
 MDPro3 v1.2.5.1更新：
 1.修复在线卡组搜索失效的错误。
 2.修复分辨率比例16:9以下时，编辑卡组界面显示不全的错误。

--- a/Assets/Fonts/SourceHanSansSC-Bold.asset
+++ b/Assets/Fonts/SourceHanSansSC-Bold.asset
--- a/Assets/Fonts/SourceHanSansSC-Medium.asset
+++ b/Assets/Fonts/SourceHanSansSC-Medium.asset
--- a/Assets/Prefabs/ServantUI/DeckEditorUI.prefab
+++ b/Assets/Prefabs/ServantUI/DeckEditorUI.prefab
@@ -92657,6 +92657,7 @@ MonoBehaviour:
  - {fileID: 4689671317571541554}
  - {fileID: 4420769399430443410}
  - {fileID: 8353873743859406989}
+  - {fileID: 9053682883534065444}
  - {fileID: 7001212255668578964}
 --- !u!1 &8100501309125588915
 GameObject:
--- a/Assets/Prefabs/ServantUI/DeckEditorUIMobile.prefab
+++ b/Assets/Prefabs/ServantUI/DeckEditorUIMobile.prefab
@@ -14600,7 +14600,7 @@ MonoBehaviour:
  m_HandleRect: {fileID: 7446650972608614846}
  m_Direction: 2
  m_Value: 1
-  m_Size: 0.8015
+  m_Size: 0.8355
  m_NumberOfSteps: 0
  m_OnValueChanged:
    m_PersistentCalls:
@@ -76048,6 +76048,7 @@ MonoBehaviour:
  - {fileID: 4689671317571541554}
  - {fileID: 4420769399430443410}
  - {fileID: 8353873743859406989}
+  - {fileID: 9053682883534065444}
  - {fileID: 7001212255668578964}
 --- !u!1 &8166086360927241581
 GameObject:
--- a/Assets/Scripts/MDPro3/Managers/UIManager.cs
+++ b/Assets/Scripts/MDPro3/Managers/UIManager.cs
@@ -84,9 +84,32 @@ namespace MDPro3
            foreach (var text in go.GetComponentsInChildren<Text>(true))
                if (text.name.StartsWith(TRANSLATE_PREFIX))
                    text.text = InterString.Get(text.text.Replace("\r\n", "@n"));
-            foreach (var text in go.GetComponentsInChildren<TextMeshProUGUI>(true))
-                if (text.name.StartsWith(TRANSLATE_PREFIX))
-                    text.text = InterString.Get(text.text.Replace("\r\n", "@n"));
+            foreach (var tmp in go.GetComponentsInChildren<TextMeshProUGUI>(true))
+            {
+                if (tmp.name.StartsWith(TRANSLATE_PREFIX))
+                    tmp.text = InterString.Get(tmp.text.Replace("\r\n", "@n"));
+                if (tmp.name.EndsWith("Menu"))
+                {
+                    UIManager instance = Program.instance.ui_;
+
+                    if ((Language.GetConfig() == Language.English
+                        || Language.GetConfig() == Language.Japanese))
+                    {
+                        tmp.font = instance.jpMenuTmpFont;
+                        tmp.fontSize = 64f;
+                    }
+                    else if (Language.GetConfig() == Language.SimplifiedChinese)
+                    {
+                        tmp.font = instance.cnMenuTmpFont;
+                        tmp.fontSize = 62f;
+                    }
+                    else
+                    {
+                        tmp.font = instance.tmpFont;
+                        tmp.fontSize = 60f;
+                    }
+                }
+            }
        }

        public static void InitializeLanguage()

--- a/Assets/Scripts/MDPro3/Servant/Servant.cs
+++ b/Assets/Scripts/MDPro3/Servant/Servant.cs
@@ -173,6 +173,7 @@ namespace MDPro3.Servant

            if (fromDuel)
            {
+                servantUI.ShowEvent();
                DOTween.To(v => { }, 0, 0, Program.instance.ocgcore.TransitionTime).OnComplete(() =>
                {
                    servantUI.gameObject.SetActive(true);
@@ -190,6 +191,7 @@ namespace MDPro3.Servant
                        UIManager.HideLine(0);

                    UIManager.ShowBlackBack(BlackAlpha, 0f);
+                    servantUI.AfterShowEvent();
                    AfterShowingEvent();
                });
            }

--- a/Assets/Scripts/MDPro3/UI/ServantUI/AppearanceUI.cs
+++ b/Assets/Scripts/MDPro3/UI/ServantUI/AppearanceUI.cs
@@ -211,7 +211,7 @@ namespace MDPro3.UI.ServantUI
                Page00PlayerName.GetSelectable().Select();
        }

-        protected override void ShowEvent()
+        public override void ShowEvent()
        {
            base.ShowEvent();


--- a/Assets/Scripts/MDPro3/UI/ServantUI/CharacterSelectorUI.cs
+++ b/Assets/Scripts/MDPro3/UI/ServantUI/CharacterSelectorUI.cs
@@ -134,7 +134,7 @@ namespace MDPro3.UI.ServantUI



-        protected override void ShowEvent()
+        public override void ShowEvent()
        {
            base.ShowEvent();


--- a/Assets/Scripts/MDPro3/UI/ServantUI/DeckEditorUI.cs
+++ b/Assets/Scripts/MDPro3/UI/ServantUI/DeckEditorUI.cs
@@ -187,7 +187,7 @@ namespace MDPro3.UI.ServantUI
            CardCollectionView.SetCursor(_ResponseRegion == ResponseRegion.Collection);
        }

-        protected override void ShowEvent()
+        public override void ShowEvent()
        {
            base.ShowEvent();

@@ -197,6 +197,8 @@ namespace MDPro3.UI.ServantUI
                    ShowBackButton();
                else
                    HideBackButton();
+
+
            }
            else
            {

--- a/Assets/Scripts/MDPro3/UI/ServantUI/DeckSelectorUI.cs
+++ b/Assets/Scripts/MDPro3/UI/ServantUI/DeckSelectorUI.cs
@@ -89,7 +89,7 @@ namespace MDPro3.UI.ServantUI
        public Dictionary<string, Deck> decks = new();
        public bool buttonLayoutSwitching;

-        protected override void ShowEvent()
+        public override void ShowEvent()
        {
            base.ShowEvent();

@@ -117,7 +117,7 @@ namespace MDPro3.UI.ServantUI
            ShowDefaultButtons();
        }

-        protected override void AfterShowEvent()
+        public override void AfterShowEvent()
        {
            base.AfterShowEvent();


--- a/Assets/Scripts/MDPro3/UI/ServantUI/OcgCoreUI.cs
+++ b/Assets/Scripts/MDPro3/UI/ServantUI/OcgCoreUI.cs
@@ -162,7 +162,7 @@ namespace MDPro3.UI.ServantUI
            ShowEvent();
        }

-        protected override void ShowEvent()
+        public override void ShowEvent()
        {
            base.ShowEvent();


--- a/Assets/Scripts/MDPro3/UI/ServantUI/OnlineServantUI.cs
+++ b/Assets/Scripts/MDPro3/UI/ServantUI/OnlineServantUI.cs
@@ -60,7 +60,7 @@ namespace MDPro3.UI.ServantUI
            ToggleLegacy.SetToggleOn();
        }

-        protected override void ShowEvent()
+        public override void ShowEvent()
        {
            base.ShowEvent();


--- a/Assets/Scripts/MDPro3/UI/ServantUI/RoomServantUI.cs
+++ b/Assets/Scripts/MDPro3/UI/ServantUI/RoomServantUI.cs
@@ -96,7 +96,7 @@ namespace MDPro3.UI.ServantUI
            Realize();
        }

-        protected override void AfterShowEvent()
+        public override void AfterShowEvent()
        {
            base.AfterShowEvent();
            if (Program.instance.currentServant != Program.instance.room)

--- a/Assets/Scripts/MDPro3/UI/ServantUI/ServantUI.cs
+++ b/Assets/Scripts/MDPro3/UI/ServantUI/ServantUI.cs
@@ -104,11 +104,11 @@ namespace MDPro3.UI.ServantUI
            ShowEvent();
        }

-        protected virtual void ShowEvent()
+        public virtual void ShowEvent()
        {
        }

-        protected virtual void AfterShowEvent()
+        public virtual void AfterShowEvent()
        {
        }


--- a/Assets/Scripts/MDPro3/UI/ServantUI/SettingServantUI.cs
+++ b/Assets/Scripts/MDPro3/UI/ServantUI/SettingServantUI.cs
@@ -577,7 +577,7 @@ namespace MDPro3.UI.ServantUI
            defaultToggle.ScrollRectToTop();
        }

-        protected override void ShowEvent()
+        public override void ShowEvent()
        {
            base.ShowEvent();


--- a/Assets/Scripts/MDPro3/UI/ServantUI/SoloSelectorUI.cs
+++ b/Assets/Scripts/MDPro3/UI/ServantUI/SoloSelectorUI.cs
@@ -90,7 +90,7 @@ namespace MDPro3.UI.ServantUI
            ButtonDeck.gameObject.SetActive(false);
        }

-        protected override void ShowEvent()
+        public override void ShowEvent()
        {
            base.ShowEvent();


--- a/Data/locales/ja-JP/translation.conf
+++ b/Data/locales/ja-JP/translation.conf
@@ -692,3 +692,17 @@ OCG_TCG->OCG_TCG
 1
 ->1

+重试->重试
+震动->震动
+开启或关闭手柄震动->开启或关闭手柄震动
+UI布局->UI布局
+移动布局->移动布局
+设置UI为适合桌面端的紧凑布局或者移动端的宽大布局->设置UI为适合桌面端的紧凑布局或者移动端的宽大布局
+自动判断->自动判断
+スクリーン最大化->スクリーン最大化
+最高->最高
+非常高い->非常高い
+オン->オン
+自分->自分
+オフ->オフ
+はい->はい