From c6ccb0a41bf595fb069ffb2ab75928dbdf23ac2e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 05 十一月 2025 11:53:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/Component/UI/Common/FuncOpen.cs | 64 ++++++++++++--------------------
1 files changed, 24 insertions(+), 40 deletions(-)
diff --git a/Main/Component/UI/Common/FuncOpen.cs b/Main/Component/UI/Common/FuncOpen.cs
index 15dd64a..f39df6b 100644
--- a/Main/Component/UI/Common/FuncOpen.cs
+++ b/Main/Component/UI/Common/FuncOpen.cs
@@ -181,39 +181,36 @@
switch (errorCode)
{
case 1:
- SysNotifyMgr.Instance.ShowStringTip(Language.Get("FuncLimit_Level", config.LimitLV)
- + Language.Get("FuncLimitOpen1"));
+ SysNotifyMgr.Instance.ShowStringTip(Language.Get("FuncLimit_Level", config.LimitLV));
break;
case 2:
//寮�鏈嶅灏戝ぉ 涓�鑸槸缁勫悎
if (config.LimitLV != 0)
{
- SysNotifyMgr.Instance.ShowStringTip(Language.Get("FuncLimit_OpenDay", config.OpenDay)
- + Language.Get("FuncLimitOpen2")
- + Language.Get("FuncLimit_Level", config.LimitLV)
- + Language.Get("FuncLimitOpen1"));
+ SysNotifyMgr.Instance.ShowStringTip(Language.Get("FuncLimit_OpenDay_LV",
+ config.LimitLV, TimeUtility.OpenDay + 1, config.OpenDay));
}
else if (config.LimitMissionID != 0)
- {
- SysNotifyMgr.Instance.ShowStringTip(Language.Get("FuncLimit_OpenDay", config.OpenDay)
- + Language.Get("FuncLimitOpen2")
- + Language.Get("FuncLimit_Mission", TaskManager.Instance.GetNeedFinishTaskCount(config.LimitMissionID))
- + Language.Get("FuncLimitOpen1"));
+ {
+ SysNotifyMgr.Instance.ShowStringTip(Language.Get("FuncLimit_OpenDay_Mission",
+ TaskManager.Instance.GetNeedFinishTaskCount(config.LimitMissionID), TimeUtility.OpenDay + 1, config.OpenDay));
+ }
+ else if (config.LimiRealmLV != 0)
+ {
+ SysNotifyMgr.Instance.ShowStringTip(Language.Get("FuncLimit_OpenDay_Realm",
+ RealmConfig.Get(config.LimiRealmLV).Name, TimeUtility.OpenDay + 1, config.OpenDay));
}
else
{
- SysNotifyMgr.Instance.ShowStringTip(Language.Get("FuncLimit_OpenDay", config.OpenDay)
- + Language.Get("FuncLimitOpen1"));
+ SysNotifyMgr.Instance.ShowStringTip(Language.Get("FuncLimit_OpenDay", config.OpenDay));
}
break;
case 3:
- SysNotifyMgr.Instance.ShowStringTip(Language.Get("FuncLimit_Realm", RealmConfig.Get(config.LimiRealmLV).Name)
- + Language.Get("FuncLimitOpen1"));
+ SysNotifyMgr.Instance.ShowStringTip(Language.Get("FuncLimit_Realm", RealmConfig.Get(config.LimiRealmLV).Name));
break;
case 4:
- SysNotifyMgr.Instance.ShowStringTip(Language.Get("FuncLimit_Mission", TaskManager.Instance.GetNeedFinishTaskCount(config.LimitMissionID))
- + Language.Get("FuncLimitOpen1"));
+ SysNotifyMgr.Instance.ShowStringTip(Language.Get("FuncLimit_Mission", TaskManager.Instance.GetNeedFinishTaskCount(config.LimitMissionID)));
break;
}
}
@@ -231,43 +228,30 @@
switch (errorCode)
{
case 1:
- return StringUtility.Contact(
- Language.Get("FuncLimit_Level", config.LimitLV),
- Language.Get("FuncLimitOpen1"));
+ return Language.Get("FuncLimit_Level", config.LimitLV);
case 2:
//寮�鏈嶅灏戝ぉ 涓�鑸槸缁勫悎
if (config.LimitLV != 0)
{
- return StringUtility.Contact(
- Language.Get("FuncLimit_OpenDay", config.OpenDay),
- Language.Get("FuncLimitOpen2"),
- Language.Get("FuncLimit_Level", config.LimitLV),
- Language.Get("FuncLimitOpen1"));
+ return Language.Get("FuncLimit_OpenDay_LV", config.LimitLV, TimeUtility.OpenDay + 1, config.OpenDay);
}
else if (config.LimitMissionID != 0)
{
- return StringUtility.Contact(
- Language.Get("FuncLimit_OpenDay", config.OpenDay),
- Language.Get("FuncLimitOpen2"),
- Language.Get("FuncLimit_Mission",
- TaskManager.Instance.GetNeedFinishTaskCount(config.LimitMissionID)),
- Language.Get("FuncLimitOpen1"));
+ return Language.Get("FuncLimit_OpenDay_Mission", TaskManager.Instance.GetNeedFinishTaskCount(config.LimitMissionID), TimeUtility.OpenDay + 1, config.OpenDay);
+ }
+ else if (config.LimiRealmLV != 0)
+ {
+ return Language.Get("FuncLimit_OpenDay_Realm", RealmConfig.Get(config.LimiRealmLV).Name, TimeUtility.OpenDay + 1, config.OpenDay);
}
else
{
- return StringUtility.Contact(
- Language.Get("FuncLimit_OpenDay", config.OpenDay),
- Language.Get("FuncLimitOpen1"));
+ return Language.Get("FuncLimit_OpenDay", config.OpenDay);
}
case 3:
- return StringUtility.Contact(
- Language.Get("FuncLimit_Realm", RealmConfig.Get(config.LimiRealmLV).Name),
- Language.Get("FuncLimitOpen1"));
+ return Language.Get("FuncLimit_Realm", RealmConfig.Get(config.LimiRealmLV).Name);
case 4:
- return StringUtility.Contact(
- Language.Get("FuncLimit_Mission", TaskManager.Instance.GetNeedFinishTaskCount(config.LimitMissionID)),
- Language.Get("FuncLimitOpen1"));
+ return Language.Get("FuncLimit_Mission", TaskManager.Instance.GetNeedFinishTaskCount(config.LimitMissionID));
}
}
return string.Empty;
--
Gitblit v1.8.0