Création de la branch dev et remise des sprites banane et sword
This commit is contained in:
parent
b103671109
commit
4e98986533
7 changed files with 84 additions and 82 deletions
|
@ -1,6 +1,8 @@
|
||||||
{
|
{
|
||||||
"resources": [
|
"resources": [
|
||||||
{"id":{"name":"sPlayer","path":"sprites/sPlayer/sPlayer.yy",},"order":2,},
|
{"id":{"name":"sPlayer","path":"sprites/sPlayer/sPlayer.yy",},"order":2,},
|
||||||
|
{"id":{"name":"sSword","path":"sprites/sSword/sSword.yy",},"order":4,},
|
||||||
|
{"id":{"name":"sBanana","path":"sprites/sBanana/sBanana.yy",},"order":3,},
|
||||||
{"id":{"name":"Purple","path":"sprites/Purple/Purple.yy",},"order":1,},
|
{"id":{"name":"Purple","path":"sprites/Purple/Purple.yy",},"order":1,},
|
||||||
{"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,},
|
{"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,},
|
||||||
{"id":{"name":"Script1","path":"scripts/Script1/Script1.yy",},"order":0,},
|
{"id":{"name":"Script1","path":"scripts/Script1/Script1.yy",},"order":0,},
|
||||||
|
|
BIN
sprites/sBanana/fe0053ed-fd85-42ab-8151-4018242053af.png
Normal file
BIN
sprites/sBanana/fe0053ed-fd85-42ab-8151-4018242053af.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 412 B |
Binary file not shown.
After Width: | Height: | Size: 412 B |
|
@ -24,9 +24,9 @@
|
||||||
"gridX": 0,
|
"gridX": 0,
|
||||||
"gridY": 0,
|
"gridY": 0,
|
||||||
"frames": [
|
"frames": [
|
||||||
{"compositeImage":{"FrameId":{"name":"8b58c208-4f64-4216-8602-31a791b3ed02","path":"sprites/sBanana/sBanana.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
|
{"compositeImage":{"FrameId":{"name":"fe0053ed-fd85-42ab-8151-4018242053af","path":"sprites/sBanana/sBanana.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
|
||||||
{"FrameId":{"name":"8b58c208-4f64-4216-8602-31a791b3ed02","path":"sprites/sBanana/sBanana.yy",},"LayerId":{"name":"a875d02b-22e4-436e-a424-6ff743ee2920","path":"sprites/sBanana/sBanana.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
|
{"FrameId":{"name":"fe0053ed-fd85-42ab-8151-4018242053af","path":"sprites/sBanana/sBanana.yy",},"LayerId":{"name":"87b3d35d-c63a-4738-9dc0-a612e9b28c56","path":"sprites/sBanana/sBanana.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
|
||||||
],"parent":{"name":"sBanana","path":"sprites/sBanana/sBanana.yy",},"resourceVersion":"1.0","name":"8b58c208-4f64-4216-8602-31a791b3ed02","tags":[],"resourceType":"GMSpriteFrame",},
|
],"parent":{"name":"sBanana","path":"sprites/sBanana/sBanana.yy",},"resourceVersion":"1.0","name":"fe0053ed-fd85-42ab-8151-4018242053af","tags":[],"resourceType":"GMSpriteFrame",},
|
||||||
],
|
],
|
||||||
"sequence": {
|
"sequence": {
|
||||||
"spriteId": {"name":"sBanana","path":"sprites/sBanana/sBanana.yy",},
|
"spriteId": {"name":"sBanana","path":"sprites/sBanana/sBanana.yy",},
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
|
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
|
||||||
"tracks": [
|
"tracks": [
|
||||||
{"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
|
{"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
|
||||||
{"id":"f303feb8-5e62-4edb-bd0e-d5e5d82956e7","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8b58c208-4f64-4216-8602-31a791b3ed02","path":"sprites/sBanana/sBanana.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
|
{"id":"829899ab-e945-4b07-8e8e-47de87a04fbf","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fe0053ed-fd85-42ab-8151-4018242053af","path":"sprites/sBanana/sBanana.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
|
||||||
],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
|
],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
|
||||||
],
|
],
|
||||||
"visibleRange": null,
|
"visibleRange": null,
|
||||||
|
@ -65,7 +65,7 @@
|
||||||
"resourceType": "GMSequence",
|
"resourceType": "GMSequence",
|
||||||
},
|
},
|
||||||
"layers": [
|
"layers": [
|
||||||
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"a875d02b-22e4-436e-a424-6ff743ee2920","tags":[],"resourceType":"GMImageLayer",},
|
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"87b3d35d-c63a-4738-9dc0-a612e9b28c56","tags":[],"resourceType":"GMImageLayer",},
|
||||||
],
|
],
|
||||||
"parent": {
|
"parent": {
|
||||||
"name": "Sprites",
|
"name": "Sprites",
|
||||||
|
|
BIN
sprites/sSword/99d311e5-d6f5-4d00-bf4b-db7a8aea407a.png
Normal file
BIN
sprites/sSword/99d311e5-d6f5-4d00-bf4b-db7a8aea407a.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 295 B |
Binary file not shown.
After Width: | Height: | Size: 295 B |
|
@ -1,78 +1,78 @@
|
||||||
{
|
{
|
||||||
"bboxMode": 0,
|
"bboxMode": 0,
|
||||||
"collisionKind": 1,
|
"collisionKind": 1,
|
||||||
"type": 0,
|
"type": 0,
|
||||||
"origin": 0,
|
"origin": 0,
|
||||||
"preMultiplyAlpha": false,
|
"preMultiplyAlpha": false,
|
||||||
"edgeFiltering": false,
|
"edgeFiltering": false,
|
||||||
"collisionTolerance": 0,
|
"collisionTolerance": 0,
|
||||||
"swfPrecision": 2.525,
|
"swfPrecision": 2.525,
|
||||||
"bbox_left": 22,
|
"bbox_left": 22,
|
||||||
"bbox_right": 32,
|
"bbox_right": 32,
|
||||||
"bbox_top": 6,
|
"bbox_top": 6,
|
||||||
"bbox_bottom": 43,
|
"bbox_bottom": 43,
|
||||||
"HTile": false,
|
"HTile": false,
|
||||||
"VTile": false,
|
"VTile": false,
|
||||||
"For3D": false,
|
"For3D": false,
|
||||||
"width": 64,
|
"width": 64,
|
||||||
"height": 64,
|
"height": 64,
|
||||||
"textureGroupId": {
|
"textureGroupId": {
|
||||||
"name": "Default",
|
"name": "Default",
|
||||||
"path": "texturegroups/Default",
|
"path": "texturegroups/Default",
|
||||||
},
|
},
|
||||||
"swatchColours": null,
|
"swatchColours": null,
|
||||||
"gridX": 0,
|
"gridX": 0,
|
||||||
"gridY": 0,
|
"gridY": 0,
|
||||||
"frames": [
|
"frames": [
|
||||||
{"compositeImage":{"FrameId":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/sSword/sSword.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
|
{"compositeImage":{"FrameId":{"name":"99d311e5-d6f5-4d00-bf4b-db7a8aea407a","path":"sprites/sSword/sSword.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
|
||||||
{"FrameId":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/sSword/sSword.yy",},"LayerId":{"name":"19b32337-1cc4-49aa-a953-00db83b561b0","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
|
{"FrameId":{"name":"99d311e5-d6f5-4d00-bf4b-db7a8aea407a","path":"sprites/sSword/sSword.yy",},"LayerId":{"name":"f22d7d55-97ea-47bf-8f60-73fb15b280fe","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
|
||||||
],"parent":{"name":"sSword","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","name":"1f54f59f-74d3-450c-a41c-1986c1537345","tags":[],"resourceType":"GMSpriteFrame",},
|
],"parent":{"name":"sSword","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","name":"99d311e5-d6f5-4d00-bf4b-db7a8aea407a","tags":[],"resourceType":"GMSpriteFrame",},
|
||||||
],
|
],
|
||||||
"sequence": {
|
"sequence": {
|
||||||
"spriteId": {"name":"sSword","path":"sprites/sSword/sSword.yy",},
|
"spriteId": {"name":"sSword","path":"sprites/sSword/sSword.yy",},
|
||||||
"timeUnits": 1,
|
"timeUnits": 1,
|
||||||
"playback": 1,
|
"playback": 1,
|
||||||
"playbackSpeed": 30.0,
|
"playbackSpeed": 30.0,
|
||||||
"playbackSpeedType": 0,
|
"playbackSpeedType": 0,
|
||||||
"autoRecord": true,
|
"autoRecord": true,
|
||||||
"volume": 1.0,
|
"volume": 1.0,
|
||||||
"length": 1.0,
|
"length": 1.0,
|
||||||
"events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
|
"events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
|
||||||
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
|
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
|
||||||
"tracks": [
|
"tracks": [
|
||||||
{"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
|
{"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
|
||||||
{"id":"4e12be63-a77f-4039-aa72-09a02319ca8d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
|
{"id":"1a03c1ef-1100-4e63-bb02-c36ede5c4357","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"99d311e5-d6f5-4d00-bf4b-db7a8aea407a","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
|
||||||
],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
|
],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
|
||||||
],
|
],
|
||||||
"visibleRange": null,
|
"visibleRange": null,
|
||||||
"lockOrigin": false,
|
"lockOrigin": false,
|
||||||
"showBackdrop": true,
|
"showBackdrop": true,
|
||||||
"showBackdropImage": false,
|
"showBackdropImage": false,
|
||||||
"backdropImagePath": "",
|
"backdropImagePath": "",
|
||||||
"backdropImageOpacity": 0.5,
|
"backdropImageOpacity": 0.5,
|
||||||
"backdropWidth": 1366,
|
"backdropWidth": 1366,
|
||||||
"backdropHeight": 768,
|
"backdropHeight": 768,
|
||||||
"backdropXOffset": 0.0,
|
"backdropXOffset": 0.0,
|
||||||
"backdropYOffset": 0.0,
|
"backdropYOffset": 0.0,
|
||||||
"xorigin": 0,
|
"xorigin": 0,
|
||||||
"yorigin": 0,
|
"yorigin": 0,
|
||||||
"eventToFunction": {},
|
"eventToFunction": {},
|
||||||
"eventStubScript": null,
|
"eventStubScript": null,
|
||||||
"parent": {"name":"sSword","path":"sprites/sSword/sSword.yy",},
|
"parent": {"name":"sSword","path":"sprites/sSword/sSword.yy",},
|
||||||
"resourceVersion": "1.3",
|
"resourceVersion": "1.3",
|
||||||
"name": "sSword",
|
"name": "sSword",
|
||||||
"tags": [],
|
"tags": [],
|
||||||
"resourceType": "GMSequence",
|
"resourceType": "GMSequence",
|
||||||
},
|
},
|
||||||
"layers": [
|
"layers": [
|
||||||
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"19b32337-1cc4-49aa-a953-00db83b561b0","tags":[],"resourceType":"GMImageLayer",},
|
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f22d7d55-97ea-47bf-8f60-73fb15b280fe","tags":[],"resourceType":"GMImageLayer",},
|
||||||
],
|
],
|
||||||
"parent": {
|
"parent": {
|
||||||
"name": "Sprites",
|
"name": "Sprites",
|
||||||
"path": "folders/Sprites.yy",
|
"path": "folders/Sprites.yy",
|
||||||
},
|
},
|
||||||
"resourceVersion": "1.0",
|
"resourceVersion": "1.0",
|
||||||
"name": "sSword",
|
"name": "sSword",
|
||||||
"tags": [],
|
"tags": [],
|
||||||
"resourceType": "GMSprite",
|
"resourceType": "GMSprite",
|
||||||
}
|
}
|
Reference in a new issue