Skip to content

Commit

Permalink
Merge branch 'dev/ella_obj_2001_2002' into dev/ella_mob_390_rabbit
Browse files Browse the repository at this point in the history
  • Loading branch information
EllaCoat committed Sep 19, 2024
2 parents 10df9a6 + 6ca804a commit c474522
Showing 1 changed file with 6 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,12 @@
# アイテムディスプレイに表示するItemをFieldから代入する
data modify entity @s item set from storage asset:context this.item

# 初期設定を行う(一時ストレージからもってくる)
execute unless data storage asset:temp 5.Color run data modify storage asset:temp 5.Color set value 0
execute unless data storage asset:temp 5.Second run data modify storage asset:temp 5.Second set value 10
execute unless data storage asset:temp 5.Scale run data modify storage asset:temp 5.Scale set value 5f
data modify entity @s item.tag.display.color set from storage asset:temp 5.Color
execute store result score @s General.Object.Tick run data get storage asset:temp 5.Second -1
data modify storage asset:context this.Scale set from storage asset:temp 5.Scale

# リセット
data remove storage asset:temp 5
# 初期設定を行う(FieldOverride)
execute unless data storage asset:context this.Color run data modify storage asset:context this.Color set value 0
execute unless data storage asset:context this.Second run data modify storage asset:context this.Second set value 10
execute unless data storage asset:context this.Scale run data modify storage asset:context this.Scale set value 5f
data modify entity @s item.tag.display.color set from storage asset:context this.Color
execute store result score @s General.Object.Tick run data get storage asset:context this.Second -1

# タグ付け
tag @s add 5.SlashEffectInit
Expand Down

0 comments on commit c474522

Please sign in to comment.