From 7fc338ea0adc508fe7530987a937c4d3831e0f22 Mon Sep 17 00:00:00 2001
From: Nomango <569629550@qq.com>
Date: Sun, 8 Oct 2017 12:39:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E7=B2=BE=E7=81=B5=E4=B8=AD=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E7=B2=BE=E7=81=B5=E5=90=8C=E6=97=B6=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Easy2D/Object/BatchSprite.cpp |  5 +++++
 Easy2D/easy2d.h               | 19 +++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Easy2D/Object/BatchSprite.cpp b/Easy2D/Object/BatchSprite.cpp
index 3e11d844..4170629d 100644
--- a/Easy2D/Object/BatchSprite.cpp
+++ b/Easy2D/Object/BatchSprite.cpp
@@ -131,6 +131,11 @@ Sprite * BatchSprite::isPointIn(CPoint point)
 	return nullptr;
 }
 
+void BatchSprite::addAction(Action * action)
+{
+	Sprite::addAction(action);
+}
+
 float BatchSprite::getScaleX() const
 {
 	return m_fScaleX;
diff --git a/Easy2D/easy2d.h b/Easy2D/easy2d.h
index 8df250d9..c6e87d76 100644
--- a/Easy2D/easy2d.h
+++ b/Easy2D/easy2d.h
@@ -783,7 +783,7 @@ protected:
 };
 
 class BatchSprite :
-	public Node
+	public Sprite
 {
 public:
 	BatchSprite();
@@ -801,21 +801,20 @@ public:
 	// 判断点是否在精灵内部
 	// 返回值：若这个点在任意一个精灵内部，返回这个精灵，否则返回空指针
 	Sprite * isPointIn(CPoint point);
+	// 所有精灵同时执行一段动画
+	virtual void addAction(Action * action) override;
 	// 同时修改所有精灵的图片
-	virtual void setImage(Image * image);
+	virtual void setImage(Image * image) override;
 
-	virtual float getScaleX() const;
-	virtual float getScaleY() const;
-	virtual float getOpacity() const;
+	virtual float getScaleX() const override;
+	virtual float getScaleY() const override;
+	virtual float getOpacity() const override;
 
-	virtual void setScale(float scaleX, float scaleY);
-	virtual void setOpacity(float opacity);
+	virtual void setScale(float scaleX, float scaleY) override;
+	virtual void setOpacity(float opacity) override;
 
 protected:
 	std::vector<Sprite*> m_vSprites;
-	float	m_fScaleX;
-	float	m_fScaleY;
-	BYTE	m_nAlpha;
 
 protected:
 	bool _exec(bool active) override;