Compare commits

..

No commits in common. "4c75ed4eab2e92b7cba6cee09085d0deffbbe7b5" and "89fb70b923bbad9b46dbf1ce80b57c2b9dbffe61" have entirely different histories.

3 changed files with 11 additions and 24 deletions

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

@ -41,6 +41,7 @@ export class LoadingScene extends SceneBase {
this.loadImage("loading_bg", "arenas"); this.loadImage("loading_bg", "arenas");
this.loadImage("logo", ""); this.loadImage("logo", "");
this.loadImage("september-update", "events");
// Load menu images // Load menu images
this.loadAtlas("bg", "ui"); this.loadAtlas("bg", "ui");
@ -244,12 +245,7 @@ export class LoadingScene extends SceneBase {
} else { } else {
this.loadAtlas("types", ""); this.loadAtlas("types", "");
} }
const availableLangs = ["en"];
if (lang && availableLangs.includes(lang)) {
this.loadImage("september-update-"+lang, "events");
} else {
this.loadImage("september-update-en", "events");
}
this.loadAtlas("statuses", ""); this.loadAtlas("statuses", "");
this.loadAtlas("categories", ""); this.loadAtlas("categories", "");

View File

@ -1,6 +1,5 @@
import BattleScene from "#app/battle-scene"; import BattleScene from "#app/battle-scene.js";
import { TextStyle, addTextObject } from "#app/ui/text"; import { TextStyle, addTextObject } from "#app/ui/text.js";
import i18next from "i18next";
export enum EventType { export enum EventType {
SHINY, SHINY,
@ -8,11 +7,10 @@ export enum EventType {
} }
interface EventBanner { interface EventBanner {
bannerKey?: string; bannerFilename?: string;
xPosition?: number; xPosition?: number;
yPosition?: number; yPosition?: number;
scale?: number; scale?: number;
availableLangs?: string[];
} }
interface TimedEvent extends EventBanner { interface TimedEvent extends EventBanner {
@ -29,11 +27,10 @@ const timedEvents: TimedEvent[] = [
eventType: EventType.GENERIC, eventType: EventType.GENERIC,
startDate: new Date(Date.UTC(2024, 7, 28, 0)), startDate: new Date(Date.UTC(2024, 7, 28, 0)),
endDate: new Date(Date.UTC(2024, 8, 15, 0)), endDate: new Date(Date.UTC(2024, 8, 15, 0)),
bannerKey: "september-update", bannerFilename: "september-update",
xPosition: 19, xPosition: 19,
yPosition: 115, yPosition: 115,
scale: 0.30, scale: 0.30
availableLangs: ["en"]
} }
]; ];
@ -71,7 +68,7 @@ export class TimedEventManager {
} }
getEventBannerFilename(): string { getEventBannerFilename(): string {
return timedEvents.find((te: TimedEvent) => this.isActive(te))?.bannerKey!; // TODO: is this bang correct? return timedEvents.find((te: TimedEvent) => this.isActive(te))?.bannerFilename!; // TODO: is this bang correct?
} }
} }
@ -89,15 +86,9 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container {
} }
setup() { setup() {
const lang = i18next.resolvedLanguage; if (this.event && this.event.bannerFilename) {
if (this.event && this.event.bannerKey) { console.log(this.event.bannerFilename);
if (lang && this.event.availableLangs && this.event.availableLangs.length > 0) { this.banner = new Phaser.GameObjects.Image(this.scene, this.event.xPosition ?? 29, this.event.yPosition ?? 64, this.event.bannerFilename);
if (this.event.availableLangs.includes(lang)) {
this.event.bannerKey += "-"+lang;
}
}
console.log(this.event.bannerKey);
this.banner = new Phaser.GameObjects.Image(this.scene, this.event.xPosition ?? 29, this.event.yPosition ?? 64, this.event.bannerKey);
this.banner.setName("img-event-banner"); this.banner.setName("img-event-banner");
this.banner.setOrigin(0.08, -0.35); this.banner.setOrigin(0.08, -0.35);
this.banner.setScale(this.event.scale ?? 0.18); this.banner.setScale(this.event.scale ?? 0.18);