Core/GameEngine/DataToCtl/PackageRegedit.cs
@@ -29,6 +29,7 @@ public static void Init() { // 登记相应的数据体及对应的数据转逻辑类 Register(typeof(HA40C_tagGCAllFamilyBossInfo), typeof(DTCA40C_tagGCAllFamilyBossInfo)); Register(typeof(HA3B1_tagMCEquipPartStarInfo), typeof(DTCA3B1_tagMCEquipPartStarInfo)); Register(typeof(HA816_tagMCMysticalShopInfo), typeof(DTCA816_tagMCMysticalShopInfo)); Register(typeof(HAC11_tagGCFeastRedPacketInfo), typeof(DTCAC11_tagGCFeastRedPacketInfo)); Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA40C_tagGCAllFamilyBossInfo.cs
New file @@ -0,0 +1,24 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Friday, March 08, 2019 //-------------------------------------------------------- using System; using System.Collections; using System.Collections.Generic; using Snxxz.UI; public class DTCA40C_tagGCAllFamilyBossInfo : DtcBasic { public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); var package = vNetPack as HA40C_tagGCAllFamilyBossInfo; ModelCenter.Instance.GetModel<AllianceBossModel>().ReceivePackage(package); } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 7242e60b4235aac4c832c4def0475e58 timeCreated: 1552024274 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/ServerPack/HA4_Family/HA40C_tagGCAllFamilyBossInfo.cs
New file @@ -0,0 +1,17 @@ using UnityEngine; using System.Collections; // A4 0C 多仙盟boss活动信息 #tagGCAllFamilyBossInfo public class HA40C_tagGCAllFamilyBossInfo : GameNetPackBasic { public byte IsEnd; // 是否已结束 public HA40C_tagGCAllFamilyBossInfo () { _cmd = (ushort)0xA40C; } public override void ReadFromBytes (byte[] vBytes) { TransBytes (out IsEnd, vBytes, NetDataType.BYTE); } } Core/NetworkPackage/ServerPack/HA4_Family/HA40C_tagGCAllFamilyBossInfo.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: c79177aa783d3ce42bab1b560bb10c5b timeCreated: 1552024235 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/Activity/ActivityModel.cs
@@ -227,6 +227,10 @@ public bool CheckLimit(int type) { DailyQuestConfig config = DailyQuestConfig.Get(type); if (config == null) { return true; } switch ((DailyQuestType)type) { case DailyQuestType.FairyGrabBoss: System/Dungeon/DungeonData.cs
@@ -105,6 +105,8 @@ public DungeonHurt[] hurtInfo; public int myHurt; public int myHurtEx; public int myRank; public int myMenberCnt; public string topName; public int topScore; public int isFullExp; System/Dungeon/DungeonFightWin.cs
@@ -107,6 +107,7 @@ m_GatherSoulDungeonBehaviour.Display(this); break; case JadeDynastyBossModel.JADEDYNASTY_MAP: case AllianceBossModel.DATAMAPID: m_Inspire.gameObject.SetActive(true); break; default: System/Dungeon/DungeonInspireBehaviour.cs
@@ -55,6 +55,7 @@ { case DemonJarModel.DEMONJAR_MAPID: case JadeDynastyBossModel.JADEDYNASTY_MAP: case AllianceBossModel.DATAMAPID: m_Icon.SetSprite("W_XYGuwu_a2"); break; default: @@ -107,7 +108,8 @@ private bool IsRequireDisplayProgress() { return PlayerDatas.Instance.baseData.MapID == DemonJarModel.DEMONJAR_MAPID || PlayerDatas.Instance.baseData.MapID == JadeDynastyBossModel.JADEDYNASTY_MAP; || PlayerDatas.Instance.baseData.MapID == JadeDynastyBossModel.JADEDYNASTY_MAP || PlayerDatas.Instance.baseData.MapID == AllianceBossModel.DATAMAPID; } private void ResetTween() System/Dungeon/DungeonModel.cs
@@ -839,6 +839,12 @@ WindowCenter.Instance.Open<JadeDynastyDamageRankWin>(); } break; case AllianceBossModel.DATAMAPID: if (!WindowCenter.Instance.IsOpen<AllianceBossHintWin>()) { WindowCenter.Instance.Open<AllianceBossHintWin>(); } break; case TreasureModel.TREASURE_MAPID: break; case HeavenBattleModel.HEAVEBATTLE_MAPID: System/Dungeon/TargetBriefInfoWin.cs
@@ -67,7 +67,8 @@ var dataMapId = MapUtility.GetDataMapId(mapId); if (dataMapId == DemonJarModel.DEMONJAR_MAPID || dataMapId == JadeDynastyBossModel.JADEDYNASTY_MAP || dataMapId == JadeDynastyTowerModel.DATA_MAPID) || dataMapId == JadeDynastyTowerModel.DATA_MAPID || dataMapId == AllianceBossModel.DATAMAPID) { if (_show) { @@ -110,7 +111,8 @@ var dataMapId = MapUtility.GetDataMapId(mapId); if (dataMapId == DemonJarModel.DEMONJAR_MAPID || dataMapId == JadeDynastyBossModel.JADEDYNASTY_MAP || dataMapId == JadeDynastyTowerModel.DATA_MAPID) || dataMapId == JadeDynastyTowerModel.DATA_MAPID || dataMapId == AllianceBossModel.DATAMAPID) { if (!WindowCenter.Instance.IsOpen("DemonJarBossLifeBarWin")) { @@ -328,7 +330,8 @@ var dataMapId = MapUtility.GetDataMapId(); if (dataMapId != DemonJarModel.DEMONJAR_MAPID && dataMapId != JadeDynastyBossModel.JADEDYNASTY_MAP && dataMapId != JadeDynastyTowerModel.DATA_MAPID) && dataMapId != JadeDynastyTowerModel.DATA_MAPID && dataMapId != AllianceBossModel.DATAMAPID) { ShowBossLifeBar(bossInfo, true); } @@ -355,7 +358,8 @@ var dataMapId = MapUtility.GetDataMapId(); if (dataMapId != DemonJarModel.DEMONJAR_MAPID && dataMapId != JadeDynastyBossModel.JADEDYNASTY_MAP && dataMapId != JadeDynastyTowerModel.DATA_MAPID) && dataMapId != JadeDynastyTowerModel.DATA_MAPID && dataMapId != AllianceBossModel.DATAMAPID) { if (bossInfo.npcId != TargetBriefInfo.bossInfo.npcId) { System/FairyAu/AllianceBossHintWin.cs
New file @@ -0,0 +1,129 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Friday, March 01, 2019 //-------------------------------------------------------- using System; using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { public class AllianceBossHintWin : Window { [SerializeField] Text m_Progress; [SerializeField] RankBehaviour[] m_Ranks; [SerializeField] Text m_AllianceRank; [SerializeField] Text m_AllianceHurt; [SerializeField] Text m_AllianceParticipate; const long BOSSHP_TOTAL = 1000000000; DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } } protected override void BindController() { } protected override void AddListeners() { } protected override void OnPreOpen() { dungeonModel.updateMissionEvent += UpdateMissionEvent; Display(); } protected override void OnAfterOpen() { } protected override void OnPreClose() { dungeonModel.updateMissionEvent -= UpdateMissionEvent; } protected override void OnAfterClose() { } void Display() { DisplayProgress(); DisplayHurtRank(); DisplayAlliance(); } void DisplayProgress() { var mission = dungeonModel.mission; var currentHp = (long)(mission.remainHPPer * 0.000001d * BOSSHP_TOTAL); var progress = 1 - (float)currentHp / BOSSHP_TOTAL; m_Progress.text = StringUtility.Contact((int)(progress * 100), "%"); } void DisplayHurtRank() { var mission = dungeonModel.mission; var hurtInfos = mission.hurtInfo; var index = 0; if (hurtInfos != null) { for (int i = 0; i < hurtInfos.Length; i++) { if (i < m_Ranks.Length) { m_Ranks[i].Display(hurtInfos[i].playerName, hurtInfos[i].totalHurt); } index++; } } for (int i = index; i < m_Ranks.Length; i++) { m_Ranks[i].Reset(); } } void DisplayAlliance() { var mission = dungeonModel.mission; m_AllianceRank.text = mission.myRank == 0 ? string.Empty : mission.myRank.ToString(); m_AllianceHurt.text = UIHelper.ReplaceLargeNum(mission.myHurtTotal); m_AllianceParticipate.text = mission.myMenberCnt.ToString(); } private void UpdateMissionEvent() { Display(); } [Serializable] public class RankBehaviour { [SerializeField] Text m_FairyName; [SerializeField] Text m_Hurt; public void Display(string fairyName, long hurt) { m_FairyName.text = fairyName; m_Hurt.text = UIHelper.ReplaceLargeNum(hurt); } public void Reset() { m_FairyName.text = string.Empty; m_Hurt.text = string.Empty; } } } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: b71ebc3552b6540418bc0aeef3303e3b timeCreated: 1551430456 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/FairyAu/AllianceBossModel.cs
New file @@ -0,0 +1,41 @@ using System; using System.Collections; using System.Collections.Generic; using UnityEngine; namespace Snxxz.UI { public class AllianceBossModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk { public const int DATAMAPID = 31260; public bool isActivityOver { get; private set; } public event Action allianceBossStateRefresh; public override void Init() { } public void OnBeforePlayerDataInitialize() { isActivityOver = false; } public void OnPlayerLoginOk() { } public override void UnInit() { } public void ReceivePackage(HA40C_tagGCAllFamilyBossInfo package) { isActivityOver = package.IsEnd == 1; if (allianceBossStateRefresh != null) { allianceBossStateRefresh(); } } } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 24d1b53e30752c7468e3a2c38124b1eb timeCreated: 1552023902 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/WindowBase/ModelCenter.cs
@@ -233,6 +233,7 @@ RegisterModel<EquipStarModel>(); RegisterModel<TreasureSkillModel>(); RegisterModel<EquipGemModel>(); RegisterModel<AllianceBossModel>(); inited = true; }
