From 56d95fa59a9f6dc12d0fc0723ea449e5b317f994 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Sat, 26 Dec 2020 14:05:00 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/ActionGameFramework/Health/Targetable.cs | 131 -------------------------------------------
1 files changed, 0 insertions(+), 131 deletions(-)
diff --git a/Assets/Scripts/ActionGameFramework/Health/Targetable.cs b/Assets/Scripts/ActionGameFramework/Health/Targetable.cs
index 53ea344..40c196f 100644
--- a/Assets/Scripts/ActionGameFramework/Health/Targetable.cs
+++ b/Assets/Scripts/ActionGameFramework/Health/Targetable.cs
@@ -1,7 +1,4 @@
using Core.Health;
-using System;
-using System.Dynamic;
-using TowerDefense.UI.HUD;
using UnityEngine;
namespace ActionGameFramework.Health
@@ -17,45 +14,9 @@
public Transform targetTransform;
/// <summary>
- /// 是否精英怪
- /// </summary>
- public bool bElit = false;
-
- /// <summary>
- /// 是否Boss怪.
- /// </summary>
- public bool bBoss = false;
-
- /// <summary>
- /// 分别对应三种不同的纹理.
- /// </summary>
- public Texture poisonTex;
- public Texture frozenTex;
- public Texture commonTex;
-
- /// <summary>
/// The position of the object
/// </summary>
protected Vector3 m_CurrentPosition, m_PreviousPosition;
-
-
- /// <summary>
- /// 速度降低值.
- /// </summary>
- protected float speedSlowRate = 0.0f;
-
- // 中毒相关的数据
- protected int poisonTimes = 0;
- protected float poisonHurt = 0.0f;
- protected int poisonAttid = 0;
- protected float timeToPoisonHurt = 0.0f;
-
- protected Color mMatColor;
-
- /// <summary>
- /// 是否处于破甲状态.
- /// </summary>
- public bool bShieldBreak { get; set; }
/// <summary>
/// The velocity of the rigidbody
@@ -77,96 +38,6 @@
return targetTransform == null ? transform : targetTransform;
}
}
-
- /// <summary>
- /// 设置当前目标的颜色数据
- /// </summary>
- /// <param name="color"></param>
- public void SetTargetableMatColor(Color color, bool force = false)
- {
-
- if (!force)
- {
- if (color == mMatColor) return;
- // 无敌状态，只接受白色原贴图:
- if (this.configuration.bInvincible && (color != Color.white)) return;
- }
-
- foreach (Transform t in transform.GetComponentsInChildren<Transform>())
- {
- if (t.name == "Cube")
- {
- Material tMat = t.GetComponent<MeshRenderer>().material;
- if ((color == Color.green) && (poisonTex != null))
- {
- tMat.mainTexture = poisonTex;
- }
- if ((color == Color.blue) && (frozenTex != null))
- {
- tMat.mainTexture = frozenTex;
- }
- if ((color == Color.white) && (commonTex != null))
- {
- tMat.mainTexture = commonTex;
- }
- mMatColor = color;
- }
-
- }
- }
-
-
- /// <summary>
- /// 降低移动速度.
- /// </summary>
- /// <param name="rate"></param>
- public void addSpeedSlowRate(float rate)
- {
- speedSlowRate += rate;
- if (speedSlowRate >= 0.5f)
- speedSlowRate = 0.5f;
- }
-
- /// <summary>
- /// 怪物中毒.
- /// </summary>
- /// <param name="damage"></param>
- public void poisonAgent(float damage, int attid)
- {
- if (this.poisonTimes >= 1) return;
-
- this.poisonTimes++;
- this.poisonAttid = attid;
- this.poisonHurt = (float)Math.Floor(this.configuration.maxHealth / 20.0f);
- this.timeToPoisonHurt = 1.0f;
- }
-
- public bool bInPoison { get { return this.poisonHurt > 0; } }
-
- /// <summary>
- /// 处理中毒相关的数据
- /// </summary>
- /// <param name="time"></param>
- protected void updatePoison(float time)
- {
- this.timeToPoisonHurt -= time;
- if (this.timeToPoisonHurt <= 0)
- {
- Vector3 backPos = this.transform.position;
- this.TakeDamage(poisonHurt, this.transform.position, null, poisonAttid);
- if ((poisonHurt > 0) && (!opponentAgent))
- {
- if (GameUI.instanceExists)
- GameUI.instance.generateBloodText(backPos, poisonHurt, false, false, true);
- else if (EndlessGameUI.instanceExists)
- EndlessGameUI.instance.generateBloodText(backPos, poisonHurt, false, false, true);
- }
-
- if (poisonHurt > 0)
- timeToPoisonHurt = 1.0f;
- }
- }
-
/// <summary>
/// Returns our targetable's transform position
@@ -196,8 +67,6 @@
{
base.Awake();
ResetPositionData();
- bShieldBreak = false;
- mMatColor = Color.white;
}
/// <summary>
--
Gitblit v1.9.1