From b8d221ed856544aec0ae376783e09f9814276722 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 18 Nov 2020 20:14:48 +0800
Subject: [PATCH] 小怪撞塔报错， 心碎特效调整
---
Assets/Scripts/TowerDefense/Agents/Agent.cs | 22 ++--------------------
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll | 0
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll | 0
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll | 0
GemBattle/宝石塔防_Data/resources.assets | 0
And/GemBattle.apk | 0
Assets/Scripts/Json/JsonDataCenter.cs | 3 ++-
Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs | 2 ++
GemBattle/宝石塔防_Data/sharedassets1.assets | 0
Assets/Prefabs/UI/Heart.prefab | 6 +++---
GemBattle/宝石塔防_Data/globalgamemanagers.assets | 0
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs | 1 -
GemBattle/宝石塔防_Data/globalgamemanagers | 0
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll | 0
GemBattle.zip | 0
GemBattle/宝石塔防_Data/level1 | 0
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll | 0
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll | 0
GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll | 0
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs | 5 +++++
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll | 0
Assets/Scripts/Manager/ManagerRoot.cs | 2 +-
22 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/And/GemBattle.apk b/And/GemBattle.apk
index f272314..37eaf3a 100644
--- a/And/GemBattle.apk
+++ b/And/GemBattle.apk
Binary files differ
diff --git a/Assets/Prefabs/UI/Heart.prefab b/Assets/Prefabs/UI/Heart.prefab
index 31284e3..9a433b8 100644
--- a/Assets/Prefabs/UI/Heart.prefab
+++ b/Assets/Prefabs/UI/Heart.prefab
@@ -141,7 +141,7 @@
- target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
type: 3}
@@ -156,7 +156,7 @@
- target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
type: 3}
propertyPath: m_LocalRotation.w
- value: 1
+ value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
type: 3}
@@ -166,7 +166,7 @@
- target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 0
+ value: -90
objectReference: {fileID: 0}
- target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
type: 3}
diff --git a/Assets/Scripts/Json/JsonDataCenter.cs b/Assets/Scripts/Json/JsonDataCenter.cs
index 9c53004..9fc992a 100644
--- a/Assets/Scripts/Json/JsonDataCenter.cs
+++ b/Assets/Scripts/Json/JsonDataCenter.cs
@@ -177,7 +177,8 @@
OpponentMgr.instance.ResetCurrency(currency);
if (EndlessLevelManager.instanceExists)
- EndlessLevelManager.instance.ResetCurrency(currency);
+ // cx test
+ EndlessLevelManager.instance.ResetCurrency(5000000);
break;
case "skilltime":
// 设置技能塔出现时间
diff --git a/Assets/Scripts/Manager/ManagerRoot.cs b/Assets/Scripts/Manager/ManagerRoot.cs
index d5ca981..00e780c 100644
--- a/Assets/Scripts/Manager/ManagerRoot.cs
+++ b/Assets/Scripts/Manager/ManagerRoot.cs
@@ -24,7 +24,7 @@
root.AddComponent<TDAA_SDKManager>();
root.AddComponent<AudioSourceManager>();
- root.AddComponent<ErrorLogOnGUIMyTools>();
+ // root.AddComponent<ErrorLogOnGUIMyTools>();
}
//gameObject.AddComponent<JsonDataReader>();
diff --git a/Assets/Scripts/TowerDefense/Agents/Agent.cs b/Assets/Scripts/TowerDefense/Agents/Agent.cs
index f8e1deb..fc9a6ab 100644
--- a/Assets/Scripts/TowerDefense/Agents/Agent.cs
+++ b/Assets/Scripts/TowerDefense/Agents/Agent.cs
@@ -875,26 +875,6 @@
}
/// <summary>
- /// 检查自身血量
- /// </summary>
- private void CheckHealth()
- {
- if (this.healthVal <= 0.1)
- {
- Die();
-
- //Debug.Log("删除多余的攻击Agent.");
- }
- }
-
- private void Die()
- {
- // 统一管理器内删除当前的Agent:
- AgentInsManager.instance.removeAgent(this);
- this.Remove();
- }
-
- /// <summary>
/// Updates the agent in its different states,
/// Reset destination when path is stale
/// River: 更新的时候，加入离最终目标的距离数据.
@@ -1083,6 +1063,8 @@
public override void PlayDeath()
{
+ if (bInDeathAct) return;
+
if (isPoison)
{
isPoison = false;
diff --git a/Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs b/Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs
index b760e95..cc4d378 100644
--- a/Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs
+++ b/Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs
@@ -92,6 +92,8 @@
}
}
+ if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
+
EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessAgentTaskDamage, agent.configuration.currentHealth);
agent.Remove();
}
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
index 0a7b6aa..e4e27b7 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
@@ -627,7 +627,6 @@
/// </summary>
public void StopSecondWave()
{
- Debug.LogError("--------------------- 停止第二关出怪 ---------------------");
if (!isStopSecondWaveCompleted)
{
isStopSecondWaveCompleted = true;
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs b/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs
index 66839b8..28ea404 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs
@@ -446,6 +446,11 @@
config.AttackTime = 0.65f;
}
}
+ else
+ {
+ // cx test
+ Debug.Log("--------------------- ---------------------");
+ }
}
}
}
diff --git a/GemBattle.zip b/GemBattle.zip
index 6727a60..79a53db 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 f8da08a..59888a0 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 fb8f90d..2b37be0 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 c573025..9b435ca 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 ef9849d..c4ba234 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 a74ff0f..c8b90e4 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/Unity.TextMeshPro.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll"
index 9251960..9312c97 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 607a055..f829dc6 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 bbc5b34..281394f 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 36b5855..328ec7c 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 bcf7abc..9744803 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/level1" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1"
index 93fafec..f1a2083 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 3a56417..d618579 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/sharedassets1.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets"
index 2a841a5..6a15613 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