3335 重构窗口管理

client_Wu Xijin

2019-02-02 5dfa1fa4f1f82a467717373bae4c98107e885d0f

3335 重构窗口管理

 System/Dungeon/TargetBriefInfoWin.cs

@@ -12,9 +12,6 @@


public class TargetBriefInfo

{



    public static int selectedNpcId { get; private set; }



    public static PlayerInfo playerInfo { get; private set; }

    public static MonsterInfo bossInfo { get; private set; }



@@ -37,14 +34,11 @@
            return;

        }



        if (_show)

        bossInfo = new MonsterInfo()

        {

            selectedNpcId = _npcId;

        }

        else

        {

            selectedNpcId = 0;

        }

            instanceId = _show ? _instanceId : 0,

            npcId = _show ? _npcId : 0,

        };



        var mapId = PlayerDatas.Instance.baseData.MapID;

        var dataMapId = ModelCenter.Instance.GetModel<DungeonModel>().GetDataMapIdByMapId(mapId);

@@ -54,33 +48,12 @@
        {

            if (_show)

            {



                DemonJarBossLifeBarWin win;

                if (!WindowCenter.Instance.IsOpen<DemonJarBossLifeBarWin>())

                {

                    win = WindowCenter.Instance.Open<DemonJarBossLifeBarWin>(true);

                }

                else

                {

                    win = WindowCenter.Instance.Get<DemonJarBossLifeBarWin>();

                }



                win.InitBossLifeBar();

                WindowCenter.Instance.Open<DemonJarBossLifeBarWin>();

            }

        }

        else

        {

            TargetBriefInfoWin win;

            if (!WindowCenter.Instance.IsOpen<TargetBriefInfoWin>())

            {

                win = WindowCenter.Instance.Open<TargetBriefInfoWin>(true);

            }

            else

            {

                win = WindowCenter.Instance.Get<TargetBriefInfoWin>();

            }



            win.ShowBossLifeBar(_instanceId, _npcId, _show);

            WindowCenter.Instance.Open<TargetBriefInfoWin>();

        }



    }

@@ -92,41 +65,34 @@
            return;

        }



        selectedNpcId = _npcId;

        bossInfo = new MonsterInfo()

        {

            instanceId = _instanceId,

            npcId = _npcId,

            hp = _hp,

            maxHp = _maxHp

        };



        var mapId = PlayerDatas.Instance.baseData.MapID;

        var dataMapId = ModelCenter.Instance.GetModel<DungeonModel>().GetDataMapIdByMapId(mapId);

        var dataMapId = MapUtility.GetDataMapId(mapId);

        if (dataMapId == DemonJarModel.DEMONJAR_MAPID

            || dataMapId == JadeDynastyBossModel.JADEDYNASTY_MAP

            || dataMapId == JadeDynastyTowerModel.DATA_MAPID)

        {

            DemonJarBossLifeBarWin win;

            if (!WindowCenter.Instance.IsOpen<DemonJarBossLifeBarWin>())

            if (!WindowCenter.Instance.IsOpen("DemonJarBossLifeBarWin"))

            {

                win = WindowCenter.Instance.Open<DemonJarBossLifeBarWin>(true);

                WindowCenter.Instance.Open<DemonJarBossLifeBarWin>();

            }

            else

            {

                win = WindowCenter.Instance.Get<DemonJarBossLifeBarWin>();

            }



            win.RefreshBossLifeBar();

        }

        else

        {

            if (PlayerDatas.Instance.hero != null && PlayerDatas.Instance.hero.SelectTarget != null

            && PlayerDatas.Instance.hero.SelectTarget.ServerInstID == TargetBriefInfoWin.currentBossInstanceId)

            {

                TargetBriefInfoWin win;

                if (!WindowCenter.Instance.IsOpen<TargetBriefInfoWin>())

                if (!WindowCenter.Instance.IsOpen("TargetBriefInfoWin"))

                {

                    win = WindowCenter.Instance.Open<TargetBriefInfoWin>(true);

                    WindowCenter.Instance.Open<TargetBriefInfoWin>(true);

                }

                else

                {

                    win = WindowCenter.Instance.Get<TargetBriefInfoWin>();

                }



                win.RefreshBossLifeBar(_instanceId, _npcId, _hp, _maxHp);

            }

        }



@@ -139,22 +105,17 @@
            return;

        }



        playerInfo = new PlayerInfo()

        {

            instanceId = _show ? _instanceId : 0,

        };



        if (WindowCenter.Instance.IsOpen("DemonJarBossLifeBarWin"))

        {

            WindowCenter.Instance.Close<DemonJarBossLifeBarWin>();

        }



        TargetBriefInfoWin win;

        if (!WindowCenter.Instance.IsOpen<TargetBriefInfoWin>())

        {

            win = WindowCenter.Instance.Open<TargetBriefInfoWin>(true);

        }

        else

        {

            win = WindowCenter.Instance.Get<TargetBriefInfoWin>();

        }



        win.ShowPlayerLifeBar(_instanceId, _show);

        WindowCenter.Instance.Open<TargetBriefInfoWin>(true);

    }



    static void OnRefreshPlayerLifeBar(uint _instanceId, ulong _hp, ulong _maxHp)

@@ -164,26 +125,32 @@
            return;

        }



        var win = WindowCenter.Instance.Get<TargetBriefInfoWin>();

        if (win != null)

        playerInfo = new PlayerInfo()

        {

            win.RefreshPlayerLifeBar(_instanceId, _hp, _maxHp);

            instanceId = _instanceId,

            hp = _hp,

            maxHp = _maxHp

        };



        if (!WindowCenter.Instance.IsOpen<TargetBriefInfoWin>())

        {

            WindowCenter.Instance.Open<TargetBriefInfoWin>(true);

        }

    }



    public struct MonsterInfo

    {

        public int instanceId;

        public uint instanceId;

        public int npcId;

        public long hp;

        public long maxHp;

        public ulong hp;

        public ulong maxHp;

    }



    public struct PlayerInfo

    {

        public int instanceId;

        public long hp;

        public long maxHp;

        public uint instanceId;

        public ulong hp;

        public ulong maxHp;

    }



}


 System/FindPrecious/DemonJarBossLifeBarWin.cs

@@ -108,10 +108,10 @@
        public void InitBossLifeBar()

        {

            m_BossLifeBar.gameObject.SetActive(true);

            var npcConfig = Config.Instance.Get<NPCConfig>(TargetBriefInfo.selectedNpcId);

            var npcConfig = Config.Instance.Get<NPCConfig>(TargetBriefInfo.bossInfo.npcId);

            currentHp = (long)(model.mission.remainHPPer * 0.000001d * BOSSHP_TOTAL);



            m_BossLifeBar.SetBaseInfo(TargetBriefInfo.selectedNpcId, (ulong)currentHp, BOSSHP_TOTAL, npcConfig.NPCLV);

            m_BossLifeBar.SetBaseInfo(TargetBriefInfo.bossInfo.npcId, (ulong)currentHp, BOSSHP_TOTAL, npcConfig.NPCLV);

            inited = true;

        }




 System/Message/MessageWin.cs

@@ -23,6 +23,7 @@
                return _inst;

            }

        }



        [SerializeField] RectTransform m_ContianerFixedTip0;

        [SerializeField] RichText m_FixedTip0;