diff --git a/resources/app/menu/assets/bootstrap/css/bootstrap.min.css b/resources/app/files/assets/bootstrap/css/bootstrap.min.css similarity index 100% rename from resources/app/menu/assets/bootstrap/css/bootstrap.min.css rename to resources/app/files/assets/bootstrap/css/bootstrap.min.css diff --git a/resources/app/menu/assets/bootstrap/js/bootstrap.min.js b/resources/app/files/assets/bootstrap/js/bootstrap.min.js similarity index 100% rename from resources/app/menu/assets/bootstrap/js/bootstrap.min.js rename to resources/app/files/assets/bootstrap/js/bootstrap.min.js diff --git a/resources/app/menu/assets/css/openfusion.css b/resources/app/files/assets/css/openfusion.css similarity index 98% rename from resources/app/menu/assets/css/openfusion.css rename to resources/app/files/assets/css/openfusion.css index b6a33eb..a28b048 100644 --- a/resources/app/menu/assets/css/openfusion.css +++ b/resources/app/files/assets/css/openfusion.css @@ -85,7 +85,7 @@ body { border-color: #6699FF; } -input { +.form-control, .form-control:focus { border-color: #0099FF; background-color: #000; color: #fff; diff --git a/resources/app/menu/assets/css/styles.css b/resources/app/files/assets/css/styles.css similarity index 100% rename from resources/app/menu/assets/css/styles.css rename to resources/app/files/assets/css/styles.css diff --git a/resources/app/menu/assets/fonts/fa-brands-400.eot b/resources/app/files/assets/fonts/fa-brands-400.eot similarity index 100% rename from resources/app/menu/assets/fonts/fa-brands-400.eot rename to resources/app/files/assets/fonts/fa-brands-400.eot diff --git a/resources/app/menu/assets/fonts/fa-brands-400.svg b/resources/app/files/assets/fonts/fa-brands-400.svg similarity index 100% rename from resources/app/menu/assets/fonts/fa-brands-400.svg rename to resources/app/files/assets/fonts/fa-brands-400.svg diff --git a/resources/app/menu/assets/fonts/fa-brands-400.ttf b/resources/app/files/assets/fonts/fa-brands-400.ttf similarity index 100% rename from resources/app/menu/assets/fonts/fa-brands-400.ttf rename to resources/app/files/assets/fonts/fa-brands-400.ttf diff --git a/resources/app/menu/assets/fonts/fa-brands-400.woff b/resources/app/files/assets/fonts/fa-brands-400.woff similarity index 100% rename from resources/app/menu/assets/fonts/fa-brands-400.woff rename to resources/app/files/assets/fonts/fa-brands-400.woff diff --git a/resources/app/menu/assets/fonts/fa-brands-400.woff2 b/resources/app/files/assets/fonts/fa-brands-400.woff2 similarity index 100% rename from resources/app/menu/assets/fonts/fa-brands-400.woff2 rename to resources/app/files/assets/fonts/fa-brands-400.woff2 diff --git a/resources/app/menu/assets/fonts/fa-regular-400.eot b/resources/app/files/assets/fonts/fa-regular-400.eot similarity index 100% rename from resources/app/menu/assets/fonts/fa-regular-400.eot rename to resources/app/files/assets/fonts/fa-regular-400.eot diff --git a/resources/app/menu/assets/fonts/fa-regular-400.svg b/resources/app/files/assets/fonts/fa-regular-400.svg similarity index 100% rename from resources/app/menu/assets/fonts/fa-regular-400.svg rename to resources/app/files/assets/fonts/fa-regular-400.svg diff --git a/resources/app/menu/assets/fonts/fa-regular-400.ttf b/resources/app/files/assets/fonts/fa-regular-400.ttf similarity index 100% rename from resources/app/menu/assets/fonts/fa-regular-400.ttf rename to resources/app/files/assets/fonts/fa-regular-400.ttf diff --git a/resources/app/menu/assets/fonts/fa-regular-400.woff b/resources/app/files/assets/fonts/fa-regular-400.woff similarity index 100% rename from resources/app/menu/assets/fonts/fa-regular-400.woff rename to resources/app/files/assets/fonts/fa-regular-400.woff diff --git a/resources/app/menu/assets/fonts/fa-regular-400.woff2 b/resources/app/files/assets/fonts/fa-regular-400.woff2 similarity index 100% rename from resources/app/menu/assets/fonts/fa-regular-400.woff2 rename to resources/app/files/assets/fonts/fa-regular-400.woff2 diff --git a/resources/app/menu/assets/fonts/fa-solid-900.eot b/resources/app/files/assets/fonts/fa-solid-900.eot similarity index 100% rename from resources/app/menu/assets/fonts/fa-solid-900.eot rename to resources/app/files/assets/fonts/fa-solid-900.eot diff --git a/resources/app/menu/assets/fonts/fa-solid-900.svg b/resources/app/files/assets/fonts/fa-solid-900.svg similarity index 100% rename from resources/app/menu/assets/fonts/fa-solid-900.svg rename to resources/app/files/assets/fonts/fa-solid-900.svg diff --git a/resources/app/menu/assets/fonts/fa-solid-900.ttf b/resources/app/files/assets/fonts/fa-solid-900.ttf similarity index 100% rename from resources/app/menu/assets/fonts/fa-solid-900.ttf rename to resources/app/files/assets/fonts/fa-solid-900.ttf diff --git a/resources/app/menu/assets/fonts/fa-solid-900.woff b/resources/app/files/assets/fonts/fa-solid-900.woff similarity index 100% rename from resources/app/menu/assets/fonts/fa-solid-900.woff rename to resources/app/files/assets/fonts/fa-solid-900.woff diff --git a/resources/app/menu/assets/fonts/fa-solid-900.woff2 b/resources/app/files/assets/fonts/fa-solid-900.woff2 similarity index 100% rename from resources/app/menu/assets/fonts/fa-solid-900.woff2 rename to resources/app/files/assets/fonts/fa-solid-900.woff2 diff --git a/resources/app/menu/assets/fonts/fontawesome-all.min.css b/resources/app/files/assets/fonts/fontawesome-all.min.css similarity index 100% rename from resources/app/menu/assets/fonts/fontawesome-all.min.css rename to resources/app/files/assets/fonts/fontawesome-all.min.css diff --git a/resources/app/menu/assets/img/btn-danger-bg.png b/resources/app/files/assets/img/btn-danger-bg.png similarity index 100% rename from resources/app/menu/assets/img/btn-danger-bg.png rename to resources/app/files/assets/img/btn-danger-bg.png diff --git a/resources/app/menu/assets/img/btn-primary-bg.png b/resources/app/files/assets/img/btn-primary-bg.png similarity index 100% rename from resources/app/menu/assets/img/btn-primary-bg.png rename to resources/app/files/assets/img/btn-primary-bg.png diff --git a/resources/app/menu/assets/img/btn-success-bg.png b/resources/app/files/assets/img/btn-success-bg.png similarity index 100% rename from resources/app/menu/assets/img/btn-success-bg.png rename to resources/app/files/assets/img/btn-success-bg.png diff --git a/resources/app/menu/assets/img/of-3.png b/resources/app/files/assets/img/of-3.png similarity index 100% rename from resources/app/menu/assets/img/of-3.png rename to resources/app/files/assets/img/of-3.png diff --git a/resources/app/gamepage/img/unity_dexlabs.png b/resources/app/files/assets/img/unity_dexlabs.png similarity index 100% rename from resources/app/gamepage/img/unity_dexlabs.png rename to resources/app/files/assets/img/unity_dexlabs.png diff --git a/resources/app/gamepage/img/unity_loadingbar.png b/resources/app/files/assets/img/unity_loadingbar.png similarity index 100% rename from resources/app/gamepage/img/unity_loadingbar.png rename to resources/app/files/assets/img/unity_loadingbar.png diff --git a/resources/app/gamepage/img/unity_loadingframe.png b/resources/app/files/assets/img/unity_loadingframe.png similarity index 100% rename from resources/app/gamepage/img/unity_loadingframe.png rename to resources/app/files/assets/img/unity_loadingframe.png diff --git a/resources/app/gamepage/img/welcome.png b/resources/app/files/assets/img/welcome.png similarity index 100% rename from resources/app/gamepage/img/welcome.png rename to resources/app/files/assets/img/welcome.png diff --git a/resources/app/menu/assets/js/bs-init.js b/resources/app/files/assets/js/bs-init.js similarity index 100% rename from resources/app/menu/assets/js/bs-init.js rename to resources/app/files/assets/js/bs-init.js diff --git a/resources/app/menu/assets/js/eastereggs.js b/resources/app/files/assets/js/eastereggs.js similarity index 61% rename from resources/app/menu/assets/js/eastereggs.js rename to resources/app/files/assets/js/eastereggs.js index 48f950d..ac2bc39 100644 --- a/resources/app/menu/assets/js/eastereggs.js +++ b/resources/app/files/assets/js/eastereggs.js @@ -3,11 +3,17 @@ var today = new Date(); // Check Christmas season: Date constructor in Javascript uses an index // so 11 is Dec. of this year, and 12 is Jan. of the next -var christmasBegin = new Date(today.getFullYear(), 11, 10); +var christmasBegin = new Date(today.getFullYear(), 11, 23); var christmasEnd = new Date(today.getFullYear(), 12, 8); +var sf if((today >= christmasBegin && today <= christmasEnd)) { - console.log("Christmas Activated."); - var sf = new Snowflakes({zIndex: -100}); + console.log("Christmas Activated."); + sf = new Snowflakes({zIndex: -100}); } - \ No newline at end of file + +function stopEasterEggs(){ + if (sf != null) { + sf.destroy(); + } +} \ No newline at end of file diff --git a/resources/app/files/assets/js/gameclient.js b/resources/app/files/assets/js/gameclient.js new file mode 100644 index 0000000..5c810b6 --- /dev/null +++ b/resources/app/files/assets/js/gameclient.js @@ -0,0 +1,80 @@ +var ipc = require("ipc"); +var gameRunning = false; + +// Unity invoked methods begin // + +// allows us to skip the login screen +/*function authDoCallback(param) { + var unity = document.getElementById('Unity_embed'); + unity.SendMessage("GlobalManager", "SetTEGid", "player"); + unity.SendMessage("GlobalManager", "SetAuthid", "0"); + unity.SendMessage("GlobalManager", "DoAuth", 0); +}*/ + +function MarkProgress(param) {} + +function redirect(html) { + ipc.send("exit", 0); +} +function HomePage(param) { + ipc.send("exit", 0); +} +function PageOut(param) { + ipc.send("exit", 0); +} +function updateSocialOptions(param) { + ipc.send("exit", 0); +} +function PayPage(param) { + ipc.send("exit", 0); +} + +// Unity invoked methods end // + +function onResize() { + if (gameRunning == true) { + var unity = document.getElementById('Unity_embed'); + unity.style.width = window.innerWidth + 'px'; + unity.style.height = window.innerHeight + 'px'; + } +} + +function launchGame() { + gameRunning = true + + var sel = document.getElementById("of-serverselector"); + sel.remove() + + document.body.style.overflow = "hidden"; + + var object = document.createElement('object'); + object.setAttribute('classid', "clsid:444785F1-DE89-4295-863A-D46C3A781394"); + object.setAttribute('codebase', "undefined/UnityWebPlayer.cab#version=2,0,0,0"); + object.setAttribute('id', "Unity_object"); + object.setAttribute('width', "1264"); + object.setAttribute('height', "661"); + + var embed = document.createElement('embed'); + embed.setAttribute('type', "application/vnd.unity"); + embed.setAttribute('pluginspage', "http://www.unity3d.com/unity-web-player-2.x"); + embed.setAttribute('id', "Unity_embed"); + embed.setAttribute('width', "1280"); + embed.setAttribute('height', "680"); + embed.setAttribute('src', "http://ht.cdn.turner.com/ff/big/beta-20100104/main.unity3d"); + embed.setAttribute('disablecontdparaextmenu', "true"); + embed.setAttribute('bordercolor', "000000"); + embed.setAttribute('backgroundcolor', "000000"); + embed.setAttribute('disableContextMenu', true); + embed.setAttribute('textcolor', "ccffff"); + embed.setAttribute('logoimage', "assets/img/unity_dexlabs.png"); + embed.setAttribute('progressbarimage', "assets/img/unity_loadingbar.png"); + embed.setAttribute('progressframeimage', "assets/img/unity_loadingframe.png"); + embed.setAttribute('autoupdateurlsignature', "42180ee5edc4e3d4dd706bcc17cedd8d6ec7b7ac463071fd34ab97fe181f1a78df31db5feb4526677e4f69ef53acaff44471591e68b87f041c80fd54765f0d5725b08aa28f5acf7716ffb2a04e971269f35925c7e38d57dd78f6a206530caaa3da7e32f07f19810efc0ebf29a4eae976a925ad9cc5beb4dd51564c67dc489033"); + embed.setAttribute('autoupdateurl', "http://wp-cartoonnetwork.unity3d.com/ff/big/beta-20111013/autodownload_webplugin_beta"); + + var div = document.getElementById('client'); + object.appendChild(embed); + div.appendChild(object); + document.title = "OpenFusion" + OnResize(); +} \ No newline at end of file diff --git a/resources/app/menu/assets/js/jquery.min.js b/resources/app/files/assets/js/jquery.min.js similarity index 100% rename from resources/app/menu/assets/js/jquery.min.js rename to resources/app/files/assets/js/jquery.min.js diff --git a/resources/app/files/assets/js/serverselector.js b/resources/app/files/assets/js/serverselector.js new file mode 100644 index 0000000..73f7a44 --- /dev/null +++ b/resources/app/files/assets/js/serverselector.js @@ -0,0 +1,13 @@ +// Write loginInfo.php, assetInfo.php, etc. +function setGameInfo(uuid) { + +} + +function connectToServer() { + stopEasterEggs(); + $('#of-serverselector').fadeOut('slow', function() { + setTimeout(function(){ + launchGame(); + }, 200); + }); +} diff --git a/resources/app/menu/assets/js/snowflakes.min.js b/resources/app/files/assets/js/snowflakes.min.js similarity index 100% rename from resources/app/menu/assets/js/snowflakes.min.js rename to resources/app/files/assets/js/snowflakes.min.js diff --git a/resources/app/menu/assets/js/uuidv4.min.js b/resources/app/files/assets/js/uuidv4.min.js similarity index 100% rename from resources/app/menu/assets/js/uuidv4.min.js rename to resources/app/files/assets/js/uuidv4.min.js diff --git a/resources/app/files/index.html b/resources/app/files/index.html new file mode 100644 index 0000000..c039162 --- /dev/null +++ b/resources/app/files/index.html @@ -0,0 +1,108 @@ + + + + + + + OpenFusion: Server Selector + + + + + + + +
+
+
+
+

Welcome to OpenFusion.
Select a server from the list below to get started.

+
+
+
+
+
+ + + + + + + + + + + + +
DescriptionGame Version
No servers added yet... perhaps you should find one?
+
+
+
+
+
+
+
+
+ + + +
v1.3
+
+
+
+
+ + + + + + + + + + + \ No newline at end of file diff --git a/resources/app/gamepage/assetInfo.php b/resources/app/gamepage/assetInfo.php deleted file mode 100644 index a3b14b0..0000000 --- a/resources/app/gamepage/assetInfo.php +++ /dev/null @@ -1 +0,0 @@ -http://ht.cdn.turner.com/ff/big/beta-20100104/ \ No newline at end of file diff --git a/resources/app/gamepage/images.php b/resources/app/gamepage/images.php deleted file mode 100644 index ebe06e7..0000000 --- a/resources/app/gamepage/images.php +++ /dev/null @@ -1 +0,0 @@ -img/welcome.png \ No newline at end of file diff --git a/resources/app/gamepage/index.html b/resources/app/gamepage/index.html deleted file mode 100644 index 0bea5bc..0000000 --- a/resources/app/gamepage/index.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - OpenFusion - - - - - - -
- -
- - - -
- -
- - \ No newline at end of file diff --git a/resources/app/gamepage/loginInfo.php b/resources/app/gamepage/loginInfo.php deleted file mode 100644 index da0ec41..0000000 --- a/resources/app/gamepage/loginInfo.php +++ /dev/null @@ -1 +0,0 @@ -144.202.52.9:23000 diff --git a/resources/app/gamepage/rankurl.txt b/resources/app/gamepage/rankurl.txt deleted file mode 100644 index 70d85d9..0000000 --- a/resources/app/gamepage/rankurl.txt +++ /dev/null @@ -1 +0,0 @@ -http://dexlabs.systems/api/ranks \ No newline at end of file diff --git a/resources/app/gamepage/sponsor.php b/resources/app/gamepage/sponsor.php deleted file mode 100644 index ebe06e7..0000000 --- a/resources/app/gamepage/sponsor.php +++ /dev/null @@ -1 +0,0 @@ -img/welcome.png \ No newline at end of file diff --git a/resources/app/index.js b/resources/app/index.js index 8fa79c1..b0b8cfd 100644 --- a/resources/app/index.js +++ b/resources/app/index.js @@ -1,9 +1,8 @@ var app = require('app'); // Module to control application life. var ipc = require('ipc'); var fs = require('fs'); -var os = require('os'); // Required for TEMP folder check -var dialog = require('dialog'); // Required for TEMP folder check -var child = require('child_process'); // Required for automatic Unity install +var os = require('os'); +var dialog = require('dialog'); var BrowserWindow = require('browser-window'); var mainWindow = null; @@ -17,7 +16,7 @@ function copyFile(src, dst) { function initialSetup() { // Exec installUnity.bat and wait for it to finish. - child.execFileSync('cmd.exe', ['/c', 'utils\\installUnity.bat']); + require('child_process').execFileSync('cmd.exe', ['/c', 'utils\\installUnity.bat']); console.log("Unity installed."); // Copy over files with default values @@ -63,8 +62,15 @@ app.on('ready', function() { mainWindow = new BrowserWindow({width: 1280, height: 720, show: false, "web-preferences": {"plugins": true}}); mainWindow.setMinimumSize(640, 480); + + // Makes it so external links are opened in the system browser, not Electron + mainWindow.webContents.on('new-window', function(e, url) { + e.preventDefault(); + require('shell').openExternal(url); + }); + // and load the index.html of the app. - mainWindow.loadUrl('file://' + __dirname + '/menu/index.html'); + mainWindow.loadUrl('file://' + __dirname + '/files/index.html'); // Reduces white flash when opening the program // Eliminating it entirely requires a newer Electron ver :( @@ -74,7 +80,7 @@ app.on('ready', function() { }, 40); }); - //mainWindow.webContents.openDevTools() + //mainWindow.webContents.openDevTools() mainWindow.on('closed', function() { mainWindow = null; diff --git a/resources/app/menu/index.html b/resources/app/menu/index.html deleted file mode 100644 index ebb5e8f..0000000 --- a/resources/app/menu/index.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - OpenFusion: Server Selector - - - - - - - -
-
-
-

Welcome to OpenFusion.
Select a server from the list below to get started.

-
-
-
-
-
- - - - - - - - - - - - -
DescriptionGame Version
No servers added yet... perhaps you should find one?
-
-
-
-
-
-
-
-
- - - -
v1.3
- - - - - - - - - \ No newline at end of file