update godot + font

sakkaku-dev · Nov 3, 2024 · b73687b · b73687b
1 parent 2b40e46
commit b73687b
Show file tree

Hide file tree

Showing 14 changed files with 162 additions and 172 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
   build-release:
     runs-on: ubuntu-latest
     container:
-      image: barichello/godot-ci:3.4.2
+      image: barichello/godot-ci:3.6
     strategy:
       matrix:
         # Remove channel if not releasing (Available: win, linux, mac, web, android)
@@ -46,21 +46,21 @@ jobs:
       - name: Build
         run: ./scripts/build-channel.sh $CHANNEL
 
-      - name: Publish Itch
-        if: env.BUTLER_API_KEY && env.GAME && !contains(github.ref, '-pre')
-        shell: bash
-        env:
-          BUTLER_API_KEY: ${{secrets.BUTLER_API_KEY}}
-          USER: ${{secrets.ITCHIO_USER}}
-        run: butler push build/$CHANNEL kuma-gee/$GAME:$CHANNEL --userversion ${GITHUB_REF/refs\/tags\//}
+      # - name: Publish Itch
+      #   if: env.BUTLER_API_KEY && env.GAME && !contains(github.ref, '-pre')
+      #   shell: bash
+      #   env:
+      #     BUTLER_API_KEY: ${{secrets.BUTLER_API_KEY}}
+      #     USER: ${{secrets.ITCHIO_USER}}
+      #   run: butler push build/$CHANNEL kuma-gee/$GAME:$CHANNEL --userversion ${GITHUB_REF/refs\/tags\//}
 
-      - name: Package builds
-        if: |
-          env.CHANNEL != 'android' &&
-          env.CHANNEL != 'mac'
-        run: |
-          cd build
-          mv $CHANNEL $GAME && zip -r $GAME-$CHANNEL.zip $GAME
+      # - name: Package builds
+      #   if: |
+      #     env.CHANNEL != 'android' &&
+      #     env.CHANNEL != 'mac'
+      #   run: |
+      #     cd build
+      #     mv $CHANNEL $GAME && zip -r $GAME-$CHANNEL.zip $GAME
 
       # Upload exported build
       - name: Upload artifacts

diff --git a/export_presets.cfg b/export_presets.cfg
@@ -35,127 +35,30 @@ progressive_web_app/background_color=Color( 0, 0, 0, 1 )
 
 [preset.1]
 
-name="win"
-platform="Windows Desktop"
-runnable=true
-custom_features=""
-export_filter="all_resources"
-include_filter="scene.dat"
-exclude_filter="addons/WAT/*,tests/*,script_templates/*,addons/**/*Test.gd"
-export_path="build/win/main.exe"
-script_export_mode=1
-script_encryption_key=""
-
-[preset.1.options]
-
-custom_template/debug=""
-custom_template/release=""
-binary_format/64_bits=true
-binary_format/embed_pck=false
-texture_format/bptc=false
-texture_format/s3tc=true
-texture_format/etc=false
-texture_format/etc2=false
-texture_format/no_bptc_fallbacks=true
-codesign/enable=false
-codesign/identity=""
-codesign/password=""
-codesign/timestamp=true
-codesign/timestamp_server_url=""
-codesign/digest_algorithm=1
-codesign/description=""
-codesign/custom_options=PoolStringArray(  )
-application/icon=""
-application/file_version=""
-application/product_version=""
-application/company_name=""
-application/product_name=""
-application/file_description=""
-application/copyright=""
-application/trademarks=""
-
-[preset.2]
-
-name="linux"
-platform="Linux/X11"
-runnable=true
-custom_features=""
-export_filter="all_resources"
-include_filter="scene.dat"
-exclude_filter="addons/WAT/*,tests/*,script_templates/*,addons/**/*Test.gd"
-export_path="build/linux/main.x86_64"
-script_export_mode=1
-script_encryption_key=""
-
-[preset.2.options]
-
-custom_template/debug=""
-custom_template/release=""
-binary_format/64_bits=true
-binary_format/embed_pck=false
-texture_format/bptc=false
-texture_format/s3tc=true
-texture_format/etc=false
-texture_format/etc2=false
-texture_format/no_bptc_fallbacks=true
-
-[preset.3]
-
-name="mac"
-platform="Mac OSX"
-runnable=true
-custom_features=""
-export_filter="all_resources"
-include_filter="scene.dat"
-exclude_filter="addons/WAT/*,tests/*,script_templates/*,addons/**/*Test.gd"
-export_path="build/mac/mac.zip"
-script_export_mode=1
-script_encryption_key=""
-
-[preset.3.options]
-
-custom_template/debug=""
-custom_template/release=""
-application/name="japanese"
-application/info="Made with Godot Engine"
-application/icon=""
-application/identifier="io.github.myin142"
-application/signature=""
-application/app_category="Games"
-application/short_version="1.0"
-application/version="1.0"
-application/copyright=""
-display/high_res=false
-privacy/camera_usage_description=""
-privacy/microphone_usage_description=""
-texture_format/s3tc=true
-texture_format/etc=false
-texture_format/etc2=false
-
-[preset.4]
-
 name="android"
 platform="Android"
 runnable=true
 custom_features=""
 export_filter="all_resources"
 include_filter="scene.dat"
 exclude_filter="addons/WAT/*,tests/*,script_templates/*,addons/**/*Test.gd"
-export_path="build/android/main.aab"
+export_path="build/android/main.apk"
 script_export_mode=1
 script_encryption_key=""
 
-[preset.4.options]
+[preset.1.options]
 
 custom_template/debug=""
 custom_template/release=""
-custom_template/use_custom_build=true
-custom_template/export_format=1
+custom_build/use_custom_build=false
+custom_build/export_format=0
+custom_build/min_sdk=""
+custom_build/target_sdk=""
 architectures/armeabi-v7a=true
 architectures/arm64-v8a=true
 architectures/x86=false
 architectures/x86_64=false
-keystore/debug="debug.keystore"
+keystore/debug="/home/myin/Android/debug.keystore"
 keystore/debug_user="androiddebugkey"
 keystore/debug_password="android"
 keystore/release=""
@@ -164,8 +67,6 @@ keystore/release_password=""
 one_click_deploy/clear_previous_install=false
 version/code=1
 version/name="1.0"
-version/min_sdk=19
-version/target_sdk=30
 package/unique_name="io.github.kumagee.$genname"
 package/name=""
 package/signed=true
@@ -175,7 +76,6 @@ package/exclude_from_recents=false
 launcher_icons/main_192x192=""
 launcher_icons/adaptive_foreground_432x432=""
 launcher_icons/adaptive_background_432x432=""
-graphics/32_bits_framebuffer=true
 graphics/opengl_debug=false
 xr_features/xr_mode=0
 xr_features/hand_tracking=0
@@ -264,6 +164,7 @@ permissions/location_hardware=false
 permissions/manage_accounts=false
 permissions/manage_app_tokens=false
 permissions/manage_documents=false
+permissions/manage_external_storage=false
 permissions/master_clear=false
 permissions/media_content_control=false
 permissions/modify_audio_settings=false
@@ -272,6 +173,7 @@ permissions/mount_format_filesystems=false
 permissions/mount_unmount_filesystems=false
 permissions/nfc=false
 permissions/persistent_activity=false
+permissions/post_notifications=false
 permissions/process_outgoing_calls=false
 permissions/read_calendar=false
 permissions/read_call_log=false

diff --git a/project.godot b/project.godot
@@ -40,7 +40,7 @@ _global_script_classes=[ {
 "path": "res://scenes/gui/FinalScore.gd"
 }, {
 "base": "KinematicBody2D",
-"class": "Geometry",
+"class": "GeometryShape",
 "language": "GDScript",
 "path": "res://scenes/geometry/Geometry.gd"
 }, {
@@ -54,7 +54,7 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://scenes/health/HealthBar.gd"
 }, {
-"base": "Reference",
+"base": "TextureRect",
 "class": "HitBorder",
 "language": "GDScript",
 "path": "res://scenes/gui/HitBorder.gd"
@@ -126,7 +126,7 @@ _global_script_class_icons={
 "Effect": "",
 "FadeEffect": "",
 "FinalScore": "",
-"Geometry": "",
+"GeometryShape": "",
 "GeometrySpawner": "",
 "HealthBar": "",
 "HitBorder": "",
@@ -168,11 +168,7 @@ window/stretch/aspect="keep_width"
 [global]
 
 window=false
-
-[gui]
-
-theme/custom="res://theme/theme.tres"
-theme/custom_font="res://theme/jackeyfont.tres"
+android=false
 
 [physics]
 

diff --git a/scenes/Main.gd b/scenes/Main.gd
@@ -35,7 +35,7 @@ func _start_game():
 	get_tree().paused = false
 
 
-func _get_close_enough_geometry() -> Geometry:
+func _get_close_enough_geometry() -> GeometryShape:
 	var outlines_threshold = 200
 #	var outlines_min = outlines.rect_global_position.y - outlines_threshold
 	var outlines_max = outlines.global_position.y + outlines_threshold

diff --git a/scenes/Main.tscn b/scenes/Main.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=2]
+[gd_scene load_steps=15 format=2]
 
 [ext_resource path="res://scenes/geometry/GeometrySpawner.tscn" type="PackedScene" id=1]
 [ext_resource path="res://src/InputReader.gd" type="Script" id=2]
@@ -13,6 +13,7 @@
 [ext_resource path="res://scenes/MainCamera.gd" type="Script" id=11]
 [ext_resource path="res://scenes/gui/HitBorder.tscn" type="PackedScene" id=12]
 [ext_resource path="res://scenes/gui/GameOver.tscn" type="PackedScene" id=13]
+[ext_resource path="res://theme/theme.tres" type="Theme" id=14]
 
 [node name="Main" type="Node2D"]
 pause_mode = 2
@@ -103,9 +104,7 @@ script = ExtResource( 2 )
 [node name="Control" type="Control" parent="CanvasLayer"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-__meta__ = {
-"_edit_use_anchors_": false
-}
+theme = ExtResource( 14 )
 
 [node name="HitBorder" parent="CanvasLayer/Control" instance=ExtResource( 12 )]
 margin_right = 1080.0
@@ -118,9 +117,9 @@ anchor_bottom = 1.0
 [node name="ScoreType" parent="CanvasLayer/Control/CenterContainer" instance=ExtResource( 8 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 885.0
+margin_top = 876.0
 margin_right = 1080.0
-margin_bottom = 1035.0
+margin_bottom = 1044.0
 
 [node name="TopBar" type="MarginContainer" parent="CanvasLayer/Control"]
 anchor_right = 1.0
@@ -136,26 +135,26 @@ __meta__ = {
 margin_left = 20.0
 margin_top = 20.0
 margin_right = 1060.0
-margin_bottom = 85.0
+margin_bottom = 94.0
 
 [node name="HealthBar" parent="CanvasLayer/Control/TopBar/HBoxContainer" instance=ExtResource( 7 )]
 margin_right = 0.0
-margin_bottom = 65.0
+margin_bottom = 74.0
 
 [node name="Control" type="Control" parent="CanvasLayer/Control/TopBar/HBoxContainer"]
 margin_left = 4.0
-margin_right = 999.0
-margin_bottom = 65.0
+margin_right = 1000.0
+margin_bottom = 74.0
 size_flags_horizontal = 3
 
 [node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/Control/TopBar/HBoxContainer"]
-margin_left = 1003.0
+margin_left = 1004.0
 margin_right = 1040.0
-margin_bottom = 65.0
+margin_bottom = 74.0
 
 [node name="Score" type="Label" parent="CanvasLayer/Control/TopBar/HBoxContainer/VBoxContainer"]
-margin_right = 37.0
-margin_bottom = 65.0
+margin_right = 36.0
+margin_bottom = 74.0
 text = "0"
 align = 2
 

diff --git a/scenes/Start.tscn b/scenes/Start.tscn
@@ -1,14 +1,16 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://src/ThemeOverride.gd" type="Script" id=1]
 [ext_resource path="res://scenes/Start.gd" type="Script" id=2]
 [ext_resource path="res://src/effect/MoveEffect.gd" type="Script" id=3]
 [ext_resource path="res://scenes/Main.tscn" type="PackedScene" id=4]
 [ext_resource path="res://src/effect/TweenEffect.gd" type="Script" id=5]
+[ext_resource path="res://theme/theme.tres" type="Theme" id=6]
 
 [node name="Start" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
+theme = ExtResource( 6 )
 script = ExtResource( 2 )
 main_scene = ExtResource( 4 )
 
@@ -20,31 +22,31 @@ __meta__ = {
 }
 
 [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
-margin_left = 316.0
-margin_top = 762.0
-margin_right = 763.0
-margin_bottom = 1157.0
+margin_left = 342.0
+margin_top = 749.0
+margin_right = 738.0
+margin_bottom = 1171.0
 custom_constants/separation = 100
 
 [node name="Title" type="Label" parent="CenterContainer/VBoxContainer"]
 self_modulate = Color( 1.2, 1.2, 1.2, 1 )
-margin_right = 447.0
-margin_bottom = 65.0
+margin_right = 396.0
+margin_bottom = 74.0
 text = "Geometry Tap"
 align = 1
 script = ExtResource( 1 )
 relative_font_size = 1.5
 
 [node name="HighScore" type="Label" parent="CenterContainer/VBoxContainer"]
-margin_top = 165.0
-margin_right = 447.0
-margin_bottom = 230.0
+margin_top = 174.0
+margin_right = 396.0
+margin_bottom = 248.0
 align = 1
 
 [node name="Start" type="Label" parent="CenterContainer/VBoxContainer"]
-margin_top = 330.0
-margin_right = 447.0
-margin_bottom = 395.0
+margin_top = 348.0
+margin_right = 396.0
+margin_bottom = 422.0
 text = "Tap to start"
 align = 1