6352 骑宠争夺更新

xingchen Qiu

2019-04-10 b45f84d1a84cb768d0b136fe37ad18364d74af1f

6352 骑宠争夺更新

 System/RidingPet/ContainerRidingPet.cs

File was renamed from System/RidingPet/Container_RidingPet.cs
@@ -12,19 +12,19 @@

namespace Snxxz.UI

{

    public class Container_RidingPet : MonoBehaviour

    public class ContainerRidingPet : MonoBehaviour

    {



        [SerializeField] Text m_MountsBossName;

        [SerializeField] Text m_ActivityInfo;

        [SerializeField] RawImage m_BossRawImage;

        DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }

        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

        public int RawImagetestBossID = 50103006;

        public RewardPositionType rewardPositonType;

        [SerializeField] ItemCell[] m_RewardArray;



        public int bossIdIndex = 0;

        public int m_ActivityID = 34;



        public void DisplayBossName()

        {

@@ -55,16 +55,16 @@


        public void DisplaySpiritPetHP()

        {

            m_ActivityInfo.text = Language.Get("RidingBossRemainHP", ModelCenter.Instance.GetModel<RidingPetBossModel>().GetBossRemianedHP(bossIdIndex));

            m_ActivityInfo.text = Language.Get("RidingPetBossRemainHP", ModelCenter.Instance.GetModel<RidingPetBossModel>().GetBossRemianedHP(bossIdIndex));

        }



        public void DisplayActivityTime()

        {

            DailyQuestOpenTime dailyQuestOpentime;

            dailyQuestModel.TryGetOpenTime(m_ActivityID, out dailyQuestOpentime);

            dailyQuestModel.TryGetOpenTime((int)DailyQuestType.RidingPetActivity, out dailyQuestOpentime);

            HourMinute hourMin;

            dailyQuestOpentime.TryGetNextOpenTime(out hourMin);

            m_ActivityInfo.text = Language.Get("RidingBossQuestTime", hourMin.hourBegin, hourMin.minuteBegin);

            m_ActivityInfo.text = Language.Get("RidingPetBossQuestTime", hourMin.hourBegin, hourMin.minuteBegin);

        }



        public void DisplayRewardItem()

@@ -89,6 +89,14 @@
                {

                    ItemCellModel cellModel = new ItemCellModel(itemConfig.ID, true, (ulong)1);

                    m_RewardArray[i].Init(cellModel);

                    if (m_RewardArray[i].button != null)

                    {

                        m_RewardArray[i].button.SetListener(()=>

                        {

                            ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true, (ulong)1);

                            itemTipsModel.SetItemTipsModel(attrData);

                        });

                    }

                }

            }

        }


 System/RidingPet/ContainerRidingPet.cs.meta

 System/RidingPet/RidingPetBossModel.cs

@@ -19,50 +19,16 @@
        private string m_Boss2RewardID;

        public event Action GetRidingPetBossLineDictAction;



        public string MountsBossID

        {

            get

            {

                if (m_MountsBossID == null)

                {

                    m_MountsBossID = FuncConfigConfig.Get("QCBOSSID").Numerical1;

                    
                }

                return m_MountsBossID;

            }

        }



        public string Boss1RewardID

        {

            get

            {

                if (m_Boss1RewardID == null)

                {

                    m_Boss1RewardID = FuncConfigConfig.Get("QCBOSSID").Numerical2;



                }

                return m_Boss1RewardID;

            }

        }



        public string Boss2RewardID

        {

            get

            {

                if (m_Boss2RewardID == null)

                {

                    m_Boss2RewardID = FuncConfigConfig.Get("QCBOSSID").Numerical3;



                }

                return m_Boss2RewardID;

            }

        }



        public override void Init()

        {

            BossIDArray = ConfigParse.GetMultipleStr<int>(MountsBossID);

            Boss1RewardIDArray = ConfigParse.GetMultipleStr<int>(Boss1RewardID);

            Boss2RewardIDArray = ConfigParse.GetMultipleStr<int>(Boss2RewardID);

            m_MountsBossID = FuncConfigConfig.Get("QCBOSSID").Numerical1;

            m_Boss1RewardID = FuncConfigConfig.Get("QCBOSSID").Numerical2;

            m_Boss2RewardID = FuncConfigConfig.Get("QCBOSSID").Numerical3;

            BossIDArray = ConfigParse.GetMultipleStr<int>(m_MountsBossID);

            Boss1RewardIDArray = ConfigParse.GetMultipleStr<int>(m_Boss1RewardID);

            Boss2RewardIDArray = ConfigParse.GetMultipleStr<int>(m_Boss2RewardID);

        }



        public void OnBeforePlayerDataInitialize()


 System/RidingPet/RidingPetBossVictoryWin.cs

