1
0
Kaynağa Gözat

0223修复补全

DrDuck0117 3 ay önce
ebeveyn
işleme
a8fe59e963
29 değiştirilmiş dosya ile 340 ekleme ve 30 silme
  1. 5 1
      ddmyx.yyp
  2. 10 2
      notes/更新日志DrDuck/更新日志DrDuck.txt
  3. 5 0
      objects/oEnemyCorpse/Create_0.gml
  4. 9 0
      objects/oEnemyCorpse/Destroy_0.gml
  5. 42 0
      objects/oEnemyCorpse/oEnemyCorpse.yy
  6. 1 1
      objects/oEnemyCrawl/Create_0.gml
  7. 1 1
      objects/oEnemyDummy/Create_0.gml
  8. 1 1
      objects/oParentEnemy/Destroy_0.gml
  9. 6 1
      objects/oPlayer/Other_4.gml
  10. 4 4
      rooms/rTest_1/rTest_1.yy
  11. 8 0
      rooms/rTest_2/rTest_2.yy
  12. 1 1
      scripts/DummyAI/DummyAI.gml
  13. 36 4
      scripts/EnemyStates/EnemyStates.gml
  14. 10 0
      scripts/PlayerStates/PlayerStates.gml
  15. 7 0
      scripts/SL/SL.gml
  16. 1 1
      sprites/sCredit/sCredit.yy
  17. 2 2
      sprites/sEnemyCrawl/sEnemyCrawl.yy
  18. 2 2
      sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy
  19. 2 2
      sprites/sEnemyDummyCounter/sEnemyDummyCounter.yy
  20. 2 2
      sprites/sEnemyDummyIdle/sEnemyDummyIdle.yy
  21. BIN
      sprites/sEnemyHitboxBC/a76ad535-27e8-4a95-b902-7e8bd3b236b8.png
  22. 0 0
      sprites/sEnemyHitboxBC/layers/a76ad535-27e8-4a95-b902-7e8bd3b236b8/294f880a-79b3-48fc-888a-f3c14992345f.png
  23. 90 0
      sprites/sEnemyHitboxBC/sEnemyHitboxBC.yy
  24. 0 0
      sprites/sEnemyHitboxMC/a76ad535-27e8-4a95-b902-7e8bd3b236b8.png
  25. BIN
      sprites/sEnemyHitboxMC/layers/a76ad535-27e8-4a95-b902-7e8bd3b236b8/294f880a-79b3-48fc-888a-f3c14992345f.png
  26. 5 5
      sprites/sEnemyHitboxMC/sEnemyHitboxMC.yy
  27. BIN
      sprites/sEnemyHitboxML/a76ad535-27e8-4a95-b902-7e8bd3b236b8.png
  28. BIN
      sprites/sEnemyHitboxML/layers/a76ad535-27e8-4a95-b902-7e8bd3b236b8/294f880a-79b3-48fc-888a-f3c14992345f.png
  29. 90 0
      sprites/sEnemyHitboxML/sEnemyHitboxML.yy

+ 5 - 1
ddmyx.yyp

@@ -12,6 +12,7 @@
   "Folders":[
     {"$GMFolder":"","%Name":"CoreObjects","folderPath":"folders/CoreObjects.yy","name":"CoreObjects","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Enemy","folderPath":"folders/Enemy.yy","name":"Enemy","resourceType":"GMFolder","resourceVersion":"2.0",},
+    {"$GMFolder":"","%Name":"oEnemyCorpse","folderPath":"folders/Enemy/oEnemyCorpse.yy","name":"oEnemyCorpse","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"oEnemyCrawl","folderPath":"folders/Enemy/oEnemyCrawl.yy","name":"oEnemyCrawl","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"oEnemyDummy","folderPath":"folders/Enemy/oEnemyDummy.yy","name":"oEnemyDummy","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"oEnemyFlying","folderPath":"folders/Enemy/oEnemyFlying.yy","name":"oEnemyFlying","resourceType":"GMFolder","resourceVersion":"2.0",},
@@ -53,6 +54,7 @@
     {"id":{"name":"oCredit","path":"objects/oCredit/oCredit.yy",},},
     {"id":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},},
     {"id":{"name":"oDoubleJumpEffect","path":"objects/oDoubleJumpEffect/oDoubleJumpEffect.yy",},},
+    {"id":{"name":"oEnemyCorpse","path":"objects/oEnemyCorpse/oEnemyCorpse.yy",},},
     {"id":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},},
     {"id":{"name":"oEnemyDummy","path":"objects/oEnemyDummy/oEnemyDummy.yy",},},
     {"id":{"name":"oEnemyFlying","path":"objects/oEnemyFlying/oEnemyFlying.yy",},},
