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

client_linchunjie

2019-03-30 f7adb74c293b6e8ea6082e7c7d24a7ea940764f8

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

 System/EquipStar/EquipStarUpgradeCandidateSlot.cs

@@ -64,6 +64,7 @@
                m_ItemCell.gameObject.SetActive(true);
                m_EmptyItem.gameObject.SetActive(false);
                m_ItemCell.Init(item);
                m_ItemCell.button.enabled = false;
                m_Description1.text = item.config.ItemName;
                m_Description1.color = UIHelper.GetUIColor(item.config.ItemColor, true);
                m_Description2.text = string.Empty;

 System/EquipTrain/EquipTrainCandidateBehaviour.cs

@@ -64,6 +64,7 @@
                m_ItemCell.gameObject.SetActive(true);
                m_EmptyItem.gameObject.SetActive(false);
                m_ItemCell.Init(item);
                m_ItemCell.button.enabled = false;
                m_Description1.text = item.config.ItemName;
                m_Description1.color = UIHelper.GetUIColor(item.config.ItemColor, true);
                m_Description2.text = string.Format("洗练等级：{0}级", this.candidate.trainLevel.Fetch());

 System/ItemTip/EquipTipUtility.cs

@@ -496,7 +496,7 @@
        private static StarInfo GetStarInfo(int itemId)
        {
            var config = ItemConfig.Get(itemId);
            if (EquipModel.IsRealmEquip(config.EquipPlace))
            if (!EquipModel.IsRealmEquip(config.EquipPlace))
            {
                return default(StarInfo);
            }

 System/ItemTip/TipStarPropertyWidget.cs

@@ -32,37 +32,33 @@
            }

            var starConfigs = EquipStarConfig.GetConfigs(starInfo.equipPosition.x, starInfo.equipPosition.y);
            for (int i = starConfigs.Count - 1; i >= 0; i--)
            var levelUpProperties = new Dictionary<int, Int2>();
            var prePropertiesCount = 0;
            foreach (var config in starConfigs)
            {
                var config = starConfigs[i];
                if (config.Star > starInfo.maxLevel)
                if (config.StarAttrInfo.Length > prePropertiesCount)
                {
                    starConfigs.RemoveAt(i);
                    var length = config.StarAttrInfo.Length;
                    levelUpProperties[config.Star] = config.StarAttrInfo[length - 1];
                    prePropertiesCount = config.StarAttrInfo.Length;
                }
            }

            var lines = new List<string>();
            for (int i = 0; i < starConfigs.Count; i++)
            foreach ( var item in levelUpProperties  )
            {
                var config = starConfigs[i];
                var actived = starInfo.starLevel >= config.Star;
                var star = item.Key;
                var property = item.Value;
                var actived = starInfo.starLevel >= item.Key;
                var description = PlayerPropertyConfig.GetFullDescription(property.x, property.y);

                if (actived)
                {
                    foreach (var property in config.StarAttrInfo)
                    {
                        var propertyConfig = PlayerPropertyConfig.Get(property.x);
                        var description = string.Format("{0} +{1}", propertyConfig.Name, PlayerPropertyConfig.GetValueDescription(property.x, property.y));
                        lines.Add(UIHelper.AppendColor(TextColType.Green, description));
                    }
                    lines.Add(UIHelper.AppendColor(TextColType.Green, description));
                }
                else
                {
                    foreach (var property in config.StarAttrInfo)
                    {
                        var propertyConfig = PlayerPropertyConfig.Get(property.x);
                        var description = string.Format("{0} +{1} （{2}星激活）", propertyConfig.Name, PlayerPropertyConfig.GetValueDescription(property.x, property.y), config.Star);
                        lines.Add(UIHelper.AppendColor(TextColType.Gray, description));
                    }
                    lines.Add(UIHelper.AppendColor(TextColType.Gray, string.Format("{0}（{1}星激活）", description, star)));
                }
            }


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -636,34 +636,14 @@
        {

            if (_unflod)

            {

                if (m_MainPositionTween.IsRightTipPanelShow)//技能面板展开状态

                {

                    ShowBtnGroup();//显示按钮组隐藏技能组(强制切换)

                }

                if (!m_MainPositionTween.IsTaskAndPanelShow)//任务面板

                {

                    TaskSwithButton();

                    onMainModel.IsBossAreaTask = false;

                }

                if (!m_MainPositionTween.IsSetCopyOfThePanelShow)//上层面板

                {

                    SetTipPanelOrBossList(true, true);

                }



                ShowBtnGroup();//显示按钮组隐藏技能组(强制切换)

                m_HighSettingFadeInFadeOut.SwitchImmedidately(true);

            }

            else

            {

                if (m_MainPositionTween.IsRightTipPanelShow)//技能面板收起状态

                {

                    ShowCastSkill();//显示技能组,隐藏按钮组(强制切换)

                }             
                if (_skillGroup != 0)

                {

                    m_SkillContainer.skillTurnplate.SwitchGroup(_skillGroup);

                }



                m_HighSettingFadeInFadeOut.SwitchImmedidately(false);

            }

        }