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

liuzhiwei

2020-12-24 45f7442afa3b25cc79c76898224e48d6aed1a2ee

 Assets/Scripts/Guide/GuideBox.cs

@@ -3,6 +3,7 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using DG.Tweening;

public enum GuideBoxType
{
@@ -36,11 +37,16 @@

    Action callBack;

    GameObject images;
    Transform btnImageTS;

    // Start is called before the first frame update
    void Awake()
    {
        bgBtn = transform.Find("BackGround").GetComponent<Button>();
        bgBtn.onClick.AddListener(OnClickBtn);

        images = transform.Find("Images").gameObject;

        srImage = transform.Find("SRImage").gameObject;

@@ -57,6 +63,8 @@
        infoTxt = transform.Find("InfoTxt/Text").GetComponent<Text>();

        myType = GuideBoxType.None;

        btnImageTS = transform.Find("BtnImage");

        gameObject.SetActive(false);
    }
@@ -88,11 +96,13 @@
            {
                Water();
            }
            AudioSourceManager.Ins.Play(AudioEnum.GuideOpenBox);
        }
    }

    private void Fire()
    {
        images.SetActive(true);
        tmpPS = firePS;
        tmpPS.SetActive(true);
        //tmpPS.Play();
@@ -111,6 +121,8 @@
    }
    private void Wood()
    {
        images.SetActive(true);

        tmpPS = woodPS;

        tmpPS.SetActive(true);
@@ -122,6 +134,8 @@
    }
    private void Water()
    {
        images.SetActive(true);

        tmpPS = waterPS;

        tmpPS.SetActive(true);
@@ -136,10 +150,51 @@
    {
        if (callBack != null)
        {
            bgBtn.interactable = false;
            if (tmpPS != null) tmpPS.SetActive(false);
            if (tmpObj != null) tmpObj.SetActive(false);
            gameObject.SetActive(false);
            callBack();
            //if (tmpObj != null) tmpObj.SetActive(false);
            images.SetActive(false);
            srImage.SetActive(false);
            infoImage.SetActive(false);
            PlayClosePs();
        }
    }

    Vector3 endScale = new Vector3(0.2f, 0.2f, 0.2f);
    private void PlayClosePs()
    {
        tmpObj.transform.Find("Images").gameObject.SetActive(false);
        tmpObj.transform.Find("Icon").GetComponent<Image>().enabled = true;

        //RectTransform ts = tmpObj.GetComponent<RectTransform>();

        tmpObj.transform.DOScale(endScale, 1.0f);
        // isRotate = true;
        // offect = 0;
        tmpObj.transform.DOMove(btnImageTS.transform.position, 1f).SetEase(Ease.OutQuad).OnComplete(Close);
        //ts.DOAnchorPos(btnImageRectTS.anchoredPosition, 1.0f).OnComplete(Close);
    }

    // bool isRotate = false;
    // float offect = 0;
    // /// <summary>
    // /// LateUpdate is called every frame, if the Behaviour is enabled.
    // /// It is called after all Update functions have been called.
    // /// </summary>
    // void LateUpdate()
    // {
    //     if (isRotate)
    //     {
    //         offect += Time.deltaTime;
    //         tmpObj.transform.localRotation = Quaternion.Euler(0, 0, offect * 1000);
    //     }
    // }

    private void Close()
    {
        //isRotate = false;
        tmpObj.gameObject.SetActive(false);
        gameObject.SetActive(false);
        callBack();
    }
}