DrDuck0117 3 månader sedan
förälder
incheckning
8c92722f46
52 ändrade filer med 689 tillägg och 52 borttagningar
  1. 9 1
      ddmyx.yyp
  2. 32 0
      objects/oAudioManager/Create_0.gml
  3. 35 0
      objects/oAudioManager/oAudioManager.yy
  4. 1 0
      objects/oBossHex/Create_0.gml
  5. 0 4
      objects/oBossHex/Draw_0.gml
  6. 0 1
      objects/oBossHex/oBossHex.yy
  7. 11 2
      objects/oBreakableSolid/Create_0.gml
  8. 34 1
      objects/oBreakableSolid/Step_0.gml
  9. 1 0
      objects/oBreakableSolid/oBreakableSolid.yy
  10. 12 0
      objects/oBrokenSolid/Create_0.gml
  11. 31 0
      objects/oBrokenSolid/Step_0.gml
  12. 36 0
      objects/oBrokenSolid/oBrokenSolid.yy
  13. 0 1
      objects/oCredit/Collision_oPlayer.gml
  14. 6 1
      objects/oCredit/Step_0.gml
  15. 10 2
      objects/oEnemyHitbox/Create_0.gml
  16. 2 1
      objects/oMain/Create_0.gml
  17. 1 1
      objects/oSavePoint/Create_0.gml
  18. 4 1
      objects/oUI/Create_0.gml
  19. 14 3
      objects/oUI/Draw_64.gml
  20. 2 0
      rooms/rTest_2/rTest_2.yy
  21. 27 0
      scripts/AudioManager/AudioManager.gml
  22. 13 0
      scripts/AudioManager/AudioManager.yy
  23. 38 27
      scripts/BossHexAI/BossHexAI.gml
  24. 0 0
      scripts/SaveLoad/SaveLoad.gml
  25. 2 2
      scripts/SaveLoad/SaveLoad.yy
  26. BIN
      sprites/sBreakableSolid/0f742070-4c45-47a6-9bab-1ace5739e5ed.png
  27. BIN
      sprites/sBreakableSolid/5f8a516f-8580-4fa8-8b91-351f5998c6db.png
  28. BIN
      sprites/sBreakableSolid/61c55a94-dd46-420d-bf99-d2a1942f6bc0.png
  29. BIN
      sprites/sBreakableSolid/7f8c2ccf-e957-4d72-a008-0b15e8e9f4f5.png
  30. BIN
      sprites/sBreakableSolid/8bf109df-7fa7-48dc-9b73-d4f4b708e099.png
  31. BIN
      sprites/sBreakableSolid/9a7ae381-8b03-46e7-80be-6d1fa53b7dee.png
  32. BIN
      sprites/sBreakableSolid/f4ff3faa-3bb6-43b9-8954-7f84493378cd.png
  33. BIN
      sprites/sBreakableSolid/layers/0f742070-4c45-47a6-9bab-1ace5739e5ed/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png
  34. BIN
      sprites/sBreakableSolid/layers/5f8a516f-8580-4fa8-8b91-351f5998c6db/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png
  35. BIN
      sprites/sBreakableSolid/layers/61c55a94-dd46-420d-bf99-d2a1942f6bc0/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png
  36. BIN
      sprites/sBreakableSolid/layers/7f8c2ccf-e957-4d72-a008-0b15e8e9f4f5/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png
  37. BIN
      sprites/sBreakableSolid/layers/8bf109df-7fa7-48dc-9b73-d4f4b708e099/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png
  38. BIN
      sprites/sBreakableSolid/layers/9a7ae381-8b03-46e7-80be-6d1fa53b7dee/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png
  39. BIN
      sprites/sBreakableSolid/layers/f4ff3faa-3bb6-43b9-8954-7f84493378cd/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png
  40. 8 4
      sprites/sBreakableSolid/sBreakableSolid.yy
  41. BIN
      sprites/sBrokenSolid1/0cfc842d-a5f7-4ecb-8207-65b5307a5a94.png
  42. BIN
      sprites/sBrokenSolid1/layers/0cfc842d-a5f7-4ecb-8207-65b5307a5a94/1f405b54-3e69-4b4c-881c-7ac0d90df3cd.png
  43. 90 0
      sprites/sBrokenSolid1/sBrokenSolid1.yy
  44. BIN
      sprites/sBrokenSolid2/0cfc842d-a5f7-4ecb-8207-65b5307a5a94.png
  45. BIN
      sprites/sBrokenSolid2/layers/0cfc842d-a5f7-4ecb-8207-65b5307a5a94/1f405b54-3e69-4b4c-881c-7ac0d90df3cd.png
  46. 90 0
      sprites/sBrokenSolid2/sBrokenSolid2.yy
  47. BIN
      sprites/sBrokenSolid3/0cfc842d-a5f7-4ecb-8207-65b5307a5a94.png
  48. BIN
      sprites/sBrokenSolid3/layers/0cfc842d-a5f7-4ecb-8207-65b5307a5a94/1f405b54-3e69-4b4c-881c-7ac0d90df3cd.png
  49. 90 0
      sprites/sBrokenSolid3/sBrokenSolid3.yy
  50. BIN
      sprites/sCreditIndi/0ea889aa-1d82-43e6-9436-2f59e0e4f375.png
  51. BIN
      sprites/sCreditIndi/layers/0ea889aa-1d82-43e6-9436-2f59e0e4f375/f32f43c4-743e-4583-a531-8ce642508d9d.png
  52. 90 0
      sprites/sCreditIndi/sCreditIndi.yy

