Преглед изворни кода

成功(?)找回丢失资源!版本控制tql!

DrDuck0117 пре 2 недеља
родитељ
комит
a346f3d56e
19 измењених фајлова са 123 додато и 6 уклоњено
  1. 2 0
      ddmyx.yyp
  2. 3 6
      objects/oPlayerCorpse/oPlayerCorpse.yy
  3. BIN
      sprites/sPlayerIdle1/1f35ea38-ff95-41e1-9957-f848343bcb44.png
  4. BIN
      sprites/sPlayerIdle1/2c23944c-aec4-4384-ae56-bcb5d5054429.png
  5. BIN
      sprites/sPlayerIdle1/aa4297c7-4744-4b2b-88b9-d9241f102cba.png
  6. BIN
      sprites/sPlayerIdle1/aad3a77b-5f07-4a2f-8b97-3c6c625072f0.png
  7. BIN
      sprites/sPlayerIdle1/be6ece33-3b72-476c-8eaf-d6bb5d4575b3.png
  8. BIN
      sprites/sPlayerIdle1/c13c3aa8-cfa7-44db-8808-f1d4a448fc41.png
  9. BIN
      sprites/sPlayerIdle1/c3a5edae-6658-4a95-bc06-7e7f19eced08.png
  10. BIN
      sprites/sPlayerIdle1/c5d44fa5-d96c-487d-bddf-77cad6272ecf.png
  11. BIN
      sprites/sPlayerIdle1/layers/1f35ea38-ff95-41e1-9957-f848343bcb44/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png
  12. BIN
      sprites/sPlayerIdle1/layers/2c23944c-aec4-4384-ae56-bcb5d5054429/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png
  13. BIN
      sprites/sPlayerIdle1/layers/aa4297c7-4744-4b2b-88b9-d9241f102cba/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png
  14. BIN
      sprites/sPlayerIdle1/layers/aad3a77b-5f07-4a2f-8b97-3c6c625072f0/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png
  15. BIN
      sprites/sPlayerIdle1/layers/be6ece33-3b72-476c-8eaf-d6bb5d4575b3/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png
  16. BIN
      sprites/sPlayerIdle1/layers/c13c3aa8-cfa7-44db-8808-f1d4a448fc41/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png
  17. BIN
      sprites/sPlayerIdle1/layers/c3a5edae-6658-4a95-bc06-7e7f19eced08/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png
  18. BIN
      sprites/sPlayerIdle1/layers/c5d44fa5-d96c-487d-bddf-77cad6272ecf/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png
  19. 118 0
      sprites/sPlayerIdle1/sPlayerIdle1.yy

+ 2 - 0
ddmyx.yyp

@@ -103,6 +103,7 @@
     {"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},},
     {"id":{"name":"oPlayerAfterImage","path":"objects/oPlayerAfterImage/oPlayerAfterImage.yy",},},
     {"id":{"name":"oPlayerAttackedEffect","path":"objects/oPlayerAttackedEffect/oPlayerAttackedEffect.yy",},},
+    {"id":{"name":"oPlayerCorpse","path":"objects/oPlayerCorpse/oPlayerCorpse.yy",},},
     {"id":{"name":"oPlayerHitbox","path":"objects/oPlayerHitbox/oPlayerHitbox.yy",},},
     {"id":{"name":"oPlayerHitboxArc","path":"objects/oPlayerHitboxArc/oPlayerHitboxArc.yy",},},
     {"id":{"name":"oPlayerHitboxDown","path":"objects/oPlayerHitboxDown/oPlayerHitboxDown.yy",},},
@@ -188,6 +189,7 @@
     {"id":{"name":"sPlayerHitstunHazard","path":"sprites/sPlayerHitstunHazard/sPlayerHitstunHazard.yy",},},
     {"id":{"name":"sPlayerHP","path":"sprites/sPlayerHP/sPlayerHP.yy",},},
     {"id":{"name":"sPlayerIdle","path":"sprites/sPlayerIdle/sPlayerIdle.yy",},},
+    {"id":{"name":"sPlayerIdle1","path":"sprites/sPlayerIdle1/sPlayerIdle1.yy",},},
     {"id":{"name":"sPlayerINK","path":"sprites/sPlayerINK/sPlayerINK.yy",},},
     {"id":{"name":"sPlayerJump","path":"sprites/sPlayerJump/sPlayerJump.yy",},},
     {"id":{"name":"sPlayerSave","path":"sprites/sPlayerSave/sPlayerSave.yy",},},

+ 3 - 6
objects/oPlayerCorpse/oPlayerCorpse.yy

@@ -12,10 +12,7 @@
     "name":"oPlayerCorpse",
     "path":"folders/Enemy/oPlayerCorpse.yy",
   },
