no message

ddmyx.yyp

@@ -21,7 +21,6 @@
     {"$GMFolder":"","%Name":"oEnemyFlyingTrack","folderPath":"folders/Enemy/oEnemyFlyingTrack.yy","name":"oEnemyFlyingTrack","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$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":"PACKAGE","folderPath":"folders/PACKAGE.yy","name":"PACKAGE","resourceType":"GMFolder","resourceVersion":"2.0",},
     {"$GMFolder":"","%Name":"ParticleEffects","folderPath":"folders/ParticleEffects.yy","name":"ParticleEffects","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",},
@@ -101,8 +100,9 @@
     {"id":{"name":"oSlicedApple","path":"objects/oSlicedApple/oSlicedApple.yy",},},
     {"id":{"name":"oSpike","path":"objects/oSpike/oSpike.yy",},},
     {"id":{"name":"oUI","path":"objects/oUI/oUI.yy",},},
-    {"id":{"name":"peBladeHitEffect","path":"particles/peBladeHitEffect/peBladeHitEffect.yy",},},
+    {"id":{"name":"peBladeHitHazard","path":"particles/peBladeHitHazard/peBladeHitHazard.yy",},},
     {"id":{"name":"peINKBurst","path":"particles/peINKBurst/peINKBurst.yy",},},
+    {"id":{"name":"pePickupCredit","path":"particles/pePickupCredit/pePickupCredit.yy",},},
     {"id":{"name":"rTest_1","path":"rooms/rTest_1/rTest_1.yy",},},
     {"id":{"name":"rTest_2","path":"rooms/rTest_2/rTest_2.yy",},},
     {"id":{"name":"rTest_3","path":"rooms/rTest_3/rTest_3.yy",},},
@@ -118,6 +118,7 @@
     {"id":{"name":"General","path":"scripts/General/General.yy",},},
     {"id":{"name":"HexAI","path":"scripts/HexAI/HexAI.yy",},},
     {"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":"Simplifier","path":"scripts/Simplifier/Simplifier.yy",},},
     {"id":{"name":"SL","path":"scripts/SL/SL.yy",},},
@@ -128,7 +129,6 @@
     {"id":{"name":"sBlockClimbable","path":"sprites/sBlockClimbable/sBlockClimbable.yy",},},
     {"id":{"name":"sBlockSlippery","path":"sprites/sBlockSlippery/sBlockSlippery.yy",},},
     {"id":{"name":"sBossHex","path":"sprites/sBossHex/sBossHex.yy",},},
-    {"id":{"name":"sBossHexMask","path":"sprites/sBossHexMask/sBossHexMask.yy",},},
     {"id":{"name":"sBreakableSolid","path":"sprites/sBreakableSolid/sBreakableSolid.yy",},},
     {"id":{"name":"sCircle24","path":"sprites/sCircle24/sCircle24.yy",},},
     {"id":{"name":"sCircle8","path":"sprites/sCircle8/sCircle8.yy",},},

objects/oBossHex/Create_0.gml

@@ -2,7 +2,7 @@ event_inherited();
 
 hp = 240;
 
-credit = 30;
+credit = 50;
 
 enemy_ai = hex_ai;
 
@@ -24,8 +24,6 @@ pivot_y = 0;
 
 state = "IDLE";
 
-//mask_index = sBossHexMask;
-
 rebounce_timer = 0;
 
 angle_alter = 0;

objects/oCredit/Collision_oPlayer.gml

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

objects/oCredit/Create_0.gml

@@ -5,4 +5,8 @@ image_angle = random(360);
 
 restitution = 0.5; // 弹力系数
 
-pickup_timer = 20; // 最快拾取时间（可选）
+pickup_timer = 30; // 最快拾取时间（可选）
+
+flash_duration = 0;
+flash_timer = 0;
+u_flash_alpha = shader_get_uniform(sh_flash, "f_alpha");

objects/oCredit/Draw_0.gml

