バグ修正と死亡時モーションの実装

ProjectTSB · Aug 29, 2024 · 5bf522a · 5bf522a
1 parent 3028b69
commit 5bf522a
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/.../data/asset/functions/mob/0392.ecual_first/ai/animation/7_0_holy_ray/beam/loop.mcfunction b/.../data/asset/functions/mob/0392.ecual_first/ai/animation/7_0_holy_ray/beam/loop.mcfunction
@@ -11,7 +11,7 @@
 
 # 着弾検知
     execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[tag=!PlayerShouldInvulnerable,dx=0] run tag @s add AW.Landing
-    execute unless block ^ ^ ^1 #lib:no_collision run tag @s add AW.Landing
+    execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add AW.Landing
 
 # ターゲットにタグ付与
     tag @a[tag=!PlayerShouldInvulnerable,dx=0] add AW.Temp.Target

diff --git a/Asset/data/asset/functions/mob/0392.ecual_first/ai/general/8.death/animation.mcfunction b/Asset/data/asset/functions/mob/0392.ecual_first/ai/general/8.death/animation.mcfunction
@@ -4,26 +4,25 @@
 #
 # @within function asset:mob/0392.ecual_first/ai/general/8.death/schedule
 
-## モデル紐づけ
-#    tag @e[type=item_display,tag=AW.ModelRoot,distance=..250,sort=nearest,limit=1] add AW.Root.This
-#
-## スコア上昇
-#    execute unless score @s AW.AnimationTick matches -2147483648..2147483647 run scoreboard players set @s AW.AnimationTick 0
-#    scoreboard players add @s AW.AnimationTick 1
-#
-## アニメーション再生
-#    execute if score @s AW.AnimationTick matches 1 as @e[type=item_display,tag=AW.Root.This,distance=..250] run function animated_jAWa:axia/animations/15_0_former_ending/play
-#
-## パーティクル処理
-#    execute if score @s AW.AnimationTick matches 99 as @e[type=item_display,tag=AW.Root.This,distance=..250] at @s run particle minecraft:explosion_emitter ~ ~ ~ 0 0 0 0 1 normal
-#    execute if score @s AW.AnimationTick matches 99 as @e[type=item_display,tag=AW.Root.This,distance=..250] at @s run playsound entity.generic.explode hostile @a ~ ~ ~ 1 1
-#
-## アニメーション終了処理
-#    execute if score @s AW.AnimationTick matches 102 run function asset:mob/0391.axia_first/ai/general/8.death/kill
-#
-## 紐づけ終了
-#    tag @e[type=item_display,tag=AW.Root.This,distance=..250] remove AW.Root.This
-#
-## スケジュール起動
-#    schedule function asset:mob/0391.axia_first/ai/general/8.death/schedule 1t
-#
+# モデル紐づけ
+    tag @e[type=item_display,tag=AW.ModelRoot,distance=..250,sort=nearest,limit=1] add AW.Root.This
+
+# スコア上昇
+    execute unless score @s AW.AnimationTick matches -2147483648..2147483647 run scoreboard players set @s AW.AnimationTick 0
+    scoreboard players add @s AW.AnimationTick 1
+
+# アニメーション再生
+    execute if score @s AW.AnimationTick matches 1 as @e[type=item_display,tag=AW.Root.This,distance=..250] run function animated_java:ecual/animations/13_0_former_ending/play
+
+# パーティクル処理
+    execute if score @s AW.AnimationTick matches 102 as @e[type=item_display,tag=AW.Root.This,distance=..250] at @s run particle minecraft:explosion_emitter ~ ~ ~ 0 0 0 0 1 normal
+    execute if score @s AW.AnimationTick matches 102 as @e[type=item_display,tag=AW.Root.This,distance=..250] at @s run playsound entity.generic.explode hostile @a ~ ~ ~ 1 1
+
+# アニメーション終了処理
+    execute if score @s AW.AnimationTick matches 105 run function asset:mob/0392.ecual_first/ai/general/8.death/kill
+
+# 紐づけ終了
+    tag @e[type=item_display,tag=AW.Root.This,distance=..250] remove AW.Root.This
+
+# スケジュール起動
+    schedule function asset:mob/0392.ecual_first/ai/general/8.death/schedule 1t
diff --git a/Asset/data/asset/functions/mob/0392.ecual_first/death/.mcfunction b/Asset/data/asset/functions/mob/0392.ecual_first/death/.mcfunction
@@ -4,11 +4,6 @@
 #
 # @within function asset:mob/0392.ecual_first/_/death
 
-# デバッグ用
-# マーカー削除
-    kill @e[tag=AW.Marker.SummonPoint]
-# AnimatedJavaモデルの削除
-    function animated_java:ecual/remove/all
 # ディスプレイ削除
     kill @e[tag=AW.WaterMagic]
     kill @e[tag=AW.WaterMagicDisplay]
@@ -18,3 +13,6 @@
     kill @e[tag=AW.QuietusRain]
     kill @e[tag=AW.WaterWall]
     kill @e[tag=AW.Critical]
+
+# スケジュール起動
+    schedule function asset:mob/0392.ecual_first/ai/general/8.death/schedule 1t
diff --git a/Asset/data/asset/functions/mob/0392.ecual_first/rejoin_process.mcfunction b/Asset/data/asset/functions/mob/0392.ecual_first/rejoin_process.mcfunction
@@ -2,4 +2,7 @@
 #
 # 使い方は必ずwikiを見ること
 #
-# @within tag/function asset:rejoin
+# @within tag/function asset:rejoin
+
+# 少し遅らせて発動させる
+    schedule function asset:mob/0392.ecual_first/ai/general/8.death/schedule 5t