From bbd20230cc76b10cd3dd2ade413cbd5032621797 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 05 十一月 2025 11:38:58 +0800
Subject: [PATCH] 0312 功能开启提示调整
---
/dev/null | 11 -----
Main/Core/NetworkPackage/ServerPack/HA1_Sys/HA103_tagMCOpenServerDay.cs.meta | 2
Main/Utility/TimeUtility.cs | 2
Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs | 2
Main/Utility/GlobalTimeEvent.cs | 14 ++++++
Main/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA103_tagMCOpenServerDay.cs.meta | 2
Main/Core/NetworkPackage/ServerPack/HA1_Sys/HA103_tagMCOpenServerDay.cs | 8 ++--
Main/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA103_tagMCOpenServerDay.cs | 12 ++++++
Main/Component/UI/Common/FuncOpen.cs | 64 ++++++++++++--------------------
9 files changed, 57 insertions(+), 60 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;
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/HA0_Sys/DTCA005_tagOpenServerDay.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/HA0_Sys/DTCA005_tagOpenServerDay.cs
deleted file mode 100644
index 0b0cf1f..0000000
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/HA0_Sys/DTCA005_tagOpenServerDay.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using UnityEngine;
-using System.Collections;
-
-//A0 05 鍚屾寮�鏈嶅ぉ鏁� #tagOpenServerDay
-
-public class DTCA005_tagOpenServerDay : DtcBasic {
- public override void Done(GameNetPackBasic vNetPack) {
- base.Done(vNetPack);
- HA005_tagOpenServerDay vNetData = vNetPack as HA005_tagOpenServerDay;
- TimeUtility.OnRefreshServerOpenDay(vNetData);
- }
-}
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/HA0_Sys/DTCA005_tagOpenServerDay.cs.meta b/Main/Core/NetworkPackage/DTCFile/ServerPack/HA0_Sys/DTCA005_tagOpenServerDay.cs.meta
deleted file mode 100644
index d35a9f6..0000000
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/HA0_Sys/DTCA005_tagOpenServerDay.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 976f30f367b23fb4d9860a66b989954e
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA103_tagMCOpenServerDay.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA103_tagMCOpenServerDay.cs
new file mode 100644
index 0000000..d6d2c86
--- /dev/null
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA103_tagMCOpenServerDay.cs
@@ -0,0 +1,12 @@
+using UnityEngine;
+using System.Collections;
+
+// A1 03 鍚屾寮�鏈嶅ぉ鏁� #tagMCOpenServerDay
+
+public class DTCA103_tagMCOpenServerDay : DtcBasic {
+ public override void Done(GameNetPackBasic vNetPack) {
+ base.Done(vNetPack);
+ HA103_tagMCOpenServerDay vNetData = vNetPack as HA103_tagMCOpenServerDay;
+ TimeUtility.OnRefreshServerOpenDay(vNetData);
+ }
+}
diff --git a/Main/Core/NetworkPackage/ServerPack/HA0_Sys/HA005_tagOpenServerDay.cs.meta b/Main/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA103_tagMCOpenServerDay.cs.meta
similarity index 83%
rename from Main/Core/NetworkPackage/ServerPack/HA0_Sys/HA005_tagOpenServerDay.cs.meta
rename to Main/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA103_tagMCOpenServerDay.cs.meta
index 5772208..d5d2fcc 100644
--- a/Main/Core/NetworkPackage/ServerPack/HA0_Sys/HA005_tagOpenServerDay.cs.meta
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA103_tagMCOpenServerDay.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: a6484a8278af59643850fd9225f7338d
+guid: 639049f3084500b42bd546a764c4ef94
MonoImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs b/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
index 9b29666..3f04256 100644
--- a/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
+++ b/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
@@ -30,7 +30,7 @@
// 鐧昏鐩稿簲鐨勬暟鎹綋鍙婂搴旂殑鏁版嵁杞�昏緫绫伙紙鍘婚噸鍚庯級
Register(typeof(H0102_tagCDBPlayer), typeof(DTC0102_tagCDBPlayer));
Register(typeof(HA004_tagServerDateTime), typeof(DTCA004_tagServerDateTime));
- Register(typeof(HA005_tagOpenServerDay), typeof(DTCA005_tagOpenServerDay));
+ Register(typeof(HA103_tagMCOpenServerDay), typeof(DTCA103_tagMCOpenServerDay));
Register(typeof(H0403_tagPlayerLoginLoadOK), typeof(DTC0403_tagPlayerLoginLoadOK));
Register(typeof(H0101_tagServerPrepared), typeof(DTC0101_tagServerPrepared));
Register(typeof(H0104_tagServerDisconnect), typeof(DTC0104_tagServerDisconnect));
diff --git a/Main/Core/NetworkPackage/ServerPack/HA0_Sys/HA005_tagOpenServerDay.cs b/Main/Core/NetworkPackage/ServerPack/HA1_Sys/HA103_tagMCOpenServerDay.cs
similarity index 88%
rename from Main/Core/NetworkPackage/ServerPack/HA0_Sys/HA005_tagOpenServerDay.cs
rename to Main/Core/NetworkPackage/ServerPack/HA1_Sys/HA103_tagMCOpenServerDay.cs
index 1cca302..20f7e5a 100644
--- a/Main/Core/NetworkPackage/ServerPack/HA0_Sys/HA005_tagOpenServerDay.cs
+++ b/Main/Core/NetworkPackage/ServerPack/HA1_Sys/HA103_tagMCOpenServerDay.cs
@@ -1,9 +1,9 @@
using UnityEngine;
using System.Collections;
-//A0 05 鍚屾寮�鏈嶅ぉ鏁� #tagOpenServerDay
+// A1 03 鍚屾寮�鏈嶅ぉ鏁� #tagMCOpenServerDay
-public class HA005_tagOpenServerDay : GameNetPackBasic {
+public class HA103_tagMCOpenServerDay : GameNetPackBasic {
public ushort Day; // 宸插紑鏈嶅ぉ鏁帮紝浠�0寮�濮�
public byte IsMixServer; //鏄惁鏄悎鏈嶆湇鍔″櫒
public ushort MixDay; // 宸插悎鏈嶅ぉ鏁帮紝浠�0寮�濮�
@@ -17,8 +17,8 @@
public uint NowMicSecond;
public byte WeekOfYear; //涓�骞翠腑鐨勭鍑犲懆
- public HA005_tagOpenServerDay () {
- _cmd = (ushort)0xA005;
+ public HA103_tagMCOpenServerDay () {
+ _cmd = (ushort)0xA103;
}
public override void ReadFromBytes (byte[] vBytes) {
diff --git a/Main/Core/NetworkPackage/ServerPack/HA0_Sys/HA005_tagOpenServerDay.cs.meta b/Main/Core/NetworkPackage/ServerPack/HA1_Sys/HA103_tagMCOpenServerDay.cs.meta
similarity index 83%
copy from Main/Core/NetworkPackage/ServerPack/HA0_Sys/HA005_tagOpenServerDay.cs.meta
copy to Main/Core/NetworkPackage/ServerPack/HA1_Sys/HA103_tagMCOpenServerDay.cs.meta
index 5772208..dfe1d58 100644
--- a/Main/Core/NetworkPackage/ServerPack/HA0_Sys/HA005_tagOpenServerDay.cs.meta
+++ b/Main/Core/NetworkPackage/ServerPack/HA1_Sys/HA103_tagMCOpenServerDay.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: a6484a8278af59643850fd9225f7338d
+guid: e092a0db076d7f04f8113dd4269bd9e0
MonoImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/Main/Utility/GlobalTimeEvent.cs b/Main/Utility/GlobalTimeEvent.cs
index 66d9296..9da381a 100644
--- a/Main/Utility/GlobalTimeEvent.cs
+++ b/Main/Utility/GlobalTimeEvent.cs
@@ -5,8 +5,8 @@
public class GlobalTimeEvent : SingletonMonobehaviour<GlobalTimeEvent>
-
{
+ public event Action MS100Event;
public event Action secondEvent;
public event Action fiveSecondEvent;
public event Action minuteEvent;
@@ -16,6 +16,7 @@
public event Action hourEvent;
public event Action halfMinuteEvent;
+ float msBuf = 0f;
int secondBuf = -1;
int fiveSecondBuf = -1;
int minuteBuf = -1;
@@ -32,6 +33,17 @@
private void Update()
{
+ var ms = Time.time;
+ if (ms - msBuf >= 0.1f)
+ {
+ if (MS100Event != null)
+ {
+ MS100Event();
+ }
+ msBuf = ms;
+ }
+
+
var second = DateTime.Now.Second;
if (second != secondBuf)
{
diff --git a/Main/Utility/TimeUtility.cs b/Main/Utility/TimeUtility.cs
index 5889fb3..6aad2aa 100644
--- a/Main/Utility/TimeUtility.cs
+++ b/Main/Utility/TimeUtility.cs
@@ -194,7 +194,7 @@
}
public static event Action OnServerOpenDayRefresh;
- public static void OnRefreshServerOpenDay(HA005_tagOpenServerDay package)
+ public static void OnRefreshServerOpenDay(HA103_tagMCOpenServerDay package)
{
{
OpenDay = package.Day;
--
Gitblit v1.8.0