Merge remote-tracking branch 'github/master'
This commit is contained in:
commit
97c4f768d1
BIN
dist/shattered_sword_assets/sounds/sword_ding1.m4a
vendored
Normal file
BIN
dist/shattered_sword_assets/sounds/sword_ding1.m4a
vendored
Normal file
Binary file not shown.
|
@ -4,6 +4,7 @@ import InAir from "./InAir";
|
|||
import InputWrapper from "../../Tools/InputWrapper";
|
||||
import PlayerState from "./PlayerState";
|
||||
import { GameEventType } from "../../../Wolfie2D/Events/GameEventType";
|
||||
import { GameState } from "../../sword_enums";
|
||||
|
||||
export default class Fall extends InAir {
|
||||
owner: AnimatedSprite;
|
||||
|
@ -14,7 +15,9 @@ export default class Fall extends InAir {
|
|||
|
||||
update(deltaT: number): void {
|
||||
if (!PlayerState.dashTimer.isStopped()) {
|
||||
if(InputWrapper.getState() === GameState.GAMING){
|
||||
this.emitter.fireEvent(GameEventType.PLAY_SOUND, {key: "dash", loop: false, holdReference: false});
|
||||
}
|
||||
this.owner.animation.playIfNotAlready("DASH");
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -7,7 +7,7 @@ import InputWrapper from "../../Tools/InputWrapper";
|
|||
import { PlayerStates } from "../PlayerController";
|
||||
import InAir from "./InAir";
|
||||
import PlayerState from "./PlayerState";
|
||||
|
||||
import { GameState } from "../../sword_enums";
|
||||
export default class Jump extends InAir {
|
||||
owner: AnimatedSprite;
|
||||
|
||||
|
@ -19,7 +19,9 @@ export default class Jump extends InAir {
|
|||
|
||||
update(deltaT: number): void {
|
||||
if (!PlayerState.dashTimer.isStopped()) {
|
||||
if(InputWrapper.getState() === GameState.GAMING){
|
||||
this.emitter.fireEvent(GameEventType.PLAY_SOUND, {key: "dash", loop: false, holdReference: false});
|
||||
}
|
||||
this.owner.animation.playIfNotAlready("DASH");
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -5,6 +5,7 @@ import { PlayerStates } from "../PlayerController";
|
|||
import OnGround from "./OnGround";
|
||||
import PlayerState from "./PlayerState";
|
||||
import { GameEventType } from "../../../Wolfie2D/Events/GameEventType";
|
||||
import { GameState } from "../../sword_enums";
|
||||
|
||||
export default class Walk extends OnGround {
|
||||
owner: AnimatedSprite;
|
||||
|
@ -17,7 +18,9 @@ export default class Walk extends OnGround {
|
|||
|
||||
update(deltaT: number): void {
|
||||
if (!PlayerState.dashTimer.isStopped()) {
|
||||
if(InputWrapper.getState() === GameState.GAMING){
|
||||
this.emitter.fireEvent(GameEventType.PLAY_SOUND, {key: "dash", loop: false, holdReference: false});
|
||||
}
|
||||
this.owner.animation.playIfNotAlready("DASH");
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -163,7 +163,7 @@ export default class GameLevel extends Scene {
|
|||
this.load.audio("level_up","shattered_sword_assets/sounds/level_up.wav");
|
||||
//神社(じんじゃ)祭(まつり) by Second Dimension Imagination Group
|
||||
this.load.audio("level_music","shattered_sword_assets/sounds/bgm1.mp3");
|
||||
this.load.audio("sword","shattered_sword_assets/sounds/sword_ding.m4a");
|
||||
this.load.audio("sword","shattered_sword_assets/sounds/sword_ding1.m4a");
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user