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

client_Hale

2018-11-13 4c2762f9fb30671679c6dbc11e3e4aa428c62ab4

 System/Treasure/TreasureDemonBehaviour.cs

@@ -9,6 +9,7 @@
{

    public class TreasureDemonBehaviour : MonoBehaviour

    {

        [SerializeField] Image m_TreasureNameIcon;

        [SerializeField] Text m_TreasureDescription;

        [SerializeField] RectTransform m_ContainerFightPower;

        [SerializeField] Text m_FightPower;

@@ -24,6 +25,7 @@


        [SerializeField] PositionTween m_DescriptionTween;

        [SerializeField] PositionTween m_SkillTween;

        [SerializeField] PositionTween m_NameTween;



        TreasureModel m_Model;

        TreasureModel model

@@ -74,11 +76,13 @@
                m_SkillTween.SetStartState();

                m_DescriptionTween.Play();

                m_SkillTween.Play();

                m_NameTween.Play();

            }

            else

            {

                m_DescriptionTween.SetEndState();

                m_SkillTween.SetEndState();

                m_NameTween.SetEndState();

            }



            var config = Config.Instance.Get<TreasureConfig>(_id);

@@ -91,6 +95,7 @@
            m_GetBtn.gameObject.SetActive(m_Treasure.state == TreasureState.Collecting);

            m_RecommondPower.gameObject.SetActive(m_Treasure.state != TreasureState.Collected);

            m_ContainerFightPower.gameObject.SetActive(m_Treasure.state == TreasureState.Collected);

            m_TreasureNameIcon.SetSprite(config.TreasureNameIcon);



            if (m_Treasure.state == TreasureState.Locked)

            {