法宝魂修改

client_linchunjie

2018-08-17 8630d6a737817e2653455278ae9bdbe334f44f41

法宝魂修改

 System/Treasure/TreasureAnimation.cs

@@ -317,8 +317,6 @@
            float _duration = 0f;

            stepComplete = false;

            var _config = ScriptableObjectLoader.LoadSoTreasureMeridian(model.selectedTreasure);

            Treasure treasure;

            model.TryGetTreasure(model.selectedTreasure, out treasure);

            _index = Mathf.Max(_index, 0);

            var _current = m_TreasureMeridians[_index];

            if (_index < 0)

@@ -326,7 +324,7 @@
                stepComplete = true;

                yield break;

            }

            if (_index < treasure.StageCount - 1)

            if (_index < _config.stagePointNum - 1)

            {

                var _effect = EffectMgr.Instance.PlayUIEffect(LINESFX, 2500, m_TreasureMeridians[_index].transform.parent, false);

                _effect.transform.localPosition = _config[_index].position;

@@ -500,11 +498,9 @@
            m_ContainerStars.gameObject.SetActive(true);

            m_StarPositionTween.SetStartState();

            TreasureMeridianConfig _config = ScriptableObjectLoader.LoadSoTreasureMeridian(selectTreasureId);

            Treasure treasure;

            model.TryGetTreasure(selectTreasureId, out treasure);

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

            {

                if (_config == null || i >= treasure.treasureStages.Count)

                if (_config == null || i >= _config.stagePointNum)

                {

                    m_Stars[i].gameObject.SetActive(false);

                }

@@ -556,9 +552,7 @@
            TreasureMeridianConfig _config = ScriptableObjectLoader.LoadSoTreasureMeridian(selectTreasureId);

            RecycleLineSfx();

            var _duration = 0f;

            Treasure treasure;

            model.TryGetTreasure(selectTreasureId, out treasure);

            while (_index < treasure.StageCount)

            while (_index < _config.stagePointNum)

            {

                timer = 0f;

                var _effect1 = EffectMgr.Instance.PlayUIEffect(SPIRALSFX, 2700, m_TreasureMeridians[_index].transform.parent, false);

@@ -572,7 +566,7 @@
                m_TreasureMeridians[_index].RequestStateSfx();

                m_Stars[_index].StopImediatly();

                timer = 0f;

                if (_index < treasure.StageCount - 1)

                if (_index < _config.stagePointNum - 1)

                {

                    var _effect2 = EffectMgr.Instance.PlayUIEffect(LINESFX, 2500, m_TreasureMeridians[_index].transform.parent, false);

                    _duration = _effect2.duration;

@@ -594,7 +588,7 @@
                }

                _index++;

            }

            for (int i = 0; i < treasure.StageCount; i++)

            for (int i = 0; i < _config.stagePointNum; i++)

            {

                m_TreasureMeridians[i].PlayLineSfx(2, true);

            }

@@ -618,6 +612,7 @@
                yield return null;

            }

            stepComplete = true;

            Treasure treasure;

            model.TryGetTreasure(selectTreasureId, out treasure);

            if (treasure.treasureStages[0].unlockType != TreasureStageUnlock.None)

            {

@@ -677,7 +672,7 @@
                return x.unlockType == TreasureStageUnlock.Skill;

            });

            var _skillStageIndex = _treasure.GetStageIndex(_skillStage);

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

            for (int i = 0; i < _config.stagePointNum; i++)

            {

                if (i == _skillStageIndex)

                {

@@ -693,7 +688,7 @@
            }

            timer = 0;

            _duration = 0;

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

            for (int i = 0; i < _config.stagePointNum; i++)

            {

                if (i == _skillStageIndex)

                {

@@ -714,7 +709,7 @@
            {

                yield return null;

            }

            if (_stages.Count > 1)

            if (_config.stagePointNum > 1)

            {

                timer = 0;

                var _effect = EffectMgr.Instance.PlayUIEffect(CONVERGESFX, 2700, m_TreasureMeridians[_skillStageIndex].transform.parent, false);


 System/Treasure/TreasureData.cs

@@ -306,13 +306,6 @@
            set

            {

                m_State = value;

                if (value == HumanTreasureState.CastSoul)

                {

                    if (IsHighestStage)

                    {

                        m_State = HumanTreasureState.Potential;

                    }

                }

                ModelCenter.Instance.GetModel<TreasureModel>().HumanTreasureStateChange(base.id);

            }

        }


 System/Treasure/TreasureLevelUpWin.cs

@@ -249,7 +249,7 @@
            Treasure _treasure;

            model.TryGetTreasure(_id, out _treasure);

            if (_id == model.selectedTreasure && _treasure != null

                && _treasure.state == TreasureState.Collecting)

                && _treasure.state == TreasureState.Collecting && model.serverInited)

            {

                UpdateStage();

                if (WindowCenter.Instance.CheckOpen<EffectToFaBaoWin>())

@@ -417,6 +417,13 @@
                            m_TreasureAnimation.OnStageLock(m_Treasure.GetStageIndex(m_Treasure.stage));

                        }

                        m_TreasureProperty.SetActive(m_Treasure.state == TreasureState.Collected);

                        if (_state == 1 && m_Treasure.IsHighestStage

                            && FuncOpen.Instance.IsFuncOpen(82) && !model.GetSpAnim(m_Treasure.id))

                        {

                            m_TreasureAnimation.step = TreasureAnimation.TreasureShowStep.FirstPotential;

                            UpdateStage(2);

                            return;

                        }

                    }

                    m_TreasureAnimation.step = TreasureAnimation.TreasureShowStep.UnLock;

                }

