From 6a225dbd25f56c7b7e102da53e780bb0a60a302d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 26 一月 2026 14:23:27 +0800
Subject: [PATCH] 453 子 【付费】新增定军阁基金 / 【付费】定军阁基金-客户端

---
 Main/System/BattlePass/BattlePassManager.cs        |   10 ++++++++++
 Main/System/BattlePass/BattlePassCommonCell.cs     |    6 +++++-
 Main/System/BattlePass/BattlePassCommonWin.cs      |    5 +++++
 Main/System/BattlePass/BattlePassManager.Common.cs |    7 +++++++
 Main/System/FuncPreset/FuncPresetManager.cs        |    7 ++++---
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/Main/System/BattlePass/BattlePassCommonCell.cs b/Main/System/BattlePass/BattlePassCommonCell.cs
index d9524f0..a53131e 100644
--- a/Main/System/BattlePass/BattlePassCommonCell.cs
+++ b/Main/System/BattlePass/BattlePassCommonCell.cs
@@ -62,7 +62,11 @@
         }
         else if (config.ZhanlingType == (int)BattlePassType.BetterMainLine)
         {
-            valueText.text = config.NeedValue/100 + "-" + config.NeedValue%100;
+            valueText.text = config.NeedValue / 100 + "-" + config.NeedValue % 100;
+        }
+        else if (config.ZhanlingType == (int)BattlePassType.DJG)
+        {
+            valueText.text = config.NeedValue / 100 + "-" + config.NeedValue % 100;
         }
         else
         {
diff --git a/Main/System/BattlePass/BattlePassCommonWin.cs b/Main/System/BattlePass/BattlePassCommonWin.cs
index 545b007..8805e4e 100644
--- a/Main/System/BattlePass/BattlePassCommonWin.cs
+++ b/Main/System/BattlePass/BattlePassCommonWin.cs
@@ -149,6 +149,11 @@
                     totalActivityText.text = Language.Get("BattlePassValue3", totalValue / 100, totalValue % 100);
                     break;
                 }
+            case BattlePassType.DJG:
+                {
+                    totalActivityText.text = Language.Get("BattlePassValue8", totalValue / 100, totalValue % 100);
+                    break;
+                }
         }
 
     }
diff --git a/Main/System/BattlePass/BattlePassManager.Common.cs b/Main/System/BattlePass/BattlePassManager.Common.cs
index c6f92bc..c033f80 100644
--- a/Main/System/BattlePass/BattlePassManager.Common.cs
+++ b/Main/System/BattlePass/BattlePassManager.Common.cs
@@ -75,6 +75,13 @@
                     totalValue = MainLevelConfig.GetPassedLevel();
                     break;
                 }
+            case BattlePassType.DJG:
+                {
+                    WarlordPavilionManager.Instance.TryGetHistoryMaxFinishProgress(out int layerNum, out int levelNum);
+                    //閫氬叧
+                    totalValue = layerNum*100 + levelNum;
+                    break;
+                }
         }
 
         if (HasAnyAward(_type, totalValue))
diff --git a/Main/System/BattlePass/BattlePassManager.cs b/Main/System/BattlePass/BattlePassManager.cs
index b3b7ce4..ead813c 100644
--- a/Main/System/BattlePass/BattlePassManager.cs
+++ b/Main/System/BattlePass/BattlePassManager.cs
@@ -123,6 +123,7 @@
             case BattlePassType.GuBao:
             case BattlePassType.Arena:
             case BattlePassType.BetterMainLine:
+            case BattlePassType.DJG:
                 {
                     UpdateCommonBPRedpoint(type);
                     break;
@@ -360,6 +361,14 @@
                     //閫氬叧鐨� 鎵句笂涓�鍏冲��
                     return MainLevelConfig.GetPassedLevel();
                 }
+            case BattlePassType.DJG:
+                {
+                    WarlordPavilionManager.Instance.TryGetHistoryMaxFinishProgress(out int layerNum, out int levelNum);
+                    //閫氬叧
+                    return layerNum * 100 + levelNum;
+                }
+
+
         }
         return 0;       
     }
@@ -393,4 +402,5 @@
     Arena = 5,   //婕旀鍦�
     Week = 6,    //鍛ㄦ垬浠�
     BetterMainLine = 7,    //楂樼骇鍏冲崱鍩洪噾
+    DJG = 8,    // 瀹氬啗闃�
 }
\ No newline at end of file
diff --git a/Main/System/FuncPreset/FuncPresetManager.cs b/Main/System/FuncPreset/FuncPresetManager.cs
index 9f1678d..70045fb 100644
--- a/Main/System/FuncPreset/FuncPresetManager.cs
+++ b/Main/System/FuncPreset/FuncPresetManager.cs
@@ -65,9 +65,10 @@
         {
             return false;
         }
-        int layerNum = 0;
-        WarlordPavilionManager.Instance.TryGetHistoryMaxPassLayerNum(out layerNum);
-        if (layerNum < openConditions[2])
+        if (!WarlordPavilionManager.Instance.TryGetHistoryMaxFinishProgress(out int layerNum, out int levelNum))
+            return false;
+
+        if (layerNum*100 + levelNum < openConditions[2])
         {
             return false;
         }

--
Gitblit v1.8.0