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

liuzhiwei

2020-11-25 925d4b4b286a5d8dff4b62be0ceb25db0c45fedc

 Assets/Scripts/Guide/ImageTowerPos2.cs

@@ -24,7 +24,8 @@
    // Start is called before the first frame update
    void Start()
    {
        imageWater = transform.parent.Find("Image_Water").GetComponent<ImageWater>();
        imageWater = transform.parent.Find("Image_Wood").GetComponent<ImageWater>();

    }