@@ -100,7 +100,7 @@
            DisplayDungeonExit();

            DisplayWinOrRank();

            DisplayAuctionItem();

            DisPlayMyItem();

            DisplayMyItem();

        }



        void DisplayDungeonExit()

@@ -171,7 +171,7 @@
            }

        }



        private void DisPlayMyItem()

        private void DisplayMyItem()

        {

            var result = dungeonModel.dungeonResult;

            if (result.itemInfo != null)


 System/RidingPet/RidingPetBottomTip.cs

File was renamed from System/RidingPet/BottomTip.cs
@@ -5,32 +5,31 @@
using UnityEngine;
using UnityEngine.UI;

public class BottomTip : MonoBehaviour {
public class RidingPetBottomTip : MonoBehaviour {

    [SerializeField] Text bottomText;
    DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
    public int m_ActivityID = 34;

    public void DisplayBottomStartTip()

    {

        DailyQuestOpenTime dailyQuestOpenTime;

        dailyQuestModel.TryGetOpenTime(m_ActivityID, out dailyQuestOpenTime);

        dailyQuestModel.TryGetOpenTime((int)DailyQuestType.RidingPetActivity, out dailyQuestOpenTime);

        int secondsToNext = dailyQuestOpenTime.GetNextSessionSurplusTime();

        int hour = secondsToNext / 3600;

        int min = secondsToNext % 3600 / 60;

        int seconds = secondsToNext % 3600 % 60;

        bottomText.text = "<color=red>"+"活动开启倒计时：" + hour + "小时" + min + "分" + seconds + "秒"+"</color>";

        bottomText.text = Language.Get("RidingPetQuestStartCountDown", hour, min, seconds);

    }

    public void DisplayBottomRemainTimeTip()

    {

        DailyQuestOpenTime dailyQuestOpenTime;

        dailyQuestModel.TryGetOpenTime(m_ActivityID, out dailyQuestOpenTime);

        dailyQuestModel.TryGetOpenTime((int)DailyQuestType.RidingPetActivity, out dailyQuestOpenTime);

        HourMinute hourMin;

        dailyQuestOpenTime.TryGetNextOpenTime(out hourMin);



        DateTime endTime = new DateTime(TimeUtility.Year, TimeUtility.Month, TimeUtility.Day, hourMin.hourEnd, hourMin.minuteEnd, 0);

        TimeSpan remainTime = endTime - TimeUtility.ServerNow;

        bottomText.text = "<color=green>"+"活动剩余时间：" + remainTime.Hours + "小时" + remainTime.Minutes + "分" + remainTime.Seconds + "秒"+"</color>";

        bottomText.text = Language.Get("RidingPetQuestRemainTime",remainTime.Hours,remainTime.Minutes,remainTime.Seconds);

    }
}

 System/RidingPet/RidingPetBottomTip.cs.meta

 System/RidingPet/RidingPetContentionWin.cs

@@ -9,9 +9,9 @@
    {

        [SerializeField] Button m_MountsGoToButton;

        [SerializeField] Button m_SpiritPetGoToButton;

        [SerializeField] Container_RidingPet m_Container_Mounts;

        [SerializeField] Container_RidingPet m_Container_SpiritPet;

        [SerializeField] BottomTip m_BottomTip;

        [SerializeField] ContainerRidingPet m_ContainerMounts;

        [SerializeField] ContainerRidingPet m_ContainerSpiritPet;

        [SerializeField] RidingPetBottomTip m_RidingPetBottomTip;

        MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } }

        RidingPetBossModel ridingPetBossModel { get { return ModelCenter.Instance.GetModel<RidingPetBossModel>(); } }

        DungeonModel dungeondel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

@@ -32,8 +32,8 @@


        protected override void OnAfterClose()

        {

            m_Container_Mounts.StopShowBossRawImage();

            m_Container_SpiritPet.StopShowAnotherBossImage();

            m_ContainerMounts.StopShowBossRawImage();

            m_ContainerSpiritPet.StopShowAnotherBossImage();

        }



        protected override void OnAfterOpen()

@@ -48,26 +48,38 @@


        protected override void OnPreOpen()

        {

            m_Container_Mounts.DisplayBossName();

            m_Container_SpiritPet.DisplayBossName();

            m_ContainerMounts.DisplayBossName();

            m_ContainerSpiritPet.DisplayBossName();

            

            ridingPetBossModel.GetRidingPetBossLineDictAction += GetRidingBossDictPackageAction;

            mapModel.RequestQueryMapLineState(RidingPetBossModel.RIDINGPETBOSS_MAP);

            GetRidingBossDictPackageAction();

            m_Container_Mounts.DisplayBossRawImage();

            m_Container_SpiritPet.DisplayAnotherBossRawImage();

            m_Container_Mounts.DisplayRewardItem();

            m_Container_SpiritPet.DisplayRewardItem();



            m_ContainerMounts.DisplayBossRawImage();

            m_ContainerSpiritPet.DisplayAnotherBossRawImage();



            m_ContainerMounts.DisplayRewardItem();

            m_ContainerSpiritPet.DisplayRewardItem();

            WindowCenter.Instance.windowBeforeCloseEvent += WindowBeforeCloseEvent;

        }



        private void WindowBeforeCloseEvent(Window _window)

        {

            if (_window is PetMatInfoWin)

            {

                m_ContainerMounts.DisplayBossRawImage();

                m_ContainerSpiritPet.DisplayAnotherBossRawImage();

            }

        }



        private void GoToKillMountsBoss()

        {

            dungeondel.SingleChallenge(RidingPetBossModel.RIDINGPETBOSS_MAP, m_Container_Mounts.bossIdIndex);

            dungeondel.SingleChallenge(RidingPetBossModel.RIDINGPETBOSS_MAP, m_ContainerMounts.bossIdIndex);

        }



        private void GoToKillSpiritPetBoss()

        {

            dungeondel.SingleChallenge(RidingPetBossModel.RIDINGPETBOSS_MAP, m_Container_SpiritPet.bossIdIndex);

            dungeondel.SingleChallenge(RidingPetBossModel.RIDINGPETBOSS_MAP, m_ContainerSpiritPet.bossIdIndex);

        }



        protected override void LateUpdate()

@@ -78,44 +90,43 @@
                mapModel.RequestQueryMapLineState(RidingPetBossModel.RIDINGPETBOSS_MAP);

                m_Timer -= 5;

            }

            UpdatebottomTip();

            if (m_Timer > 1)

            {

                UpdateRidingPetBottomTip();

                m_Timer -= 1;

            }

        }



        public void GetRidingBossDictPackageAction()

        {

            switch (dailyQuestModel.GetQuestState(m_Container_Mounts.m_ActivityID))

            switch (dailyQuestModel.GetQuestState((int)DailyQuestType.RidingPetActivity))

            {

                case DailyQuestModel.DailyQuestState.Completed:

                case DailyQuestModel.DailyQuestState.Normal:

                    m_Container_Mounts.DisplaySpiritPetHP();

                    m_ContainerMounts.DisplaySpiritPetHP();

                    m_ContainerSpiritPet.DisplaySpiritPetHP();

                    m_MountsGoToButton.interactable = true;

                    m_SpiritPetGoToButton.interactable = true;

                    break;

                default:

                    m_Container_Mounts.DisplayActivityTime();

                    break;

            }



            switch (dailyQuestModel.GetQuestState(m_Container_SpiritPet.m_ActivityID))

            {

                case DailyQuestModel.DailyQuestState.Completed:

                case DailyQuestModel.DailyQuestState.Normal:

                    m_Container_SpiritPet.DisplaySpiritPetHP();

                    break;

                default:

                    m_Container_SpiritPet.DisplayActivityTime();

                    m_ContainerMounts.DisplayActivityTime();

                    m_ContainerSpiritPet.DisplayActivityTime();

                    m_MountsGoToButton.interactable = false;

                    m_SpiritPetGoToButton.interactable = false;

                    break;

            }

        }



        public void UpdatebottomTip()

        public void UpdateRidingPetBottomTip()

        {

            switch (dailyQuestModel.GetQuestState(m_BottomTip.m_ActivityID))

            switch (dailyQuestModel.GetQuestState((int)DailyQuestType.RidingPetActivity))

            {

                case DailyQuestModel.DailyQuestState.Completed:

                case DailyQuestModel.DailyQuestState.Normal:

                    m_BottomTip.DisplayBottomRemainTimeTip();

                    m_RidingPetBottomTip.DisplayBottomRemainTimeTip();

                    break;

                default:

                    m_BottomTip.DisplayBottomStartTip();

                    m_RidingPetBottomTip.DisplayBottomStartTip();

                    break;

            }

        }


 Utility/EnumHelper.cs

@@ -290,6 +290,7 @@
    GatherSoulDungeon = 30,

    CrossServerPk = 31,

    AllianceBoss = 32,

    RidingPetActivity = 34

    //JadeDynastyBoss = 32,--诛仙功能暂时关闭

    //JadeDynastyTower = 33,

}