Merge commit '4b116e3d552fd8b317be611cd7aee2c091317d9f' into master

chenxin

2020-12-11 f453404715d4e4951d46856578de068b75fe0f34

 Assets/Scripts/Common/GameConfig.cs

@@ -106,6 +106,11 @@
        /// </summary>
        public static bool InfiniteSkill;

        /// <summary>
        /// 关卡完成次数，通关或者是没过关爱心数量为0
        /// </summary>
        public static int GameCompletedCount;

        #region 各个塔的偏移量
        public static Vector3 fireScale = new Vector3(1.92f, 1.92f, 2.208f);
        public static Vector3 woodScale = new Vector3(1.5f, 1.5f, 2.82f);