Skip to content

Commit bfef1b4

Browse files
committed
Pimple Popper v1.7
1 parent 4853898 commit bfef1b4

File tree

46 files changed

+15304
-597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+15304
-597
lines changed

.DS_Store

8 KB
Binary file not shown.

Game.gd

+68-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
extends Node
2-
2+
onready var yodo1mas = $Yodo1Mas
33
onready var _animation = $AnimationPlayer
44
onready var _finish_popup = $finish_game_popup
55

6+
onready var debug_out = $CanvasLayer/Orange/DebugOut
67
# shows what tools can be used with each body part.
78
export(Dictionary) var tools_per_type:Dictionary
89

@@ -16,7 +17,6 @@ func _ready():
1617
for bp in nodes:
1718
bp.connect("bodypart_cleaned", self, "_on_bodypart_cleaned")
1819
_animation.play("fade_out")
19-
2020
_hints = get_tree().get_nodes_in_group("hint")
2121
hide_hints(hint_hided)
2222
# yield(get_tree(), "idle_frame")
@@ -27,7 +27,7 @@ func _ready():
2727
continue
2828
b.visible = tools_per_type[Global.type].has(b.name)
2929

30-
Yodo.load_interstitial_ads()
30+
#Yodo.load_interstitial_ads()
3131

3232
func hide_hints(hided: bool) -> void:
3333
for h in _hints:
@@ -94,13 +94,14 @@ func _on_animation_finished(anim: String) -> void:
9494

9595
func _on_hint_pressed():
9696
hint_hided = not hint_hided
97+
yodo1mas.show_interstitial_ad()
9798
hide_hints(hint_hided)
9899

99100

100101
func _on_anim_finished(finish_type):
101102
if finish_type == _finish_popup.finish_type.WIN:
102-
Yodo.show_interstitial_ad()
103-
yield(Yodo, "interstitial_ad_closed")
103+
yodo1mas.show_interstitial_ad()
104+
yield(yodo1mas, "interstitial_ad_closed")
104105
get_tree().change_scene("res://menu/main_screen.tscn")
105106

106107
func _input(event):
@@ -111,3 +112,65 @@ func _on_scroll_gui_input(event):
111112
if event is InputEventScreenTouch:
112113
print ("_gui_event scroll...")
113114
pass # Replace with function body.
115+
# callbacks from signals
116+
117+
func _on_Yodo1Mas_banner_ad_loaded():
118+
debug_out.text = debug_out.text + "Banner loaded\n"
119+
120+
func _on_Yodo1Mas_banner_failed_ad_loaded():
121+
debug_out.text = debug_out.text + "Banner not loaded\n"
122+
func _on_Yodo1Mas_banner_ad_opened():
123+
#add_coins(5)
124+
debug_out.text = debug_out.text + "Banner opened\n"
125+
126+
func _on_Yodo1Mas_banner_ad_failed_opened():
127+
#add_coins(5)
128+
debug_out.text = debug_out.text + "Banner not opened\n"
129+
130+
func _on_Yodo1Mas_banner_ad_closed():
131+
debug_out.text = debug_out.text + "Banner closed\n"
132+
133+
134+
135+
136+
func _on_Yodo1Mas_interstitial_ad_loaded():
137+
debug_out.text = debug_out.text + "Interstitial loaded\n"
138+
139+
func _on_Yodo1Mas_interstitial_ad_not_loaded():
140+
yodo1mas.load_interstitial_ads()
141+
debug_out.text = debug_out.text + "Interstitial not loaded\n"
142+
143+
func _on_Yodo1Mas_interstitial_ad_opened():
144+
debug_out.text = debug_out.text + "Interstitial opened\n"
145+
146+
func _on_Yodo1Mas_interstitial_ad_failed_to_opened():
147+
yodo1mas.load_interstitial_ads()
148+
debug_out.text = debug_out.text + "Interstitial not opened\n"
149+
150+
func _on_Yodo1Mas_interstitial_ad_closed():
151+
yodo1mas.load_interstitial_ads()
152+
#add_coins(10)
153+
debug_out.text = debug_out.text + "Interstitial closed\n"
154+
155+
156+
157+
func _on_Yodo1Mas_rewarded_ad_loaded():
158+
debug_out.text = debug_out.text + "Rewarded video loaded\n"
159+
160+
func _on_Yodo1Mas_rewarded_ad_not_loaded():
161+
yodo1mas.load_rewarded_ad()
162+
debug_out.text = debug_out.text + "Rewarded video not loaded\n"
163+
164+
func _on_Yodo1Mas_rewarded_ad_opened():
165+
debug_out.text = debug_out.text + "Rewarded video opened\n"
166+
167+
func _on_Yodo1Mas_rewarded_ad_failed_opened():
168+
yodo1mas.load_rewarded_ad()
169+
debug_out.text = debug_out.text + "Rewarded video not opened\n"
170+
func _on_Yodo1Mas_rewarded_ad_closed():
171+
yodo1mas.load_rewarded_ad()
172+
debug_out.text = debug_out.text + "Rewarded video closed\n"
173+
174+
func _on_Yodo1Mas_rewarded_ad_earned():
175+
#add_coins(15)
176+
debug_out.text = debug_out.text + "Rewarded video earned\n"

