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

client_Zxw

2018-10-11 1b2a0c564e4729ab6c8c84939acc1b5cded54842

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

 System/FakeDungeon/FakeDemonJarDungeonStage.cs

@@ -109,7 +109,7 @@
    {

        if (isReconnected)

        {

            if (surplusTime < 0f)

            if (surplusTime <= 0f)

            {

                if (fighting)

                {


 System/MainWin/SkillButton.cs

@@ -32,7 +32,13 @@
        [SerializeField] Image m_Icon;
        public Image icon { get { return m_Icon; } }
        [SerializeField] Transform m_Locked;
        public Transform locked { get { return m_Locked; } }
        public Transform locked
        {
            get
            {
                return m_Locked;
            }
        }

        [SerializeField] Text m_CoolDown;
        [SerializeField] Image m_CoolDownMask;
@@ -46,21 +52,27 @@
        bool isExit = false;

        float m_TotalCoolDown = 0f;
        public float totalCoolDown {
            get {
        public float totalCoolDown
        {
            get
            {
                return m_TotalCoolDown;
            }
            set {
            set
            {
                m_TotalCoolDown = value;
            }
        }

        float m_CoolDownCompleteTime = 0f;
        public float coolDownCompleteTime {
            get {
        public float coolDownCompleteTime
        {
            get
            {
                return m_CoolDownCompleteTime;
            }
            set {
            set
            {
                m_CoolDownCompleteTime = value;
            }
        }
@@ -75,14 +87,15 @@
            m_SkillData = _skillData;
            if (m_SkillData == null)
            {
                m_Locked.gameObject.SetActive(true);
                locked.gameObject.SetActive(true);
                m_Icon.gameObject.SetActive(false);
            }
            else
            {
                if (PreFightMission.Instance.IsFinished())
                if (PreFightMission.Instance.IsFinished()
                 || PreFightMission.Instance.s_MissionDict.ContainsKey(1002))
                {
                    m_Locked.gameObject.SetActive(false);
                    locked.gameObject.SetActive(false);
                    m_Icon.gameObject.SetActive(true);
                }
                var skillConfig = m_SkillData.skillCfg;

 System/Treasure/TreasurePotentialPanel.cs

@@ -951,7 +951,9 @@
            {

                DisplayPotentialBook(model.selectedPotentialBook);

                var levelUpConfig = GetPotentialLevelUpConfig();

                m_PotentialCount.text = StringUtility.Contact(levelUpConfig.own, "/", levelUpConfig.need);

                bool satisfy = levelUpConfig.own >= levelUpConfig.need;

                m_PotentialCount.text = StringUtility.Contact(UIHelper.GetTextColorByItemColor(satisfy ?

                    TextColType.LightYellow : TextColType.Red, levelUpConfig.own.ToString()), "/", levelUpConfig.need);

            }

        }