diff --git a/addons/admob/admob.gd b/addons/admob/admob.gd index 6a4bd53..c8e7465 100644 --- a/addons/admob/admob.gd +++ b/addons/admob/admob.gd @@ -31,7 +31,7 @@ var ios_download_path := "res://addons/admob/downloads/ios/" var default_download_path := "res://addons/admob/downloads/" var current_download_path := default_download_path var godot_version := "v" + str(Engine.get_version_info().major) + "." + str(Engine.get_version_info().minor) + "." + str(Engine.get_version_info().patch) -var plugin_version := get_plugin_version() +var plugin_version := PoingAdMobVersionHelper.get_plugin_version() var version_support := { "android": "v3.0.2", @@ -44,7 +44,6 @@ enum Items { GitHub } - class PoingAdMobEditorExportPlugin extends EditorExportPlugin: const CFG_FILE_PATH := "res://addons/admob/plugin.cfg" @@ -102,7 +101,7 @@ func _exit_tree(): func _request_version_support(): - var url = "https://raw.githubusercontent.com/Poing-Studios/godot-admob-versions/" + get_plugin_version() + "/versions.json" + var url = "https://raw.githubusercontent.com/Poing-Studios/godot-admob-versions/" + plugin_version + "/versions.json" var http_request = HTTPRequest.new() http_request.request_completed.connect(_on_version_support_request_completed) add_child(http_request) @@ -179,7 +178,7 @@ func _on_popupmenu_id_pressed(id : int): var path_directory = ProjectSettings.globalize_path(default_download_path) OS.shell_open(str("file://", path_directory)) Items.GitHub: - OS.shell_open("https://github.com/Poing-Studios/godot-admob-plugin/tree/" + get_plugin_version()) + OS.shell_open("https://github.com/Poing-Studios/godot-admob-plugin/tree/" + plugin_version) func show_download_percent(url_download: String = ""): if not url_download.is_empty(): diff --git a/addons/admob/assets/android.png.import b/addons/admob/assets/android.png.import index 8cd7f04..ab2761c 100644 --- a/addons/admob/assets/android.png.import +++ b/addons/admob/assets/android.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/android.png-fb2caea48032eea3d74244daf04c3454. [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/admob/assets/format-app-open.svg.import b/addons/admob/assets/format-app-open.svg.import index eb33485..a0e8b21 100644 --- a/addons/admob/assets/format-app-open.svg.import +++ b/addons/admob/assets/format-app-open.svg.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/format-app-open.svg-09f678ee2c2c062157f34ba08 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/admob/assets/format-banner.svg.import b/addons/admob/assets/format-banner.svg.import index 6f9ee86..1a82712 100644 --- a/addons/admob/assets/format-banner.svg.import +++ b/addons/admob/assets/format-banner.svg.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/format-banner.svg-fa375daddf415dc3be42b87fb2a [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/admob/assets/format-interstitial.svg.import b/addons/admob/assets/format-interstitial.svg.import index 0c2f659..09ac68c 100644 --- a/addons/admob/assets/format-interstitial.svg.import +++ b/addons/admob/assets/format-interstitial.svg.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/format-interstitial.svg-068610673c8c89ff9e1c9 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/admob/assets/format-native.svg.import b/addons/admob/assets/format-native.svg.import index 3cdec03..2a215fd 100644 --- a/addons/admob/assets/format-native.svg.import +++ b/addons/admob/assets/format-native.svg.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/format-native.svg-bcde3b00cc17049b22902f31b65 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/admob/assets/format-rewarded-interstitial.svg.import b/addons/admob/assets/format-rewarded-interstitial.svg.import index e5afb4e..b23389f 100644 --- a/addons/admob/assets/format-rewarded-interstitial.svg.import +++ b/addons/admob/assets/format-rewarded-interstitial.svg.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/format-rewarded-interstitial.svg-e572976a0c09 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/admob/assets/icon-1024.png.import b/addons/admob/assets/icon-1024.png.import old mode 100755 new mode 100644 index 08caaa1..9ebbe3c --- a/addons/admob/assets/icon-1024.png.import +++ b/addons/admob/assets/icon-1024.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/icon-1024.png-2958e8f3e03f08146a840475cdd3cd6 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/admob/assets/icon-120.png.import b/addons/admob/assets/icon-120.png.import old mode 100755 new mode 100644 index 2217fef..ceadce2 --- a/addons/admob/assets/icon-120.png.import +++ b/addons/admob/assets/icon-120.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/icon-120.png-f1130a47a81f19626ca0e688a5d38d3a [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/admob/assets/icon-15.png.import b/addons/admob/assets/icon-15.png.import old mode 100755 new mode 100644 index f775cfa..bd16c5e --- a/addons/admob/assets/icon-15.png.import +++ b/addons/admob/assets/icon-15.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/icon-15.png-befc05bf38293c8cfe2bd393c6e153c6. [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/admob/assets/icon-500.png.import b/addons/admob/assets/icon-500.png.import old mode 100755 new mode 100644 index 18779f4..c12c4d6 --- a/addons/admob/assets/icon-500.png.import +++ b/addons/admob/assets/icon-500.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/icon-500.png-551469a97496c83ff13bc47c2b1cdefa [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/admob/assets/icon-76.png.import b/addons/admob/assets/icon-76.png.import old mode 100755 new mode 100644 index 90b9bb6..d626c4b --- a/addons/admob/assets/icon-76.png.import +++ b/addons/admob/assets/icon-76.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/icon-76.png-81101785e7e41d0daa72dddaf6f4956f. [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/admob/assets/ios.png.import b/addons/admob/assets/ios.png.import index 22c76d1..ccc78bd 100644 --- a/addons/admob/assets/ios.png.import +++ b/addons/admob/assets/ios.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/ios.png-09946c77d84d877ee235a3ef7222fc0c.ctex [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/admob/assets/music.ogg.import b/addons/admob/assets/music.ogg.import old mode 100755 new mode 100644 diff --git a/addons/admob/assets/poing.jpeg.import b/addons/admob/assets/poing.jpeg.import old mode 100755 new mode 100644 index fcab5d0..c4a1986 --- a/addons/admob/assets/poing.jpeg.import +++ b/addons/admob/assets/poing.jpeg.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/poing.jpeg-b1ae7a0b5e3bb646b5b1cf5ae07e3b86.c [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/admob/plugin.cfg b/addons/admob/plugin.cfg index 6f67b5a..f681ced 100644 --- a/addons/admob/plugin.cfg +++ b/addons/admob/plugin.cfg @@ -3,5 +3,5 @@ name="AdMob" description="The AdMob Plugin for Android and iOS." author="Poing Studios" -version="v3.0.1" +version="v3.0.2" script="admob.gd" diff --git a/addons/admob/version_helper.gd b/addons/admob/version_helper.gd index 28d85a2..49ba3dc 100644 --- a/addons/admob/version_helper.gd +++ b/addons/admob/version_helper.gd @@ -27,7 +27,7 @@ static var version_formated : String = _get_plugin_version_formated() : set(value): version_formated = _get_plugin_version_formated() -static func _get_plugin_version_formated() -> String: +static func get_plugin_version() -> String: var plugin_config_file := ConfigFile.new() var version: String = "v3.0.1" #redundancy @@ -36,6 +36,11 @@ static func _get_plugin_version_formated() -> String: else: push_error("Failed to load plugin.cfg") + return version + +static func _get_plugin_version_formated() -> String: + var version := get_plugin_version() + var pattern = RegEx.new() pattern.compile("(?:v)?(\\d+\\.\\d+\\.\\d+)")