+ 9 - 1
ddmyx.yyp

@@ -22,6 +22,7 @@
     {"$GMFolder":"","%Name":"oEnemyFlyingTrack2","folderPath":"folders/Enemy/oEnemyFlyingTrack2.yy","name":"oEnemyFlyingTrack2","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"oPlayerCorpse","folderPath":"folders/Enemy/oPlayerCorpse.yy","name":"oPlayerCorpse","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"ParticleEffects","folderPath":"folders/ParticleEffects.yy","name":"ParticleEffects","resourceType":"GMFolder","resourceVersion":"2.0",},
+    {"$GMFolder":"","%Name":"BrokenSolid","folderPath":"folders/ParticleEffects/BrokenSolid.yy","name":"BrokenSolid","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Player","folderPath":"folders/Player.yy","name":"Player","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Hitbox","folderPath":"folders/Player/Hitbox.yy","name":"Hitbox","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"Sprites","folderPath":"folders/Player/Sprites.yy","name":"Sprites","resourceType":"GMFolder","resourceVersion":"2.0",},
@@ -53,10 +54,12 @@
     {"id":{"name":"fTest","path":"fonts/fTest/fTest.yy",},},
     {"id":{"name":"更新日志DrDuck","path":"notes/更新日志DrDuck/更新日志DrDuck.yy",},},
     {"id":{"name":"更新日志tianhaobu","path":"notes/更新日志tianhaobu/更新日志tianhaobu.yy",},},
+    {"id":{"name":"oAudioManager","path":"objects/oAudioManager/oAudioManager.yy",},},
     {"id":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},},
     {"id":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},},
     {"id":{"name":"oBossHex","path":"objects/oBossHex/oBossHex.yy",},},
     {"id":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},},
+    {"id":{"name":"oBrokenSolid","path":"objects/oBrokenSolid/oBrokenSolid.yy",},},
     {"id":{"name":"oCamera","path":"objects/oCamera/oCamera.yy",},},
     {"id":{"name":"oCredit","path":"objects/oCredit/oCredit.yy",},},
     {"id":{"name":"oDoor","path":"objects/oDoor/oDoor.yy",},},
@@ -109,6 +112,7 @@
     {"id":{"name":"rTest_3","path":"rooms/rTest_3/rTest_3.yy",},},
     {"id":{"name":"rTest_backup","path":"rooms/rTest_backup/rTest_backup.yy",},},
     {"id":{"name":"rTitle","path":"rooms/rTitle/rTitle.yy",},},
+    {"id":{"name":"AudioManager","path":"scripts/AudioManager/AudioManager.yy",},},
     {"id":{"name":"BossHexAI","path":"scripts/BossHexAI/BossHexAI.yy",},},
     {"id":{"name":"CrawlAI","path":"scripts/CrawlAI/CrawlAI.yy",},},
     {"id":{"name":"DummyAI","path":"scripts/DummyAI/DummyAI.yy",},},
@@ -121,8 +125,8 @@
     {"id":{"name":"Interaction","path":"scripts/Interaction/Interaction.yy",},},
     {"id":{"name":"ParticleEffects","path":"scripts/ParticleEffects/ParticleEffects.yy",},},
     {"id":{"name":"PlayerStates","path":"scripts/PlayerStates/PlayerStates.yy",},},
+    {"id":{"name":"SaveLoad","path":"scripts/SaveLoad/SaveLoad.yy",},},
     {"id":{"name":"Simplifier","path":"scripts/Simplifier/Simplifier.yy",},},
-    {"id":{"name":"SL","path":"scripts/SL/SL.yy",},},
     {"id":{"name":"sh_flash","path":"shaders/sh_flash/sh_flash.yy",},},
     {"id":{"name":"sh_grey","path":"shaders/sh_grey/sh_grey.yy",},},
     {"id":{"name":"sh_ink_blend","path":"shaders/sh_ink_blend/sh_ink_blend.yy",},},
