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

chenxin

2020-12-25 914b0ab6ff4b86a809fb0b6b206504e90612a92a

 Assets/Scripts/Guide/ImageFire2.cs

@@ -1,18 +1,10 @@
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using KTGMGemClient;

public class ImageFire2 : MonoBehaviour, IDragHandler, IBeginDragHandler, IEndDragHandler
public class ImageFire2 : GuideImageBase, IDragHandler, IBeginDragHandler, IEndDragHandler
{
    bool isDraging;
    public bool IsDraging
    {
        get
        {
            return isDraging;
        }
    }

    public void OnBeginDrag(PointerEventData eventData)
    {
        isDraging = true;
@@ -35,7 +27,7 @@
        {
            //合成宝石
            Debug.Log("合成宝石");
            imageFire1.Add();
            //imageFire1.GetComponent<ImageFire1>().Add();
            gameObject.SetActive(false);
        }
        else
@@ -49,22 +41,32 @@

    }

    ImageFire1 imageFire1;
    GameObject imageFire1;
    Image tmpImage;

    Vector2 pos;

    RectTransform rectTransform;
    // Start is called before the first frame update
    void Start()
    //Vector3 startP;
    public Vector2 GetStartP
    {
        get
        {
            return pos;
        }
    }
    // Start is called before the first frame update
    private void Awake()
    {
        //startP = transform.position;

        //imageFire1 = transform.parent.Find("Image_Fire1").GetComponent<ImageFire1>();
        tmpImage = GetComponent<Image>();
        rectTransform = GetComponent<RectTransform>();
        pos = rectTransform.anchoredPosition;
    }

    public void SetTarget(ImageFire1 target)
    public override void SetTarget(GameObject target)
    {
        imageFire1 = target;
    }