From 78e14d93c46238881339f33a56c81275c55d5089 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Wed, 04 Nov 2020 14:02:54 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/Material/ChangeMat.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/Material/ChangeMat.cs b/Assets/Scripts/Material/ChangeMat.cs
index 97a33f0..f69744f 100644
--- a/Assets/Scripts/Material/ChangeMat.cs
+++ b/Assets/Scripts/Material/ChangeMat.cs
@@ -35,9 +35,11 @@
fsmManager.Update();
}
+ UnityAction checkCallBack;
+
UnityAction dieCallBack;
- public void SetSelf(bool isSelf,UnityAction ac)
+ public void SetSelf(bool isSelf,UnityAction checkAC,UnityAction dieAC)
{
this.isSelf = isSelf;
@@ -52,7 +54,8 @@
EnemyDie tmpDie = new EnemyDie(m_renderer, isSelf ? matDie_Self : matDie_Oppo, AfterDie);
fsmManager.AddState(tmpDie);
- dieCallBack = ac;
+ checkCallBack = checkAC;
+ dieCallBack = dieAC;
SetMove();
}
@@ -77,7 +80,7 @@
private void AfterAttack()
{
- dieCallBack();
+ checkCallBack();
}
//被攻击
--
Gitblit v1.9.1