@@ -131,9 +135,13 @@
     {"id":{"name":"sBlockSlippery","path":"sprites/sBlockSlippery/sBlockSlippery.yy",},},
     {"id":{"name":"sBossHex","path":"sprites/sBossHex/sBossHex.yy",},},
     {"id":{"name":"sBreakableSolid","path":"sprites/sBreakableSolid/sBreakableSolid.yy",},},
+    {"id":{"name":"sBrokenSolid1","path":"sprites/sBrokenSolid1/sBrokenSolid1.yy",},},
+    {"id":{"name":"sBrokenSolid2","path":"sprites/sBrokenSolid2/sBrokenSolid2.yy",},},
+    {"id":{"name":"sBrokenSolid3","path":"sprites/sBrokenSolid3/sBrokenSolid3.yy",},},
     {"id":{"name":"sCircle24","path":"sprites/sCircle24/sCircle24.yy",},},
     {"id":{"name":"sCircle8","path":"sprites/sCircle8/sCircle8.yy",},},
     {"id":{"name":"sCredit","path":"sprites/sCredit/sCredit.yy",},},
+    {"id":{"name":"sCreditIndi","path":"sprites/sCreditIndi/sCreditIndi.yy",},},
     {"id":{"name":"sDoor","path":"sprites/sDoor/sDoor.yy",},},
     {"id":{"name":"sDoubleJumpEffect","path":"sprites/sDoubleJumpEffect/sDoubleJumpEffect.yy",},},
     {"id":{"name":"sEnemyCrawl","path":"sprites/sEnemyCrawl/sEnemyCrawl.yy",},},

+ 32 - 0
objects/oAudioManager/Create_0.gml

