Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle

wangguan

2020-11-27 6c547fcd89adf90eb67a2d077934eca97ecd1959

Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle

 Assets/Scripts/Json/JsonDataCenter.cs

@@ -261,9 +261,6 @@
        /// </summary>
        private static void InitData()
        {
            int guide = PlayerPrefs.GetInt("GemBattleGuide");
            GameConfig.IsNewbie = guide == 0;
            GameConfig.IsNewbieStart = GameConfig.IsNewbie;
            EndlessEnemyData.Init();
            EndlessBuffData.Init();
            EndlessBossData.Init();

 Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs

@@ -426,6 +426,7 @@
        {
            foreach (EndlessPortConfig data in waveData)
            {
                if (waves[data.Config.tunel - 1].LineState == EndlessWaveLineState.Spawning)
                waves[data.Config.tunel - 1].PauseWave();
            }
        }
@@ -437,6 +438,7 @@
        {
            foreach (EndlessPortConfig data in waveData)
            {
                if (waves[data.Config.tunel - 1].LineState == EndlessWaveLineState.Spawning)
                waves[data.Config.tunel - 1].RestartWave();
            }
        }

 Assets/Scripts/TowerDefense/Level/JsonDataInit.cs

@@ -4,8 +4,7 @@

public class JsonDataInit : MonoBehaviour
{
    // Start is called before the first frame update
    void Awake()
    private void OnEnable()
    {
        JsonDataCenter.allData = new Dictionary<string, List<tabledata>>();
        JsonDataReader.Instance.StartRead(JsonDataCenter.ProcessInitDataLoad);

 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs

@@ -156,6 +156,10 @@

    private void CheckIsNewbie()
    {
        int guide = PlayerPrefs.GetInt("GemBattleGuide");
        GameConfig.IsNewbie = guide == 0;
        GameConfig.IsNewbieStart = GameConfig.IsNewbie;
        
        if (GameConfig.IsNewbie)
        {
            Debug.Log("开始新手引导");

 Assets/Scripts/TowerDefense/UI/LoadingScene.cs

@@ -24,7 +24,6 @@
        curTime = UPDATE_TIME;
    }


    IEnumerator LoadScene()
    {
        async = SceneManager.LoadSceneAsync(GameConfig.NextSceneName);