Merge commit '998ebc0dc00c103b365e36797c1a1ac4a6a2afa5' into master

chenxin

2020-11-19 fdfb88a9ee3652e716e603f759d3be5dcc0bd3bd

 Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs

@@ -67,7 +67,7 @@
        private void Start()
        {
            Init();
            EventCenter.Ins.Add<Agent>((int)KTGMGemClient.EventType.EndlessAgentDead, AgentDead);
            EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.EndlessAgentDead, AgentDead);
            EventCenter.Ins.Add((int)KTGMGemClient.EventType.EndlessOneHit, OnHit);
            EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.EndlessOneTimeKillCount, OnTimeKill);
            canvasGroup = DoubleHit.GetComponent<CanvasGroup>();
@@ -97,10 +97,10 @@
            }
        }

        private void AgentDead(Agent agent)
        private void AgentDead(int point)
        {
            if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
            AddScore(agent.EnemyData.point);
            AddScore(point);
        }

        // Update is called once per frame