diff --git a/.gitignore b/.gitignore index 15c29aa..5de7268 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ platforms/ plugins/ nbproject/private/ +/www/manifest.json \ No newline at end of file diff --git a/config.xml b/config.xml index e4df9a6..e654dad 100644 --- a/config.xml +++ b/config.xml @@ -1,21 +1,5 @@ - - - - + + TerranQuest Augmented Reality fantasy game @@ -23,45 +7,46 @@ limitations under the License. Netsyms Technologies - - - - - - - - - + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/nbproject/plugins.properties b/nbproject/plugins.properties index 1a5ca5d..572fc79 100644 --- a/nbproject/plugins.properties +++ b/nbproject/plugins.properties @@ -9,8 +9,6 @@ # For more information about plugins see http://cordova.apache.org/blog/releases/2013/07/23/cordova-3.html # -com.phonegap.plugins.barcodescanner=https://github.com/Telerik-Verified-Plugins/BarcodeScanner -#phonegap-plugin-barcodescanner=https://github.com/phonegap/phonegap-plugin-barcodescanner.git cordova-plugin-whitelist=https://github.com/apache/cordova-plugin-whitelist.git cordova-plugin-splashscreen=https://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen.git cordova-plugin-dialogs=https://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs.git @@ -21,3 +19,5 @@ cordova-plugin-geolocation=https://git-wip-us.apache.org/repos/asf/cordova-plugi cordova-plugin-network-information=https://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information.git cordova-plugin-console=https://git-wip-us.apache.org/repos/asf/cordova-plugin-console.git cordova-plugin-device=https://git-wip-us.apache.org/repos/asf/cordova-plugin-device.git +com.phonegap.plugins.barcodescanner=https://github.com/Telerik-Verified-Plugins/BarcodeScanner3 +cordova-plugin-inapppurchase=https://github.com/AlexDisler/cordova-plugin-inapppurchase \ No newline at end of file diff --git a/www/css/main.css b/www/css/main.css index c2e46af..dbb0f4c 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -384,4 +384,56 @@ body { left: 0; width: 100%; height: 100%; +} + +#shopmessage { + position: fixed; + z-index: 9999; + background: rgba(0, 0, 0, .85); + border-radius: 10px; + left: 10%; + right: 10%; + top: 25%; + bottom: 25%; + height: fit-content; + max-height: 500px; + padding: 10px; + padding-top: 20px; + padding-bottom: 15px; + display: none; +} + +.hugesymbol { + text-align: center; + margin-bottom: 20px; + display: none; +} + +#shopmessagecontent { + font-size: 120%; + text-align: center; + margin-bottom: 10px; +} + +#shop-balance-bar { + text-align: right; + position: fixed; + right: 10px; + background: rgba(0, 0, 0, .5); + border-radius: 5px; + z-index: 9500; + padding: 10px; +} + +#menutablist { + z-index: 9999; + position: fixed; + width: 100%; + left: 0; + top: 0; + background: rgba(0, 0, 0, .8); +} + +#menutabcontent { + padding-top: 85px; } \ No newline at end of file diff --git a/www/js/shop.js b/www/js/shop.js new file mode 100644 index 0000000..463dd9e --- /dev/null +++ b/www/js/shop.js @@ -0,0 +1,190 @@ +/* + TerranQuest - Augmented Reality fantasy game + Copyright 2016 Netsyms Technologies + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + +// Depending on the device, a few examples are: +// - "Android" +// - "BlackBerry" +// - "iOS" +// - "webOS" +// - "WinCE" +// - "Tizen" + +var DEVICE_ANDROID = 0; +var DEVICE_GOOGLEPLAY = 1; +var DEVICE_IOS = 2; +var DEVICE_WEB = 3; +var DEVICE_WINDOWS_PHONE = 5; +var DEVICE_WINDOWS = 6; +var DEVICE_OTHER = 10; + +function getPlatform() { + var devicePlatform = device.platform; + switch (devicePlatform) { + case 'Android': + return DEVICE_ANDROID; + case 'iOS': + return DEVICE_IOS; + case 'WinCE': + return DEVICE_WINDOWS_PHONE; + case 'Win32NT': + return DEVICE_WINDOWS_PHONE; + case 'Windows': + return DEVICE_WINDOWS; + case 'browser': + return DEVICE_WEB; + default: + return DEVICE_OTHER; + } +} + +function buycoins(productId) { + if (getPlatform() == DEVICE_ANDROID) { + inAppPurchase + .buy(productId) + .then(function (data) { + console.log(JSON.stringify(data)); + $.getJSON(mkApiUrl('processiap', 'gs'), { + os: 'android', + data: data.receipt, + signature: data.signature, + id: productId + }, function (result) { + if (result.status == 'OK') { + return inAppPurchase.consume(data.type, data.receipt, data.signature); + } else { + showShopMessage("Error: " + result.message, true); + } + }).fail(function () { + showShopMessage("Error: Lost connection to TerranQuest servers. If your purchase does not appear within a few hours, contact support@netsyms.com.", true); + }); + }) + .then(function () { + loadstorefront(); + showShopMessage("Thanks for your purchase!", true); + }) + .catch(function (err) { + console.log("Error: " + err.message); + showShopMessage("Error: " + err.message, true); + }); + + } else { + showShopMessage("Store not available on your device. Please go to terranquest.net to purchase coins.", true); + } +} + +function showShopMessage(msg, iserror) { + if (iserror) { + $('#hugetimessign').css('display', 'block'); + $('#hugecheckmark').css('display', 'none'); + } else { + $('#hugetimessign').css('display', 'none'); + $('#hugecheckmark').css('display', 'block'); + } + $('#shopmessagecontent').text(msg); + $('#shopmessage').css('display', 'block'); +} + +function buyitem(id, cost) { + $('#shopitem-' + id).prop('onclick', null).off('click'); + $.getJSON(mkApiUrl('buyitem', 'gs'), { + merchid: id, + cost: cost + }, function (data) { + if (data.status == 'OK') { + showShopMessage(data.message, false); + } else { + showShopMessage(data.message, true); + } + loadstorefront(); + }); +} + +function getmerchhtmlfromjson(item) { + var itemhtml = "\ +
\ +

