Merge branch 'develop'

Author: sergei-playgama

README.md

@@ -7,7 +7,6 @@ One SDK for cross-platform publishing HTML5 games.
 + [Crazy Games](https://crazygames.com)
 + [Yandex Games](https://yandex.com/games)
 + [Y8](https://y8.com)
-+ [Wortal](https://wortal.ai)
 + [PlayDeck](https://playdeck.io)
 + [Telegram](https://core.telegram.org/bots/webapps)
 + [VK](https://vk.com)

datafiles/playgama-bridge-config.json

@@ -14,32 +14,22 @@
         "lagged": {
             "devId": "",
             "publisherId": ""
+        }
+    },
+    "advertisement": {
+        "interstitial": {
+            "preloadOnStart": true
         },
-        "facebook": {
-            "bannerPlacementId": "",
-            "interstitialPlacements": [],
-            "rewardedPlacements": []
+        "rewarded": {
+            "preloadOnStart": true
         }
     },
     "payments": [
         {
-            "commonId": "test_product",
-            "yandex": {
-                "id": "test_product"
-            },
-            "facebook": {
-                "productID": "test_product"
-            },
-            "msn": {
-                "productId": "test_product"
-            },
+            "id": "test_product",
             "playgama": {
                 "amount": 1
             },
-            "qa_tool": {
-                "id": "test_product",
-                "amount": 1
-            },
             "playdeck": {
                 "amount": 1,
                 "description": "TEST PRODUCT"

datafiles/playgama-bridge.js

@@ -24,12 +24,12 @@ bridge.game.on(
 
 
 // advertisement
-function playgamaBridgeAdvertisementShowInterstitial() {
-    window.bridge.advertisement.showInterstitial()
+function playgamaBridgeAdvertisementShowInterstitial(placement) {
+    window.bridge.advertisement.showInterstitial(placement)
 }
 
-function playgamaBridgeAdvertisementShowRewarded() {
-    window.bridge.advertisement.showRewarded()
+function playgamaBridgeAdvertisementShowRewarded(placement) {
+    window.bridge.advertisement.showRewarded(placement)
 }
 
 function playgamaBridgeAdvertisementInterstitialState() {
@@ -40,6 +40,10 @@ function playgamaBridgeAdvertisementRewardedState() {
     return window.bridge.advertisement.rewardedState
 }
 
+function playgamaBridgeAdvertisementRewardedPlacement() {
+    return window.bridge.advertisement.rewardedPlacement
+}
+
 function playgamaBridgeAdvertisementIsBannerSupported() {
     return serializeData(window.bridge.advertisement.isBannerSupported)
 }
@@ -52,13 +56,8 @@ function playgamaBridgeAdvertisementSetMinimumDelayBetweenInterstitial(value) {
     window.bridge.advertisement.setMinimumDelayBetweenInterstitial(value)
 }
 
-function playgamaBridgeAdvertisementShowBanner(options) {
-    try {
-        options = JSON.parse(options)
-    }
-    catch (e) {}
-
-    window.bridge.advertisement.showBanner(options)
+function playgamaBridgeAdvertisementShowBanner(position, placement) {
+    window.bridge.advertisement.showBanner(position, placement)
 }
 
 function playgamaBridgeAdvertisementHideBanner() {
@@ -536,8 +535,8 @@ function playgamaBridgePaymentsPurchase(id) {
 
 function playgamaBridgePaymentsConsumePurchase(id) {
     window.bridge.payments.consumePurchase(id)
-        .then(() => {
-            sendCallbackToGameMaker('payments_consume_purchase', true)
+        .then((data) => {
+            sendCallbackToGameMaker('payments_consume_purchase', true, data)
         })
         .catch(() => {
             sendCallbackToGameMaker('payments_consume_purchase', false)

extensions/playgama_bridge/playgama-bridge-gm.js

@@ -215,12 +215,15 @@ if async_load[? "type"] == "playgama_bridge_achievements_show_native_popup_callb
 if async_load[? "type"] == "playgama_bridge_payments_purchase_callback" {
 	if async_load[? "success"] {
 		var purchase = json_parse(async_load[? "data"])
-		var commonId = purchase.commonId
+		var productId = purchase.id
+		// your logic
 	}
 }
 
 if async_load[? "type"] == "playgama_bridge_payments_consume_purchase_callback" {
 	if async_load[? "success"] {
+		var purchase = json_parse(async_load[? "data"])
+		var productId = purchase.id
 		// your logic
 	}
 }
@@ -230,7 +233,7 @@ if async_load[? "type"] == "playgama_bridge_payments_get_catalog_callback" {
 		var catalog = json_parse(async_load[? "data"])
 		for (var i = 0; i < array_length(catalog); i += 1)
 		{
-		    var commonId = catalog[i].commonId
+		    var productId = catalog[i].id
 			var price = catalog[i].price
 			var priceCurrencyCode = catalog[i].priceCurrencyCode
 			var priceValue = catalog[i].priceValue
@@ -243,7 +246,7 @@ if async_load[? "type"] == "playgama_bridge_payments_get_purchases_callback" {
 		var purchases = json_parse(async_load[? "data"])
 		for (var i = 0; i < array_length(purchases); i += 1)
 		{
-		    var commonId = purchases[i].commonId
+		    var productId = purchases[i].id
 		}
 	}
 }