Merge branch 'master' of https://github.com/unfa/jam-01
commit
cb680365a4
|
@ -0,0 +1,55 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
sodipodi:docname="Sprite.svg"
|
||||
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
|
||||
id="svg8"
|
||||
version="1.1"
|
||||
viewBox="0 0 8.4666665 8.4666669"
|
||||
height="32"
|
||||
width="32">
|
||||
<defs
|
||||
id="defs2" />
|
||||
<sodipodi:namedview
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-height="1006"
|
||||
inkscape:window-width="1920"
|
||||
units="px"
|
||||
showgrid="false"
|
||||
inkscape:document-rotation="0"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:cy="17.262441"
|
||||
inkscape:cx="18.341432"
|
||||
inkscape:zoom="22.4"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0"
|
||||
borderopacity="1.0"
|
||||
bordercolor="#666666"
|
||||
pagecolor="#000000"
|
||||
id="base" />
|
||||
<metadata
|
||||
id="metadata5">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
id="layer1"
|
||||
inkscape:groupmode="layer"
|
||||
inkscape:label="Layer 1" />
|
||||
</svg>
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
@ -1,48 +1,11 @@
|
|||
[gd_scene load_steps=9 format=2]
|
||||
[gd_scene load_steps=3 format=2]
|
||||
|
||||
[ext_resource path="res://Assets/Weapons/Handgun/Handgun.gltf" type="PackedScene" id=1]
|
||||
[ext_resource path="res://Assets/Weapons/Weapon.gd" type="Script" id=2]
|
||||
|
||||
[sub_resource type="AnimationNodeAdd2" id=1]
|
||||
|
||||
[sub_resource type="AnimationNodeAnimation" id=2]
|
||||
animation = "StaticAction"
|
||||
|
||||
[sub_resource type="AnimationNodeAnimation" id=3]
|
||||
animation = "SlideAction"
|
||||
|
||||
[sub_resource type="AnimationNodeBlendTree" id=4]
|
||||
nodes/Add2/node = SubResource( 1 )
|
||||
nodes/Add2/position = Vector2( 400, 160 )
|
||||
nodes/Animation/node = SubResource( 3 )
|
||||
nodes/Animation/position = Vector2( 100, 100 )
|
||||
"nodes/Animation 2/node" = SubResource( 2 )
|
||||
"nodes/Animation 2/position" = Vector2( 100, 280 )
|
||||
nodes/output/position = Vector2( 660, 200 )
|
||||
node_connections = [ "output", 0, "Add2", "Add2", 0, "Animation", "Add2", 1, "Animation 2" ]
|
||||
|
||||
[sub_resource type="AnimationNodeStateMachine" id=5]
|
||||
states/Shoot/node = SubResource( 4 )
|
||||
states/Shoot/position = Vector2( 450, 217 )
|
||||
|
||||
[sub_resource type="AnimationNodeStateMachinePlayback" id=6]
|
||||
|
||||
[node name="Weapon" type="Spatial"]
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="Handgun" parent="." instance=ExtResource( 1 )]
|
||||
|
||||
[node name="Static" parent="Handgun" index="0"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.175396, 0.110301, 1.48199e-08 )
|
||||
|
||||
[node name="Slide" parent="Handgun/Static" index="2"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.175396, -0.110301, -1.48199e-08 )
|
||||
|
||||
[node name="AnimationTree" type="AnimationTree" parent="."]
|
||||
tree_root = SubResource( 5 )
|
||||
anim_player = NodePath("../Handgun/AnimationPlayer")
|
||||
active = true
|
||||
parameters/playback = SubResource( 6 )
|
||||
parameters/Shoot/Add2/add_amount = 1.0
|
||||
|
||||
[editable path="Handgun"]
|
||||
|
|
Reference in New Issue