Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta
File was deleted Core/NetworkPackage/ServerPack/HA3_Function/HA306_tagMCFairyDomainInfo.cs
@@ -3,10 +3,10 @@ // A3 06 缥缈仙域信息 #tagMCFairyDomainInfo public class HA306_tagMCFairyDomainInfo : GameNetPackBasic { //public byte IsAll; //是否全部 public class HA306_tagMCFairyDomainInfo : GameNetPackBasic { public byte IsAll; //是否全部 public byte State; //是否寻访中 //public uint VisitCnt; //寻访次数 public uint VisitCnt; //寻访次数 public ushort Energy; //体力 public byte Count; // 信息个数 public tagMCFairyDomainEvent[] InfoList; // 信息列表 @@ -15,8 +15,8 @@ _cmd = (ushort)0xA306; } public override void ReadFromBytes (byte[] vBytes) { //TransBytes(out IsAll, vBytes, NetDataType.BYTE); TransBytes (out State, vBytes, NetDataType.BYTE); //TransBytes(out VisitCnt, vBytes, NetDataType.DWORD); public override void ReadFromBytes (byte[] vBytes) { TransBytes(out IsAll, vBytes, NetDataType.BYTE); TransBytes (out State, vBytes, NetDataType.BYTE); TransBytes(out VisitCnt, vBytes, NetDataType.DWORD); TransBytes (out Energy, vBytes, NetDataType.WORD); TransBytes (out Count, vBytes, NetDataType.BYTE); InfoList = new tagMCFairyDomainEvent[Count]; Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta
File was deleted Core/NetworkPackage/ServerPack/HAE_Truck.meta
File was deleted Core/NetworkPackage/ServerPack/HAF_Merge.meta
File was deleted Core/NetworkPackage/ServerPack/HB0_Event.meta
File was deleted System/HazyRegion/HazyRegionEntrancePanel.cs
@@ -15,6 +15,7 @@ [SerializeField] Button m_BuyTimes; [SerializeField] Button m_Goto; [SerializeField] Text m_GotoLabel; HazyRegionModel model { get { return ModelCenter.Instance.GetModel<HazyRegionModel>(); } } DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } } @@ -28,9 +29,11 @@ public void Display() { dailyQuestModel.dailyQuestProgressUpdateEvent += DailyQuestProgressUpdateEvent; model.onHazyRegionIncidentRefresh += OnHazyRegionIncidentRefresh; DisplayOpenTime(); DisplayTimes(); DisplayButtonState(); } void DisplayTimes() @@ -69,6 +72,12 @@ } } void DisplayButtonState() { bool allowClick = !model.InFakeHazyRegion || model.satisfyFakeOpen; m_Goto.SetColorful(m_GotoLabel, allowClick); } private void Goto() { var error = 0; @@ -101,6 +110,18 @@ bool TryOpenHazyReion(out int error) { error = 0; if (model.InFakeHazyRegion) { if (model.satisfyFakeOpen) { return true; } else { error = 4; return false; } } var questState = dailyQuestModel.GetQuestState((int)DailyQuestType.HazyRegion); if (questState != DailyQuestModel.DailyQuestState.Normal) { @@ -144,12 +165,21 @@ case 3: SysNotifyMgr.Instance.ShowTip("OpenHazyRegionError_3"); break; case 4: SysNotifyMgr.Instance.ShowTip("OpenHazyRegionError_4"); break; } } public void Dispose() { dailyQuestModel.dailyQuestProgressUpdateEvent -= DailyQuestProgressUpdateEvent; model.onHazyRegionIncidentRefresh -= OnHazyRegionIncidentRefresh; } private void OnHazyRegionIncidentRefresh() { DisplayButtonState(); } private void DailyQuestProgressUpdateEvent(int id) System/HazyRegion/HazyRegionModel.cs
@@ -432,14 +432,14 @@ satisfyFakeOpen = package.State == 2; //hazyRegionOpenTimes = (int)package.VisitCnt; hazyRegionOpenTimes = (int)package.VisitCnt; point = package.Energy; //if (package.IsAll == 1) //{ if (package.IsAll == 1) { m_Incidents.Clear(); //} } for (int i = 0; i < package.Count; i++) { Utility/ComponentExtersion.cs
@@ -212,6 +212,24 @@ } [XLua.LuaCallCSharp] public static void SetColorful(this Button _btn, Text _btnTxt, bool _colorful) { if (_btn != null) { var imageEx = _btn.image as ImageEx; if (imageEx != null) { imageEx.gray = !_colorful; } } if (_btnTxt != null) { _btnTxt.color = UIHelper.GetUIColor(_colorful ? TextColType.NavyBrown : TextColType.White); _btnTxt.color = _btnTxt.color.SetA(_colorful ? 1 : 0.5f); } } [XLua.LuaCallCSharp] public static void SetInteractable(this Button _btn, Text _btnText, bool _interactable) { if (_btn != null)
