Core/GameEngine/DataToCtl/PackageRegedit.cs
@@ -25,6 +25,7 @@ public static void Init() { // 登记相应的数据体及对应的数据转逻辑类 Register(typeof(HA718_tagMCCollectAwardItemInfo), typeof(DTCA718_tagMCCollectAwardItemInfo)); Register(typeof(HB214_tagMCCuntomFBPrizeInfo), typeof(DTCB214_tagMCCuntomFBPrizeInfo)); Register(typeof(HA307_tagMCFairyAdventuresInfo), typeof(DTCA307_tagMCFairyAdventuresInfo)); Register(typeof(HA306_tagMCFairyDomainInfo), typeof(DTCA306_tagMCFairyDomainInfo)); Core/NetworkPackage/DTCFile/ServerPack/HA7_Interaction/DTCA718_tagMCCollectAwardItemInfo.cs
New file @@ -0,0 +1,27 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Tuesday, April 16, 2019 //-------------------------------------------------------- using System; using System.Collections; using System.Collections.Generic; public class DTCA718_tagMCCollectAwardItemInfo : DtcBasic { public static event Action<HA718_tagMCCollectAwardItemInfo> onCollectSucc; public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); var package = vNetPack as HA718_tagMCCollectAwardItemInfo; if (onCollectSucc != null) { onCollectSucc(package); } } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 9d49d1b23f9edd0479798e49db5669c5 timeCreated: 1555400708 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/ServerPack/HA7_Interaction/HA718_tagMCCollectAwardItemInfo.cs
New file @@ -0,0 +1,33 @@ using UnityEngine; using System.Collections; // A7 18 采集奖励物品通知 #tagMCCollectAwardItemInfo public class HA718_tagMCCollectAwardItemInfo : GameNetPackBasic { public uint CollectNPCID; //采集的NPCID public byte Count; public tagMCCollectAwardItem[] AwardItemList; //奖励物品信息列表 public HA718_tagMCCollectAwardItemInfo () { _cmd = (ushort)0xA718; } public override void ReadFromBytes (byte[] vBytes) { TransBytes (out CollectNPCID, vBytes, NetDataType.DWORD); TransBytes (out Count, vBytes, NetDataType.BYTE); AwardItemList = new tagMCCollectAwardItem[Count]; for (int i = 0; i < Count; i ++) { AwardItemList[i] = new tagMCCollectAwardItem(); TransBytes (out AwardItemList[i].ItemID, vBytes, NetDataType.DWORD); TransBytes (out AwardItemList[i].Count, vBytes, NetDataType.BYTE); TransBytes (out AwardItemList[i].IsAuctionItem, vBytes, NetDataType.BYTE); } } public struct tagMCCollectAwardItem { public uint ItemID; public byte Count; public byte IsAuctionItem; //是否拍品 } } Core/NetworkPackage/ServerPack/HA7_Interaction/HA718_tagMCCollectAwardItemInfo.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 5a0d77854a2576049a2d56c552b58843 timeCreated: 1555400676 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Fight/Stage/Dungeon/DungeonStage.cs
@@ -247,6 +247,10 @@ case RidingPetBossModel.RIDINGPETBOSS_MAP: WindowCenter.Instance.Open<RidingPetBossHintWin>(); break; case HazyGrassModel.FairyGrassMapId: case HazyGrassModel.ReikiGrassMapId: WindowCenter.Instance.Open<DungeonCollectItemSuccWin>(); break; default: WindowCenter.Instance.Open<DungeonStageTimeWin>(); break; System/HazyRegion/DungeonCollectItemSuccWin.cs
New file @@ -0,0 +1,113 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Tuesday, April 16, 2019 //-------------------------------------------------------- using System; using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { public class DungeonCollectItemSuccWin : Window { [SerializeField] Transform m_Container; [SerializeField] Text m_GainRemind; bool displaying = false; Clock clock = null; Queue<Item> displayItems = new Queue<Item>(); #region Built-in protected override void BindController() { } protected override void AddListeners() { } protected override void OnPreOpen() { displaying = false; m_Container.gameObject.SetActive(false); displayItems.Clear(); DTCA718_tagMCCollectAwardItemInfo.onCollectSucc += OnCollectSucc; } protected override void OnAfterOpen() { } protected override void OnPreClose() { DTCA718_tagMCCollectAwardItemInfo.onCollectSucc -= OnCollectSucc; if (clock != null) { Clock.Stop(clock); clock = null; } } protected override void OnAfterClose() { } #endregion private void OnCollectSucc(HA718_tagMCCollectAwardItemInfo package) { for (int i = 0; i < package.Count; i++) { var item = new Item() { id = (int)package.AwardItemList[i].ItemID, count = package.AwardItemList[i].Count, }; displayItems.Enqueue(item); } if (!displaying) { DisplayCollectSucc(); } } void DisplayCollectSucc() { if (displayItems.Count > 0) { m_Container.gameObject.SetActive(true); var item = displayItems.Dequeue(); var config = ItemConfig.Get(item.id); if (config != null) { m_GainRemind.text = string.Format("获得{0}个{1}", item.count, config.ItemName); } if (clock != null) { Clock.Stop(clock); clock = null; } clock = Clock.AlarmAfter(2, DisplayCollectSucc); } else { m_Container.gameObject.SetActive(false); displaying = false; } } } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 083cbd7ec1d1c4344904b08cef67dad9 timeCreated: 1555401005 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/HazyRegion/HazyGrassDungeonWin.cs
@@ -20,9 +20,6 @@ [SerializeField] Text m_BasicGrassRefreshTime; [SerializeField] Text m_FairyGrassRefreshTime; [SerializeField] Transform m_ContainerCollectSucc; [SerializeField] Text m_GainRemind; DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } } HazyRegionModel hazyRegionModel { get { return ModelCenter.Instance.GetModel<HazyRegionModel>(); } } HazyGrassModel hazyGrassModel { get { return ModelCenter.Instance.GetModel<HazyGrassModel>(); } } @@ -37,8 +34,6 @@ protected override void OnPreOpen() { m_ContainerCollectSucc.gameObject.SetActive(false); Display(); GlobalTimeEvent.Instance.secondEvent += PerSecond; System/HazyRegion/HazyRegionModel.cs
@@ -40,7 +40,11 @@ public bool InFakeHazyRegion { get { return hazyRegionOpenTimes <= fakeOpenTimes; } get { return hazyRegionOpenTimes <= fakeOpenTimes || !FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.HazyRegion); } } int cacheMapId = 0; Utility/EnumHelper.cs
@@ -698,6 +698,7 @@ ReikiRoot = 145,//灵根 CrossServer = 157, //跨服天梯赛 CrossServerBoss = 162, HazyRegion = 173,//缥缈仙域 } //属性类型 public enum PropertyType
