From 85f0d13945f3aef5aef1b3c1b47c77cea0514c17 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 22 Oct 2020 16:06:50 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/ActionGameFramework/Health/Damager.cs | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/Assets/Scripts/ActionGameFramework/Health/Damager.cs b/Assets/Scripts/ActionGameFramework/Health/Damager.cs
index a5861ce..1bbfd3c 100644
--- a/Assets/Scripts/ActionGameFramework/Health/Damager.cs
+++ b/Assets/Scripts/ActionGameFramework/Health/Damager.cs
@@ -18,6 +18,11 @@
public float damage;
/// <summary>
+ /// 用于最后一颗子弹的多倍攻击
+ /// </summary>
+ public float damageMulti = 1.0f;
+
+ /// <summary>
/// TEST CODE TO TOWER_NAME
/// </summary>
public string towerName = "";
@@ -49,6 +54,7 @@
/// The alignment of the damager
/// </summary>
public SerializableIAlignmentProvider alignment;
+
/// <summary>
/// Gets the alignment of the damager
@@ -105,7 +111,16 @@
/// </summary>
public float finalDamage
{
- get { return damage + inSceneUpGradeDamage; }
+
+
+ get {
+ float fd = damage * damageMulti;
+ if (damageMulti > 1.0f)
+ Debug.Log("hello,world:" + damageMulti.ToString() );
+
+ damageMulti = 1.0f;
+ return fd + inSceneUpGradeDamage;
+ }
}
/// <summary>
--
Gitblit v1.9.1