@@ -841,7 +848,7 @@
                    if (model.openFromTreasureSoul)

                    {

                        var config = ScriptableObjectLoader.LoadSoTreasureMeridian(model.selectedTreasure);

                        m_TreasureMeridians[m_Treasure.StageCount - 1].StartSoulTween();

                        m_TreasureMeridians[config.stagePointNum - 1].StartSoulTween();

                    }

                    if (model.GetTreasureStageShow(m_Treasure.id) != -1)

                    {

@@ -862,7 +869,7 @@
                    UpdateLevelUpSfx(false);

                    m_TreasureProperty.SetActive(m_Treasure.state == TreasureState.Collected);

                    var _config = ScriptableObjectLoader.LoadSoTreasureMeridian(model.selectedTreasure);

                    for (int i = 0; i < m_Treasure.treasureStages.Count; i++)

                    for (int i = 0; i < _config.stagePointNum; i++)

                    {

                        m_TreasureMeridians[i].RequestStateSfx();

                    }

@@ -909,7 +916,8 @@
            {

                return;

            }

            for (int i = 0; i < m_Treasure.treasureStages.Count; i++)

            var _config = ScriptableObjectLoader.LoadSoTreasureMeridian(model.selectedTreasure);

            for (int i = 0; i < _config.stagePointNum; i++)

            {

                m_TreasureMeridians[i].RequestSfx();

            }

@@ -1001,10 +1009,15 @@
                case TreasureStageUnlock.Func:

                    StartScreenShot();

                    break;

                //case TreasureStageUnlock.Privilege:

                case TreasureStageUnlock.Item:

                case TreasureStageUnlock.Property:

                    WindowCenter.Instance.Open<TreasureNewStageWin>(true);

                    break;

                case TreasureStageUnlock.Treasure:

                    WindowJumpMgr.Instance.ClearJumpData();

                    WindowCenter.Instance.Open<MainInterfaceWin>();

                    CloseImmediately();

                    break;

            }

        }




 System/Treasure/TreasureModel.cs

