Merge commit '67ee17292855d8ce2e077bea2f86113adadf839c'

wangguan

2020-12-17 adf42e9f9f0ea328e4cd3d3d8d63cc111f3f72a1

 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,7 +41,7 @@

    }

    ImageFire1 imageFire1;
    GameObject imageFire1;
    Image tmpImage;

    Vector2 pos;
@@ -74,7 +66,7 @@
        pos = rectTransform.anchoredPosition;
    }

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