1889 【前端】神兽地界及界面相关

client_Wu Xijin

2018-08-21 e429f1086125244a372e186418fe86dc9e7eee56

1889 【前端】神兽地界及界面相关

 System/DogzDungeon/DogzDungeonBreifInfoBehaviour.cs

@@ -27,7 +27,19 @@
        protected override InteractorableState interactorableState {
            get {
                var selected = selectedBossId == bossId;
                var dieOrLocked = !model.IsBossUnLocked(bossId) || !findPreciousModel.IsBossAlive(bossId);
                var config = ConfigManager.Instance.GetTemplate<DogzDungeonConfig>(bossId);
                var dieOrLocked = false;
                switch (config.MonsterType)
                {
                    case 1:
                    case 2:
                    case 3:
                        dieOrLocked = false;
                        break;
                    case 4:
                        dieOrLocked = !model.IsBossUnLocked(bossId) || !findPreciousModel.IsBossAlive(bossId);
                        break;
                }

                if (!dieOrLocked)
                {
@@ -56,7 +68,7 @@
            base.Display(_data);

            m_Attention.gameObject.SetActive(findPreciousModel.IsBossSubscribed(bossId));
            var config = ConfigManager.Instance.GetTemplate<WorldBossConfig>(bossId);
            var config = ConfigManager.Instance.GetTemplate<DogzDungeonConfig>(bossId);
            var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(bossId);

            DrawBossBaseInfo(config.PortraitID, npcConfig.charName, npcConfig.NPCLV, npcConfig.Realm);

 System/DogzDungeon/DogzDungeonModel.cs

@@ -85,6 +85,7 @@

        public override void Init()
        {
            ParseConfig();
        }

        public override void UnInit()
@@ -110,10 +111,10 @@
        {
            if (bigBoxCollectCount < 2) //未疲劳
            {
                return 999;//大宝箱npc id
                return bigBoxNpcId;//大宝箱npc id
            }

            if (wearyValue < GeneralConfig.Instance.bossWearyValues[1])
            if (wearyValue < GeneralConfig.Instance.bossWearyValues[2])
            {
                var playerLevel = PlayerDatas.Instance.baseData.LV;
                for (int i = sortedBossIds.Count - 1; i >= 0; i--)
@@ -133,12 +134,41 @@
                return sortedBossIds[0];
            }

            return 999;//大宝箱 npcid
            return bigBoxNpcId;//大宝箱 npcid
        }

        public bool IsBossUnLocked(int _bossId)
        {
            if (_bossId == bigBoxNpcId || _bossId == smallBoxNpcId)
            {
                return true;
            }

            if (eliteMonsters.Contains(_bossId))
            {
                return true;
            }

            return bosses.ContainsKey(_bossId) && bosses[_bossId].isUnLocked;
        }

        public void RequestBoxAndEliteSurplusInfo()
        {
            var sendInfo = new CA227_tagCMQueryNPCCntInfo();
            sendInfo.MapID = DATA_MAPID;
            sendInfo.LineID = 0;
            var stringArray = new string[eliteMonsters.Count + 2];
            for (int i = 0; i < eliteMonsters.Count; i++)
            {
                stringArray[i] = eliteMonsters[i].ToString();
            }

            stringArray[eliteMonsters.Count] = bigBoxNpcId.ToString();
            stringArray[eliteMonsters.Count + 1] = smallBoxNpcId.ToString();

            sendInfo.NPCIDList = string.Format("[{0}]", string.Join(",", stringArray));
            sendInfo.NPCIDListLen = (byte)sendInfo.NPCIDList.Length;
            GameNetSystem.Instance.SendInfo(sendInfo);
        }

        public void RequestBoxSurplusInfo()
@@ -147,6 +177,7 @@
            sendInfo.MapID = DATA_MAPID;
            sendInfo.LineID = 0;
            sendInfo.NPCIDList = string.Format("[{0},{1}]", bigBoxNpcId, smallBoxNpcId);
            sendInfo.NPCIDListLen = (byte)sendInfo.NPCIDList.Length;
            GameNetSystem.Instance.SendInfo(sendInfo);
        }

@@ -162,6 +193,7 @@
            }

            sendInfo.NPCIDList = string.Format("[{0}]", string.Join(",", stringArray));
            sendInfo.NPCIDListLen = (byte)sendInfo.NPCIDList.Length;
            GameNetSystem.Instance.SendInfo(sendInfo);
        }


 System/DogzDungeon/DogzDungeonWin.cs

