Merge branch 'master' into HazyRegion

client_linchunjie

2019-04-11 28764a911c496fbabc8ded5d062d1e222d582201

Merge branch 'master' into HazyRegion

Conflicts:
	Utility/EnumHelper.cs

 Core/GameEngine/Model/Config/JobSetupConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------

//    [Author]:           Fish

//    [  Date ]:           Thursday, February 14, 2019

//    [  Date ]:           Wednesday, April 10, 2019

//--------------------------------------------------------



using System.Collections.Generic;

@@ -14,30 +14,31 @@
{



    public readonly int Job;

    public readonly int[] BaseEquip;

    public readonly int[] ComAtkIdList;

    public readonly int[] StopAction;

    public readonly int[] CanStopSkillList;

    public readonly string CanBeStopSkillList;

    public readonly int RushMinDist;

    public readonly int RushMaxDist;

    public readonly int RushSpeed;

    public readonly int RushInterval;

    public readonly int RushAnimatorSpeed;

    public readonly int RushTargetType;

    public readonly int ShadowLastTime;

    public readonly int ShadowCreateInterval;

    public readonly int SearchEnemyDist;

    public readonly int MaxSwitchTargetDist;

    public readonly int[] HangupSkillList;

    public readonly string DungeonSkillList;

    public readonly string OffLineSkillList;

    public readonly int HpPerUseSkill;

    public readonly int[] HpSkillList;

    public readonly int[] GainSkillList;

    public readonly int MoveLimitDist;

    public readonly int[] BaseEquip;

    public readonly int[] ComAtkIdList;

    public readonly int[] StopAction;

    public readonly int[] CanStopSkillList;

    public readonly string CanBeStopSkillList;

    public readonly int RushMinDist;

    public readonly int RushMaxDist;

    public readonly int RushSpeed;

    public readonly int RushInterval;

    public readonly int RushAnimatorSpeed;

    public readonly int RushTargetType;

    public readonly int ShadowLastTime;

    public readonly int ShadowCreateInterval;

    public readonly int SearchEnemyDist;

    public readonly int MaxSwitchTargetDist;

    public readonly int[] HangupSkillList;

    public readonly string DungeonSkillList;

    public readonly string OffLineSkillList;

    public readonly int HpPerUseSkill;

    public readonly int[] HpSkillList;

    public readonly int[] GainSkillList;

    public readonly int MoveLimitDist;

    public readonly int[] RollBreakSkillList;



    public JobSetupConfig()

    public JobSetupConfig()

    {

    }



@@ -47,86 +48,93 @@
        {

            var tables = input.Split('\t');



            int.TryParse(tables[0],out Job); 
            int.TryParse(tables[0], out Job);



            string[] BaseEquipStringArray = tables[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            BaseEquip = new int[BaseEquipStringArray.Length];
            for (int i=0;i<BaseEquipStringArray.Length;i++)
            {
                 int.TryParse(BaseEquipStringArray[i],out BaseEquip[i]);
            }

            string[] BaseEquipStringArray = tables[1].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);

            BaseEquip = new int[BaseEquipStringArray.Length];

            for (int i = 0; i < BaseEquipStringArray.Length; i++)

            {

                int.TryParse(BaseEquipStringArray[i], out BaseEquip[i]);

            }



            string[] ComAtkIdListStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            ComAtkIdList = new int[ComAtkIdListStringArray.Length];
            for (int i=0;i<ComAtkIdListStringArray.Length;i++)
            {
                 int.TryParse(ComAtkIdListStringArray[i],out ComAtkIdList[i]);
            }

            string[] ComAtkIdListStringArray = tables[2].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);

            ComAtkIdList = new int[ComAtkIdListStringArray.Length];

            for (int i = 0; i < ComAtkIdListStringArray.Length; i++)

            {

                int.TryParse(ComAtkIdListStringArray[i], out ComAtkIdList[i]);

            }



            string[] StopActionStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            StopAction = new int[StopActionStringArray.Length];
            for (int i=0;i<StopActionStringArray.Length;i++)
            {
                 int.TryParse(StopActionStringArray[i],out StopAction[i]);
            }

            string[] StopActionStringArray = tables[3].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);

            StopAction = new int[StopActionStringArray.Length];

            for (int i = 0; i < StopActionStringArray.Length; i++)

            {

                int.TryParse(StopActionStringArray[i], out StopAction[i]);

            }



            string[] CanStopSkillListStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            CanStopSkillList = new int[CanStopSkillListStringArray.Length];
            for (int i=0;i<CanStopSkillListStringArray.Length;i++)
            {
                 int.TryParse(CanStopSkillListStringArray[i],out CanStopSkillList[i]);
            }

            string[] CanStopSkillListStringArray = tables[4].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);

            CanStopSkillList = new int[CanStopSkillListStringArray.Length];

            for (int i = 0; i < CanStopSkillListStringArray.Length; i++)

            {

                int.TryParse(CanStopSkillListStringArray[i], out CanStopSkillList[i]);

            }



            CanBeStopSkillList = tables[5];

            CanBeStopSkillList = tables[5];



            int.TryParse(tables[6],out RushMinDist); 
            int.TryParse(tables[6], out RushMinDist);



            int.TryParse(tables[7],out RushMaxDist); 
            int.TryParse(tables[7], out RushMaxDist);



            int.TryParse(tables[8],out RushSpeed); 
            int.TryParse(tables[8], out RushSpeed);



            int.TryParse(tables[9],out RushInterval); 
            int.TryParse(tables[9], out RushInterval);



            int.TryParse(tables[10],out RushAnimatorSpeed); 
            int.TryParse(tables[10], out RushAnimatorSpeed);



            int.TryParse(tables[11],out RushTargetType); 
            int.TryParse(tables[11], out RushTargetType);



            int.TryParse(tables[12],out ShadowLastTime); 
            int.TryParse(tables[12], out ShadowLastTime);



            int.TryParse(tables[13],out ShadowCreateInterval); 
            int.TryParse(tables[13], out ShadowCreateInterval);



            int.TryParse(tables[14],out SearchEnemyDist); 
            int.TryParse(tables[14], out SearchEnemyDist);



            int.TryParse(tables[15],out MaxSwitchTargetDist); 
            int.TryParse(tables[15], out MaxSwitchTargetDist);



            string[] HangupSkillListStringArray = tables[16].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            HangupSkillList = new int[HangupSkillListStringArray.Length];
            for (int i=0;i<HangupSkillListStringArray.Length;i++)
            {
                 int.TryParse(HangupSkillListStringArray[i],out HangupSkillList[i]);
            }

            string[] HangupSkillListStringArray = tables[16].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);

            HangupSkillList = new int[HangupSkillListStringArray.Length];

            for (int i = 0; i < HangupSkillListStringArray.Length; i++)

            {

                int.TryParse(HangupSkillListStringArray[i], out HangupSkillList[i]);

            }



            DungeonSkillList = tables[17];

            DungeonSkillList = tables[17];



            OffLineSkillList = tables[18];

            OffLineSkillList = tables[18];



            int.TryParse(tables[19],out HpPerUseSkill); 
            int.TryParse(tables[19], out HpPerUseSkill);



            string[] HpSkillListStringArray = tables[20].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            HpSkillList = new int[HpSkillListStringArray.Length];
            for (int i=0;i<HpSkillListStringArray.Length;i++)
            {
                 int.TryParse(HpSkillListStringArray[i],out HpSkillList[i]);
            }

            string[] HpSkillListStringArray = tables[20].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);

            HpSkillList = new int[HpSkillListStringArray.Length];

            for (int i = 0; i < HpSkillListStringArray.Length; i++)

            {

                int.TryParse(HpSkillListStringArray[i], out HpSkillList[i]);

            }



            string[] GainSkillListStringArray = tables[21].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            GainSkillList = new int[GainSkillListStringArray.Length];
            for (int i=0;i<GainSkillListStringArray.Length;i++)
            {
                 int.TryParse(GainSkillListStringArray[i],out GainSkillList[i]);
            }

            string[] GainSkillListStringArray = tables[21].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);

            GainSkillList = new int[GainSkillListStringArray.Length];

            for (int i = 0; i < GainSkillListStringArray.Length; i++)

            {

                int.TryParse(GainSkillListStringArray[i], out GainSkillList[i]);

            }



            int.TryParse(tables[22],out MoveLimitDist); 
            int.TryParse(tables[22], out MoveLimitDist);



            string[] RollBreakSkillListStringArray = tables[23].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);

            RollBreakSkillList = new int[RollBreakSkillListStringArray.Length];

            for (int i = 0; i < RollBreakSkillListStringArray.Length; i++)

            {

                int.TryParse(RollBreakSkillListStringArray[i], out RollBreakSkillList[i]);

            }

        }

        catch (Exception ex)

        {

@@ -136,13 +144,13 @@


    static Dictionary<string, JobSetupConfig> configs = new Dictionary<string, JobSetupConfig>();

    public static JobSetupConfig Get(string id)

    {   
        if (!inited)

    {

        if (!inited)

        {

            Debug.Log("JobSetupConfig 还未完成初始化。");

            return null;

        }

		


        if (configs.ContainsKey(id))

        {

            return configs[id];

@@ -158,7 +166,7 @@
        return config;

    }



    public static JobSetupConfig Get(int id)

    public static JobSetupConfig Get(int id)

    {

        return Get(id.ToString());

    }

@@ -185,32 +193,32 @@
        return values;

    }



    public static bool Has(string id)

    public static bool Has(string id)

    {

        return configs.ContainsKey(id) || rawDatas.ContainsKey(id);

    }



    public static bool Has(int id)

    public static bool Has(int id)

    {

        return Has(id.ToString());

    }



    public static bool inited { get; private set; }

    public static bool inited { get; private set; }

    protected static Dictionary<string, string> rawDatas = new Dictionary<string, string>();

    public static void Init(bool sync=false)

    public static void Init(bool sync = false)

    {

        inited = false;

        var path = string.Empty;

        inited = false;

        var path = string.Empty;

        if (AssetSource.refdataFromEditor)

        {

            path = ResourcesPath.CONFIG_FODLER +"/JobSetup.txt";

            path = ResourcesPath.CONFIG_FODLER + "/JobSetup.txt";

        }

        else

        {

            path = AssetVersionUtility.GetAssetFilePath("config/JobSetup.txt");

        }



        var tempConfig = new JobSetupConfig();

        var tempConfig = new JobSetupConfig();

        var preParse = tempConfig is IConfigPostProcess;



        if (sync)

@@ -222,67 +230,67 @@
            }

            for (int i = 3; i < lines.Length; i++)

            {

                try 
                {

                    var line = lines[i];

                    var index = line.IndexOf("\t");

                    if (index == -1)

                    {

                        continue;

                    }

                    var id = line.Substring(0, index);

                try

                {

                    var line = lines[i];

                    var index = line.IndexOf("\t");

                    if (index == -1)

                    {

                        continue;

                    }

                    var id = line.Substring(0, index);



                    if (preParse)

                    {

                        var config = new JobSetupConfig(line);

                        configs[id] = config;

                        (config as IConfigPostProcess).OnConfigParseCompleted();

                    }

                    else

                    {

                        rawDatas[id] = line;

                    }

                }

                catch (System.Exception ex)

                    if (preParse)

                    {

                        var config = new JobSetupConfig(line);

                        configs[id] = config;

                        (config as IConfigPostProcess).OnConfigParseCompleted();

                    }

                    else

                    {

                        rawDatas[id] = line;

                    }

                }

                catch (System.Exception ex)

                {

                    Debug.LogError(ex);

                }

            }

            inited = true;

            inited = true;

        }

        else

        {

            ThreadPool.QueueUserWorkItem((object _object) =>

            {

                var lines = File.ReadAllLines(path);

                if (!preParse)

                {

                    rawDatas = new Dictionary<string, string>(lines.Length - 3);

                }

                if (!preParse)

                {

                    rawDatas = new Dictionary<string, string>(lines.Length - 3);

                }

                for (int i = 3; i < lines.Length; i++)

                {

                    try 
                    {

                       var line = lines[i];

                        var index = line.IndexOf("\t");

                        if (index == -1)

                        {

                            continue;

                        }

                        var id = line.Substring(0, index);

                    try

                    {

                        var line = lines[i];

                        var index = line.IndexOf("\t");

                        if (index == -1)

                        {

                            continue;

                        }

                        var id = line.Substring(0, index);



                        if (preParse)

                        {

                            var config = new JobSetupConfig(line);

                            configs[id] = config;

                            (config as IConfigPostProcess).OnConfigParseCompleted();

                        }

                        else

                        {

                            rawDatas[id] = line;

                        }

                    }

                    catch (System.Exception ex)

                        if (preParse)

                        {

                            var config = new JobSetupConfig(line);

                            configs[id] = config;

                            (config as IConfigPostProcess).OnConfigParseCompleted();

                        }

                        else

                        {

                            rawDatas[id] = line;

                        }

                    }

                    catch (System.Exception ex)

                    {

                        Debug.LogError(ex);

                    }


 Core/GameEngine/Model/Config/JobSetupConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 44af7bf1f77c36a4fbdbd0a1eec24768
timeCreated: 1550120895
timeCreated: 1554882392
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Fight/GameActor/GA_Hero.cs

@@ -936,29 +936,26 @@
            }

        }



        if (!PreFightMission.Instance.IsFinished())

        if (skillID == 190)

        {

            if (skillID == 190)

            if (State != E_ActorState.Roll)

            {

                if (State != E_ActorState.Roll)

                if (SkillMgr.CurCastSkill != null)

                {

                    if (SkillMgr.CurCastSkill != null)

                    int _id = SkillMgr.CurCastSkill.id;



                    foreach (var _skillID in JobSetup.RollBreakSkillList)

                    {

                        SkillMgr.CurCastSkill.SkillCompelete = true;

                        if (_id == _skillID)

                        {

                            SkillMgr.CurCastSkill.SkillCompelete = true;

                            Behaviour.StartKillUntilDieAI(skillID);

                            aiHandler.currentType = E_HeroAIType.None;

                            Behaviour.DoAttack(_skill);

                            return;

                        }

                    }



                    Behaviour.StartKillUntilDieAI(skillID);

                    aiHandler.currentType = E_HeroAIType.None;

                    Behaviour.DoAttack(_skill);



                    return;

                }

            }

            else

            {

                if (!PreFightMission.Instance.IsHeroCanCastSkill)

                {

                    return;

                }

            }

        }


 System/EquipStar/EquipStarModel.cs

@@ -122,6 +122,12 @@
                return;
            }

            if (config.CostItemDict.x > 0 && specialMaterial.value == 0)
            {
                SysNotifyMgr.Instance.ShowTip("StarLevelUp2", config.CostItemDict.x);
                return;
            }

            if (config.CostItemDict.x > 0 && packModel.GetItemCountByID(PackType.Item, config.CostItemDict.x) < config.CostItemDict.y)
            {
                SysNotifyMgr.Instance.ShowTip("StarLevelUp2", config.CostItemDict.x);
@@ -140,7 +146,7 @@
                }
            }

            if (materialIndexs.Count < (config.CostEquipCnt + (config.CostItemDict.x > 0 ? 1 : 0)))
            if (materialIndexs.Count < config.CostEquipCnt)
            {
                SysNotifyMgr.Instance.ShowTip("StarLevelUp3");
                return;

 System/FairyAu/AllianceBossBehaviour.cs

@@ -14,6 +14,7 @@
        [SerializeField] RawImage m_RawBoss;

        [SerializeField] ItemCell[] m_Items;

        [SerializeField] Button m_Goto;

        [SerializeField] Text m_GotoLabel;



        int index = 0;



@@ -50,6 +51,8 @@


            model.allianceBossStateRefresh += AllianceBossStateRefresh;

            model.allianceBossLineRefresh += AllianceBossLineRefresh;



            WindowCenter.Instance.windowBeforeCloseEvent += WindowBeforeCloseEvent;

        }



        void DisplayBase()

@@ -57,6 +60,7 @@
            var npcId = model.GetBossNpcId(index);

            var npcConfig = NPCConfig.Get(npcId);

            m_BossName.text = npcConfig.charName;

            DisplayBossModel();

        }



        void DisplayItems()

