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

client_Hale

2018-11-05 1b4e8bb37f33dc03e0119b1d2fcaefbc291d6fad

 System/MainInterfacePanel/SkillContainerResetTimer.cs

@@ -27,7 +27,7 @@
            }



            timer += Time.deltaTime;

            if (timer > GeneralConfig.Instance.mainWinSkillResetTime)

            if (timer > GeneralDefine.mainWinSkillResetTime)

            {

                WindowCenter.Instance.Get<MainInterfaceWin>().MarkRayButton();

                this.gameObject.SetActive(false);