@@ -361,6 +361,7 @@
            uint.TryParse(QuickSetting.Instance.GetQuickSetting(QuickSetting.QuickSettingType.SpAnim, 0), out value);

            int bitValue = MathUtility.SetBitValue((int)value, (ushort)index, anim);

            QuickSetting.Instance.SetQuickSetting(QuickSetting.QuickSettingType.SpAnim, bitValue);

            QuickSetting.Instance.SendPackage();

        }



        public bool TryGetUnlockShowTreasure(out int _id)


 System/Treasure/TreasureNewStageWin.cs

@@ -19,13 +19,9 @@
        [SerializeField] PropertyCompareBehaviour m_Property;

        [SerializeField] Button m_PropertyConfirmBtn;



        [SerializeField] RectTransform m_ContainerPrivilege;

        [SerializeField] Text m_PrivilegeName;

        [SerializeField] Text m_Description;

        [SerializeField] RectTransform m_ContainerProgress;

        [SerializeField] Text m_Progress1;

        [SerializeField] Text m_Progress2;

        [SerializeField] Button m_PrivilegeConfirmBtn;

        [SerializeField] RectTransform m_ContainerItem;

        [SerializeField] ItemCell m_Item;

        [SerializeField] Button m_ItemConfirm;



        Treasure treasure;



@@ -45,7 +41,7 @@
        protected override void AddListeners()

        {

            m_PropertyConfirmBtn.onClick.AddListener(CloseClick);

            m_PrivilegeConfirmBtn.onClick.AddListener(CloseClick);

            m_ItemConfirm.onClick.AddListener(CloseClick);

        }



        protected override void OnPreOpen()

@@ -69,7 +65,7 @@
        private void Display()

        {

            m_ContainerProperty.gameObject.SetActive(false);

            m_ContainerPrivilege.gameObject.SetActive(false);

            m_ContainerItem.gameObject.SetActive(false);

            model.TryGetTreasure(model.selectedTreasure, out treasure);

            if (treasure == null)

            {

@@ -81,9 +77,9 @@
                case TreasureStageUnlock.Property:

                    DisplayProperty(stage);

                    break;

                //case TreasureStageUnlock.Privilege:

                //    DisplayPrivilege(stage);

                //    break;

                case TreasureStageUnlock.Item:

                    DisplayItem(stage);

                    break;

            }

        }



@@ -95,38 +91,12 @@
            m_Property.Display(_keyValue.Key, _beforeValue, UIHelper.GetPropertyMapPlayerData((AttrEnum)_keyValue.Key));

        }



        private void DisplayPrivilege(TreasureStage _stage)

        private void DisplayItem(TreasureStage _stage)

        {

            m_ContainerPrivilege.gameObject.SetActive(true);

            m_ContainerProgress.gameObject.SetActive(false);

            m_Progress1.gameObject.SetActive(false);

            m_Progress2.gameObject.SetActive(false);

            //var config = ConfigManager.Instance.GetTemplate<TreasurePrivilegeConfig>(_stage.privilege);

            //m_PrivilegeName.text = config.Name;

            //m_Description.text = config.Description;

            //switch (_stage.specialData.type)

            //{

            //    case TreasurePrivilege.Property:

            //        break;

            //    case TreasurePrivilege.DemonJarAtk:

            //        break;

            //    case TreasurePrivilege.StrengthenAdd:

            //        break;

            //    case TreasurePrivilege.Suit:

            //    case TreasurePrivilege.RuneBreakExpAdd:

            //    case TreasurePrivilege.Boss:

            //        break;

            //    case TreasurePrivilege.MountAtk:

            //        break;

            //    case TreasurePrivilege.PetHp:

            //        break;

            //    case TreasurePrivilege.Wing:

            //        break;

            //    case TreasurePrivilege.Wash:

            //        break;

            //}

            m_ContainerItem.gameObject.SetActive(true);

            ItemCellModel itemCell = new ItemCellModel(_stage.item.id, true, (ulong)_stage.item.count, _stage.item.bind ? 1 : 0);

            m_Item.Init(itemCell);

        }



    }



}