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

client_Hale

2019-05-23 3dedbca7d7aaace2a1e2994f356f5e9e4d5c7619

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

 System/Treasure/DemonTreasureWin.cs

@@ -32,6 +32,7 @@
        [SerializeField] Transform m_ContainerChallenge;

        [SerializeField] Button m_Challenge;

        [SerializeField] Text m_RecommondPower;

        [SerializeField] Text m_RecommondDefense;

        [SerializeField] Button m_ViewProperty;



        [SerializeField] float m_Expand = 1.05f;

@@ -172,7 +173,9 @@
                return;

            }

            var fightPower = PlayerDatas.Instance.baseData.FightPoint;

            var defense = UIHelper.GetPropertyValue(PropertyType.DEF);

            var recommandPower = 0;

            var recommandDefense = 0;

            TreasureDungeon treasureDungeon;

            if (model.TryGetTreasureDungeon(model.selectedTreasure, out treasureDungeon))

            {

@@ -180,7 +183,14 @@
                if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))

                {

                    recommandPower = dungeonInfo.fightPower;

                    recommandDefense = dungeonInfo.defense;

                }

            }



            if (fightPower < recommandPower && defense < recommandDefense)

            {

                SysNotifyMgr.Instance.ShowTip("TreasureDungeonGotoError_1");

                return;

            }



            var config = TreasureConfig.Get(model.selectedTreasure);

@@ -390,7 +400,9 @@
            }

            m_ContainerChallenge.gameObject.SetActive(treasure.state == TreasureState.Collecting);

            var fightPower = PlayerDatas.Instance.baseData.FightPoint;

            var defense = UIHelper.GetPropertyValue(PropertyType.DEF);

            var recommandPower = 0;

            var recommandDefense = 0;

            TreasureDungeon treasureDungeon;

            if (model.TryGetTreasureDungeon(model.selectedTreasure, out treasureDungeon))

            {

@@ -398,10 +410,15 @@
                if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))

                {

                    recommandPower = dungeonInfo.fightPower;

                    recommandDefense = dungeonInfo.defense;

                }

            }

            m_RecommondPower.text = Language.Get("TreasureRecommendAttr", StringUtility.Contact(fightPower, "/", recommandPower));

            m_RecommondPower.color = UIHelper.GetUIColor(fightPower >= recommandPower ? TextColType.Green : TextColType.Red);





            m_RecommondDefense.text = Language.Get("TreasureRecommendDefense", StringUtility.Contact(defense, "/", recommandDefense));

            m_RecommondDefense.color = UIHelper.GetUIColor(defense >= recommandDefense ? TextColType.Green : TextColType.Red);

        }



        private void DisplayDungeons()