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; Main/Core/NetworkPackage/DTCFile/ServerPack/HA0_Sys/DTCA005_tagOpenServerDay.cs
File was deleted Main/Core/NetworkPackage/DTCFile/ServerPack/HA0_Sys/DTCA005_tagOpenServerDay.cs.meta
File was deleted Main/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA103_tagMCOpenServerDay.cs
New file @@ -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); } } Main/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA103_tagMCOpenServerDay.cs.meta
File was renamed from Main/Core/NetworkPackage/ServerPack/HA0_Sys/HA005_tagOpenServerDay.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: a6484a8278af59643850fd9225f7338d guid: 639049f3084500b42bd546a764c4ef94 MonoImporter: externalObjects: {} serializedVersion: 2 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)); Main/Core/NetworkPackage/ServerPack/HA1_Sys/HA103_tagMCOpenServerDay.cs
File was renamed from Main/Core/NetworkPackage/ServerPack/HA0_Sys/HA005_tagOpenServerDay.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) { Main/Core/NetworkPackage/ServerPack/HA1_Sys/HA103_tagMCOpenServerDay.cs.metacopy from Main/Core/NetworkPackage/ServerPack/HA0_Sys/HA005_tagOpenServerDay.cs.meta copy to Main/Core/NetworkPackage/ServerPack/HA1_Sys/HA103_tagMCOpenServerDay.cs.meta
File was copied from Main/Core/NetworkPackage/ServerPack/HA0_Sys/HA005_tagOpenServerDay.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: a6484a8278af59643850fd9225f7338d guid: e092a0db076d7f04f8113dd4269bd9e0 MonoImporter: externalObjects: {} serializedVersion: 2 Main/System/HeroUI/HeroTrainWin.cs
@@ -130,6 +130,10 @@ deleteBtn.AddListener(DeleteHero); awakeBtn.AddListener(() => { if (!FuncOpen.Instance.IsFuncOpen(38, true)) { return; } HeroUIManager.Instance.selectAwakeHeroGuid = guid; UIManager.Instance.OpenWindow<HeroAwakeWin>(); }); Main/System/InternalAffairs/AffairBaseWin.cs
@@ -76,6 +76,17 @@ fullGoldRush.SetActive(GoldRushManager.Instance.GetFinishGoldRushCount() >= GoldRushManager.Instance.warehouseMaxCnt); RefreshGoldRushMoney(); autoText.text = Language.Get(GoldRushManager.Instance.isAutoWorking ? "GoldRush34" : "GoldRush24"); if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.GoldRush)) { autoBtn.SetActive(true); goldRushItemBtn.SetActive(true); } else { autoBtn.SetActive(false); goldRushItemBtn.SetActive(false); } }
@@ -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) { 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;