-  "parentObjectId":{
-    "name":"oParentEnemy",
-    "path":"objects/oParentEnemy/oParentEnemy.yy",
-  },
+  "parentObjectId":null,
   "persistent":false,
   "physicsAngularDamping":0.1,
   "physicsDensity":0.5,
@@ -34,8 +31,8 @@
   "resourceVersion":"2.0",
   "solid":false,
   "spriteId":{
-    "name":"sPlayerIdle",
-    "path":"sprites/sPlayerIdle/sPlayerIdle.yy",
+    "name":"sPlayerIdle1",
+    "path":"sprites/sPlayerIdle1/sPlayerIdle1.yy",
   },
   "spriteMaskId":null,
   "visible":true,

BIN
sprites/sPlayerIdle1/1f35ea38-ff95-41e1-9957-f848343bcb44.png


BIN
sprites/sPlayerIdle1/2c23944c-aec4-4384-ae56-bcb5d5054429.png


BIN
sprites/sPlayerIdle1/aa4297c7-4744-4b2b-88b9-d9241f102cba.png


BIN
sprites/sPlayerIdle1/aad3a77b-5f07-4a2f-8b97-3c6c625072f0.png


BIN
sprites/sPlayerIdle1/be6ece33-3b72-476c-8eaf-d6bb5d4575b3.png


BIN
sprites/sPlayerIdle1/c13c3aa8-cfa7-44db-8808-f1d4a448fc41.png


BIN
sprites/sPlayerIdle1/c3a5edae-6658-4a95-bc06-7e7f19eced08.png


BIN
sprites/sPlayerIdle1/c5d44fa5-d96c-487d-bddf-77cad6272ecf.png


BIN
sprites/sPlayerIdle1/layers/1f35ea38-ff95-41e1-9957-f848343bcb44/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png


BIN
sprites/sPlayerIdle1/layers/2c23944c-aec4-4384-ae56-bcb5d5054429/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png


BIN
sprites/sPlayerIdle1/layers/aa4297c7-4744-4b2b-88b9-d9241f102cba/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png


BIN
sprites/sPlayerIdle1/layers/aad3a77b-5f07-4a2f-8b97-3c6c625072f0/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png


BIN
sprites/sPlayerIdle1/layers/be6ece33-3b72-476c-8eaf-d6bb5d4575b3/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png


BIN
sprites/sPlayerIdle1/layers/c13c3aa8-cfa7-44db-8808-f1d4a448fc41/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png


BIN
sprites/sPlayerIdle1/layers/c3a5edae-6658-4a95-bc06-7e7f19eced08/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png


BIN
sprites/sPlayerIdle1/layers/c5d44fa5-d96c-487d-bddf-77cad6272ecf/21d8bf7d-8959-4267-a6af-fcedb5d5d32f.png


+ 118 - 0
sprites/sPlayerIdle1/sPlayerIdle1.yy

