diff --git a/build.gradle b/build.gradle index 11fdf1fb0994e578499014194d912f33d07c5c7a..cee4938433e9098e9076f7916c70e8085b4e11f6 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.2' + classpath 'com.android.tools.build:gradle:8.3.0' classpath 'com.google.gms:google-services:4.4.1' diff --git a/core/src/com/wordbattle/game/WordBattle.java b/core/src/com/wordbattle/game/WordBattle.java index 6c4f20a8302601954f95dddf9c28699611b08169..5ace65822848450806ad0a809589eed1198bdf2f 100644 --- a/core/src/com/wordbattle/game/WordBattle.java +++ b/core/src/com/wordbattle/game/WordBattle.java @@ -7,6 +7,7 @@ import com.badlogic.gdx.utils.ScreenUtils; import com.wordbattle.game.model.CreateWords; import com.wordbattle.game.network.FirebaseInterface; import com.wordbattle.game.states.MainMenuState; +import com.wordbattle.game.states.StartState; import com.wordbattle.game.states.StateManager; import com.wordbattle.game.manager.SoundManager; import com.wordbattle.game.manager.MusicManager; @@ -33,7 +34,7 @@ public class WordBattle extends ApplicationAdapter { // CreateWords createWords = new CreateWords(_FBIC); // createWords.updateDB(); ScreenUtils.clear(1, 0, 0, 1); - stateManager.setState(new MainMenuState(stateManager, _FBIC)); // Set the main menu as the initial state + stateManager.setState(new StartState(stateManager,_FBIC)); // Set the main menu as the initial state MusicManager.initialize(); MusicManager.playMusic(); SoundManager.initialize(); diff --git a/core/src/com/wordbattle/game/controller/StartController.java b/core/src/com/wordbattle/game/controller/StartController.java index ab7fe227ee1ff5c5fab33ea118b1384d652f16e7..d77b99d6b9475eb3cc8c27efba48503720ada432 100644 --- a/core/src/com/wordbattle/game/controller/StartController.java +++ b/core/src/com/wordbattle/game/controller/StartController.java @@ -13,11 +13,18 @@ public class StartController { StartView startView; + float timer; + + float loadingTime; + public StartController(StartState state) { this.state = state; startView= new StartView(state.getCam()); + timer=0; + loadingTime= 2; + } @@ -34,6 +41,11 @@ public class StartController { public void update(float dt){ handleInput(); + timer+=dt; + if (timer>=loadingTime){ + state.getStateManager().setState(new MainMenuState(state.getStateManager(), state.get_FBIC())); + } + } diff --git a/core/src/com/wordbattle/game/states/StartState.java b/core/src/com/wordbattle/game/states/StartState.java index 3f5aa7631d8330e84d85bcf6923e5fef9bef1536..29a0abb03f9d61abee6924e50dba16e4f7b130bf 100644 --- a/core/src/com/wordbattle/game/states/StartState.java +++ b/core/src/com/wordbattle/game/states/StartState.java @@ -5,15 +5,19 @@ import com.badlogic.gdx.utils.compression.lzma.Base; import com.wordbattle.game.WordBattle; import com.wordbattle.game.controller.MainMenuController; import com.wordbattle.game.controller.StartController; +import com.wordbattle.game.network.FirebaseInterface; public class StartState extends BaseState { StartController controller; + FirebaseInterface _FBIC; - public StartState(StateManager gsm) { + + public StartState(StateManager gsm, FirebaseInterface _FBIC) { super(gsm); this.controller = new StartController(this); // 'this' provides context + this._FBIC=_FBIC; cam.setToOrtho(false, WordBattle.WIDTH, WordBattle.HEIGHT); } @@ -39,6 +43,10 @@ public class StartState extends BaseState { return gsm; } + public FirebaseInterface get_FBIC() { + return _FBIC; + } + @Override public void enter() { diff --git a/core/src/com/wordbattle/game/view/LobbyView.java b/core/src/com/wordbattle/game/view/LobbyView.java index 30162167ccc73a793abfcfb0461750a049f84802..24ca3c8a7e0187ab160d7cf6806fc41f7515e4e6 100644 --- a/core/src/com/wordbattle/game/view/LobbyView.java +++ b/core/src/com/wordbattle/game/view/LobbyView.java @@ -20,6 +20,7 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion; import java.util.ArrayList; import java.util.List; + public class LobbyView { private Texture backgroundTexture; private BitmapFont font;