@@ -107,7 +109,9 @@
     {"id":{"name":"sEnemyDummyCounter","path":"sprites/sEnemyDummyCounter/sEnemyDummyCounter.yy",},},
     {"id":{"name":"sEnemyDummyIdle","path":"sprites/sEnemyDummyIdle/sEnemyDummyIdle.yy",},},
     {"id":{"name":"sEnemyFlying","path":"sprites/sEnemyFlying/sEnemyFlying.yy",},},
-    {"id":{"name":"sEnemyHitboxRec","path":"sprites/sEnemyHitboxRec/sEnemyHitboxRec.yy",},},
+    {"id":{"name":"sEnemyHitboxBC","path":"sprites/sEnemyHitboxBC/sEnemyHitboxBC.yy",},},
+    {"id":{"name":"sEnemyHitboxMC","path":"sprites/sEnemyHitboxMC/sEnemyHitboxMC.yy",},},
+    {"id":{"name":"sEnemyHitboxML","path":"sprites/sEnemyHitboxML/sEnemyHitboxML.yy",},},
     {"id":{"name":"sHitboxArc","path":"sprites/sHitboxArc/sHitboxArc.yy",},},
     {"id":{"name":"sHitboxHor","path":"sprites/sHitboxHor/sHitboxHor.yy",},},
     {"id":{"name":"sHitboxMark","path":"sprites/sHitboxMark/sHitboxMark.yy",},},

+ 10 - 2
notes/更新日志DrDuck/更新日志DrDuck.txt

@@ -167,6 +167,8 @@ global.player是游戏内玩家inst_id
 4. 浅尝粒子效果,习得基本原理
 击中敌人效果作为半成品留在代码中,后续优化
 
+5. 新增sh_flash的shader实现击中敌人平滑闪白
+
 2025/2/21 DrDuck
 
 1. 由于铸币操作导致2/20版本掉进虚空,难以界定当前所在版本
@@ -175,6 +177,12 @@ global.player是游戏内玩家inst_id
 
 2. 将更新日志分为两个独立部分,方便整理阅读
 
-3. 终于优化了敌人碰撞箱逻辑!(2/20丢失内容,正在补)
+3. 终于优化了敌人碰撞箱逻辑!(2/20丢失内容,补充完毕)
+将全部敌人碰撞箱归类为middle/center, bottom/center, middle/left三类
+本来写了详细说明的,懒得补了
+
+4. 玩家死掉会掉落一定Credit和(蓝槽上限),需要收尸才能捡回(2/20丢失内容,补充完毕)
+
+2025/2/23 DrDuck
 
-4. 玩家死掉会掉落一定Credit和蓝槽上限,需要收尸才能捡回来(2/20丢失内容,正在补)
+1. 昨天鸽了一天……

+ 5 - 0
objects/oEnemyCorpse/Create_0.gml

@@ -0,0 +1,5 @@
+event_inherited();
+
+hp = 1;
+
+image_alpha = 0.6;

+ 9 - 0
objects/oEnemyCorpse/Destroy_0.gml

@@ -0,0 +1,9 @@
+// Inherit the parent event
+event_inherited();
+
+global.save_data.player.Credit += global.save_data.player.corpse.droppedCredit;
+	 
+global.save_data.player.corpse.droppedCredit = 0;
+global.save_data.player.corpse.targetRoom = noone;
+global.save_data.player.corpse.xPos = -1;
+global.save_data.player.corpse.yPos = -1;

+ 42 - 0
objects/oEnemyCorpse/oEnemyCorpse.yy

