From 09053388ef6d58a7de59fab450c11ee0affbceb2 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 20 Nov 2020 11:50:55 +0800
Subject: [PATCH] Merge commit 'fafc11ad74601a1c4e4b2e28165af25bd19bb5a9' into master

---
 Assets/Scripts/Common/GameConfig.cs |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/Assets/Scripts/Common/GameConfig.cs b/Assets/Scripts/Common/GameConfig.cs
index 11e4672..62b67ae 100644
--- a/Assets/Scripts/Common/GameConfig.cs
+++ b/Assets/Scripts/Common/GameConfig.cs
@@ -1,8 +1,10 @@
-/**
- * 全局配置
- * @Author: chenxin
- * @Date: 2020-10-14 10:40:24
- */
+
+using UnityEngine;
+/**
+* 全局配置
+* @Author: chenxin
+* @Date: 2020-10-14 10:40:24
+*/
 namespace KTGMGemClient
 {
     public class GameConfig
@@ -10,12 +12,19 @@
         /// <summary>
         /// LoadingScene 载入下一个场景的场景名
         /// </summary>
-        public static string NextSceneName = "Endless";
+        // cx test
+        public static string NextSceneName = "Endless2D";
+        // public static string NextSceneName = "Endless";
+
+        public static bool isFirstStart = true;
 
         public static bool IsDebug = false;
+
         public static string TestLoginUrl = "http://10.5.3.227:9000/user/login";
+
         public static string LoginUrl = "http://172.16.1.52:9000/user/login";
-        public static bool OpenDebug = true;
+
+        public static bool OpenDebug = false;
 
         /// <summary>
         /// PVE无尽模式,是否可以点击购买新的宝石
@@ -28,8 +37,42 @@
         public static bool CanOpenNewTower = true;
 
         /// <summary>
+        /// 攻击塔是否可以收到伤害
+        /// </summary>
+        public static bool TowerCanTakeDamage = false;
+
+        /// <summary>
+        /// 攻击塔是否第一次收到伤害
+        /// </summary>
+        public static bool TowerFirstTakeDamage = true;
+
+        /// <summary>
         /// 是否是新手
         /// </summary>
         public static bool IsNewbie = true;
+
+        /// <summary>
+        /// 无尽模式每一轮游戏中成功使用技能宝石的次数
+        /// </summary>
+        public static int EndlessPortUseSkillTowerCount;
+
+        /// <summary>
+        /// 每一轮游戏中成功开启的塔位置数量,这个是上阵的塔,可以攻击的塔位
+        /// </summary>
+        public static int EndlessOpenAttackTowerCount;
+
+        /// <summary>
+        /// 每一轮游戏中成功购买塔的数量
+        /// </summary>
+        public static int EndlessBuyTowerCount;
+
+        #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);
+        public static Vector3 waterScale = new Vector3(1.0f, 1.0f, 1.88f);
+
+        public static Vector3 fireOffectp = new Vector3(0f, 0f, -0.15f);
+        public static Vector3 woodOffectp = new Vector3(0.08f, 0f, 0.2f);
+        #endregion
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1