@@ -0,0 +1,118 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sPlayerIdle1",
+  "bboxMode":1,
+  "bbox_bottom":127,
+  "bbox_left":0,
+  "bbox_right":71,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"c5d44fa5-d96c-487d-bddf-77cad6272ecf","name":"c5d44fa5-d96c-487d-bddf-77cad6272ecf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"c13c3aa8-cfa7-44db-8808-f1d4a448fc41","name":"c13c3aa8-cfa7-44db-8808-f1d4a448fc41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"2c23944c-aec4-4384-ae56-bcb5d5054429","name":"2c23944c-aec4-4384-ae56-bcb5d5054429","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"aad3a77b-5f07-4a2f-8b97-3c6c625072f0","name":"aad3a77b-5f07-4a2f-8b97-3c6c625072f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"aa4297c7-4744-4b2b-88b9-d9241f102cba","name":"aa4297c7-4744-4b2b-88b9-d9241f102cba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"1f35ea38-ff95-41e1-9957-f848343bcb44","name":"1f35ea38-ff95-41e1-9957-f848343bcb44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"c3a5edae-6658-4a95-bc06-7e7f19eced08","name":"c3a5edae-6658-4a95-bc06-7e7f19eced08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"be6ece33-3b72-476c-8eaf-d6bb5d4575b3","name":"be6ece33-3b72-476c-8eaf-d6bb5d4575b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":128,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"21d8bf7d-8959-4267-a6af-fcedb5d5d32f","blendMode":0,"displayName":"default","isLocked":false,"name":"21d8bf7d-8959-4267-a6af-fcedb5d5d32f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sPlayerIdle1",
+  "nineSlice":null,
+  "origin":7,
+  "parent":{
+    "name":"StateFree",
+    "path":"folders/Player/Sprites/StateFree.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sPlayerIdle",
+    "autoRecord":true,
+    "backdropHeight":768,
+    "backdropImageOpacity":0.5,
+    "backdropImagePath":"",
+    "backdropWidth":1366,
+    "backdropXOffset":0.0,
+    "backdropYOffset":0.0,
+    "events":{
+      "$KeyframeStore<MessageEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MessageEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "eventStubScript":null,
+    "eventToFunction":{},
+    "length":8.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sPlayerIdle",
+    "playback":1,
+    "playbackSpeed":60.0,
+    "playbackSpeedType":0,
+    "resourceType":"GMSequence",
+    "resourceVersion":"2.0",
+    "showBackdrop":true,
+    "showBackdropImage":false,
+    "timeUnits":1,
+    "tracks":[
+      {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5d44fa5-d96c-487d-bddf-77cad6272ecf","path":"sprites/sPlayerIdle1/sPlayerIdle1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"54aef927-d91d-400b-b504-9ec17ad6b802","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c13c3aa8-cfa7-44db-8808-f1d4a448fc41","path":"sprites/sPlayerIdle1/sPlayerIdle1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"f2f895df-a1cd-4b07-b2c2-dbe48c12c662","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c23944c-aec4-4384-ae56-bcb5d5054429","path":"sprites/sPlayerIdle1/sPlayerIdle1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"eb96dd54-13a3-458d-b303-66b3f9a1fe74","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aad3a77b-5f07-4a2f-8b97-3c6c625072f0","path":"sprites/sPlayerIdle1/sPlayerIdle1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"851899ff-c5eb-42b3-b18b-486c4c5947b5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa4297c7-4744-4b2b-88b9-d9241f102cba","path":"sprites/sPlayerIdle1/sPlayerIdle1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"12af99af-7b96-43db-bf90-0222c72d3b58","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f35ea38-ff95-41e1-9957-f848343bcb44","path":"sprites/sPlayerIdle1/sPlayerIdle1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"b8d65b58-5618-48bf-b200-284529f76045","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3a5edae-6658-4a95-bc06-7e7f19eced08","path":"sprites/sPlayerIdle1/sPlayerIdle1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"50dd35c3-aab1-4933-ba9d-93817f92012c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be6ece33-3b72-476c-8eaf-d6bb5d4575b3","path":"sprites/sPlayerIdle1/sPlayerIdle1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"b11030a8-9d6d-4152-afff-bceb830afae4","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+          ],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
+    ],
+    "visibleRange":null,
+    "volume":1.0,
+    "xorigin":36,
+    "yorigin":128,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":72,
+}