@@ -0,0 +1,13 @@
+if flash_duration > 0
+{
+    shader_set(sh_flash);
+    
+    var _alpha = flash_timer / flash_duration;
+    shader_set_uniform_f(u_flash_alpha, _alpha);
+ 
+    draw_self();
+    shader_reset();
+    
+    flash_timer += global.time_scale;
+}
+else draw_self();

objects/oCredit/Step_0.gml

@@ -25,4 +25,8 @@ x += x_spd;
 
 pickup_timer--;
 
-image_angle += 4 * point_distance(0, 0, x_spd, y_spd);
+image_angle += 4 * point_distance(0, 0, x_spd, y_spd);
+
+
+if flash_timer > flash_duration
+	instance_destroy();

objects/oCredit/oCredit.yy

@@ -5,6 +5,7 @@
     {"$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":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"eventNum":0,"eventType":4,"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":"oCredit",

objects/oParentEnemy/Create_0.gml

@@ -2,6 +2,16 @@ get_hit = function(_info)
 {
 	if has_ink
 		player_add_INK(1);
+	else
+	{
+		var _struct = particle_get_info(peBladeHitHazard);
+		var _part_type = _struct.emitters[0].parttype.ind;
+		var _dir = point_direction(0, 0, -_info.kbFactorX, -_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);
+	}
 	
 	flash_timer = 6;
 	flash_duration = 6;

objects/oParentHazard/Create_0.gml

@@ -2,7 +2,12 @@ damage = 1;
 
 get_hit = function(_info)
 {
-	return;
-	//pe
+    var _struct = particle_get_info(peBladeHitHazard);
+    var _part_type = _struct.emitters[0].parttype.ind;
+    var _dir = point_direction(0, 0, -_info.kbFactorX, -_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);
 	//se
 };

objects/oPlayer/Draw_0.gml

@@ -15,11 +15,13 @@ shader_reset();
 
 if global.developer_mode
 {
+	/*
 	draw_set_halign(fa_left);
 	draw_set_valign(fa_middle);
 	draw_set_font(fTest);
 	
 	draw_text(x + 72, y - 96, script_get_name(state));
 	draw_text(x + 72, y - 48, sprite_get_name(sprite_index) + " " + string(image_index));
+	*/
 
 }

objects/oPlayerHitbox/Create_0.gml

@@ -11,8 +11,8 @@ feedback_activated = false;
 hit_feedback = function(_owner, _inst){};
 hit_info = {
 	damage: 1,
-	kbFactorX: 1.0,
-	kbFactorY: 1.0,
+	kbFactorX: 0.0,
+	kbFactorY: 0.0,
 	sourceX: -1,
 	sourceY: -1
 };

objects/oRippleShrink/Create_0.gml

@@ -1,5 +1,5 @@
-r_in = sqrt(sqr(room_width) + sqr(room_height));
-r_out = sqrt(sqr(room_width) + sqr(room_height));
+r_in = sqrt(sqr(room_width) + sqr(room_height)) / 1.6;
+r_out = sqrt(sqr(room_width) + sqr(room_height)) / 1.6;
 shrink_speed = 24;
 is_finished = false;
 

particles/peBladeHitEffect/peBladeHitEffect.yy

@@ -1,25 +0,0 @@
-{
-  "$GMParticleSystem":"",
-  "%Name":"peBladeHitEffect",
-  "backdropHeight":768,
-  "backdropImageOpacity":0.5,
-  "backdropImagePath":"",
-  "backdropWidth":1366,
-  "backdropXOffset":0.0,
-  "backdropYOffset":0.0,
-  "drawOrder":0,
-  "emitters":[
-    {"$GMPSEmitter":"","%Name":"Emitter","additiveBlend":false,"directionIncrease":0.0,"directionMax":20.0,"directionMin":-20.0,"directionWiggle":0.0,"distribution":0,"editorColour":1090519039,"editorDrawShape":true,"emitCount":1,"emitDelayMax":0.0,"emitDelayMin":0.0,"emitDelayUnits":0,"emitIntervalMax":0.0,"emitIntervalMin":0.0,"emitIntervalUnits":0,"enabled":true,"endColour":2164260863,"GMPresetName":null,"gravityDirection":0.0,"gravityForce":0.0,"headPosition":0.0,"lifetimeMax":12.0,"lifetimeMin":10.0,"linkedEmitter":null,"locked":false,"midColour":2164260863,"mode":0,"name":"Emitter","orientationIncrease":0.0,"orientationMax":0.0,"orientationMin":0.0,"orientationRelative":true,"orientationWiggle":0.0,"regionH":0.0,"regionW":0.0,"regionX":0.0,"regionY":0.0,"resourceType":"GMPSEmitter","resourceVersion":"2.0","scaleX":2.0,"scaleY":1.0,"shape":0,"sizeIncrease":0.05,"sizeMax":1.0,"sizeMin":0.5,"sizeWiggle":0.0,"spawnOnDeathCount":1,"spawnOnDeathGMPreset":null,"spawnOnDeathId":null,"spawnOnUpdateCount":1,"spawnOnUpdateGMPreset":null,"spawnOnUpdateId":null,"speedIncrease":0.0,"speedMax":15.0,"speedMin":10.0,"speedWiggle":0.0,"spriteAnimate":false,"spriteId":{"name":"sBladeHitEffect","path":"sprites/sBladeHitEffect/sBladeHitEffect.yy",},"spriteRandom":false,"spriteStretch":false,"startColour":4294967295,"texture":-1,},
-  ],
-  "name":"peBladeHitEffect",
-  "parent":{
-    "name":"ParticleEffects",
-    "path":"folders/ParticleEffects.yy",
-  },
-  "resourceType":"GMParticleSystem",
-  "resourceVersion":"2.0",
-  "showBackdrop":true,
-  "showBackdropImage":false,
-  "xorigin":0,
-  "yorigin":0,
-}

particles/peBladeHitHazard/peBladeHitHazard.yy

@@ -0,0 +1,25 @@
+{
+  "$GMParticleSystem":"",
+  "%Name":"peBladeHitHazard",
+  "backdropHeight":768,
+  "backdropImageOpacity":0.5,
+  "backdropImagePath":"",
+  "backdropWidth":1366,
+  "backdropXOffset":0.0,
+  "backdropYOffset":0.0,
+  "drawOrder":0,
+  "emitters":[
+    {"$GMPSEmitter":"","%Name":"Emitter","additiveBlend":false,"directionIncrease":0.0,"directionMax":120.0,"directionMin":60.0,"directionWiggle":0.0,"distribution":0,"editorColour":1090519039,"editorDrawShape":true,"emitCount":12,"emitDelayMax":0.0,"emitDelayMin":0.0,"emitDelayUnits":0,"emitIntervalMax":0.0,"emitIntervalMin":0.0,"emitIntervalUnits":0,"enabled":true,"endColour":4281515007,"GMPresetName":null,"gravityDirection":270.0,"gravityForce":0.6,"headPosition":0.0,"lifetimeMax":60.0,"lifetimeMin":45.0,"linkedEmitter":null,"locked":false,"midColour":4281532415,"mode":1,"name":"Emitter","orientationIncrease":0.0,"orientationMax":0.0,"orientationMin":0.0,"orientationRelative":true,"orientationWiggle":0.0,"regionH":64.0,"regionW":64.0,"regionX":0.0,"regionY":0.0,"resourceType":"GMPSEmitter","resourceVersion":"2.0","scaleX":0.4,"scaleY":1.0,"shape":0,"sizeIncrease":0.0,"sizeMax":0.5,"sizeMin":0.3,"sizeWiggle":0.0,"spawnOnDeathCount":1,"spawnOnDeathGMPreset":null,"spawnOnDeathId":null,"spawnOnUpdateCount":1,"spawnOnUpdateGMPreset":null,"spawnOnUpdateId":null,"speedIncrease":0.0,"speedMax":15.0,"speedMin":12.0,"speedWiggle":0.0,"spriteAnimate":false,"spriteId":null,"spriteRandom":false,"spriteStretch":true,"startColour":4291624959,"texture":3,},
+  ],
+  "name":"peBladeHitHazard",
+  "parent":{
+    "name":"ParticleEffects",
+    "path":"folders/ParticleEffects.yy",
+  },
+  "resourceType":"GMParticleSystem",
+  "resourceVersion":"2.0",
+  "showBackdrop":true,
+  "showBackdropImage":false,
+  "xorigin":0,
+  "yorigin":0,
+}

particles/pePickupCredit/pePickupCredit.yy

@@ -0,0 +1,25 @@
+{
+  "$GMParticleSystem":"",
+  "%Name":"pePickupCredit",
+  "backdropHeight":768,
+  "backdropImageOpacity":0.5,
+  "backdropImagePath":"",
+  "backdropWidth":1366,
+  "backdropXOffset":0.0,
+  "backdropYOffset":0.0,
+  "drawOrder":0,
+  "emitters":[
+    {"$GMPSEmitter":"","%Name":"Emitter","additiveBlend":false,"directionIncrease":0.0,"directionMax":360.0,"directionMin":0.0,"directionWiggle":0.0,"distribution":0,"editorColour":1090519039,"editorDrawShape":true,"emitCount":1,"emitDelayMax":0.0,"emitDelayMin":0.0,"emitDelayUnits":0,"emitIntervalMax":0.0,"emitIntervalMin":0.0,"emitIntervalUnits":0,"enabled":true,"endColour":16777215,"GMPresetName":null,"gravityDirection":270.0,"gravityForce":0.0,"headPosition":0.0,"lifetimeMax":24.0,"lifetimeMin":24.0,"linkedEmitter":null,"locked":false,"midColour":4294967295,"mode":1,"name":"Emitter","orientationIncrease":0.0,"orientationMax":0.0,"orientationMin":0.0,"orientationRelative":false,"orientationWiggle":0.0,"regionH":0.0,"regionW":0.0,"regionX":0.0,"regionY":0.0,"resourceType":"GMPSEmitter","resourceVersion":"2.0","scaleX":1.0,"scaleY":1.0,"shape":0,"sizeIncrease":0.0,"sizeMax":1.0,"sizeMin":1.0,"sizeWiggle":0.0,"spawnOnDeathCount":1,"spawnOnDeathGMPreset":null,"spawnOnDeathId":null,"spawnOnUpdateCount":1,"spawnOnUpdateGMPreset":null,"spawnOnUpdateId":null,"speedIncrease":0.0,"speedMax":0.0,"speedMin":0.0,"speedWiggle":0.0,"spriteAnimate":false,"spriteId":null,"spriteRandom":false,"spriteStretch":true,"startColour":2164260863,"texture":8,},
+  ],
+  "name":"pePickupCredit",
+  "parent":{
+    "name":"ParticleEffects",
+    "path":"folders/ParticleEffects.yy",
+  },
+  "resourceType":"GMParticleSystem",
+  "resourceVersion":"2.0",
+  "showBackdrop":true,
+  "showBackdropImage":false,
+  "xorigin":0,
+  "yorigin":0,
+}

scripts/ParticleEffects/ParticleEffects.gml

@@ -0,0 +1,21 @@
+function pe_blade_hit_hazard(_x, _y)
+{
+	var _part = part_system_create_layer("Effect", false);
+	var _type = part_type_create();
+	var _dir = point_direction(0, 0, _x, _y);
+
+	part_type_shape(_type, pt_shape_line);
+	part_type_scale(_type, 0.4, 1)
+	part_type_size(_type, 0.3, 0.5, 0, 0);
+	part_type_speed(_type, 15, 20, 0, 0);
+	part_type_direction(_type, _dir - 45, _dir + 45, 0, 5);
+	part_type_color3(_type, c_white, c_yellow, c_orange);
+	part_type_alpha2(_type, 1.0, 0.0);
+	part_type_life(_type, 30, 30);
+	part_type_gravity(_type, 1, 270);
+
+	part_particles_create(_part, x, y, _type, 12);
+
+	part_type_destroy(_type);
+	part_system_destroy(_part);
+}

scripts/ParticleEffects/ParticleEffects.yy

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

scripts/PlayerStates/PlayerStates.gml

@@ -53,7 +53,9 @@ function player_status_update()
 	if !instance_exists(current_hb)
 		current_hb = noone;
 	
-	/**/
+	if state != state_focus
+		INK_blend = 0;
+
 	image_index += animation_spd;
 	
 	if oMain._dash
@@ -467,6 +469,7 @@ function state_attack()
 	player_check_movement();
 	player_check_jump();
 	player_check_dash();
+	player_check_focus();
 	
     y_spd += player_calc_gravity();
 	

scripts/SL/SL.gml

@@ -4,7 +4,7 @@ function get_default_save_data()
 	{
 		player:
 		{
-			maxHP: 1,
+			maxHP: 6,
 			maxINK: 9,
 			Credit: 0,
 			

sprites/sBossHexMask/sBossHexMask.yy

@@ -1,109 +0,0 @@
-{
-  "$GMSprite":"v2",
-  "%Name":"sBossHexMask",
-  "bboxMode":0,
-  "bbox_bottom":215,
-  "bbox_left":0,
-  "bbox_right":215,
-  "bbox_top":0,
-  "collisionKind":2,
-  "collisionTolerance":0,
-  "DynamicTexturePage":false,
-  "edgeFiltering":false,
-  "For3D":false,
-  "frames":[
-    {"$GMSpriteFrame":"v1","%Name":"eece6a41-a8f3-4e33-b519-060097baf368","name":"eece6a41-a8f3-4e33-b519-060097baf368","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
-  ],
-  "gridX":0,
-  "gridY":0,
-  "height":216,
-  "HTile":false,
-  "layers":[
-    {"$GMImageLayer":"","%Name":"6b9701e4-db4a-44cb-947f-7ef6e92e0c3e","blendMode":0,"displayName":"default","isLocked":false,"name":"6b9701e4-db4a-44cb-947f-7ef6e92e0c3e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
-  ],
-  "name":"sBossHexMask",
-  "nineSlice":{
-    "$GMNineSliceData":"",
-    "bottom":0,
-    "enabled":false,
-    "guideColour":[4294902015,4294902015,4294902015,4294902015,],
-    "highlightColour":1728023040,
-    "highlightStyle":0,
-    "left":0,
-    "resourceType":"GMNineSliceData",
-    "resourceVersion":"2.0",
-    "right":0,
-    "tileMode":[
-      0,
-      0,
-      0,
-      0,
-      0,
-    ],
-    "top":0,
-  },
-  "origin":4,
-  "parent":{
-    "name":"oBossHex",
-    "path":"folders/Enemy/oBossHex.yy",
-  },
-  "preMultiplyAlpha":false,
-  "resourceType":"GMSprite",
-  "resourceVersion":"2.0",
-  "sequence":{
-    "$GMSequence":"v1",
-    "%Name":"sBossHexMask",
-    "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":"sBossHexMask",
-    "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":"eece6a41-a8f3-4e33-b519-060097baf368","path":"sprites/sBossHexMask/sBossHexMask.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
-              },"Disabled":false,"id":"7cf6e5ff-fb85-481b-afb0-f80e4c0050d4","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":108,
-    "yorigin":108,
-  },
-  "swatchColours":null,
-  "swfPrecision":0.5,
-  "textureGroupId":{
-    "name":"Default",
-    "path":"texturegroups/Default",
-  },
-  "type":0,
-  "VTile":false,
-  "width":216,
-}