Commit: 9ae73c42e14ddd7add72673032c93f75f4bf6fe0 - SpaceRocket (hg)

Commit MetaInfo

• Revisión: 9ae73c42e14ddd7add72673032c93f75f4bf6fe0 (tree)
• Tiempo: 2022-04-07 22:55:42
• Autor: sebastian_bugiu
• Commiter: sebastian_bugiu

Log Message

Added buy menu when demo mode is enabled and score limit is reached.

Cambiar Resumen

• modified: core/src/com/headwayent/spacerocket/MainMenuActivity.java
• modified: core/src/com/headwayent/spacerocket/SpaceRocket.java
• modified: core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java
• modified: ios/robovm.properties
• add: core/src/com/headwayent/spacerocket/FullAccessActivity.java

Diferencia incremental

diff -r 14a7c47a320b -r 9ae73c42e14d core/src/com/headwayent/spacerocket/FullAccessActivity.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/src/com/headwayent/spacerocket/FullAccessActivity.java	Thu Apr 07 16:55:42 2022 +0300
@@ -0,0 +1,95 @@
+package com.headwayent.spacerocket;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.ScreenAdapter;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.ScreenUtils;
+import com.badlogic.gdx.utils.viewport.ScreenViewport;
+import com.headwayent.spacerocket.old.ExtendedCanvas;
+
+public class FullAccessActivity extends ScreenAdapter {
+
+    private final Stage stage;
+    private Label titleLabel;
+    private Label buyLabel;
+
+    public FullAccessActivity() {
+        stage = new Stage(new ScreenViewport());
+    }
+
+    @Override
+    public void show() {
+        super.show();
+
+        stage.clear();
+        Table table = new Table();
+//        table.setFillParent(true);
+        table.setWidth(ExtendedCanvas.getScreenWidth());
+        table.setY(40.0f);
+        table.setHeight(ExtendedCanvas.getScreenHeight() - 80.0f);
+        //table.setDebug(true);
+        stage.addActor(table);
+
+        Gdx.input.setInputProcessor(stage);
+
+        Skin skin = SpaceRocket.getGame().getSkin();
+
+        titleLabel = new Label("Options", skin);
+        titleLabel.setAlignment(Align.center);
+        buyLabel = new Label("Sound enabled", skin);
+        String buyString = "You are playing the demo version.\n" +
+                "If you want to bypass the score limitation " +
+                "please buy the full version of the game.";
+        titleLabel.setText("Buy full game");
+        buyLabel.setText(buyString);
+        buyLabel.setWrap(true);
+
+        ScrollPane scrollPane = new ScrollPane(buyLabel, skin);
+        scrollPane.setScrollingDisabled(true, false);
+
+        TextButton buy = Utility.createTextButton("Buy full version", skin);
+        final TextButton backButton = Utility.createTextButton("Done", skin); // the extra argument here "small" is used to set the button to the smaller version instead of the big default version
+
+        buy.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                MainMenuActivity.buyFullGame(stage);
+            }
+        });
+
+        backButton.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                SpaceRocket.getGame().changeScreen(SpaceRocket.Screen.HIGH_SCORE);
+            }
+        });
+
+        table.add(titleLabel).fillX().uniformX();
+        table.row().pad(10, 20, 10, 20);
+        table.add(scrollPane).expandX().fillX();
+        if (SpaceRocket.getGame().getPurchaseManager() != null) {
+            table.row().pad(10, 20, 0, 20);
+            table.add(buy).fillX().uniformX();
+        }
+        table.row().pad(10, 20, 10, 20);
+        table.add(backButton).fillX().uniformX();
+    }
+
+    @Override
+    public void render(float delta) {
+        super.render(delta);
+        ScreenUtils.clear(0, 0, 0, 1);
+
+        // tell our stage to do actions and draw itself
+        stage.act(Math.min(Gdx.graphics.getDeltaTime(), 1 / 30f));
+        stage.draw();
+    }
+}

diff -r 14a7c47a320b -r 9ae73c42e14d core/src/com/headwayent/spacerocket/MainMenuActivity.java
--- a/core/src/com/headwayent/spacerocket/MainMenuActivity.java	Sun Jan 30 09:33:48 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/MainMenuActivity.java	Thu Apr 07 16:55:42 2022 +0300
@@ -69,12 +69,12 @@
         table.add(help).fillX().uniformX();
         table.row().pad(10, 20, 0, 20);
         table.add(credits).fillX().uniformX();
