From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/BattlePass/BattlePassManager.Common.cs | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/Main/System/BattlePass/BattlePassManager.Common.cs b/Main/System/BattlePass/BattlePassManager.Common.cs
index abe8c99..c033f80 100644
--- a/Main/System/BattlePass/BattlePassManager.Common.cs
+++ b/Main/System/BattlePass/BattlePassManager.Common.cs
@@ -19,6 +19,8 @@
{3, 40},
{4, 28},
{5, 27},
+ {7, 53},
+ {8, 54}
};
public int[] battlePassTypeSortList;
@@ -59,7 +61,7 @@
}
case BattlePassType.GuBao:
{
- totalValue = (int)battlePassData.value1;
+ totalValue = GubaoManager.Instance.GetGubaoTotalCnt();
break;
}
case BattlePassType.Arena:
@@ -67,6 +69,19 @@
totalValue = (int)battlePassData.value1;
break;
}
+ case BattlePassType.BetterMainLine:
+ {
+ //閫氬叧鐨� 鎵句笂涓�鍏冲��
+ 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))
--
Gitblit v1.8.0