From 8683916588d0f2d19a9eaa6816cc1127e585e0a7 Mon Sep 17 00:00:00 2001 From: akshay Date: Sat, 20 Aug 2022 23:37:31 -0400 Subject: [PATCH] Updated item balloon asset and adjusted the item anchor on it --- assets/item_balloon/Balloon White.material | Bin 1821 -> 798 bytes assets/item_balloon/item_balloon.glb | Bin 22316 -> 22284 bytes scenes/item.tscn | 1 + scenes/item_balloon.tscn | 8 ++++---- scenes/oven.tscn | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/assets/item_balloon/Balloon White.material b/assets/item_balloon/Balloon White.material index 77e4e06d42764354cb6ab100cb0739b6062ffa4a..861629989c41148695fc3b8167b32b5ca5a80884 100644 GIT binary patch literal 798 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 delta 2695 zcmc&#YfKbZ6ut|yymodWfIJj%Yj~yzyZ07Y#Aa!#beAX??b@QY_0d*Ls4;32tgW-y zniAPH&}l*wV%t;@(^7C}O=>ZOrINHiO3<1%M2oHbXecB|Es08j>A81?8AAPA-DL8e z$9KMS?!9w&eBFkwZi8ii-HR1r2%-F!5K2jFv2<3E0$ZugQH%+;7e8Y!wUxZF*5=4x zYbz+RmDp{?4(up)lopi~;rvI0{!<*d)5`@vH`XPETdme0pEhjG>qp3&RnT`O2yM|K zLd;2hnxi(vQ_peFMhe;1FuQ>!ttT(u73S@-EC6w{eNOleD|Q%0=oUOophuQ@qQo!Q z7vz3PiC>Tw7h(i4hOX{ zs%CG14+&Lysu>-u2QA6e^^{dHrF8LsgjR2-n`l7Bm-NTk72zFrft4O1dl0 z<4DwOQ<`m-)_H4{W{4{+HI!XsgQC2izR3)mavYh3?0A)9La&Fo;0#yP504XU^6_lA z=0_!Rr0nLLMDqeA6lcxh>rG~jP}6216`WD?s}Dwy&(`bt?wzq@<-jx(p!Jzg-^1x+ zyv9$cH<5;)Z)$nd7gIR!X0PVw#CPGX1LM>e*n}IbWB6X$j7FIF@^@Tu5@~`*ev2TJ z!}>s6O*E;#dPCzwGyFovea%1cwvjZ|#%T4;=_c})VMNRCYyAbM=FuGylr8#pAd(zf z8KD*M!v<1)I9BubR>YH+e~r`pvQK#u?b8RMJJjEzZ!y?p_G>-Aqt!^VH(9iL*e#Ms zV1a^qMj2-fq$M>>BP1RTBa>%zK?~wYZnJ)-uU_Ry%HV{yqFn1A_%*xk%hMA$c2qfI zdPG}d=JB5IBQ^aG98sj~mNB>slI#dzTGD@AFL*A09!pNW;kNA@sokghCu|&P9@l+w ziX+QkIx)_Z`H?4TqjDv^PUS^aklIUq`l3_bB6lgWxR~c&B_8r{27@@@N)|&dPHc8X ziS=$?yyS`#uemwV=H`z0xjJLHf3U5F$pJ!}DfYzyG)*_BW>YypJ_8?N96)pH?N^u$2UCajbC%z}0rwsso*;kU85TH5Zt2K-R=$}4% zp9ul-BQdCh>Hs$FA651MP+Kcq@$$Et`t)y;T^st}`Y6KxoENl<{A30Y^o##Q1`w8g i-X8Z62#>oVeMy%*;%ZO26GEuUox&-pKN`S14t diff --git a/scenes/item.tscn b/scenes/item.tscn index 8194a76..5475b60 100644 --- a/scenes/item.tscn +++ b/scenes/item.tscn @@ -9,4 +9,5 @@ script = ExtResource( 1 ) [node name="ItemLabel" type="Label3D" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.881756, 0 ) +visible = false billboard = 1 diff --git a/scenes/item_balloon.tscn b/scenes/item_balloon.tscn index 66935fe..4124ba7 100644 --- a/scenes/item_balloon.tscn +++ b/scenes/item_balloon.tscn @@ -9,7 +9,7 @@ animation = "Balloon Bounce" [sub_resource type="AnimationNodeAnimation" id=2] -animation = "Balloon Idle" +animation = "Balloon Idle-loop" [sub_resource type="AnimationNodeAnimation" id=3] animation = "Balloon Reset" @@ -28,7 +28,7 @@ auto_advance = true states/bounce/node = SubResource( 1 ) states/bounce/position = Vector2( 653, 152.25 ) states/idle/node = SubResource( 2 ) -states/idle/position = Vector2( 358, 151.875 ) +states/idle/position = Vector2( 358, 151.781 ) states/reset/node = SubResource( 3 ) states/reset/position = Vector2( 495, 279.5 ) transitions = [ "idle", "bounce", SubResource( 4 ), "bounce", "reset", SubResource( 5 ), "reset", "idle", SubResource( 6 ) ] @@ -40,12 +40,12 @@ start_node = "idle" script = ExtResource( 1 ) [node name="ItemSpawn" type="BoneAttachment" parent="Armature/Skeleton" index="1"] -transform = Transform( -1, 0, -8.74228e-08, -8.96342e-08, 0, 1.0253, 0, 1, 0, 0, -0.013823, 0 ) +transform = Transform( 1, 2.77886e-15, 8.74228e-08, 2.76877e-15, 0.996368, -6.33421e-08, -8.74228e-08, 6.3573e-08, 1, 0, 0.00594532, 0 ) bone_name = "Item" [node name="attached_item" parent="Armature/Skeleton/ItemSpawn" index="0" instance=ExtResource( 3 )] unique_name_in_owner = true -transform = Transform( 1, 0, -2.37178e-09, 0, 1, 0, -2.37177e-09, 0, 1.02713, 1.6173e-08, 0, -0.184997 ) +transform = Transform( 1, -2.11758e-21, -2.37178e-09, -4.23516e-22, 1, 0, -2.37177e-09, -1.20792e-13, 1.02713, -5.21145e-16, -0.187539, 1.19224e-08 ) item_type = ExtResource( 4 ) [node name="AnimationPlayer" parent="." index="1"] diff --git a/scenes/oven.tscn b/scenes/oven.tscn index a86acb3..6b306e2 100644 --- a/scenes/oven.tscn +++ b/scenes/oven.tscn @@ -18,7 +18,7 @@ script = ExtResource( 2 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.621351, 0 ) [node name="item_dump" parent="." instance=ExtResource( 4 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.117529, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.38419e-07, -0.117529, 0.694059 ) collision_mask = 0 items_required = [ ExtResource( 7 ), ExtResource( 6 ) ]