From aea99467cb43d6647fa38b42344b56c466592f25 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Thu, 10 Dec 2020 17:57:45 +0800
Subject: [PATCH] 修改SKD相关
---
Assets/Scripts/Guide/ImageFire2.cs | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/Assets/Scripts/Guide/ImageFire2.cs b/Assets/Scripts/Guide/ImageFire2.cs
index f280587..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,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;
}
--
Gitblit v1.9.1