From 2010ad32026a0f5f99e2212dfe529adcc85e3149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Tue, 4 Jun 2024 00:33:18 +0800
Subject: [PATCH] effect on it

---
 scripts/components/aipc_dou_projectile.lua | 31 +++++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/scripts/components/aipc_dou_projectile.lua b/scripts/components/aipc_dou_projectile.lua
index 4f6961a7..02bf18fd 100644
--- a/scripts/components/aipc_dou_projectile.lua
+++ b/scripts/components/aipc_dou_projectile.lua
@@ -225,6 +225,20 @@ function Projectile:FindEntities(element, pos, radius, excludePrefabs)
 		end
 	end
 
+	-- 额外找一下有没有红包需要开（且不在 filteredEnts 里）
+	ents = TheSim:FindEntities(pos.x, pos.y, pos.z, radius or AREA_DISTANCE, { "unwrappable" }, NO_TAGS)
+	for i, ent in ipairs(ents) do
+		if
+			not aipInTable(excludePrefabs, ent) and
+			ent:IsValid() and ent.entity:IsVisible() and
+			ent.components.unwrappable ~= nil and
+			not aipInTable(filteredEnts, ent)
+		then
+			table.insert(filteredEnts, ent)
+		end
+	end
+	aipPrint("Find:", #ents, #filteredEnts)
+
 	return filteredEnts
 end
 
@@ -446,7 +460,18 @@ function Projectile:EffectTaskOn(target)
 			finalDamage = finalDamage * math.pow(1.5, self.task.elementCount)
 		end
 
-		target.components.combat:GetAttacked(self.doer, finalDamage, nil, nil)
+		-- 造成伤害
+		if target.components.combat then
+			target.components.combat:GetAttacked(self.doer, finalDamage, nil, nil)
+		end
+
+		-- 打开红包
+		aipPrint("effect!!!!", target.components)
+		if target.components.unwrappable then
+			aipPrint("open!!!")
+			target.components.unwrappable:Unwrap(self.doer)
+		end
+
 		doEffect = true
 
 		-- 【赋能 - 吸血】每次伤害都恢复 10 点生命值
@@ -555,9 +580,7 @@ function Projectile:OnUpdate(dt)
 		for i, prefab in ipairs(ents) do
 			if
 				prefab:IsValid() and
-				prefab.entity:IsVisible() and
-				prefab.components.combat ~= nil and
-				prefab.components.health ~= nil
+				prefab.entity:IsVisible()
 			then
 				local effectWork = self:EffectTaskOn(prefab)