3335 装备模块代码修整。

client_Wu Xijin

2019-03-16 e2b8621065c4bcb279422e9a9290a8fe8e79a5ca

3335 装备模块代码修整。

 System/Equip/EquipModel.cs

@@ -24,6 +24,7 @@
        public readonly LogicString selectedEquip = new LogicString();
        public readonly LogicInt selectedStarLevel = new LogicInt();
        public readonly LogicStruct<EquipAppearance> appearance = new LogicStruct<EquipAppearance>();
        public readonly LogicInt fightPoint = new LogicInt();
        public readonly LogicList<CandidateEquip> candidateEquips = new LogicList<CandidateEquip>();
        public readonly LogicList<int> getWays = new LogicList<int>();

@@ -76,7 +77,8 @@
                selectedStarLevel.value = 0;
                selectedStarLevel.dirty = true;

                appearance.value = GetAppearance(selectedLevel.value);
                appearance.value = GetAppearance(equipPosition.x);
                fightPoint.value = GetFightPoint(equipPosition.x);
            }

            if (selectedLevel.dirty || selectedPlace.dirty)
@@ -102,6 +104,7 @@
            selectedPlace.value = 0;
            selectedEquip.value = string.Empty;
            selectedStarLevel.value = 0;
            fightPoint.value = 0;
            appearance.value = default(EquipAppearance);
            candidateEquips.Clear();
            getWays.Clear();
@@ -453,6 +456,7 @@
                    if (selectedLevel.value > 0)
                    {
                        appearance.value = GetAppearance(selectedLevel.value);
                        fightPoint.value = GetFightPoint(selectedLevel.value);
                        RefreshCandidateEquips(new Int2(selectedLevel.value, selectedPlace.value));
                    }
                    break;
@@ -489,7 +493,7 @@
                    equipSets[clientPlace.x].UpdateEquipSlot(clientPlace.y, equip == null ? string.Empty : equip.guid);

                    appearance.value = GetAppearance(selectedLevel.value);

                    fightPoint.value = GetFightPoint(selectedLevel.value);
                    if (clientPlace.x == PlayerDatas.Instance.baseData.equipShowSwitch / 10)
                    {
                        if (appearanceChangeEvent != null)

 System/Equip/RealmEquipWin.cs

@@ -90,13 +90,17 @@
                var level = model.selectedLevel.Fetch();

                DisplayEquips(level);
                DisplayFightPoint(level);
                m_SuitPropertyWidget.Init(level);
            }

            if (force || model.appearance.dirty)
            {
                DisplayAppearance(model.appearance.Fetch(), force);
            }

            if (force || model.fightPoint.dirty)
            {
                DisplayFightPoint(model.fightPoint.Fetch());
            }

            if (force || model.selectedPlace.dirty || model.candidateEquips.dirty)
@@ -132,7 +136,6 @@
                levelSelectBehaviours.Insert(0, instance.GetComponent<EquipLevelSelectBehaviour>());
            }

            var emptyGap = emptyCount - emptyFillers.Count;
            for (var i = 0; i < emptyCount; i++)
            {
                var instance = UIUtility.CreateWidget("EquipLevelSelectEmptyBehaviour", "EquipLevelSelectEmptyBehaviour");
@@ -181,9 +184,9 @@
            });
        }

        private void DisplayFightPoint(int level)
        private void DisplayFightPoint(int fightPoint)
        {
            m_FightPoint.text = model.GetFightPoint(level).ToString();
            m_FightPoint.text = fightPoint.ToString();
        }

        private void DisplayGetWays(List<int> getWays)

 System/EquipStar/EquipStarMaterialCandidate.cs

@@ -44,7 +44,7 @@
        private void SelectMaterial()
        {
            var materialIndex = model.operateMaterialIndex.value;
            model.GetMaterialLogicStringByIndex(materialIndex).value = this.equip;
            model.AddMaterial(materialIndex, this.equip);
            model.operateMaterialIndex.value = 0;
        }


 System/EquipTrain/EquipTrainModel.cs

@@ -103,6 +103,13 @@

        public void Train(Int2 equipPosition, bool[] inevitables)
        {
            var maxLevel = GetMaxTrainLevel(equipPosition);
            if (maxLevel < 1)
            {
                SysNotifyMgr.Instance.ShowTip("WashStarRequirement");
                return;
            }

            var code = 0;
            var inevitableCount = 0;
            for (int i = 0; i < inevitables.Length; i++)