@@ -0,0 +1,42 @@
+{
+  "$GMObject":"",
+  "%Name":"oEnemyCorpse",
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":1,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oEnemyCorpse",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"oEnemyCorpse",
+    "path":"folders/Enemy/oEnemyCorpse.yy",
+  },
+  "parentObjectId":{
+    "name":"oParentEnemy",
+    "path":"objects/oParentEnemy/oParentEnemy.yy",
+  },
+  "persistent":false,
+  "physicsAngularDamping":0.1,
+  "physicsDensity":0.5,
+  "physicsFriction":0.2,
+  "physicsGroup":1,
+  "physicsKinematic":false,
+  "physicsLinearDamping":0.1,
+  "physicsObject":false,
+  "physicsRestitution":0.1,
+  "physicsSensor":false,
+  "physicsShape":1,
+  "physicsShapePoints":[],
+  "physicsStartAwake":true,
+  "properties":[],
+  "resourceType":"GMObject",
+  "resourceVersion":"2.0",
+  "solid":false,
+  "spriteId":{
+    "name":"sPlayerIdle",
+    "path":"sprites/sPlayerIdle/sPlayerIdle.yy",
+  },
+  "spriteMaskId":null,
+  "visible":true,
+}

+ 1 - 1
objects/oEnemyCrawl/Create_0.gml

@@ -7,4 +7,4 @@ credit = 10;
 
 enemy_ai = enemy_crawl_ai;
 
-hitbox = enemy_create_hitbox(48, 48);
+hitbox = enemy_create_hitboxBC(56, 56);

+ 1 - 1
objects/oEnemyDummy/Create_0.gml

@@ -7,4 +7,4 @@ enemy_ai = enemy_dummy_ai;
 
 state = "IDLE";
 
-hitbox = enemy_create_hitbox(80, 192);
+hitbox = enemy_create_hitboxBC(88, 180);

+ 1 - 1
objects/oParentEnemy/Destroy_0.gml

@@ -1,2 +1,2 @@
 for(var i = 0; i < credit; i++)
-	icl(oCredit);
+	icl(oCredit, x, y - 25);

+ 6 - 1
objects/oPlayer/Other_4.gml

@@ -25,4 +25,9 @@ else
 		global.player.y = y;
 	}
 	camera_snap();
-}
+}
+
+if global.save_data.player.corpse.targetRoom == room
+	icl(oEnemyCorpse,
+	global.save_data.player.corpse.xPos,
+	global.save_data.player.corpse.yPos);

+ 4 - 4
rooms/rTest_1/rTest_1.yy

@@ -531,7 +531,7 @@
         {"$GMRInstance":"v4","%Name":"inst_59EA9380","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_59EA9380","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":864.0,},
         {"$GMRInstance":"v4","%Name":"inst_29CB5C78","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_29CB5C78","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":928.0,},
         {"$GMRInstance":"v4","%Name":"inst_3C96E371","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3C96E371","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":480.0,},