@@ -0,0 +1,32 @@
+bgm_current = noone;
+bgm_volume = 1.0;
+sfx_volume = 1.0;
+
+/*
+bgm_map =
+{
+	title:
+    explore:
+    battle:
+};
+
+sfx_map =
+{
+	ui_move:
+	ui_select:
+	
+    attack:
+    land:
+    dash:
+	focusing:
+	focus_end:
+	get_hit:
+	pickup_credit:
+	
+    blade_hit_ink:
+	blade_hit_spark:
+	blade_hit_solid:
+	
+	boss_hex_smash:
+	boss_hex_bounce:
+};

+ 35 - 0
objects/oAudioManager/oAudioManager.yy

@@ -0,0 +1,35 @@
+{
+  "$GMObject":"",
+  "%Name":"oAudioManager",
+  "eventList":[
+    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oAudioManager",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"CoreObjects",
+    "path":"folders/CoreObjects.yy",
+  },
+  "parentObjectId":null,
+  "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":null,
+  "spriteMaskId":null,
+  "visible":true,
+}

+ 1 - 0
objects/oBossHex/Create_0.gml

@@ -31,6 +31,7 @@ angle_alter = 0;
 cnt = 0;
 
 last_attack = -1;
+current_attack = -1;
 
 depth = 10;
 

+ 0 - 4
objects/oBossHex/Draw_0.gml

@@ -1,4 +0,0 @@
-// Inherit the parent event
-event_inherited();
-
-draw_text(200, 200, string(last_attack));

+ 0 - 1
objects/oBossHex/oBossHex.yy

@@ -4,7 +4,6 @@
   "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":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
-    {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
   ],
   "managed":true,
   "name":"oBossHex",

+ 11 - 2
objects/oBreakableSolid/Create_0.gml

@@ -5,6 +5,15 @@ animation_spd = 1;
 
 get_hit = function(_info)
 {
-	if _info.sourceY < y
+	shake_power = 6;
+	var _attack_dir = point_direction(0, 0, _info.kbFactorX, _info.kbFactorY);
+	if round(_attack_dir) == breakable_dir
 		image_index++;
-}
+}
+
+shake_offset = 0;
+shake_power = 0;
+shake_interval = 3;
+shake_timer = 0;
+origin_x = x;
+origin_y = y;

+ 34 - 1
objects/oBreakableSolid/Step_0.gml

@@ -1,2 +1,35 @@
 if animation_end()
-	self_record_destroy();
+{
+	repeat(10)
+	{
+		var _x = random_range(x - sprite_width / 3, x + sprite_width / 3);
+		var _y = random_range(y - sprite_height / 3, y + sprite_height / 3);
+		var _pe = icd(oBrokenSolid, _x, _y, 101);
+		if breakable_dir == 0 || breakable_dir == 180
+			_pe.x_spd = random_range(5, 10) * dcos(breakable_dir)
+		else
+			_pe.x_spd = random_range(-6, 6);
+	}
+	self_record_destroy();
+}
+if abs(shake_power) > 0.1
+{
+    shake_timer--;
+    if shake_timer <= 0
+	{
+        shake_timer = shake_interval;
+        shake_power *= -0.6;
+        shake_offset = shake_power;
+        
+        var _parallel = breakable_dir;
+        x = origin_x + lengthdir_x(shake_offset, _parallel);
+        y = origin_y + lengthdir_y(shake_offset, _parallel);
+    }
+}
+else
+{
+    shake_power = 0;
+    shake_timer = 0;
+    x = origin_x;
+    y = origin_y;
+}

+ 1 - 0
objects/oBreakableSolid/oBreakableSolid.yy

@@ -31,6 +31,7 @@
   "physicsStartAwake":true,
   "properties":[
     {"$GMObjectProperty":"v2","%Name":"uuid","filters":[],"listItems":[],"multiselect":false,"name":"uuid","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"","varType":2,},
+    {"$GMObjectProperty":"v2","%Name":"breakable_dir","filters":[],"listItems":[],"multiselect":false,"name":"breakable_dir","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"0","varType":1,},
   ],
   "resourceType":"GMObject",
   "resourceVersion":"2.0",

+ 12 - 0
objects/oBrokenSolid/Create_0.gml

@@ -0,0 +1,12 @@
+x_spd = 0;
+y_spd = random_range(-6, -15);
+
+image_speed = 0;
+
+restitution = 0.3;
+
+mask_index = sEnemyHitboxMC;
+
+sprite_index = choose(sBrokenSolid1, sBrokenSolid2, sBrokenSolid3);
+image_xscale = 2;
+image_yscale = 2;

+ 31 - 0
objects/oBrokenSolid/Step_0.gml

@@ -0,0 +1,31 @@
+y_spd += global.g;
+
+if place_meeting(x, y + y_spd, oParentSolid)
+{
+    while !place_meeting(x, y + sign(y_spd), oParentSolid)
+        y += sign(y_spd);
+    
+    if y_spd > 2
+	{
+        y_spd *= -restitution;
+		x_spd *= restitution;
+	}
+	else
+	{
+        y_spd = 0;
+		x_spd = 0;
+	}
+}
+y += y_spd * global.time_scale;
+
+if place_meeting(x + x_spd, y, oParentSolid)
+    x_spd *= -restitution;
+
+x += x_spd * global.time_scale;
+
+image_angle += point_distance(0, 0, x_spd, y_spd) * global.time_scale;
+
+image_alpha -= 0.001;
+
+if image_alpha <= 0
+	instance_destroy();

+ 36 - 0
objects/oBrokenSolid/oBrokenSolid.yy

@@ -0,0 +1,36 @@
+{
+  "$GMObject":"",
+  "%Name":"oBrokenSolid",
+  "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":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",},
+  ],
+  "managed":true,
+  "name":"oBrokenSolid",
+  "overriddenProperties":[],
+  "parent":{
+    "name":"BrokenSolid",
+    "path":"folders/ParticleEffects/BrokenSolid.yy",
+  },
+  "parentObjectId":null,
+  "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":null,
+  "spriteMaskId":null,
+  "visible":true,
+}

+ 0 - 1
objects/oCredit/Collision_oPlayer.gml

@@ -1,7 +1,6 @@
 if pickup_timer < 0 && flash_duration == 0
 {
 	flash_duration = 10;
-	global.save_data.player.Credit++;
 	var _part = part_system_create_layer("Instances", false, pePickupCredit);
 	part_system_position(_part, x, y);
 }

+ 6 - 1
objects/oCredit/Step_0.gml

@@ -29,4 +29,9 @@ image_angle += 4 * point_distance(0, 0, x_spd, y_spd);
 
 
 if flash_timer > flash_duration
-	instance_destroy();
+{
+	oUI.credit_pickup_timer = 120;
+	oUI.credit_pickup++;
+	global.save_data.player.Credit++;
+	instance_destroy();
+}

+ 10 - 2
objects/oEnemyHitbox/Create_0.gml

@@ -10,8 +10,16 @@ get_hit = function(_info)
 {
 	if hitbox_type == "BLADE"
 	{
-		global.hitstop = 12;
-		// se, pe...
+		global.hitstop = 15;
+		/*
+		var _struct = particle_get_info(peBladeHitHazard);
+		var _part_type = _struct.emitters[0].parttype.ind;
+		var _dir = point_direction(0, 0, _info.kbFactorX, -abs(_info.kbFactorY));
+		part_type_direction(_part_type, _dir - 45, _dir + 45, 0, 5);
+    
+		var _part = part_system_create_layer("Effect", false, peBladeHitHazard);
+		part_system_position(_part, x, y);
+		*/
 	}
 }
 

+ 2 - 1
objects/oMain/Create_0.gml

@@ -1,5 +1,7 @@
 random_set_seed(current_time);
 
