From 5e61bf3fc6c438beb0a6470518aee73f30ff0b35 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 20 Nov 2020 14:13:42 +0800
Subject: [PATCH] 冷冻气息连杀
---
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll | 0
Assets/Scripts/TowerDefense/UI/FreezeBreath.cs | 9 +++++++++
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll | 0
GemBattle/宝石塔防_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll | 0
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll | 0
GemBattle/宝石塔防_Data/sharedassets0.assets | 0
GemBattle/宝石塔防_Data/resources.assets | 0
And/GemBattle.apk | 0
GemBattle/宝石塔防_Data/sharedassets1.assets | 0
GemBattle/宝石塔防_Data/globalgamemanagers.assets | 0
GemBattle/宝石塔防_Data/globalgamemanagers | 0
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll | 0
GemBattle.zip | 0
GemBattle/宝石塔防_Data/resources.assets.resS | 0
GemBattle/宝石塔防_Data/level0 | 0
GemBattle/宝石塔防_Data/level1 | 0
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll | 0
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll | 0
GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll | 0
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll | 0
20 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/And/GemBattle.apk b/And/GemBattle.apk
index a5ff425..cfe30a1 100644
--- a/And/GemBattle.apk
+++ b/And/GemBattle.apk
Binary files differ
diff --git a/Assets/Scripts/TowerDefense/UI/FreezeBreath.cs b/Assets/Scripts/TowerDefense/UI/FreezeBreath.cs
index 8f98467..ab4f2d7 100644
--- a/Assets/Scripts/TowerDefense/UI/FreezeBreath.cs
+++ b/Assets/Scripts/TowerDefense/UI/FreezeBreath.cs
@@ -98,6 +98,9 @@
agentList.Add(list[i]);
}
+ // 一次性死亡数量
+ int deathCount = 0;
+
while (agentList.Count > 0)
{
Agent agent = agentList[0];
@@ -111,10 +114,16 @@
agent.PlayOnHitImmediately();
EndlessGameUI.instance.generateBloodText(agent.position, damage);
agent.TakeDamage(damage, agent.position, alignmentProvider);
+
+ if (agent.isDead)
+ ++deathCount;
}
else if (agent.AgentType == SpawnAgentType.BubbleBomb)
EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessBossSkillBubbleBombGetHit, (agent as BubbleBombAgent).Id);
}
+
+ if (deathCount > 1)
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessOneTimeKillCount, deathCount);
}
public void PlayFreezeEffect(int waveLineId)
diff --git a/GemBattle.zip b/GemBattle.zip
index 5794148..820ab33 100644
--- a/GemBattle.zip
+++ b/GemBattle.zip
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll"
index 1140118..db47116 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll"
index ed9cf50..3763253 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll"
index 11fae86..5bd3c69 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll"
index 58d3f28..28635f8 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll"
index c2c758a..e520572 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll"
index 25cc1ba..9445d09 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll"
index b2ac9c1..1ea43c1 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll"
index 9e37b14..f9ba202 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll"
index 09b3e50..c0cef09 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers"
index 4d1ac70..14f99ea 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets"
index 8c7019c..61307ce 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level0" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level0"
index c63bc8b..66b7fb6 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level0"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level0"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1"
index fc1b941..b788431 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets"
index 4944b27..c9e6860 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets.resS" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets.resS"
index d5fe11e..a01c422 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets.resS"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets.resS"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets"
index 5c7e38b..81c051e 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets"
index 9e86ce5..937e31f 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets"
Binary files differ
--
Gitblit v1.9.1