@@ -71,8 +71,7 @@
        {
            base.OnActived();
            ShowBosses();
            model.RequestBoxSurplusInfo();
            model.RequestEliteSurplusInfo();
            model.RequestBoxAndEliteSurplusInfo();
        }
        #endregion

@@ -83,7 +82,7 @@
            m_Bosses.Init(bosses);
            m_Bosses.MoveToCenter(bosses.IndexOf(model.selectedBoss));

            DisplayItemDropTip(model.selectedBoss);
            // DisplayItemDropTip(model.selectedBoss);
            DisplayBossBaseInfo(model.selectedBoss);
            DisplayWearyValue(model.selectedBoss);
        }
@@ -108,7 +107,11 @@

        private void GotoKillBoss()
        {
            var dataMapId = dungeonModel.GetDungeonDataIdByMapId(PlayerDatas.Instance.baseData.MapID);
            if (PlayerDatas.Instance.baseData.MapID == DogzDungeonModel.DATA_MAPID)
            {
                WindowCenter.Instance.Close<LootPreciousFrameWin>();
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
            EnterDogzDungeon();
        }

@@ -119,7 +122,7 @@

        private void OnBossSelected(int _bossId)
        {
            DisplayItemDropTip(_bossId);
            //DisplayItemDropTip(_bossId);
            DisplayBossBaseInfo(_bossId);
            DisplayWearyValue(_bossId);
        }
@@ -191,14 +194,14 @@
                    m_ContainerBoxCollectWeary.gameObject.SetActive(true);
                    m_ContainerBossKillWeary.gameObject.SetActive(false);
                    var bigBoxCollectCountLimit = 2;
                    m_BossKillWearyValue.text = StringUtility.Contact(model.wearyValue, "/", bigBoxCollectCountLimit);
                    m_BossKillWearyValue.colorType = model.bigBoxCollectCount >= bigBoxCollectCountLimit ? TextColType.Red : TextColType.DarkGreen;
                    m_BoxCollectWearyValue.text = StringUtility.Contact(model.bigBoxCollectCount, "/", bigBoxCollectCountLimit);
                    m_BoxCollectWearyValue.colorType = model.bigBoxCollectCount >= bigBoxCollectCountLimit ? TextColType.Red : TextColType.DarkGreen;
                    break;
                case 3:
                case 4:
                    m_ContainerBoxCollectWeary.gameObject.SetActive(false);
                    m_ContainerBossKillWeary.gameObject.SetActive(true);
                    var wearyValueLimit = GeneralConfig.Instance.bossWearyValues[1];
                    var wearyValueLimit = GeneralConfig.Instance.bossWearyValues[2];
                    m_BossKillWearyValue.text = StringUtility.Contact(model.wearyValue, "/", wearyValueLimit);
                    m_BossKillWearyValue.colorType = model.wearyValue >= wearyValueLimit ? TextColType.Red : TextColType.DarkGreen;
                    break;
@@ -210,6 +213,7 @@
            var error = 0;
            if (TestEnterDungeon(out error))
            {
                MapTransferUtility.Instance.MoveToNPC(model.selectedBoss);
            }
            else
            {

 System/DogzDungeon/DogzEliteMonsterBehaviour.cs

@@ -46,7 +46,7 @@
        private void LateUpdate()
        {
            timer += Time.deltaTime;
            if (timer > 30)
            if (timer > 30f)
            {
                timer = 0f;
                model.RequestEliteSurplusInfo();

 System/FindPrecious/FindPreciousBossRebornBehaviour.cs

@@ -250,7 +250,17 @@


        private void GotoKillDogzDungeonBoss(int _bossId)

        {

            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);



            if (mapConfig.MapFBType == (int)MapType.OpenCountry)

            {

                MapTransferUtility.Instance.MoveToNPC(_bossId);

            }

            else

            {

                SysNotifyMgr.Instance.ShowTip("InDungeon_CantGo");

            }

        }



        private void EnterBossHome(int _floor)


 System/GeneralConfig/GeneralConfig.cs

@@ -126,6 +126,7 @@
    public int inGameDownLoadHighestLevelPoint { get; private set; }



    public List<int> dungeonCanUseMoneyIds { get; private set; }

    public int dogzBoxLimit { get; private set; }



    public void Init()

    {

@@ -431,6 +432,7 @@
            inGameDownLoadHighestLevelPoint = GetInt("DownReward", 2);



            dungeonCanUseMoneyIds = new List<int>(GetIntArray("FBEnterTickeyAuto", 1));

            dogzBoxLimit = GetInt("DogzBoxLimit");

        }

        catch (Exception ex)

        {