From 7f9f5fa4440c237c7116ad0ada6b72d0e7cc8781 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Thu, 03 Dec 2020 10:22:46 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle

---
 Assets/Scripts/Common/GameConfig.cs |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/Assets/Scripts/Common/GameConfig.cs b/Assets/Scripts/Common/GameConfig.cs
index 62b67ae..32c0145 100644
--- a/Assets/Scripts/Common/GameConfig.cs
+++ b/Assets/Scripts/Common/GameConfig.cs
@@ -12,7 +12,6 @@
         /// <summary>
         /// LoadingScene 载入下一个场景的场景名
         /// </summary>
-        // cx test
         public static string NextSceneName = "Endless2D";
         // public static string NextSceneName = "Endless";
 
@@ -25,6 +24,12 @@
         public static string LoginUrl = "http://172.16.1.52:9000/user/login";
 
         public static bool OpenDebug = false;
+
+        public static string PlayerName = "";
+
+        //是否震屏
+        public static bool IsShaking = false;
+
 
         /// <summary>
         /// PVE无尽模式,是否可以点击购买新的宝石
@@ -49,7 +54,15 @@
         /// <summary>
         /// 是否是新手
         /// </summary>
-        public static bool IsNewbie = true;
+        public static bool IsNewbie = false;
+        /// <summary>
+        /// 是否JSON读取完毕
+        /// </summary>
+        public static bool JsonReadDone = false;
+        /// <summary>
+        /// 新手模式是否可以推拽塔
+        /// </summary>
+        public static bool CanDragTower = false;
 
         /// <summary>
         /// 无尽模式每一轮游戏中成功使用技能宝石的次数
@@ -66,6 +79,31 @@
         /// </summary>
         public static int EndlessBuyTowerCount;
 
+        /// <summary>
+        /// 每一轮游戏中技能值
+        /// </summary>
+        public static int EnergyCount;
+
+        /// <summary>
+        /// 每一轮游戏中技能等级
+        /// </summary>
+        public static int SkillLevel;
+
+        /// <summary>
+        /// 是否随机合成塔
+        /// </summary>
+        public static bool CreateRandomTower = true;
+
+        /// <summary>
+        /// 是否是从新手开始闯关的
+        /// </summary>
+        public static bool IsNewbieStart;
+
+        /// <summary>
+        /// 无限释放技能
+        /// </summary>
+        public static bool InfiniteSkill;
+
         #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