Global.gd

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ var _window_project_size: Vector2
115115
var relative_screen_size_x: float
116116

117117
var player_data: Dictionary = {
118-
'is_add_active': true
118+
'is_add_active': false
119119
}
120120

121121
func _ready():

android/.DS_Store

6 KB
Binary file not shown.

android/.build_version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.5.1.stable
1+
3.5.3.stable
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Sun Nov 20 17:57:20 COT 2022
2-
gradle.version=7.2
1+
#Mon Mar 04 17:46:01 PKT 2024
2+
gradle.version=7.4.2
Binary file not shown.

android/build/AndroidManifest.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
<!-- Any tag in this line after android:icon will be erased when doing custom builds. -->
2828
<!-- If you want to add tags manually, do before it. -->
2929
<!-- WARNING: This should stay on a single line until the parsing code is improved. See GH-32414. -->
30-
<application tools:replace="android:allowBackup,android:label" android:label="@string/godot_project_name_string" android:allowBackup="false" tools:ignore="GoogleAppIndexingWarning" android:requestLegacyExternalStorage="false" android:icon="@mipmap/icon">
30+
<application android:label="@string/godot_project_name_string" android:allowBackup="false" android:isGame="true" android:hasFragileUserData="false" android:requestLegacyExternalStorage="false" tools:ignore="GoogleAppIndexingWarning" android:icon="@mipmap/icon">
31+
3132
<!-- Records the version of the Godot editor used for building -->
3233
<meta-data
3334
android:name="org.godotengine.editor.version"
@@ -41,10 +42,6 @@
4142
android:name="xr_mode_metadata_name"
4243
android:value="xr_mode_metadata_value" />
4344

44-
<meta-data
45-
android:name="com.google.android.gms.ads.APPLICATION_ID"
46-
android:value="ca-app-pub-4973750815225055~4827496363"/>
47-
4845
<!-- XR hand tracking metadata -->
4946
<!-- This is modified by the exporter based on the selected xr mode. DO NOT CHANGE the values here. -->
5047
<!-- Removed at export time if the xr mode is not VR or hand tracking is disabled. -->
@@ -59,6 +56,9 @@
5956
android:name="xr_hand_tracking_version_name"
6057
android:value="xr_hand_tracking_version_value"/>
6158

59+
<meta-data
60+
android:name="com.google.android.gms.ads.APPLICATION_ID"
61+
android:value="ca-app-pub-4973750815225055~4827496363"/>
6262
<!-- Supported Meta devices -->
6363
<!-- This is removed by the exporter if the xr mode is not VR. -->
6464
<meta-data

android/build/build.gradle

