Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master

liuzhiwei

2020-12-24 45f7442afa3b25cc79c76898224e48d6aed1a2ee

 Assets/Scripts/Core/Economy/Currency.cs

@@ -12,6 +12,8 @@
        /// </summary>
        public int currentCurrency { get; private set; }

        public int lastCurrency { get; private set; }

        /// <summary>
        /// Occurs when currency changed.
        /// </summary>
@@ -31,6 +33,8 @@
        /// <param name="increment">the change in currency</param>
        public void AddCurrency(int increment)
        {
            if (increment == 0) return;

            ChangeCurrency(increment);
        }

@@ -66,6 +70,7 @@
        {
            if (increment != 0)
            {
                lastCurrency = currentCurrency;
                currentCurrency += increment;
                if (currencyChanged != null)
                {