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/ImageWood2.cs | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/Assets/Scripts/Guide/ImageSkill.cs b/Assets/Scripts/Guide/ImageWood2.cs
similarity index 65%
rename from Assets/Scripts/Guide/ImageSkill.cs
rename to Assets/Scripts/Guide/ImageWood2.cs
index 44137a7..4b029d2 100644
--- a/Assets/Scripts/Guide/ImageSkill.cs
+++ b/Assets/Scripts/Guide/ImageWood2.cs
@@ -1,23 +1,14 @@
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
-using KTGMGemClient;
-public class ImageSkill : MonoBehaviour, IDragHandler, IBeginDragHandler, IEndDragHandler
+public class ImageWood2 : GuideImageBase, IDragHandler, IBeginDragHandler, IEndDragHandler
{
- bool isDraging;
- public bool IsDraging
- {
- get
- {
- return isDraging;
- }
- }
public void OnBeginDrag(PointerEventData eventData)
{
isDraging = true;
tmpImage.raycastTarget = false;
- GuideCtrl.Ins.BeginDrag11_1();
+ GuideCtrl.Ins.BeginDrag();
}
Vector3 dragPos;
@@ -31,12 +22,11 @@
public void OnEndDrag(PointerEventData eventData)
{
isDraging = false;
- if (skillRim != null)
+ if (imageWood1 != null)
{
- //释放技能
- Debug.Log("释放技能");
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.SkillRelease);
-
+ //合成宝石
+ Debug.Log("合成宝石");
+ imageWood1.GetComponent<ImageWood>().Add();
gameObject.SetActive(false);
}
else
@@ -45,15 +35,18 @@
tmpImage.raycastTarget = true;
//返回原位，提示开始推拽
- GuideCtrl.Ins.EndDrag11_1();
+ GuideCtrl.Ins.EndDrag();
}
}
- GameObject skillRim;
+ GameObject imageWood1;
Image tmpImage;
Vector2 pos;
+
+ RectTransform rectTransform;
+ //Vector3 startP;
public Vector2 GetStartP
{
get
@@ -61,19 +54,18 @@
return pos;
}
}
- RectTransform rectTransform;
-
// Start is called before the first frame update
private void Awake()
{
- //imageFire1 = transform.parent.Find("Image_Fire1").GetComponent<ImageFire1>();
tmpImage = GetComponent<Image>();
rectTransform = GetComponent<RectTransform>();
pos = rectTransform.anchoredPosition;
}
- public void SetTarget(GameObject target)
+ public override void SetTarget(GameObject target)
{
- skillRim = target;
+ imageWood1 = target;
}
+
}
+
--
Gitblit v1.9.1