" + item.title + "

\ +

" + item.desc + "

"; + itemhtml += "\ + Buy Item (" + item.cost + " coins)\ + \ +
"; + return itemhtml; +} + +function getcoinhtmlfromjson(coin) { + var coinhtml = "\ +
\ +

" + coin.display + " (" + coin.coins + ")

"; + coinhtml += "\ + Buy Coins ($" + coin.cost_usd + ")\ + \ +
"; + return coinhtml; +} + +function setcoinhtmlfromiap(coinsjson) { + var prodIds = []; + coinsjson.forEach(function (item) { + prodIds.push(item.merchid); + }); + var coinsHtml = ""; + inAppPurchase.getProducts(prodIds) + .then(function (products) { + console.log(products); + products.forEach(function (prod) { + coinsHtml += "" + + "
" + + "

" + prod.title.replace(" (TerranQuest)", "") + "

" + + "

" + prod.description + "

" + + "" + + "Buy Coins (" + prod.price + ")" + + "" + + "
"; + }); + $('#coin-list').html(coinsHtml); + /* + [{ productId: 'com.yourapp.prod1', 'title': '...', description: '...', price: '...' }, ...] + */ + }) + .catch(function (err) { + console.log(err.message); + coinsHtml = getcoinhtmlfromjson(coinsjson); + $('#coin-list').html(coinsHtml); + }); +} + +function loadstorefront() { + $.getJSON(mkApiUrl('shopitems'), function (data) { + var content = ""; + if (data.status == 'OK') { + var items = data.items; + var coins = data.coins; + items.forEach(function (item) { + content += getmerchhtmlfromjson(item); + }); + setcoinhtmlfromiap(coins); + $('#coinbalance').text(data.balance); + } else { + content = "
An error occurred.
"; + coincode = "
An error occurred.
"; + } + $('#shop-list').html(content); + }); + loadinventory(); // Make sure purchases stay in sync + // Put it last in case it fails, so it doesn't crash stuff badly +} \ No newline at end of file diff --git a/www/js/user.js b/www/js/user.js index e8b0a31..29d7de8 100644 --- a/www/js/user.js +++ b/www/js/user.js @@ -79,7 +79,7 @@ setInterval(function () { }, 3000); // Send chat messages $("#chatsendform").submit(function (event) { - message = $('#chatbox-input').val(); + var message = $('#chatbox-input').val(); if (message !== '') { $.post(mkApiUrl('chat', 'cs'), { user: username, diff --git a/www/screens/inventory.html b/www/screens/inventory.html index d346ddb..bd51a44 100644 --- a/www/screens/inventory.html +++ b/www/screens/inventory.html @@ -15,64 +15,64 @@ See the License for the specific language governing permissions and limitations under the License. --> -
-
-
- Loading... -
-
-
- - \ No newline at end of file diff --git a/www/screens/licenses.html b/www/screens/licenses.html index a71f6ee..f24d1fb 100644 --- a/www/screens/licenses.html +++ b/www/screens/licenses.html @@ -207,6 +207,13 @@ limitations under the License.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ +

cordova-plugin-inapppurchase

+

The MIT License

+

Copyright (c) 2016 Alex Disler

+

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

+

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.