+icl(oAudioManager);
+
 global.input_handles_index = [
 	"debug",
 	"ingame",
@@ -44,7 +46,6 @@ global.save_data = {};
 global.save_filename = "ddmyx_save.dat";
 
 
-
 // title UI (BETA)
 menu_options = ["CONTINUE", "NEW GAME", "OPTIONS", "EXIT"];
 menu_index = 0;

+ 1 - 1
objects/oSavePoint/Create_0.gml

@@ -13,4 +13,4 @@ callback = function()
 	
 	save_game_to_disk();
 }
-depth = oPlayer.depth + 1;
+depth = 102;

+ 4 - 1
objects/oUI/Create_0.gml

@@ -9,4 +9,7 @@ offset_y = 24;
 
 flash_timer = 0;
 flash_duration = 0;
-u_flash_alpha = shader_get_uniform(sh_flash, "f_alpha");
+u_flash_alpha = shader_get_uniform(sh_flash, "f_alpha");
+
+credit_pickup = 0;
+credit_pickup_timer = 0;

+ 14 - 3
objects/oUI/Draw_64.gml

@@ -25,7 +25,18 @@ if flash_timer > 0
 draw_sprite_ext(sPlayerINK, global.playerINK, offset_x, 96, 4, 4, 0, c_white, 1.0);
 shader_reset();
 
-if true
+draw_sprite_ext(sCreditIndi, 0, 48, 188, 1, 1, 0, c_white, 1.0);
+draw_set_halign(fa_left);
+draw_set_valign(fa_middle);
+draw_text(96, 188, string(round(global.save_data.player.Credit - credit_pickup)));
+if credit_pickup > 0
 {
-	draw_sprite(sCredit, 0, offset_x, 192);
-}
+	draw_set_colour(c_yellow);
+	draw_text(96, 232, "+" + string(round(credit_pickup)));
+	draw_set_colour(c_white);
+}
+
+if credit_pickup_timer > 0
+	credit_pickup_timer--;
+else if credit_pickup > 0
+	credit_pickup -= 0.25;

+ 2 - 0
rooms/rTest_2/rTest_2.yy