+5-6
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ allprojects {
3030
repositories {
3131
google()
3232
mavenCentral()
33-
maven { url "https://android-sdk.is.com" }
34-
maven { url "https://artifact.bytedance.com/repository/pangle" }
35-
maven { url "https://sdk.tapjoy.com/" }
36-
maven { url "https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea" }
3733
//CHUNK_ALLPROJECTS_REPOSITORIES_BEGIN
3834
//CHUNK_ALLPROJECTS_REPOSITORIES_END
3935

36+
maven { url "https://artifact.bytedance.com/repository/pangle" }
37+
maven { url "https://android-sdk.is.com" }
38+
maven { url "https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea" }
39+
maven { url "https://artifactory.bidmachine.io/bidmachine" }
4040
// Godot user plugins custom maven repos
4141
String[] mavenRepos = getGodotPluginsMavenRepos()
4242
if (mavenRepos != null && mavenRepos.size() > 0) {
@@ -123,8 +123,7 @@ android {
123123
versionName getExportVersionName()
124124
minSdkVersion getExportMinSdkVersion()
125125
targetSdkVersion getExportTargetSdkVersion()
126-
multiDexEnabled true
127-
126+
128127
missingDimensionStrategy 'products', 'template'
129128
//CHUNK_ANDROID_DEFAULTCONFIG_BEGIN
130129
//CHUNK_ANDROID_DEFAULTCONFIG_END

android/build/build/generated/source/buildConfig/release/com/godot/game/BuildConfig.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
public final class BuildConfig {
77
public static final boolean DEBUG = false;
8-
public static final String APPLICATION_ID = "org.godotengine.pimples";
8+
public static final String APPLICATION_ID = "rocks.poopjournal.pimplepopper";
99
public static final String BUILD_TYPE = "release";
10-
public static final int VERSION_CODE = 1;
11-
public static final String VERSION_NAME = "1.0";
10+
public static final int VERSION_CODE = 18;
11+
public static final String VERSION_NAME = "1.7";
1212
}
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/assets"/><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/build/intermediates/shader_assets/release/out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/src/release/assets"/></dataSet></merger>
2+
<merger version="3"><dataSet config="com.pangle.global:metasec_pgl:1.0.0.4-rc.2" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/e6d8cb536f0920edbf21c3ab019a8b4a/transformed/jetified-metasec_pgl-1.0.0.4-rc.2/assets"><file name="cid" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/e6d8cb536f0920edbf21c3ab019a8b4a/transformed/jetified-metasec_pgl-1.0.0.4-rc.2/assets/cid"/></source></dataSet><dataSet config="com.mbridge.msdk.oversea:dycreator:16.5.91" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/b0da1c5cdafe4a00007a3595783f3170/transformed/jetified-dycreator-16.5.91/assets"><file name="rv_binddatas.xml" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/b0da1c5cdafe4a00007a3595783f3170/transformed/jetified-dycreator-16.5.91/assets/rv_binddatas.xml"/></source></dataSet><dataSet config="io.bidmachine:ads.networks.gam:2.4.1.2" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/4d2a42cb51164332f82b41c679692bb7/transformed/jetified-ads.networks.gam-2.4.1.2/assets"><file name="bm_networks/gam.bmnetwork" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/4d2a42cb51164332f82b41c679692bb7/transformed/jetified-ads.networks.gam-2.4.1.2/assets/bm_networks/gam.bmnetwork"/></source></dataSet><dataSet config="io.bidmachine:ads.networks.a4g:2.4.1.2" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/668274f710b0990b216025440d865a05/transformed/jetified-ads.networks.a4g-2.4.1.2/assets"><file name="bm_networks/a4g.bmnetwork" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/668274f710b0990b216025440d865a05/transformed/jetified-ads.networks.a4g-2.4.1.2/assets/bm_networks/a4g.bmnetwork"/></source></dataSet><dataSet config="io.bidmachine:ads.networks.appodeal_gam:2.4.1.2" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/51bc35c2663f02c4fe615e38a4ea25a5/transformed/jetified-ads.networks.appodeal_gam-2.4.1.2/assets"><file name="bm_networks/appodeal_gam.bmnetwork" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/51bc35c2663f02c4fe615e38a4ea25a5/transformed/jetified-ads.networks.appodeal_gam-2.4.1.2/assets/bm_networks/appodeal_gam.bmnetwork"/></source></dataSet><dataSet config="io.bidmachine:ads.networks.notsy:2.4.1.8" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/62e9859c37ada09ac20300e9ba9303f6/transformed/jetified-ads.networks.notsy-2.4.1.8/assets"><file name="bm_networks/notsy.bmnetwork" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/62e9859c37ada09ac20300e9ba9303f6/transformed/jetified-ads.networks.notsy-2.4.1.8/assets/bm_networks/notsy.bmnetwork"/></source></dataSet><dataSet config="com.fyber:marketplace-sdk:8.2.5" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/2bd750ad0f39a775de7ad89077830333/transformed/jetified-marketplace-sdk-8.2.5/assets"><file name="fyb_iframe_endcard_tmpl.html" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/2bd750ad0f39a775de7ad89077830333/transformed/jetified-marketplace-sdk-8.2.5/assets/fyb_iframe_endcard_tmpl.html"/><file name="fyb_static_endcard_tmpl.html" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/2bd750ad0f39a775de7ad89077830333/transformed/jetified-marketplace-sdk-8.2.5/assets/fyb_static_endcard_tmpl.html"/><file name="ia_mraid_bridge.txt" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/2bd750ad0f39a775de7ad89077830333/transformed/jetified-marketplace-sdk-8.2.5/assets/ia_mraid_bridge.txt"/><file name="ia_js_load_monitor.txt" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/2bd750ad0f39a775de7ad89077830333/transformed/jetified-marketplace-sdk-8.2.5/assets/ia_js_load_monitor.txt"/></source></dataSet><dataSet config="com.facebook.android:audience-network-sdk:6.16.0" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/9721076451ba624411ad9cc19fef361b/transformed/jetified-audience-network-sdk-6.16.0/assets"><file name="audience_network.dex" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/9721076451ba624411ad9cc19fef361b/transformed/jetified-audience-network-sdk-6.16.0/assets/audience_network.dex"/></source></dataSet><dataSet config="com.amazon.android:aps-sdk:9.8.8" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/640bbb2589580365d9e008bd540c7f9a/transformed/jetified-aps-sdk-9.8.8/assets"><file name="aps-mraid.js" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/640bbb2589580365d9e008bd540c7f9a/transformed/jetified-aps-sdk-9.8.8/assets/aps-mraid.js"/><file name="aps_mobile_client_config.json" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/640bbb2589580365d9e008bd540c7f9a/transformed/jetified-aps-sdk-9.8.8/assets/aps_mobile_client_config.json"/><file name="dtb-m.js" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/640bbb2589580365d9e008bd540c7f9a/transformed/jetified-aps-sdk-9.8.8/assets/dtb-m.js"/><file name="omsdk-v1.js" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/640bbb2589580365d9e008bd540c7f9a/transformed/jetified-aps-sdk-9.8.8/assets/omsdk-v1.js"/></source></dataSet><dataSet config="com.pangle.global:ads-sdk:5.7.0.2" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/7bf10bf3152a4878c19727c0078bdbb5/transformed/jetified-ads-sdk-5.7.0.2/assets"><file name="tt_mime_type.pro" path="/Users/aitssamulhaqrabbani/.gradle/caches/transforms-3/7bf10bf3152a4878c19727c0078bdbb5/transformed/jetified-ads-sdk-5.7.0.2/assets/tt_mime_type.pro"/></source></dataSet><dataSet config="main" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/assets"/><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/build/intermediates/shader_assets/release/out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.gitignore:!.ds_store:!*.scc:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/src/release/assets"/></dataSet></merger>
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/libs/release"><file name="godot-lib.release.aar" path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/libs/release/godot-lib.release.aar"/></source></dataSet></merger>
2+
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/libs/release"><file name="godot-lib.release.aar" path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/libs/release/godot-lib.release.aar"/></source></dataSet></merger>
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/david/proyectos/Fiverr/preorder/PimplePopperGit/android/build/src/release/shaders"/></dataSet></merger>
2+
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/aitssamulhaqrabbani/Downloads/PimplePopper-development/android/build/src/release/shaders"/></dataSet></merger>
Binary file not shown.

0 commit comments

Comments
 (0)