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

client_Zxw

2018-12-28 4275009d3bac2cbc9e70db4efd85aebbc6ed5f10

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

 System/Strengthening/GemModel.cs

@@ -278,133 +278,6 @@
            return SatisfyCondition(config.EffectValueA1, config.EffectValueB1, out _place, out _hole);

        }



        /*旧版红点规则

        public void OnUpdateRedPoint()

        {

            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Gem))

            {

                return;

            }

            UpdateHoleRedpoint(presentGemEquip);

            for (int i = 1; i <= 10; i++)

            {

                ItemModel item = playerPack.GetItemModelByIndex(PackType.rptEquip, i);

                redpointList[i - 1].state = RedPointState.None;

                if (item != null)

                {

                    ItemConfig itemCfg = Config.Instance.Get<ItemConfig>((int)item.itemInfo.ItemID);

                    List<ItemModel> list = IsBagHaveGem(FuncConfigConfig.GetGemTypeByEquipPos(item.itemInfo.ItemPlace));

                    if (list == null || list.Count == 0) continue;

                    uint[] stones = PlayerStoneData.Instance.GetStoneInfo(i);

                    for (int j = 0; j < 4; j++)

                    {

                        if (j == 3)

                        {

                            if (PlayerDatas.Instance.baseData.VIPLv < gemVipHoleLv || itemCfg.LV < gemOpenArray[0])

                            {

                                continue;

                            }

                        }

                        else

                        {

                            if (itemCfg.LV < gemOpenArray[j])

                            {

                                continue;

                            }

                        }

                        if ((stones == null || stones[j] == 0) && list.Count > 0)

                        {

                            redpointList[i - 1].state = RedPointState.Simple;

                            break;

                        }

                        else

                        {

                            bool _replace = false;

                            foreach (var gemItem in list)

                            {

                                if (gemItem.itemInfo.ItemID > stones[j])

                                {

                                    redpointList[i - 1].state = RedPointState.Simple;

                                    _replace = true;

                                    break;

                                }

                            }

                            if (!_replace && IsSatisfyGemCompose(i, j, (int)stones[j]))

                            {

                                redpointList[i - 1].state = RedPointState.Simple;

                                continue;

                            }

                        }

                    }

                }

            }

        }



        public void UpdateHoleRedpoint(int _index)

        {

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

            {

                gemHoleReds[i].state = RedPointState.None;

                gemComposeReds[i].state = RedPointState.None;

            }

            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Gem))

            {

                return;

            }

            ItemModel item = playerPack.GetItemModelByIndex(PackType.rptEquip, _index);

            if (item != null)

            {

                ItemConfig itemCfg = Config.Instance.Get<ItemConfig>((int)item.itemInfo.ItemID);

                List<ItemModel> list = IsBagHaveGem(FuncConfigConfig.GetGemTypeByEquipPos(item.itemInfo.ItemPlace));

                if (list == null || list.Count == 0)

                {

                    return;

                }

                uint[] stones = PlayerStoneData.Instance.GetStoneInfo(_index);

                for (int j = 0; j < 4; j++)

                {

                    if (j == 3)

                    {

                        if (PlayerDatas.Instance.baseData.VIPLv < gemVipHoleLv || itemCfg.LV < gemOpenArray[0])

                        {

                            continue;

                        }

                    }

                    else

                    {

                        if (itemCfg.LV < gemOpenArray[j])

                        {

                            continue;

                        }

                    }

                    if ((stones == null || stones[j] == 0) && list.Count > 0)

                    {

                        gemHoleReds[j].state = RedPointState.Simple;

                        continue;

                    }

                    else

                    {

                        bool _replace = false;

                        foreach (var gemItem in list)

                        {

                            if (gemItem.itemInfo.ItemID > stones[j])

                            {

                                gemHoleReds[j].state = RedPointState.Simple;

                                _replace = true;

                                break;

                            }

                        }

                        if (!_replace && IsSatisfyGemCompose(_index, j, (int)stones[j]))

                        {

                            gemComposeReds[j].state = RedPointState.Simple;

                            gemHoleReds[j].state = RedPointState.Simple;

                            continue;

                        }

                    }

                }

            }

        }*/



        private Dictionary<int, Dictionary<int, bool>> gemHoleRedpoints = new Dictionary<int, Dictionary<int, bool>>();



        public void OnUpdateRedPoint()


 System/Treasure/KingTreasureWin.cs

@@ -158,9 +158,9 @@
                bool containsDivision = kingTreasureModel.TryGetDivision(model.selectedTreasure, history.rewardLevel, out division);

                m_ContainerBaseProperty.gameObject.SetActive(containsDivision && division.basePropertys.Count > 0);

                m_ContainerSpecialProperty.gameObject.SetActive(containsDivision && division.specialPropertys.Count > 0);

                var index = 0;

                if (containsDivision && division.basePropertys.Count > 0)

                {

                    var index = 0;

                    foreach (var key in division.basePropertys.Keys)

                    {

                        if (index < m_BasePropertys.Length)

@@ -170,14 +170,14 @@
                        }

                        index++;

                    }

                    for (int i = index; i < m_BasePropertys.Length; i++)

                    {

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

                    }

                }

                for (int i = index; i < m_BasePropertys.Length; i++)

                {

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

                }

                index = 0;

                if (containsDivision && division.specialPropertys.Count > 0)

                {

                    var index = 0;

                    foreach (var key in division.specialPropertys.Keys)

                    {

                        if (index < m_SpecialPropertys.Length)

@@ -187,10 +187,10 @@
                        }

                        index++;

                    }

                    for (int i = index; i < m_SpecialPropertys.Length; i++)

                    {

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

                    }

                }

                for (int i = index; i < m_SpecialPropertys.Length; i++)

                {

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

                }

            }

        }

@@ -242,7 +242,7 @@


        private void Goto()

        {

            //--todo 跳转至赛季目标

            WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)278);

        }



    }