From 243d65af53aae9e3084f20ea9c5815f5b29df09e Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 26 Nov 2020 18:26:58 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/Scripts/Common/GameConfig.cs |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Assets/Scripts/Common/GameConfig.cs b/Assets/Scripts/Common/GameConfig.cs
index 3f912dd..f41700a 100644
--- a/Assets/Scripts/Common/GameConfig.cs
+++ b/Assets/Scripts/Common/GameConfig.cs
@@ -84,6 +84,11 @@
         /// </summary>
         public static int SkillLevel;
 
+        /// <summary>
+        /// 是否随机合成塔
+        /// </summary>
+        public static bool CreateRandomTower = true;
+
         #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);

--
Gitblit v1.9.1