From 54181477c210344b037d88f17dbe2cddc5cbc930 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 02 Dec 2020 17:54:32 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/Guide/ImageFire2.cs | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/Assets/Scripts/Guide/ImageFire2.cs b/Assets/Scripts/Guide/ImageFire2.cs
index ec6fd4b..fe07d8d 100644
--- a/Assets/Scripts/Guide/ImageFire2.cs
+++ b/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;
}
--
Gitblit v1.9.1