3335 缥缈仙域

client_linchunjie

2019-04-16 c1e51b5bb514093ad3975cf3a0168d609c66a329

3335 缥缈仙域

 Fight/Stage/Dungeon/DungeonStage.cs

@@ -228,6 +228,8 @@
            case 31140:

            case JadeDynastyBossModel.JADEDYNASTY_MAP:

            case HazyDemonKingModel.Client_MapID:

            case HazyDemonKingModel.DEMONKINGMAPID1:

            case HazyDemonKingModel.DEMONKINGMAPID2:

                WindowCenter.Instance.Open<DungeonPickUpItemCoolDownWin>();

                break;

            case FairyLeagueModel.FAIRY_LEAGUE_DUNGEON:


 System/HazyRegion/HazyAdventureHintWin.cs

@@ -55,7 +55,7 @@
            if (config != null)

            {

                var npcConfig = NPCConfig.Get(config.npcId);

                m_AdventureName.text = string.Format("与{0}对话：", npcConfig.charName);

                m_AdventureName.text = Language.Get("AdventureDialogue", npcConfig.charName);

            }



            HazyRegionModel.Incident incident;


 System/HazyRegion/HazyDemonKingModel.cs

@@ -14,6 +14,9 @@


        public const int Client_MapID = 2000;



        public const int DEMONKINGMAPID1 = 22030;

        public const int DEMONKINGMAPID2 = 32030;



        public event Action onPlayerInfoRefresh;



        HazyRegionModel hazyRegionModel { get { return ModelCenter.Instance.GetModel<HazyRegionModel>(); } }


 System/HazyRegion/HazyDemonKingPlayerBehaviour.cs

@@ -102,18 +102,15 @@
                switch (atkState)

                {

                    case 0:

                        m_FightSign.SetSprite("HazyFightState_Red");

                        m_AtkState.text = "战斗中";

                        m_AtkState.text = Language.Get("DemonKingFightState_0");

                        m_AtkState.color = UIHelper.GetUIColor(TextColType.Red, true);

                        break;

                    case 1:

                        m_FightSign.SetSprite("HazyFightState_White");

                        m_AtkState.text = "反击";

                        m_AtkState.text = Language.Get("DemonKingFightState_1");

                        m_AtkState.color = UIHelper.GetUIColor(TextColType.Red, true);

                        break;

                    case 2:

                        m_FightSign.SetSprite("HazyFightState_White");

                        m_AtkState.text = "攻击";

                        m_AtkState.text = Language.Get("DemonKingFightState_2");

                        m_AtkState.color = UIHelper.GetUIColor(TextColType.NavyBrown, true);

                        break;

                }


 System/HazyRegion/HazyDemonKingVictoryWin.cs

@@ -19,6 +19,8 @@
        [SerializeField] ScrollRect m_RewardsScroll;

        [SerializeField] Text m_ExitTimer;

        [SerializeField] HorizontalLayoutGroup m_RewardLayout;

        [SerializeField] Transform m_ContainerFirst;

        [SerializeField] Transform m_ContainerOther;

        [SerializeField] ButtonEx m_Exit;



        List<DemonJarRewardBehaviour> m_Items = new List<DemonJarRewardBehaviour>();

@@ -101,6 +103,11 @@
            timer = 0f;

            m_ExitTimer.text = Language.Get("DungeonVictoryWin_Btn_Exit_1", Mathf.Clamp((int)seconds, 0, int.MaxValue));

            m_ExitTimer.gameObject.SetActive(true);



            bool isFirst = model.dungeonResult.ownerID == PlayerDatas.Instance.PlayerId;

            m_ContainerFirst.gameObject.SetActive(isFirst);

            m_ContainerOther.gameObject.SetActive(!isFirst);



            m_ContainerPoivt.gameObject.SetActive(true);



            DisplayRewards();


 System/HazyRegion/HazyGrassDungeonWin.cs

@@ -88,8 +88,8 @@
        {

            var used = Mathf.Max(0, (int)(TimeUtility.ServerNow - hazyGrassModel.grassBornTime).TotalSeconds);

            var refreshSeconds = hazyGrassModel.grassRefreshSeconds - used % hazyGrassModel.grassRefreshSeconds;

            m_BasicGrassRefreshTime.text = string.Format("基础草丛{0}后刷新", TimeUtility.SecondsToMS(refreshSeconds));

            m_FairyGrassRefreshTime.text = string.Format("灵草丛{0}后刷新", TimeUtility.SecondsToMS(refreshSeconds));

            m_BasicGrassRefreshTime.text = Language.Get("HazyBasicGrassRefresh", TimeUtility.SecondsToMS(refreshSeconds));

            m_FairyGrassRefreshTime.text = Language.Get("HazyFairyGrassRefresh", TimeUtility.SecondsToMS(refreshSeconds));

        }

    }




 System/HazyRegion/HazyRegionEntrancePanel.cs

@@ -68,7 +68,7 @@
                            hourMinute.minuteBegin.ToString("D2"), hourMinute.hourEnd.ToString("D2"),

                            hourMinute.minuteEnd.ToString("D2"));

                        timeLabel = UIHelper.AppendColor(TextColType.Green, timeLabel);

                        m_OpenTime.text = string.Format("每日{0}可进行寻访", timeLabel);

                        m_OpenTime.text = Language.Get("HazyRegionEntranceTime", timeLabel);

                    }

                }

            }


 System/HazyRegion/HazyRegionIncidentBehaviour.cs

@@ -69,7 +69,7 @@
        void DisplayBase()

        {

            var config = HazyRegionConfig.Get(incidentId);

            m_DepletionPoint.text = string.Format("消耗体力： {0}", config.point);

            m_DepletionPoint.text = Language.Get("HazyRegionPoint", config.point);

            m_IncidentTitle.text = config.name;

            m_Icon.SetSprite(config.PortraitID);

            m_Icon.SetNativeSize();

@@ -106,6 +106,27 @@
                var npcConfig = NPCConfig.Get(config.npcId);

                m_BossName.text = npcConfig.charName;

            }



            DisplayBossState();

        }



        void DisplayBossState()

        {

            if (incidentType == HazyRegionIncidentType.DemonKing)

            {

                if (model.InFakeHazyRegion)

                {

                    var fighting = ClientDungeonStageUtility.isClientDungeon;

                    m_PlayerCount.gameObject.SetActive(true);

                    m_RebornTime.gameObject.SetActive(false);

                    m_PlayerCount.text = Language.Get("HazyDemonKingPlayerCount", fighting ? 1 : 0);

                }

                else

                {

                    m_PlayerCount.gameObject.SetActive(false);

                    m_RebornTime.gameObject.SetActive(false);

                }

            }

        }



        void DisplayState()


 System/HazyRegion/HazyRegionIncidentPanel.cs

@@ -124,7 +124,7 @@
            switch (state)

            {

                case 1:

                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get(""), (bool isOk) =>

                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("HazyRegionBackRemind_1"), (bool isOk) =>

                    {

                        if (isOk)

                        {

@@ -133,7 +133,7 @@
                    });

                    break;

                case 2:

                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get(""), (bool isOk) =>

                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("HazyRegionBackRemind_2"), (bool isOk) =>

                    {

                        if (isOk)

                        {