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

chenxin

2020-10-27 43b531f76be6e12c775a1135f6895e8fdc389a59

 Assets/Scripts/Guide/ImageWater.cs

@@ -51,10 +51,9 @@
        {
            //生成一个1级的水元素塔
            Debug.Log("生成一个1级的水元素塔");
            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateWaterLv1);
            gameObject.SetActive(false);
            target.GetComponent<Image>().sprite = tmpImage.sprite;

            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateWaterLv1);
        }
        else
        {