@@ -463,6 +463,7 @@
         {"$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":992.0,},
         {"$GMRInstance":"v4","%Name":"inst_2F685D8C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2F685D8C","objectId":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"properties":[
             {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"propertyId":{"name":"uuid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"rTest2_bs2",},
+            {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"propertyId":{"name":"breakable_dir","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"270",},
           ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":-90.0,"scaleX":1.0,"scaleY":1.0,"x":3392.0,"y":544.0,},
         {"$GMRInstance":"v4","%Name":"inst_4FEA3227","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4FEA3227","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":608.0,},
         {"$GMRInstance":"v4","%Name":"inst_4161E055","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4161E055","objectId":{"name":"oBlockClimbable","path":"objects/oBlockClimbable/oBlockClimbable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":3168.0,"y":544.0,},
@@ -615,6 +616,7 @@
         {"$GMRInstance":"v4","%Name":"inst_2BDB3A70","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2BDB3A70","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":1504.0,},
         {"$GMRInstance":"v4","%Name":"inst_131EAE7D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_131EAE7D","objectId":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"properties":[
             {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"propertyId":{"name":"uuid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"rTest2_bs1",},
+            {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"oBreakableSolid","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"propertyId":{"name":"breakable_dir","path":"objects/oBreakableSolid/oBreakableSolid.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"0",},
           ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1536.0,"y":1280.0,},
         {"$GMRInstance":"v4","%Name":"inst_4D13EA92","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4D13EA92","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":1440.0,},
         {"$GMRInstance":"v4","%Name":"inst_3122815E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3122815E","objectId":{"name":"oBlockSlippery","path":"objects/oBlockSlippery/oBlockSlippery.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":1504.0,},

+ 27 - 0
scripts/AudioManager/AudioManager.gml

@@ -0,0 +1,27 @@
+function bgm_play(_key)
+{
+    var _mus = oAudioManager.bgm_map[$ _key];
+    if audio_is_playing(oAudioManager.bgm_current)
+        audio_stop_sound(oAudioManager.bgm_current);
+    oAudioManager.bgm_current = audio_play_sound(_mus, 0, true);
+    audio_sound_gain(oAudioManager.bgm_current, oAudioManager.bgm_volume, 0);
+}
+
+function bgm_stop()
+{
+    audio_stop_sound(oAudioManager.bgm_current);
+    oAudioManager.bgm_current = noone;
+}
+
+function sfx_play(_key, _pitch_vary = 0.1, _vol_vary = 0.1)
+{
+    var _sfx = oAudioManager.sfx_map[$ _key];
+    var _inst = audio_play_sound(_sfx, 1, false);
+    
+    var _pitch = 1.0 + (random(_pitch_vary * 2) - _pitch_vary);
+    var _vol = oAudioManager.sfx_volume * (1.0 - random(_vol_vary));
+    
+    audio_sound_pitch(_inst, _pitch);
+    audio_sound_gain(_inst, _vol, 0);
+    return _inst;
+}

+ 13 - 0
scripts/AudioManager/AudioManager.yy

@@ -0,0 +1,13 @@
+{
+  "$GMScript":"v1",
+  "%Name":"AudioManager",
+  "isCompatibility":false,
+  "isDnD":false,
+  "name":"AudioManager",
+  "parent":{
+    "name":"Scripts",
+    "path":"folders/Scripts.yy",
+  },
+  "resourceType":"GMScript",
+  "resourceVersion":"2.0",
+}

+ 38 - 27
scripts/BossHexAI/BossHexAI.gml

@@ -9,6 +9,37 @@ function hex_ai()
 				roll_init();
 			}
 			break;
+		
+		case "WAIT":
+			cooldown -= global.time_scale;
+			if cooldown <= 0
+			{
+				cooldown = 0;
+				switch(current_attack)
+				{
+					case 0:
+						cnt = 0;
+						roll_init();
+						break;
+		
+					case 1:
+						cnt = 3;
+						smash_init();
+						break;
+			
+					case 2:
+						cnt = 5;
+						bounce_init();
+						break;
+			
+					case 3:
+						cnt = 2;
+						spawn_init();
+						break;
+				}
+			}
+			break;
+				
 			
 		case "ROLL":
 		
@@ -103,7 +134,7 @@ function hex_ai()
 				screen_shake(20);
 				
 				if !--cnt
-					hex_pick_attack();
+					current_attack = hex_pick_attack();
 				else
 					smash_init();
 			}
@@ -130,7 +161,7 @@ function hex_ai()
 				icd(oEnemyHex, x, 998, depth + 1);
 				
 				if !--cnt
-					hex_pick_attack();
+					current_attack = hex_pick_attack();
 				else
 					spawn_init();
 			}
@@ -153,7 +184,7 @@ function hex_ai()
 				screen_shake(15);
 				
 				if !--cnt
-					hex_pick_attack();
+					current_attack = hex_pick_attack();
 				else
 					bounce_init();
 					
@@ -208,6 +239,8 @@ function bounce_init()
 function hex_pick_attack()
 {
 	hex_var_erase();
+	cooldown = 6;
+	state = "WAIT";
 	
     // 构建候选池
     var pool = [];
@@ -222,7 +255,7 @@ function hex_pick_attack()
 			array_push(forbidden, 3);
     
     // 将不在forbidden中的技能加入候选池
-    for (var i = 0; i < 4; i++)
+    for(var i = 0; i < 4; i++)
 	{
         if array_get_index(forbidden, i) == -1
             array_push(pool, i);
@@ -231,29 +264,7 @@ function hex_pick_attack()
     // 从候选池随机选一个
     var pick = pool[irandom(array_length(pool) - 1)];
     last_attack = pick;
-	
-	switch(pick)
-	{
-		case 0:
-			cnt = 0;
-			roll_init();
-			break;
-		
-		case 1:
-			cnt = 3;
-			smash_init();
-			break;
-			
-		case 2:
-			cnt = 5;
-			bounce_init();
-			break;
-			
-		case 3:
-			cnt = 2;
-			spawn_init();
-			break;
-	}
+	return pick;
 }
 function hex_var_erase()
 {

+ 0 - 0
scripts/SL/SL.gml → scripts/SaveLoad/SaveLoad.gml


+ 2 - 2
scripts/SL/SL.yy → scripts/SaveLoad/SaveLoad.yy

@@ -1,9 +1,9 @@
 {
   "$GMScript":"v1",
-  "%Name":"SL",
+  "%Name":"SaveLoad",
   "isCompatibility":false,
   "isDnD":false,
-  "name":"SL",
+  "name":"SaveLoad",
   "parent":{
     "name":"Scripts",
     "path":"folders/Scripts.yy",

BIN
sprites/sBreakableSolid/0f742070-4c45-47a6-9bab-1ace5739e5ed.png


BIN
sprites/sBreakableSolid/5f8a516f-8580-4fa8-8b91-351f5998c6db.png


BIN
sprites/sBreakableSolid/61c55a94-dd46-420d-bf99-d2a1942f6bc0.png


BIN
sprites/sBreakableSolid/7f8c2ccf-e957-4d72-a008-0b15e8e9f4f5.png


BIN
sprites/sBreakableSolid/8bf109df-7fa7-48dc-9b73-d4f4b708e099.png


BIN
sprites/sBreakableSolid/9a7ae381-8b03-46e7-80be-6d1fa53b7dee.png


BIN
sprites/sBreakableSolid/f4ff3faa-3bb6-43b9-8954-7f84493378cd.png


BIN
sprites/sBreakableSolid/layers/0f742070-4c45-47a6-9bab-1ace5739e5ed/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png


BIN
sprites/sBreakableSolid/layers/5f8a516f-8580-4fa8-8b91-351f5998c6db/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png


BIN
sprites/sBreakableSolid/layers/61c55a94-dd46-420d-bf99-d2a1942f6bc0/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png


BIN
sprites/sBreakableSolid/layers/7f8c2ccf-e957-4d72-a008-0b15e8e9f4f5/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png


BIN
sprites/sBreakableSolid/layers/8bf109df-7fa7-48dc-9b73-d4f4b708e099/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png


BIN
sprites/sBreakableSolid/layers/9a7ae381-8b03-46e7-80be-6d1fa53b7dee/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png


BIN
sprites/sBreakableSolid/layers/f4ff3faa-3bb6-43b9-8954-7f84493378cd/dc2c122c-d732-48ba-a0d9-baf2160c52f5.png


+ 8 - 4
sprites/sBreakableSolid/sBreakableSolid.yy

@@ -16,7 +16,8 @@
     {"$GMSpriteFrame":"v1","%Name":"61c55a94-dd46-420d-bf99-d2a1942f6bc0","name":"61c55a94-dd46-420d-bf99-d2a1942f6bc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
     {"$GMSpriteFrame":"v1","%Name":"f4ff3faa-3bb6-43b9-8954-7f84493378cd","name":"f4ff3faa-3bb6-43b9-8954-7f84493378cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
     {"$GMSpriteFrame":"v1","%Name":"7f8c2ccf-e957-4d72-a008-0b15e8e9f4f5","name":"7f8c2ccf-e957-4d72-a008-0b15e8e9f4f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
-    {"$GMSpriteFrame":"v1","%Name":"8bf109df-7fa7-48dc-9b73-d4f4b708e099","name":"8bf109df-7fa7-48dc-9b73-d4f4b708e099","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"9a7ae381-8b03-46e7-80be-6d1fa53b7dee","name":"9a7ae381-8b03-46e7-80be-6d1fa53b7dee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"0f742070-4c45-47a6-9bab-1ace5739e5ed","name":"0f742070-4c45-47a6-9bab-1ace5739e5ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
   ],
   "gridX":0,
   "gridY":0,
@@ -53,7 +54,7 @@
     },
     "eventStubScript":null,
     "eventToFunction":{},
-    "length":5.0,
+    "length":6.0,
     "lockOrigin":false,
     "moments":{
       "$KeyframeStore<MomentsEventKeyframe>":"",
@@ -85,8 +86,11 @@
                 "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f8c2ccf-e957-4d72-a008-0b15e8e9f4f5","path":"sprites/sBreakableSolid/sBreakableSolid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
               },"Disabled":false,"id":"96348c8a-b4ec-4e56-9618-49fc28bfebf0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
             {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
-                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bf109df-7fa7-48dc-9b73-d4f4b708e099","path":"sprites/sBreakableSolid/sBreakableSolid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
-              },"Disabled":false,"id":"1a4f952f-a51c-4a7a-84e7-c5e7235ec9a3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a7ae381-8b03-46e7-80be-6d1fa53b7dee","path":"sprites/sBreakableSolid/sBreakableSolid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"04e4ebfb-df59-4f99-bceb-96e830b46ed7","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f742070-4c45-47a6-9bab-1ace5739e5ed","path":"sprites/sBreakableSolid/sBreakableSolid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"7043b53d-62ad-42f7-97e8-a9916166fd1f","IsCreationKey":false,"Key":5.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,

BIN
sprites/sBrokenSolid1/0cfc842d-a5f7-4ecb-8207-65b5307a5a94.png


BIN
sprites/sBrokenSolid1/layers/0cfc842d-a5f7-4ecb-8207-65b5307a5a94/1f405b54-3e69-4b4c-881c-7ac0d90df3cd.png


+ 90 - 0
sprites/sBrokenSolid1/sBrokenSolid1.yy

@@ -0,0 +1,90 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sBrokenSolid1",
+  "bboxMode":0,
+  "bbox_bottom":19,
+  "bbox_left":0,
+  "bbox_right":19,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"0cfc842d-a5f7-4ecb-8207-65b5307a5a94","name":"0cfc842d-a5f7-4ecb-8207-65b5307a5a94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":20,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"1f405b54-3e69-4b4c-881c-7ac0d90df3cd","blendMode":0,"displayName":"default","isLocked":false,"name":"1f405b54-3e69-4b4c-881c-7ac0d90df3cd","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sBrokenSolid1",
+  "nineSlice":null,
+  "origin":4,
+  "parent":{
+    "name":"BrokenSolid",
+    "path":"folders/ParticleEffects/BrokenSolid.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sBrokenSolid1",
+    "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":"sBrokenSolid1",
+    "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":"0cfc842d-a5f7-4ecb-8207-65b5307a5a94","path":"sprites/sBrokenSolid1/sBrokenSolid1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"2e117d00-70b0-4453-bd47-eb674f647958","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":10,
+    "yorigin":10,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":20,
+}

BIN
sprites/sBrokenSolid2/0cfc842d-a5f7-4ecb-8207-65b5307a5a94.png


BIN
sprites/sBrokenSolid2/layers/0cfc842d-a5f7-4ecb-8207-65b5307a5a94/1f405b54-3e69-4b4c-881c-7ac0d90df3cd.png


+ 90 - 0
sprites/sBrokenSolid2/sBrokenSolid2.yy

@@ -0,0 +1,90 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sBrokenSolid2",
+  "bboxMode":0,
+  "bbox_bottom":19,
+  "bbox_left":0,
+  "bbox_right":19,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"0cfc842d-a5f7-4ecb-8207-65b5307a5a94","name":"0cfc842d-a5f7-4ecb-8207-65b5307a5a94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":20,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"1f405b54-3e69-4b4c-881c-7ac0d90df3cd","blendMode":0,"displayName":"default","isLocked":false,"name":"1f405b54-3e69-4b4c-881c-7ac0d90df3cd","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sBrokenSolid2",
+  "nineSlice":null,
+  "origin":4,
+  "parent":{
+    "name":"BrokenSolid",
+    "path":"folders/ParticleEffects/BrokenSolid.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sBrokenSolid2",
+    "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":"sBrokenSolid2",
+    "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":"0cfc842d-a5f7-4ecb-8207-65b5307a5a94","path":"sprites/sBrokenSolid2/sBrokenSolid2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"2e117d00-70b0-4453-bd47-eb674f647958","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":10,
+    "yorigin":10,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":20,
+}

BIN
sprites/sBrokenSolid3/0cfc842d-a5f7-4ecb-8207-65b5307a5a94.png


BIN
sprites/sBrokenSolid3/layers/0cfc842d-a5f7-4ecb-8207-65b5307a5a94/1f405b54-3e69-4b4c-881c-7ac0d90df3cd.png


+ 90 - 0
sprites/sBrokenSolid3/sBrokenSolid3.yy

@@ -0,0 +1,90 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sBrokenSolid3",
+  "bboxMode":0,
+  "bbox_bottom":19,
+  "bbox_left":0,
+  "bbox_right":19,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"0cfc842d-a5f7-4ecb-8207-65b5307a5a94","name":"0cfc842d-a5f7-4ecb-8207-65b5307a5a94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":20,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"1f405b54-3e69-4b4c-881c-7ac0d90df3cd","blendMode":0,"displayName":"default","isLocked":false,"name":"1f405b54-3e69-4b4c-881c-7ac0d90df3cd","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sBrokenSolid3",
+  "nineSlice":null,
+  "origin":4,
+  "parent":{
+    "name":"BrokenSolid",
+    "path":"folders/ParticleEffects/BrokenSolid.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sBrokenSolid3",
+    "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":"sBrokenSolid3",
+    "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":"0cfc842d-a5f7-4ecb-8207-65b5307a5a94","path":"sprites/sBrokenSolid3/sBrokenSolid3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"2e117d00-70b0-4453-bd47-eb674f647958","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":10,
+    "yorigin":10,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":20,
+}

BIN
sprites/sCreditIndi/0ea889aa-1d82-43e6-9436-2f59e0e4f375.png


BIN
sprites/sCreditIndi/layers/0ea889aa-1d82-43e6-9436-2f59e0e4f375/f32f43c4-743e-4583-a531-8ce642508d9d.png


+ 90 - 0
sprites/sCreditIndi/sCreditIndi.yy

@@ -0,0 +1,90 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sCreditIndi",
+  "bboxMode":0,
+  "bbox_bottom":49,
+  "bbox_left":0,
+  "bbox_right":49,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"0ea889aa-1d82-43e6-9436-2f59e0e4f375","name":"0ea889aa-1d82-43e6-9436-2f59e0e4f375","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":50,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"f32f43c4-743e-4583-a531-8ce642508d9d","blendMode":0,"displayName":"default","isLocked":false,"name":"f32f43c4-743e-4583-a531-8ce642508d9d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sCreditIndi",
+  "nineSlice":null,
+  "origin":4,
+  "parent":{
+    "name":"UIsprite",
+    "path":"folders/UIsprite.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sCreditIndi",
+    "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":"sCreditIndi",
+    "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":"0ea889aa-1d82-43e6-9436-2f59e0e4f375","path":"sprites/sCreditIndi/sCreditIndi.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"1e635740-872f-4f4c-b00a-c57094f3c531","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":25,
+    "yorigin":25,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":50,
+}