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

client_linchunjie

2019-03-25 c04a021eb2873eec04b31c046eb5587eff1f1d7c

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

 System/Equip/CandidateEquipBehaviour.cs

@@ -48,6 +48,7 @@
        {
            var equip = packModel.GetItemByGuid(this.candidateEquip.guid);
            m_ItemCell.Init(equip, true);
            m_ItemCell.button.enabled = false;

            var isEquipLevelUnlocked = model.IsLevelUnLocked(equip.config.LV);
            m_BackGround.gray=!isEquipLevelUnlocked;

 System/Equip/EquipModel.cs

@@ -18,6 +18,7 @@

        public readonly List<int> showedSuitPlaceEffect = new List<int>();
        public readonly List<int> showedSuitLevelEffect = new List<int>();
        public readonly List<int> remindedSuitSetAppearances = new List<int>();

        public readonly LogicInt selectedLevel = new LogicInt();
        public readonly LogicString selectedEquip = new LogicString();
@@ -73,7 +74,14 @@
            var showedSuitLevelEffectsRecord = LocalSave.GetIntArray(StringUtility.Contact(playerId, "_showedSuitLevelEffect"));
            if (showedSuitLevelEffectsRecord != null)
            {
                showedSuitPlaceEffect.AddRange(showedSuitLevelEffectsRecord);
                showedSuitLevelEffect.AddRange(showedSuitLevelEffectsRecord);
            }

            remindedSuitSetAppearances.Clear();
            var remindedSetAppearancesRecord = LocalSave.GetIntArray(StringUtility.Contact(playerId, "_reminedSuitLevelSetAppearance"));
            if (remindedSetAppearancesRecord != null)
            {
                remindedSuitSetAppearances.AddRange(remindedSetAppearancesRecord);
            }
        }

@@ -103,10 +111,10 @@

        public int GetFirstRedpointEquipSet()
        {
            for (int i = sortedLevels.Count - 1; i >= 0; i--)
            for (int i = 0; i < sortedLevels.Count; i++)
            {
                var level = sortedLevels[i];
                if (equipSets[level].redpoint.state == RedPointState.Simple)
                if (equipSets[level].redpoint.state != RedPointState.None)
                {
                    return level;
                }
@@ -513,6 +521,21 @@
            }
        }

        public bool IsSetAppearanceHinted(int level)
        {
            return remindedSuitSetAppearances.Contains(level);
        }

        public void RecordSuitSetAppearanceHint(int level)
        {
            if (!remindedSuitSetAppearances.Contains(level))
            {
                remindedSuitSetAppearances.Add(level);
                var playerId = PlayerDatas.Instance.baseData.PlayerID;
                LocalSave.SetIntArray(StringUtility.Contact(playerId, "_reminedSuitLevelSetAppearance"), remindedSuitSetAppearances.ToArray());
            }
        }

        private void OnPlayerDataRefresh(PlayerDataType type)
        {
            switch (type)

 System/Equip/EquipSuitPropertyWidget.cs

@@ -27,7 +27,7 @@

        int level;

        public void Init(int level)
        public void Init(int level, int eightSuitLevel)
        {
            this.level = level;

@@ -37,6 +37,23 @@
            m_StarToggles[2].SetActive(maxLevel >= 6);
            m_StarToggles[1].SetActive(maxLevel >= 3);
            m_StarToggles[0].SetActive(true);

            if (eightSuitLevel < 0)
            {
                m_StarToggles[0].Select();
            }
            else if (eightSuitLevel < 3)
            {
                m_StarToggles[1].Select();
            }
            else if (eightSuitLevel < 6)
            {
                m_StarToggles[2].Select();
            }
            else
            {
                m_StarToggles[3].Select();
            }
        }

        public void DisplaySuitPlaces(List<int> places)
@@ -86,6 +103,16 @@
            {
                m_SuitLevelEffects[2].Play();
                model.RecordSuitLevelEffectPlay(new Int3(suitActive.level, suitActive.star, 8));
                if (!model.IsSetAppearanceHinted(suitActive.level))
                {
                    model.RecordSuitSetAppearanceHint(suitActive.level);
                    var equipSet = model.GetEquipSet(suitActive.level);
                    var config = RealmConfig.Get(equipSet.realm);
                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
                        Language.Get("WearRealmEquip", config.Name, config.Name),
                        (bool ok) => { if (ok) { model.SetAppearance(suitActive.level); } }
                        );
                }
            }
        }

@@ -119,7 +146,6 @@
            public void SetActive(bool active)
            {
                title.gameObject.SetActive(active);
                toggle.isOn = active;
                toggle.interactable = active;
                if (active)
                {
@@ -131,6 +157,11 @@
                }
            }

            public void Select()
            {
                toggle.isOn = true;
            }

            private void OnValueChange(bool value)
            {
                if (value)

 System/Equip/RealmEquipWin.cs

@@ -93,7 +93,8 @@
                var level = model.selectedLevel.Fetch();

                DisplayEquips(level);
                m_SuitPropertyWidget.Init(level);
                var eightSuitLevel = model.GetSuitLevel(level, EquipSuitType.EightSuit);
                m_SuitPropertyWidget.Init(level , eightSuitLevel);
            }

            if (force || model.appearance.dirty)