@@ -117,7 +121,7 @@
            }

        }



        void DisplayState()

        void DisplayBossModel()

        {

            m_RawBoss.gameObject.SetActive(true);



@@ -128,15 +132,18 @@
            if (index == 0)

            {

                UI3DModelExhibition.Instance.ShowNPC(npcId, npcConifg.UIModeLOffset,

                    npcConifg.UIModelRotation, m_RawBoss, state == 0);

                    npcConifg.UIModelRotation, m_RawBoss);

            }

            else

            {

                UI3DModelExhibition.InstanceClone1.ShowNPC(npcId, npcConifg.UIModeLOffset,

                    npcConifg.UIModelRotation, m_RawBoss, state == 0);

                    npcConifg.UIModelRotation, m_RawBoss);

            }

        }



            m_Goto.gameObject.SetActive(state != 0);

        void DisplayState()

        {

            m_Goto.SetInteractable(m_GotoLabel, state != 0);



            switch (state)

            {

@@ -147,8 +154,8 @@
                        var hourMinutes = dailyQuestOpenTime.NormalOpenTimes.Values.First();

                        if (index < hourMinutes.Count)

                        {

                            m_BossState.text = StringUtility.Contact(Language.Get("ActivityTime"),

                                hourMinutes[index].ToOpenTime());

                            var timeLabel = UIHelper.AppendColor(TextColType.Red, hourMinutes[index].ToOpenTime());

                            m_BossState.text = StringUtility.Contact(Language.Get("ActivityTime"), timeLabel);

                        }

                    }

                    m_BossState.color = UIHelper.GetUIColor(TextColType.White);

@@ -277,10 +284,19 @@
            }

        }



        private void WindowBeforeCloseEvent(Window window)

        {

            if (window is PetMatInfoWin)

            {

                DisplayBossModel();

            }

        }



        public void Dispose()

        {

            model.allianceBossStateRefresh -= AllianceBossStateRefresh;

            model.allianceBossLineRefresh -= AllianceBossLineRefresh;

            WindowCenter.Instance.windowBeforeCloseEvent -= WindowBeforeCloseEvent;



            UI3DModelExhibition.Instance.StopShow();

            UI3DModelExhibition.InstanceClone1.StopShow();


 System/FairyAu/AllianceBossModel.cs

@@ -87,7 +87,7 @@
            }



            m_Items.Add(1, new List<Item>());

            itemsArray = ConfigParse.GetMultipleStr<int>(config.Numerical2);

            itemsArray = ConfigParse.GetMultipleStr<int>(config.Numerical3);

            for (int i = 0; i < itemsArray.Length; i++)

            {

                m_Items[1].Add(new Item()


 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

    HazyRegion = 35,

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

    //JadeDynastyTower = 33,