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/ImageFire1.cs | 92 +++++-----------------------------------------
1 files changed, 10 insertions(+), 82 deletions(-)
diff --git a/Assets/Scripts/Guide/ImageFire1.cs b/Assets/Scripts/Guide/ImageFire1.cs
index e580ecd..29b619e 100644
--- a/Assets/Scripts/Guide/ImageFire1.cs
+++ b/Assets/Scripts/Guide/ImageFire1.cs
@@ -1,43 +1,14 @@
-using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine;
using UnityEngine.EventSystems;
using KTGMGemClient;
-using UnityEngine.UI;
-public class ImageFire1 : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IDragHandler, IBeginDragHandler, IEndDragHandler
+public class ImageFire1 : GuideImageBase, IDragHandler, IBeginDragHandler, IEndDragHandler
{
- ImageFire2 imageFire2;
-
- public void OnPointerEnter(PointerEventData eventData)
- {
- if (imageFire2.IsDraging)
- {
- imageFire2.SetTarget(this);
- }
- }
-
- public void OnPointerExit(PointerEventData eventData)
- {
- if (imageFire2.IsDraging)
- {
- imageFire2.SetTarget(null);
- }
- }
-
- GameObject level1, level2;//等级标志
- bool canDrag;//是否可以推拽
RectTransform rectTransform;//自身Rect
-
- public RectTransform GetRect
- {
- get
- {
- return rectTransform;
- }
- }
GameObject target;//推拽到塔位置的标识
Image tmpImage;//自身图片
Vector2 pos;//初始坐标
- //Vector3 startP;
public Vector2 GetStartP
{
get
@@ -45,67 +16,28 @@
return pos;
}
}
-
// Start is called before the first frame update
private void Awake()
{
-
- //startP = transform.position;
- rectTransform = GetComponent<RectTransform>();
-
- imageFire2 = transform.parent.Find("Image_Fire2").GetComponent<ImageFire2>();
- level1 = transform.Find("Image_1").gameObject;
- level2 = transform.Find("Image_2").gameObject;
- level2.SetActive(false);
-
- tmpImage = GetComponent<Image>();
rectTransform = GetComponent<RectTransform>();
pos = rectTransform.anchoredPosition;
- }
-
- //合成宝石
- public void Add()
- {
- Debug.Log("合成了宝石");
- level1.SetActive(false);
- level2.SetActive(true);
- canDrag = true;
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.AddCard);
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.GuidePlayUpgradeEffect, transform.position);
+ tmpImage = GetComponent<Image>();
}
-
- public void SetTarget(GameObject target)
+ public override void SetTarget(GameObject target)
{
this.target = target;
}
- bool isDraging;
- public bool IsDraging
- {
- get
- {
- return isDraging;
- }
- }
Vector3 dragPos;//开始拖拽的临时变量
public void OnDrag(PointerEventData eventData)
{
- if (!canDrag)
- {
- return;
- }
RectTransformUtility.ScreenPointToWorldPointInRectangle(rectTransform, eventData.position, eventData.enterEventCamera, out dragPos);
- //dragPos.z = 0;
rectTransform.position = dragPos;
}
public void OnBeginDrag(PointerEventData eventData)
{
- if (!canDrag)
- {
- return;
- }
isDraging = true;
tmpImage.raycastTarget = false;
@@ -113,19 +45,14 @@
public void OnEndDrag(PointerEventData eventData)
{
- if (!canDrag)
- {
- return;
- }
-
isDraging = false;
if (target != null)
{
- //生成一个2级的火焰塔
- Debug.Log("生成一个2级的火焰塔");
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateFireLv2);
+ //生成一个1级的水元素塔
+ Debug.Log("生成一个1级的火元素塔");
gameObject.SetActive(false);
- target.GetComponent<Image>().sprite = tmpImage.sprite;
+ //target.GetComponent<Image>().sprite = tmpImage.sprite;
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateFireLv1);
}
else
{
@@ -134,3 +61,4 @@
}
}
}
+
--
Gitblit v1.9.1