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

client_Hale

2018-10-09 2e7aa5faabcbe00757c74379f67b3231b1b3370f

 System/Treasure/TreasureModel.cs

@@ -45,6 +45,7 @@
        public event Action<int> treasureLevelProgressUpdateEvent;

        public event Action<int> treasureStageUpEvent;

        public event Action<int> humanTreasureStateChangeEvent;

        public event Action skillLevelUpRedpointUpdate;



        bool m_WaitOpenDetailsWin = false;

        public bool waitOpenDetailsWin {

@@ -842,6 +843,10 @@
                            {

                                treasure.skillLevelUpRedpoint.state = RedPointState.Simple;

                                treasure.autoSelectPotential = k;

                                if (skillLevelUpRedpointUpdate != null)

                                {

                                    skillLevelUpRedpointUpdate();

                                }

                                return;

                            }

                        }

@@ -869,7 +874,7 @@
                                var itemConfig = Config.Instance.Get<ItemConfig>(item.id);

                                var itemColor = itemConfig.ItemColor;

                                if (minCostItemColor == 0 || itemColor < minCostItemColor ||

                                    (itemColor == minCostItemColor && minCostItemCount < item.count))

                                    (itemColor == minCostItemColor && item.count < minCostItemCount))

                                {

                                    minCostItemColor = itemColor;

                                    minCostItemCount = item.count;

@@ -896,6 +901,10 @@
                    treasures[minCostTreasure].skillLevelUpRedpoint.state = RedPointState.Simple;

                    treasures[minCostTreasure].autoSelectPotential = minCostPotentialIndex;

                }

            }

            if (skillLevelUpRedpointUpdate != null)

            {

                skillLevelUpRedpointUpdate();

            }

        }



@@ -1303,6 +1312,7 @@
                    }

                }

            }

            UpdateSkillLevelUpRedpoints();

        }



        public void HumanTreasureStateChange(int _id)