-        table.row().pad(10, 20, 0, 20);
-        table.add(buy).fillX().uniformX();
         if (SpaceRocket.getGame().getPurchaseManager() != null) {
             table.row().pad(10, 20, 0, 20);
-            table.add(exit).fillX().uniformX();
+            table.add(buy).fillX().uniformX();
         }
+        table.row().pad(10, 20, 0, 20);
+        table.add(exit).fillX().uniformX();
 
         // create button listeners
         exit.addListener(new ChangeListener() {
@@ -130,13 +130,17 @@
         buy.addListener(new ChangeListener() {
             @Override
             public void changed(ChangeEvent event, Actor actor) {
-                new IAPShop(skin).show(stage);
+                buyFullGame(stage);
             }
         });
 
 //        SpaceRocket.getGame().changeScreen(SpaceRocket.Screen.SELECT_DIFFICULTY);
     }
 
+    public static void buyFullGame(Stage stage) {
+        new IAPShop(SpaceRocket.getGame().getSkin()).show(stage);
+    }
+
     @Override
     public void render(float delta) {
         super.render(delta);

diff -r 14a7c47a320b -r 9ae73c42e14d core/src/com/headwayent/spacerocket/SpaceRocket.java
--- a/core/src/com/headwayent/spacerocket/SpaceRocket.java	Sun Jan 30 09:33:48 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/SpaceRocket.java	Thu Apr 07 16:55:42 2022 +0300
@@ -46,6 +46,7 @@
 	private MultiplayerJoinGameActivity multiplayerJoinGameActivity;
 	private MultiplayerLobbyActivity multiplayerLobbyActivity;
 	private FinalResultsActivity finalResultsActivity;
+	private FullAccessActivity fullAccessActivity;
 	private Skin skin;
 	private AssetManager assetManager;
 
@@ -65,7 +66,7 @@
 		IN_GAME, MAIN_MENU, SELECT_DIFFICULTY, HIGH_SCORE,
 		OPTIONS, HELP, CREDITS, MULTIPLAYER_LOGIN, MULTIPLAYER_LOGGED_IN,
 		MULTIPLAYER_CREATE_GAME, MULTIPLAYER_JOIN_GAME, MULTIPLAYER_LOBBY,
-		MULTIPLAYER_ADD_FRIEND, FINAL_RESULTS
+		MULTIPLAYER_ADD_FRIEND, FINAL_RESULTS, FULL_ACCESS
 	}
 
 	public SpaceRocket(PurchaseManager purchaseManager) {
@@ -218,6 +219,12 @@
 				}
 				setScreen(finalResultsActivity);
 				break;
+			case FULL_ACCESS:
+				if (fullAccessActivity == null) {
+					fullAccessActivity = new FullAccessActivity();
+				}
+				setScreen(fullAccessActivity);
+				break;
 		}
 	}
 

diff -r 14a7c47a320b -r 9ae73c42e14d core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java
--- a/core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java	Sun Jan 30 09:33:48 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java	Thu Apr 07 16:55:42 2022 +0300
@@ -277,7 +277,10 @@
                 if(System.currentTimeMillis() - gameOverTime > 3000) {
                     setGameOver();
                     getStatus().setShowHighScore(true);
-                    SpaceRocket.getGame().changeScreen(SpaceRocket.Screen.HIGH_SCORE);
+                    SpaceRocket.getGame().changeScreen(
+                            Preferences.getInstance().isFullAccess() ?
+                                    SpaceRocket.Screen.HIGH_SCORE :
+                                    SpaceRocket.Screen.FULL_ACCESS);
                 }
             }
         }

diff -r 14a7c47a320b -r 9ae73c42e14d ios/robovm.properties
--- a/ios/robovm.properties	Sun Jan 30 09:33:48 2022 +0200
+++ b/ios/robovm.properties	Thu Apr 07 16:55:42 2022 +0300
@@ -2,5 +2,5 @@
 app.id=com.headwayent.spacerocket
 app.mainclass=com.headwayent.spacerocket.IOSLauncher
 app.executable=IOSLauncher
-app.build=18
+app.build=19
 app.name=Hotshot 2D