diff --git a/app/scenes/gameplay.rb b/app/scenes/gameplay.rb index e7c1aed..c700303 100644 --- a/app/scenes/gameplay.rb +++ b/app/scenes/gameplay.rb @@ -31,21 +31,14 @@ class GameplayScene < SceneInstance end def tick_pause_button(args) - pause_button = { - x: 72.from_right, - y: 72.from_top, - w: 52, - h: 52, - path: Sprite.for(:pause) - } - pause_rect = pause_button.dup + rect = { x: 72.from_right, y: 72.from_top, w: 52, h: 52 } + Sprite.for(:pause).render(args, rect) + pause_rect = rect.dup pause_padding = 12 pause_rect.x -= pause_padding pause_rect.y -= pause_padding pause_rect.w += pause_padding * 2 pause_rect.h += pause_padding * 2 return pause(args) if args.inputs.mouse.down && args.inputs.mouse.inside_rect?(pause_rect) - - args.outputs.sprites << pause_button end end diff --git a/app/scenes/menu.rb b/app/scenes/menu.rb index aa38b80..1622b0c 100644 --- a/app/scenes/menu.rb +++ b/app/scenes/menu.rb @@ -17,7 +17,7 @@ class MenuScene < SceneInstance current_option_i: 0, hold_delay: 0 } - @spacer ||= mobile? ? 100 : 80 + @spacer ||= 80 @menu_options ||= menu_options @menu_y = opts.menu_y._?(440) @title ||= title @@ -72,7 +72,7 @@ class MenuScene < SceneInstance end button_border = { w: 340, h: 80, x: l.x - 170, y: l.y - 55 }.merge(WHITE) - (args.outputs.borders << button_border) if mobile? + # (args.outputs.borders << button_border) if mobile? if args.inputs.mouse.up && args.inputs.mouse.inside_rect?(button_border) o = @menu_options.find { |o| o[:key] == l[:key] } Sound.play(args, :menu) diff --git a/metadata/icon.png b/metadata/icon.png index e20e8c2..3e2fccd 100644 Binary files a/metadata/icon.png and b/metadata/icon.png differ diff --git a/package.bat b/package.bat index 00d3efa..5cfebe0 100644 --- a/package.bat +++ b/package.bat @@ -5,4 +5,20 @@ for %%I in (.) do set CurrDirName=%%~nxI cd .. @echo on -dragonruby-publish --only-package %CurrDirName% \ No newline at end of file +dragonruby-publish --only-package %CurrDirName% +@echo off +cd builds +if not exist ./%CurrDirName%.keystore ( + echo "no keystore, generating keys" + keytool -genkey -v -keystore %CurrDirName%.keystore -alias %CurrDirName% -keyalg RSA -keysize 2048 -validity 10000 +) +if exist ./%CurrDirName%-android.apk ( + echo "Signing apk..." + call "C:\Program Files (x86)\Android\android-sdk\build-tools\32.0.0\apksigner.bat" sign -ks %CurrDirName%.keystore %CurrDirName%-android.apk +) else ( + ECHO "no apk?" + ECHO ./%CurrDirName%-android.apk +) +ECHO "All done!" +explorer.exe %cd% +PAUSE \ No newline at end of file