-        {"$GMRInstance":"v4","%Name":"inst_574F2C78","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_574F2C78","objectId":{"name":"oEnemyDummy","path":"objects/oEnemyDummy/oEnemyDummy.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":1440.0,},
+        {"$GMRInstance":"v4","%Name":"inst_574F2C78","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_574F2C78","objectId":{"name":"oEnemyDummy","path":"objects/oEnemyDummy/oEnemyDummy.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":1536.0,},
         {"$GMRInstance":"v4","%Name":"inst_3176D910","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3176D910","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":1504.0,},
         {"$GMRInstance":"v4","%Name":"inst_5A250572","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5A250572","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":1440.0,},
         {"$GMRInstance":"v4","%Name":"inst_58CEF064","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_58CEF064","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":1376.0,},
@@ -544,7 +544,7 @@
         {"$GMRInstance":"v4","%Name":"inst_4EC20CF8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4EC20CF8","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1920.0,"y":1120.0,},
         {"$GMRInstance":"v4","%Name":"inst_A340686","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A340686","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":1056.0,},
         {"$GMRInstance":"v4","%Name":"inst_25FD1AB7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_25FD1AB7","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":1184.0,},
-        {"$GMRInstance":"v4","%Name":"inst_42A435AC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_42A435AC","objectId":{"name":"oEnemyDummy","path":"objects/oEnemyDummy/oEnemyDummy.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2240.0,"y":1440.0,},
+        {"$GMRInstance":"v4","%Name":"inst_42A435AC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_42A435AC","objectId":{"name":"oEnemyDummy","path":"objects/oEnemyDummy/oEnemyDummy.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2240.0,"y":1536.0,},
         {"$GMRInstance":"v4","%Name":"inst_32214111","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_32214111","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2496.0,"y":1056.0,},
         {"$GMRInstance":"v4","%Name":"inst_12FA8480","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_12FA8480","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2560.0,"y":1056.0,},
         {"$GMRInstance":"v4","%Name":"inst_7F5572E1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7F5572E1","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2496.0,"y":992.0,},
@@ -578,7 +578,7 @@
         {"$GMRInstance":"v4","%Name":"inst_364B45A3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_364B45A3","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2560.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_647563C0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_647563C0","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2880.0,"y":1056.0,},
         {"$GMRInstance":"v4","%Name":"inst_6FC46F65","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6FC46F65","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2880.0,"y":992.0,},
-        {"$GMRInstance":"v4","%Name":"inst_671EBBB6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_671EBBB6","objectId":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":992.0,},
+        {"$GMRInstance":"v4","%Name":"inst_671EBBB6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_671EBBB6","objectId":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":1024.0,},
         {"$GMRInstance":"v4","%Name":"inst_1FAD02C0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1FAD02C0","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":1056.0,},
         {"$GMRInstance":"v4","%Name":"inst_CBF887D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CBF887D","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1920.0,"y":1056.0,},
         {"$GMRInstance":"v4","%Name":"inst_54C669A0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_54C669A0","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2944.0,"y":1504.0,},
@@ -776,7 +776,7 @@
         {"$GMRInstance":"v4","%Name":"inst_6BC4320C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6BC4320C","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2304.0,"y":96.0,},
         {"$GMRInstance":"v4","%Name":"inst_3DE1FC7D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3DE1FC7D","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2368.0,"y":96.0,},
         {"$GMRInstance":"v4","%Name":"inst_771FD67B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_771FD67B","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2432.0,"y":96.0,},
-        {"$GMRInstance":"v4","%Name":"inst_7944AB45","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7944AB45","objectId":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3392.0,"y":1504.0,},
+        {"$GMRInstance":"v4","%Name":"inst_7944AB45","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7944AB45","objectId":{"name":"oEnemyCrawl","path":"objects/oEnemyCrawl/oEnemyCrawl.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3392.0,"y":1536.0,},
         {"$GMRInstance":"v4","%Name":"inst_1B33EC15","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1B33EC15","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":608.0,},
         {"$GMRInstance":"v4","%Name":"inst_2CD606E3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2CD606E3","objectId":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_2CE8950A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2CE8950A","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":672.0,},

+ 8 - 0
rooms/rTest_2/rTest_2.yy

@@ -44,6 +44,10 @@
     {"name":"inst_1DBB8205","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_1E35F125","path":"rooms/rTest_2/rTest_2.yy",},
     {"name":"inst_2826FF93","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_564D1DAE","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_27B03676","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_51400F79","path":"rooms/rTest_2/rTest_2.yy",},
+    {"name":"inst_65F145CC","path":"rooms/rTest_2/rTest_2.yy",},
   ],
   "isDnd":false,
   "layers":[
@@ -96,6 +100,10 @@
             {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"propertyId":{"name":"door_direction","path":"objects/oDoor/oDoor.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"LEFT",},
             {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},"propertyId":{"name":"target_room","path":"objects/oDoor/oDoor.yy",},"resource":{"name":"rTest_1","path":"rooms/rTest_1/rTest_1.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"rTest_1",},
           ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3904.0,"y":1568.0,},
+        {"$GMRInstance":"v4","%Name":"inst_564D1DAE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_564D1DAE","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":1024.0,},
+        {"$GMRInstance":"v4","%Name":"inst_27B03676","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_27B03676","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":1088.0,},
+        {"$GMRInstance":"v4","%Name":"inst_51400F79","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_51400F79","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":1152.0,},
+        {"$GMRInstance":"v4","%Name":"inst_65F145CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_65F145CC","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3968.0,"y":1216.0,},
       ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,},
     {"$GMRBackgroundLayer":"","%Name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Background","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,},
   ],

+ 1 - 1
scripts/DummyAI/DummyAI.gml

@@ -16,7 +16,7 @@ function enemy_dummy_ai()
 		case "COUNTER":
 			if animation_end()
 			{
-				enemy_create_hitbox(384, 144, facing * 192, 0, 12);
+				var _hb = enemy_create_hitboxML(384, 144, 0, -96, 10);
 				
 				state = "ATTACK";
 				set_sprite(sEnemyDummyAttack);

+ 36 - 4
scripts/EnemyStates/EnemyStates.gml

@@ -65,23 +65,23 @@ function enemy_get_hit(_damage, _kb_x, _kb_y)
     }
 }
 
-/// @desc 优雅地以该实例为原点,给定宽高、偏移与持续时间为参数,生成敌人碰撞箱
+/// @desc 优雅地以该实例为原点,给定宽高、偏移与持续时间为参数,生成敌人middle/left碰撞箱(多用于攻击)
 /// @param {real} _x 碰撞箱宽度
 /// @param {real} _y 碰撞箱高度
 /// @param {real} _x_offset 碰撞箱与该实例在x轴上的偏移量,默认为0
 /// @param {real} _y_offset 碰撞箱与该实例在y轴上的偏移量,默认为0
 /// @param {real} _duration 碰撞箱持续时间,默认为0,即无限
-function enemy_create_hitbox(_x, _y,
+function enemy_create_hitboxML(_x, _y,
 _x_offset = 0, _y_offset = 0, _duration = 0)
 {
 	var _hb = icd(oEnemyHitbox, x + _x_offset, y + _y_offset);
 	_hb.owner = id;
-	_hb.sprite_index = sEnemyHitboxRec;
+	_hb.sprite_index = sEnemyHitboxML;
 	_hb.x_offset = _x_offset;
 	_hb.y_offset = _y_offset;
 	
 	var _base = 2;
-	_hb.image_xscale = _x / _base;
+	_hb.image_xscale = _x / _base * facing;
 	_hb.image_yscale = _y / _base;
 /*
 oEnemyHitbox的基础大小为2*2
@@ -93,5 +93,37 @@ oEnemyHitbox的基础大小为2*2
 		_hb.hitbox_type = "BLADE";
 		_hb.duration = _duration;
 	}
+	return _hb;
+}
+
+/// @desc 优雅地以该实例为原点,给定宽高为参数,生成敌人middle/center碰撞箱(多用于空中本体,射弹等)
+/// @param {real} _x 碰撞箱宽度
+/// @param {real} _y 碰撞箱高度
+function enemy_create_hitboxMC(_x, _y)
+{
+	var _hb = icd(oEnemyHitbox, x, y);
+	_hb.owner = id;
+	_hb.sprite_index = sEnemyHitboxMC;
+	
+	var _base = 2;
+	_hb.image_xscale = _x / _base;
+	_hb.image_yscale = _y / _base;
+
+	return _hb;
+}
+
+/// @desc 优雅地以该实例为原点,给定宽高为参数,生成敌人bottom/center碰撞箱(多用于地面本体)
+/// @param {real} _x 碰撞箱宽度
+/// @param {real} _y 碰撞箱高度
+function enemy_create_hitboxBC(_x, _y)
+{
+	var _hb = icd(oEnemyHitbox, x, y);
+	_hb.owner = id;
+	_hb.sprite_index = sEnemyHitboxBC;
+	
+	var _base = 2;
+	_hb.image_xscale = _x / _base;
+	_hb.image_yscale = _y / _base;
+
 	return _hb;
 }

+ 10 - 0
scripts/PlayerStates/PlayerStates.gml

@@ -193,6 +193,16 @@ function player_check_death()
 	
 	if global.playerHP <= 0
 	{
+		var _drop = round(random_range(0.4 * global.save_data.player.Credit,
+		0.6 * global.save_data.player.Credit));
+		
+		global.save_data.player.Credit -= _drop;
+		 
+		global.save_data.player.corpse.droppedCredit = _drop;
+		global.save_data.player.corpse.targetRoom = room;
+		global.save_data.player.corpse.xPos = x; //lastsafe
+		global.save_data.player.corpse.yPos = y; //lastsafe
+		
 		save_game_to_disk();
 		state = state_death;
 		set_sprite(sPlayerDeath);

+ 7 - 0
scripts/SL/SL.gml

@@ -13,6 +13,13 @@ function get_default_save_data()
 				dash: false,
 				wall_climb: false,
 				double_jump: false
+			},
+			corpse:
+			{
+				targetRoom: noone,
+				xPos: -1,
+				yPos: -1,
+				droppedCredit: 0
 			}
 		},
 		world:

+ 1 - 1
sprites/sCredit/sCredit.yy

@@ -6,7 +6,7 @@
   "bbox_left":0,
   "bbox_right":49,
   "bbox_top":0,
-  "collisionKind":1,
+  "collisionKind":4,
   "collisionTolerance":0,
   "DynamicTexturePage":false,
   "edgeFiltering":false,

+ 2 - 2
sprites/sEnemyCrawl/sEnemyCrawl.yy

@@ -24,7 +24,7 @@
   ],
   "name":"sEnemyCrawl",
   "nineSlice":null,
-  "origin":4,
+  "origin":7,
   "parent":{
     "name":"oEnemyCrawl",
     "path":"folders/Enemy/oEnemyCrawl.yy",
@@ -80,7 +80,7 @@
     "visibleRange":null,
     "volume":1.0,
     "xorigin":32,
-    "yorigin":32,
+    "yorigin":64,
   },
   "swatchColours":null,
   "swfPrecision":0.5,

+ 2 - 2
sprites/sEnemyDummyAttack/sEnemyDummyAttack.yy

@@ -32,7 +32,7 @@
   ],
   "name":"sEnemyDummyAttack",
   "nineSlice":null,
-  "origin":4,
+  "origin":7,
   "parent":{
     "name":"oEnemyDummy",
     "path":"folders/Enemy/oEnemyDummy.yy",
@@ -112,7 +112,7 @@
     "visibleRange":null,
     "volume":1.0,
     "xorigin":48,
-    "yorigin":96,
+    "yorigin":192,
   },
   "swatchColours":null,
   "swfPrecision":0.5,

+ 2 - 2
sprites/sEnemyDummyCounter/sEnemyDummyCounter.yy

@@ -32,7 +32,7 @@
   ],
   "name":"sEnemyDummyCounter",
   "nineSlice":null,
-  "origin":4,
+  "origin":7,
   "parent":{
     "name":"oEnemyDummy",
     "path":"folders/Enemy/oEnemyDummy.yy",
@@ -112,7 +112,7 @@
     "visibleRange":null,
     "volume":1.0,
     "xorigin":48,
-    "yorigin":96,
+    "yorigin":192,
   },
   "swatchColours":null,
   "swfPrecision":0.5,

+ 2 - 2
sprites/sEnemyDummyIdle/sEnemyDummyIdle.yy

@@ -23,7 +23,7 @@
   ],
   "name":"sEnemyDummyIdle",
   "nineSlice":null,
-  "origin":4,
+  "origin":7,
   "parent":{
     "name":"oEnemyDummy",
     "path":"folders/Enemy/oEnemyDummy.yy",
@@ -76,7 +76,7 @@
     "visibleRange":null,
     "volume":1.0,
     "xorigin":48,
-    "yorigin":96,
+    "yorigin":192,
   },
   "swatchColours":null,
   "swfPrecision":0.5,

BIN
sprites/sEnemyHitboxBC/a76ad535-27e8-4a95-b902-7e8bd3b236b8.png


+ 0 - 0
sprites/sEnemyHitboxRec/layers/a76ad535-27e8-4a95-b902-7e8bd3b236b8/294f880a-79b3-48fc-888a-f3c14992345f.png → sprites/sEnemyHitboxBC/layers/a76ad535-27e8-4a95-b902-7e8bd3b236b8/294f880a-79b3-48fc-888a-f3c14992345f.png


+ 90 - 0
sprites/sEnemyHitboxBC/sEnemyHitboxBC.yy

@@ -0,0 +1,90 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sEnemyHitboxBC",
+  "bboxMode":0,
+  "bbox_bottom":1,
+  "bbox_left":0,
+  "bbox_right":1,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"a76ad535-27e8-4a95-b902-7e8bd3b236b8","name":"a76ad535-27e8-4a95-b902-7e8bd3b236b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":2,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"294f880a-79b3-48fc-888a-f3c14992345f","blendMode":0,"displayName":"default","isLocked":false,"name":"294f880a-79b3-48fc-888a-f3c14992345f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sEnemyHitboxBC",
+  "nineSlice":null,
+  "origin":7,
+  "parent":{
+    "name":"Enemy",
+    "path":"folders/Enemy.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sEnemyHitboxBC",
+    "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":1.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sEnemyHitboxBC",
+    "playback":1,
+    "playbackSpeed":30.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":"a76ad535-27e8-4a95-b902-7e8bd3b236b8","path":"sprites/sEnemyHitboxBC/sEnemyHitboxBC.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"73869285-356b-4099-9b4c-1c03d485a21e","IsCreationKey":false,"Key":0.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":1,
+    "yorigin":2,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":2,
+}

+ 0 - 0
sprites/sEnemyHitboxRec/a76ad535-27e8-4a95-b902-7e8bd3b236b8.png → sprites/sEnemyHitboxMC/a76ad535-27e8-4a95-b902-7e8bd3b236b8.png


BIN
sprites/sEnemyHitboxMC/layers/a76ad535-27e8-4a95-b902-7e8bd3b236b8/294f880a-79b3-48fc-888a-f3c14992345f.png


+ 5 - 5
sprites/sEnemyHitboxRec/sEnemyHitboxRec.yy → sprites/sEnemyHitboxMC/sEnemyHitboxMC.yy

@@ -1,6 +1,6 @@
 {
   "$GMSprite":"v2",
-  "%Name":"sEnemyHitboxRec",
+  "%Name":"sEnemyHitboxMC",
   "bboxMode":0,
   "bbox_bottom":1,
   "bbox_left":0,
@@ -21,7 +21,7 @@
   "layers":[
     {"$GMImageLayer":"","%Name":"294f880a-79b3-48fc-888a-f3c14992345f","blendMode":0,"displayName":"default","isLocked":false,"name":"294f880a-79b3-48fc-888a-f3c14992345f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
   ],
-  "name":"sEnemyHitboxRec",
+  "name":"sEnemyHitboxMC",
   "nineSlice":null,
   "origin":4,
   "parent":{
@@ -33,7 +33,7 @@
   "resourceVersion":"2.0",
   "sequence":{
     "$GMSequence":"v1",
-    "%Name":"sEnemyHitboxRec",
+    "%Name":"sEnemyHitboxMC",
     "autoRecord":true,
     "backdropHeight":768,
     "backdropImageOpacity":0.5,
@@ -57,7 +57,7 @@
       "resourceType":"KeyframeStore<MomentsEventKeyframe>",
       "resourceVersion":"2.0",
     },
-    "name":"sEnemyHitboxRec",
+    "name":"sEnemyHitboxMC",
     "playback":1,
     "playbackSpeed":30.0,
     "playbackSpeedType":0,
@@ -69,7 +69,7 @@
     "tracks":[
       {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a76ad535-27e8-4a95-b902-7e8bd3b236b8","path":"sprites/sEnemyHitboxRec/sEnemyHitboxRec.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a76ad535-27e8-4a95-b902-7e8bd3b236b8","path":"sprites/sEnemyHitboxMC/sEnemyHitboxMC.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
               },"Disabled":false,"id":"73869285-356b-4099-9b4c-1c03d485a21e","IsCreationKey":false,"Key":0.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,},
     ],

BIN
sprites/sEnemyHitboxML/a76ad535-27e8-4a95-b902-7e8bd3b236b8.png


BIN
sprites/sEnemyHitboxML/layers/a76ad535-27e8-4a95-b902-7e8bd3b236b8/294f880a-79b3-48fc-888a-f3c14992345f.png


+ 90 - 0
sprites/sEnemyHitboxML/sEnemyHitboxML.yy

@@ -0,0 +1,90 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sEnemyHitboxML",
+  "bboxMode":0,
+  "bbox_bottom":1,
+  "bbox_left":0,
+  "bbox_right":1,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"a76ad535-27e8-4a95-b902-7e8bd3b236b8","name":"a76ad535-27e8-4a95-b902-7e8bd3b236b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":2,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"294f880a-79b3-48fc-888a-f3c14992345f","blendMode":0,"displayName":"default","isLocked":false,"name":"294f880a-79b3-48fc-888a-f3c14992345f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sEnemyHitboxML",
+  "nineSlice":null,
+  "origin":3,
+  "parent":{
+    "name":"Enemy",
+    "path":"folders/Enemy.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sEnemyHitboxML",
+    "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":1.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sEnemyHitboxML",
+    "playback":1,
+    "playbackSpeed":30.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":"a76ad535-27e8-4a95-b902-7e8bd3b236b8","path":"sprites/sEnemyHitboxML/sEnemyHitboxML.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"73869285-356b-4099-9b4c-1c03d485a21e","IsCreationKey":false,"Key":0.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":0,
+    "yorigin":1,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":2,
+}