Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2018-08-31 219316ab0f220e8253ef19b8671b6867a520914b

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Model/Config/FairyGrabBossConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Tuesday, August 28, 2018
//    [  Date ]:           Friday, August 31, 2018
//--------------------------------------------------------

using UnityEngine;
@@ -13,7 +13,9 @@

        public int NPCID { get ; private set ; }

        public string PortraitID { get ; private set; } 

        public string dropItems { get ; private set; } 
        public string dropItems { get ; private set; } 
        public int petId { get ; private set ; }

        public int horseId { get ; private set ; }

        public override string getKey()
        {
@@ -27,7 +29,11 @@
            

                PortraitID = rawContents[1].Trim();

            

                dropItems = rawContents[2].Trim();
                dropItems = rawContents[2].Trim();

			
                petId=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; 
			
                horseId=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0; 
            }
            catch (Exception ex)
            {

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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 353bb58b84bc9d74b87bcdbb10330f00
timeCreated: 1535422842
timeCreated: 1535697045
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0419_tagPlayerReborn.cs

@@ -57,8 +57,14 @@
                    switch (vNetData.Type)

                    {

                        case 0:

                            _hero.Behaviour.StopHandupAI();

                            _hero.Behaviour.StopKillUntilDieAI();

                            if (DungeonStage.CurrentMapType != MapType.OpenCountry)

                            {

                                if (!GeneralConfig.Instance.RebornAutoFightMapID.Contains(PlayerDatas.Instance.baseData.MapID))

                                {

                                    _hero.Behaviour.StopHandupAI();

                                    _hero.Behaviour.StopKillUntilDieAI();

                                }

                            }

                            break;

                        case 2:

                        case 3:


 Fight/Actor/HeroBehaviour.cs

@@ -121,13 +121,36 @@
            _skill.CSkillPrepareEnd = false;

        }



        GActorFight _fightTarget = m_Hero.LockTarget as GActorFight;



        if (_fightTarget != null && _fightTarget.CanAtked())

        {

            m_Hero.SelectTarget = _fightTarget;

        }

        else

        {

            _fightTarget = m_Hero.SelectTarget as GActorFight;



            if (_fightTarget != null && _fightTarget.CanAtked())

            {

                m_Hero.LockTarget = m_Hero.SelectTarget;

            }

            else

            {

                float _range = m_Hero.JobSetup.SearchEnemyDist * Constants.F_DELTA;

                m_Hero.LockTarget = m_Hero.SelectTarget = GAMgr.Instance.FindAtkTarget(m_Hero.Pos, _range, 360);

                _fightTarget = m_Hero.SelectTarget as GActorFight;

            }

        }





        if (m_Hero.aiHandler.currentType == E_HeroAIType.None)

        {

            byte _type = (byte)E_HeroAIType.KillUntilDie;

            KillUntilDieData _data = m_Hero.aiHandler.aiData[_type] as KillUntilDieData;

            if (m_Hero.SelectTarget != null)

            if (_fightTarget != null)

            {

                _data.targetServerInstID = m_Hero.SelectTarget.ServerInstID;

                _data.targetServerInstID = _fightTarget.ServerInstID;

            }

            _data.defaultSkillID = m_WillUsedSkillID;

            m_Hero.aiHandler.currentType = E_HeroAIType.KillUntilDie;


 Fight/Stage/Dungeon/MapTransfer.cs

@@ -25,6 +25,11 @@
        {

            _fight = _actorList[i] as GActorFight;



            if (_fight == null)

            {

                continue;

            }



            _chkDistSqrt = MathUtility.DistanceSqrtXZ(transform.position, _actorList[i].Pos);

            if (_chkDistSqrt < 3)

            {


 System/FairyAu/FairyGrabBossBehaviour.cs

@@ -15,9 +15,12 @@
        [SerializeField] RectTransform m_ContainerSelect;

        [SerializeField] RectTransform m_ContainerKilling;

        [SerializeField] RectTransform m_ContainerKilled;

        [SerializeField] RectTransform m_ContainerMapName;

        [SerializeField] Image m_BossPortrait;

        [SerializeField] Text m_MapName;

        [SerializeField] Text m_BossType;

        [SerializeField] Text m_BossName;

        [SerializeField] Image m_RealmIcon;

        [SerializeField] Text m_Progress;

        [SerializeField] Button m_Select;

        public int bossId { get; private set; }

@@ -73,6 +76,26 @@
            m_BossPortrait.SetSprite(config.PortraitID);

            m_MapName.text = mapConfig.Name;

            m_BossName.text = npcConfig.charName;



            var petConfig = Config.Instance.Get<PetInfoConfig>(config.petId);

            m_BossType.text = string.Empty;

            if (petConfig != null)

            {

                m_BossType.text = Language.Get("FairyGrabPet");

                m_BossName.color = UIHelper.GetUIColor(petConfig.Quality, true);

            }

            var horseConfig = Config.Instance.Get<HorseConfig>(config.horseId);

            if (horseConfig != null)

            {

                m_BossType.text = Language.Get("FairyGrabHorse");

                m_BossName.color = UIHelper.GetUIColor(horseConfig.Quality, true);

            }



            var realmConfig = Config.Instance.Get<RealmConfig>(npcConfig.ClientRealm);

            if (realmConfig != null)

            {

                m_RealmIcon.SetSprite(realmConfig.Img);

            }

        }



        private void BossProgressUpdate(int _bossId)

@@ -106,6 +129,7 @@
            m_ContainerKilled.gameObject.SetActive(killed && opened);

            m_ContainerKilling.gameObject.SetActive(!killed && opened);

            m_BossPortrait.material = opened ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];

            m_ContainerMapName.gameObject.SetActive(!opened);

        }






 System/FairyAu/FairyGrabBossModel.cs

@@ -83,6 +83,7 @@
        public event Action<int> bossSelectedEvent;

        public event Action<int, int> bossHurtUpdate;

        public event Action<int> bossProgressUpdate;

        public event Action bossAllProgressUpdate;

        public event Action bossGrabHintEvent;



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

@@ -353,6 +354,10 @@
                    bossProgressUpdate(bossProgress.NPCID);

                }

            }

            if (bossAllProgressUpdate != null)

            {

                bossAllProgressUpdate();

            }

        }



        public bool TryGetBossProgress(int bossId,out BossProgressInfo bossProgressInfo)


 System/FairyAu/FairyGrabBossWin.cs

