mirror of
https://github.com/MartinKral/Slash-The-Hordes
synced 2025-10-09 00:26:04 +00:00
Settings and translation into app root
This commit is contained in:
@@ -37,8 +37,6 @@ export class Game extends Component {
|
||||
@property(GameUI) private gameUI: GameUI;
|
||||
@property(Background) private background: Background;
|
||||
@property(ModalWindowManager) private modalWindowManager: ModalWindowManager;
|
||||
@property(JsonAsset) private settingsAsset: JsonAsset;
|
||||
@property(JsonAsset) private translationAsset: JsonAsset;
|
||||
|
||||
private playerCollisionSystem: PlayerCollisionSystem;
|
||||
private haloProjectileLauncher: HaloProjectileLauncher;
|
||||
@@ -59,9 +57,7 @@ export class Game extends Component {
|
||||
this.gamePauser.pause();
|
||||
}
|
||||
|
||||
public async playGame(userData: UserData): Promise<GameResult> {
|
||||
const translationData = <TranslationData>this.translationAsset.json;
|
||||
const settings = <GameSettings>this.settingsAsset.json;
|
||||
public async playGame(userData: UserData, settings: GameSettings, translationData: TranslationData): Promise<GameResult> {
|
||||
const metaUpgrades = new MetaUpgrades(userData.game.metaUpgrades, settings.metaUpgrades);
|
||||
|
||||
this.virtualJoystic.init();
|
||||
|
@@ -1,4 +1,5 @@
|
||||
import { CCInteger, Component, _decorator } from "cc";
|
||||
import { approx, CCInteger, Component, _decorator } from "cc";
|
||||
import { AppRoot } from "../AppRoot/AppRoot";
|
||||
import { GameRunner } from "../Menu/GameRunner";
|
||||
import { delay } from "../Services/Utils/AsyncUtils";
|
||||
import { UserData } from "./Data/UserData";
|
||||
@@ -20,7 +21,7 @@ export class TestGameRunner extends Component {
|
||||
}
|
||||
|
||||
public async playTestGameAsync(): Promise<void> {
|
||||
while (Game.Instance == null) await delay(100);
|
||||
while (Game.Instance == null || AppRoot.Instance == null) await delay(100);
|
||||
|
||||
const testUserData = new UserData();
|
||||
testUserData.game.metaUpgrades.maxHpLevel = this.maxHpLevel;
|
||||
@@ -29,6 +30,6 @@ export class TestGameRunner extends Component {
|
||||
testUserData.game.metaUpgrades.movementSpeedLevel = this.movementSpeedLevel;
|
||||
testUserData.game.metaUpgrades.xpGathererLevel = this.xpGathererLevel;
|
||||
testUserData.game.metaUpgrades.goldGathererLevel = this.goldGathererLevel;
|
||||
Game.Instance.playGame(testUserData);
|
||||
Game.Instance.playGame(testUserData, AppRoot.Instance.Settings, AppRoot.Instance.TranslationData);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user