From ad3ac1661daaf4b445914f87009d3d88c990f040 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 28 四月 2026 11:45:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/Component/UI/Common/FuncOpen.cs | 42 ++++++++++--------------------------------
1 files changed, 10 insertions(+), 32 deletions(-)
diff --git a/Main/Component/UI/Common/FuncOpen.cs b/Main/Component/UI/Common/FuncOpen.cs
index e92c9b8..93ac833 100644
--- a/Main/Component/UI/Common/FuncOpen.cs
+++ b/Main/Component/UI/Common/FuncOpen.cs
@@ -346,42 +346,20 @@
public string GetErrorStr(int funcId)
{
- if (!FuncOpenLVConfig.HasKey(funcId))
- return string.Empty;
FuncOpenLVConfig config = FuncOpenLVConfig.Get(funcId);
- List<string> conditionStrs = new List<string>();
- if (config.LimitLV > 0)
- {
- conditionStrs.Add(Language.Get("FunctionPreviewErr01", config.LimitLV));
- }
-
- if (config.LimiRealmLV > 0)
- {
- conditionStrs.Add(Language.Get("FunctionPreviewErr02", RealmConfig.Get(config.LimiRealmLV).Name));
- }
-
- if (config.LimitMissionID > 0)
- {
- conditionStrs.Add(Language.Get("FunctionPreviewErr03", Mathf.Max(TaskManager.Instance.GetNeedFinishTaskCount(config.LimitMissionID), 0)));
- }
-
- if (config.OpenDay > 0)
- {
- conditionStrs.Add(Language.Get("FunctionPreviewErr04", config.OpenDay));
- }
+ if (config == null)
+ return string.Empty;
if (config.ManLevel > 0)
- {
- conditionStrs.Add(Language.Get("FunctionPreviewErr05", config.ManLevel / 10000, config.ManLevel / 100 % 100, config.ManLevel % 100));
- }
+ return Language.Get("FunctionPreviewLimit_ManLevel", config.ManLevel / 10000, config.ManLevel / 100 % 100, config.ManLevel % 100);
- if (conditionStrs.Count == 0)
- {
- return string.Empty;
- }
- string connector = Language.Get("FunctionPreview01"); // "涓�"
- string result = string.Join(connector, conditionStrs);
- return result;
+ if (config.LimitMissionID > 0)
+ return Language.Get("FunctionPreviewErr03", Mathf.Max(TaskManager.Instance.GetNeedFinishTaskCount(config.LimitMissionID), 0));
+
+ if (config.LimitLV > 0 && config.OpenDay > 0)
+ return Language.Get("FunctionPreviewLimit_LimitLV_OpenDay", config.LimitLV, config.OpenDay);
+
+ return string.Empty;
}
public void SendGetAward(int funcId)
--
Gitblit v1.8.0