@@ -32,6 +32,9 @@
        float m_Timer = 0f;

        const float Interval = 10f;



        bool autoSelect = false;

        int defaultSelect = 0;



        #region Built-in

        protected override void BindController()

        {

@@ -48,10 +51,10 @@
            DisplaySurplusTime();

            DisplayBossInfo();

            DisplayHighestFairy();

            model.QueryGrabBossProgress();

            GlobalTimeEvent.Instance.secondEvent += SecondEvent;

            model.bossSelectedEvent += BossSelectedEvent;

            model.bossProgressUpdate += BossProgressUpdate;

            model.bossAllProgressUpdate += BossAllProgressUpdate;

            model.stateUpdate += StateUpdate;

            m_Timer = 0;

        }

@@ -60,6 +63,9 @@
        {

            base.OnActived();

            DisplayBosses();

            defaultSelect = model.selectBoss;

            autoSelect = false;

            model.QueryGrabBossProgress();

        }



        protected override void OnAfterOpen()

@@ -71,6 +77,7 @@
            GlobalTimeEvent.Instance.secondEvent -= SecondEvent;

            model.bossSelectedEvent -= BossSelectedEvent;

            model.bossProgressUpdate -= BossProgressUpdate;

            model.bossAllProgressUpdate -= BossAllProgressUpdate;

            model.stateUpdate -= StateUpdate;

        }



@@ -196,6 +203,10 @@


        private void BossSelectedEvent(int bossId)

        {

            if (defaultSelect != bossId)

            {

                autoSelect = true;

            }

            DisplayBossInfo();

            DisplayHighestFairy();

        }

@@ -207,11 +218,45 @@
                DisplayHighestFairy();

            }

        }



        void BossAllProgressUpdate()

        {

            if (!autoSelect)

            {

                AutoSelect();

            }

        }



        private void StateUpdate()

        {

            DisplayHighestFairy();

        }



        void AutoSelect()

        {

            autoSelect = true;

            var index = 0;

            for (int i = 0; i < model.bosses.Count; i++)

            {

                FairyGrabBossModel.BossProgressInfo bossProgress;

                if (model.TryGetBossProgress(model.bosses[i], out bossProgress))

                {

                    var progress = (float)bossProgress.currentHp / bossProgress.totalHp;

                    if (progress > 0)

                    {

                        index = i;

                        break;

                    }

                }

                else

                {

                    index = i;

                    break;

                }

            }

            m_Bosses.MoveToCenter(index);

        }



    }



}


 System/GeneralConfig/GeneralConfig.cs

@@ -133,6 +133,8 @@


    public Dictionary<int, List<int>> DropItemEffectMapID { get; private set; }



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



    public void Init()

    {

        try

@@ -475,6 +477,9 @@
                    }

                }

            }



            func = Config.Instance.Get<FuncConfigConfig>("RebornAutoFightDungeon");

            RebornAutoFightMapID = new List<int>(GetIntArray(func.Numerical1));

        }

        catch (Exception ex)

        {


 System/MainInterfacePanel/HighSettingTip.cs

@@ -58,6 +58,8 @@
        StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }

        OSGiftModel osGiftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } }

        PlayerMainDate mainModel { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } }



        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        private void Start()

        {

            isNeedTip = true;

@@ -250,7 +252,14 @@
        void LootPreciousButton()//夺宝

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<LootPreciousFrameWin>();

            if (fairyGrabBossModel.InActivityTime)

            {

                WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 1);

            }

            else

            {

                WindowCenter.Instance.Open<LootPreciousFrameWin>();

            }

        }



        void RechargeButton()//充值按钮


 System/Treasure/TreasureLevelUpWin.cs

@@ -592,6 +592,11 @@
                StartBack();

                return;

            }

            if (!WindowJumpMgr.Instance.IsJumpState && model.openFromTreasureList)

            {

                StartBack();

                return;

            }

            if (!WindowJumpMgr.Instance.IsJumpState && model.exitRecord >= 4)

            {

                StartBack();