diff --git a/Erupe/www/erupe/css/main.css b/Erupe/www/erupe/css/main.css index 127b287aa..6132156e3 100644 --- a/Erupe/www/erupe/css/main.css +++ b/Erupe/www/erupe/css/main.css @@ -111,7 +111,6 @@ body{background:#092314; font-family:sans-serif; color:#d1c0a5; font-size:14px; #footer{width:100%; height:39px; position:absolute; left:0; bottom:0; background-color:rgba(0,0,0,0.6); overflow:hidden;} #footer .link{padding:4px; display:block; z-index:1000; cursor:pointer;float:left;} - #launcher_info_list{width:535px; height:240px; position:absolute; right:38px; padding:5px; top:135px; overflow:hidden; overflow-y:auto; background-color:rgba(0,0,0,0.5); border-radius:3px 3px 3px 3px; border: 1px solid #a6a08a;} #launcher_info_list .important_info, #launcher_info_list .normal_info{margin-bottom:5px;} #launcher_info_list .head{width:513px; height:23px; position:relative;} @@ -139,21 +138,21 @@ body{background:#092314; font-family:sans-serif; color:#d1c0a5; font-size:14px; #launcher_modal .dialog p span.attention{color:#f4de22;} #launcher_modal .dialog p span.notes{color:#eb3535; font-size:16px; line-height:20px;} #launcher_modal .dialog p div.sp{width:100%; height:10px;} -#launcher_modal .dialog .btnBox{width:100%; height:44px; position:absolute; left:0; top:252px;} -#launcher_modal .dialog .btns{text-align:center; margin:0 auto; position:relative; overflow:hidden} +#launcher_modal .dialog .btn_box{width:100%; height:44px; position:absolute; left:0; top:252px;} +#launcher_modal .dialog .btns{text-align:center; margin:0 auto; position:relative; overflow:hidden;} #launcher_modal .dialog .btns ul{position:relative; left:50%; float:left; list-style:none} #launcher_modal .dialog .btns ul li{position:relative; left:-50%; float:left; margin-left:33px;} #launcher_modal .dialog .btns ul li:first-child{margin-left:5px;} -#launcher_modal .dialog .btns ul li div{display:block; width:130px; height:35px; padding-top:9px; position:relative; background:url(../img/button_option.png) no-repeat 0px 0px; text-decoration:none; color:#d1c0a5; font-weight:bold; font-size:18px; line-height:18px; text-align:center; cursor:pointer;} -#launcher_modal .dialog .btns ul li div:hover,#launcher_modal .dialog .btns ul li div.hover{background:url(../img/button_option_hover.png) no-repeat 0px 0px;} -#launcher_modal .dialog .btns ul li div.wait:hover,#launcher_modal .dialog .btns ul li div.wait.hover{background-position:0px 0px; cursor:default;} +#launcher_modal .dialog .btns ul li div{display:block; width:130px; height:35px; padding-top:9px; position:relative; background:url(../img/button_option.png) no-repeat 0px 0px; text-decoration:none; color:white; font-weight:bold; font-size:18px; line-height:18px; text-align:center; cursor:pointer;} +#launcher_modal .dialog .btns ul li div:hover, +#launcher_modal .dialog .btns ul li div.hover{background:url(../img/button_option_hover.png) no-repeat 0px 0px;} #launcher_menu{height:86px; position:absolute; left:535px; top:416px; overflow:hidden;} #launcher_menu .btn{width:82px; height:86px; background:no-repeat 0px 0px; float:left; margin:0 2px; cursor:pointer;} #launcher_menu .btn:hover{background-position:0px -86px;} -#launcher_menu .btn.hangameb,#launcher_menu .btn.hancoin{display:none;} -#launcher_menu .btn.manual{background:url(../img/manual.png);} -#launcher_menu .btn.pastebin{background:url(../img/pastebin.png);} +#launcher_menu .btn.manual{background-image:url(../img/manual.png);} +#launcher_menu .btn.pastebin{background-image:url(../img/pastebin.png);} + /* UNUSED #launcher_bnr{width:533px; height:129px; position:absolute; right:38px; top:30px;} #launcher_bnr .bnr{width:523px; height:129px; position:absolute; left:0; top:0; background:no-repeat 0px 0px; overflow:hidden;} diff --git a/Erupe/www/erupe/img/manual.png b/Erupe/www/erupe/img/manual.png index be0a77560..b1d864c8b 100644 Binary files a/Erupe/www/erupe/img/manual.png and b/Erupe/www/erupe/img/manual.png differ diff --git a/Erupe/www/erupe/img/pastebin.png b/Erupe/www/erupe/img/pastebin.png index cd3c20b23..0c7169211 100644 Binary files a/Erupe/www/erupe/img/pastebin.png and b/Erupe/www/erupe/img/pastebin.png differ diff --git a/Erupe/www/erupe/index.html b/Erupe/www/erupe/index.html index c651c70ca..0a5dee251 100644 --- a/Erupe/www/erupe/index.html +++ b/Erupe/www/erupe/index.html @@ -15,8 +15,8 @@
-
__
-
✕
+
__
+
✕
-
-
-
+
Log In
+
+ Remember Login +
Current Weapon
-
- Auto-Login
-
Add - Character
-
Delete Character
-
Log - Out
-
Launch
+
+ Auto-Login +
+
Add Character
+
Delete Character
+
Log Out
+
Launch

-
- -
+
+

Important Updates

@@ -103,22 +88,30 @@
-
-
+
+
+
+
+ +
+
-

-
-
-
+

+
@@ -130,5 +123,4 @@
- \ No newline at end of file diff --git a/Erupe/www/erupe/js/script.js b/Erupe/www/erupe/js/script.js index 8a21f7f3b..c3553616e 100644 --- a/Erupe/www/erupe/js/script.js +++ b/Erupe/www/erupe/js/script.js @@ -83,25 +83,25 @@ function saveAccount() { function createCharItem(name, uid, weapon, hr, gr, date, sex) { var icon; - const dateObject = new Date(date * 1000); - date = dateObject.toLocaleDateString('en-US'); - let dateString = ''; - for (var i = 0; i < date.length; i++) { - if (date[i] != '‎') { // invisible LTR char - dateString += date[i]; - } - } + const dateObject = new Date(date * 1000); + date = dateObject.toLocaleDateString('en-US'); + let dateString = ''; + for (var i = 0; i < date.length; i++) { + if (date[i] != '‎') { // invisible LTR char + dateString += date[i]; + } + } if (sex == 'M') { sex = "♂"; } else { sex = "♀"; } if (hr > 999) { - hr = 999; - } - if (gr > 999) { - gr = 999; - } + hr = 999; + } + if (gr > 999) { + gr = 999; + } switch (weapon) { case '片手剣': weapon = 'Sword & Shield'; @@ -268,11 +268,12 @@ function doLogin(option) { soundPreLogin(); addLog('Authenticating...', 'normal'); try { - if(option){ + if (option) { addLog('Creating new character...', 'normal'); - window.external.loginCog(username+"+", password, password); - }else{ - window.external.loginCog(username, password, password);} + window.external.loginCog(username+'+', password, password); + } else { + window.external.loginCog(username, password, password); + } } catch (e) { addLog('Error on loginCog: '+e, 'error'); } @@ -356,51 +357,93 @@ function setUidIndex(index) { document.getElementById(selectedUid).classList.add('active'); } -function toggleModal(preset,url) { - // just pass 0 for hiding - // probably call toggleModal(0) when the user clicks any button? - // besides when chaining modals (i.e confirm delete 1 -> confirm delete 2) - - let modal = document.getElementById("launcher_modal") // get modal id - +function toggleModal(preset, url) { + let modal = document.getElementById('launcher_modal'); modalState = !modalState; if (modalState) { - setModalContent(preset,url) - modal.style.display = 'block' + setModalContent(preset, url); + modal.style.display = 'block'; } else { - modal.style.display = 'none' + modal.style.display = 'none'; } } -function setModalContent(preset,url) { - let modal = document.getElementById("launcher_modal"); - switch (preset) { - case 'openLink': - - modal.querySelector(".dialog p").innerHTML = "You have clicked a link, are you sure you want to open it?
(URL:"+url+")
This will open a web browser"; - modal.querySelector(".dialog .btns").innerHTML = ""; - break; - case 'confirmCharDelete': - modal.querySelector(".dialog p").innerHTML = "Are you sure you want to delete your character?
INSERT NAME (ID:INSER NAME)?
You wont be able to recover this character
It will be gone forever."; - modal.querySelector(".dialog .btns").innerHTML = ""; - //Uses the launcher delete - //modal.querySelector(".dialog .btns").innerHTML = ""; - break; - case 'addCharNew': - modal.querySelector(".dialog p").innerHTML = "Historically the game required you to buy character slots.
Click the 'Add Character' Button to add a new slot."; - modal.querySelector(".dialog .btns").innerHTML = ""; - break; - default: - return; - } +function setModalContent(preset, url) { + let modal = document.getElementById('launcher_modal'); + switch (preset) { + case 'openLink': + modal.querySelector('.dialog p').innerHTML = ' \ + Are you sure you want to open this URL? \ +
\ + '+url+' \ +
\ +
\ + This will open in a browser \ + '; + modal.querySelector('.dialog .btns').innerHTML = ' \ + \ + '; + break; + case 'confirmCharDelete': + modal.querySelector('.dialog p').innerHTML = ' \ + Are you sure you want to delete your character? \ +
NAME \ + (ID: 000000) \ +
\ +
\ + You will not be able to recover this character, \ +
it will be gone forever. \ + \ + '; + modal.querySelector('.dialog .btns').innerHTML = ' \ + \ + '; + // Uses the launcher delete + // modal.querySelector(".dialog .btns").innerHTML = ""; + break; + case 'addCharNew': + modal.querySelector('.dialog p').innerHTML = ' \ + Are you sure you want to add a new character? \ +
\ +
\ + Press [Add Character] to add a new slot. \ + '; + modal.querySelector('.dialog .btns').innerHTML = ' \ + \ + '; + break; + default: + return; + } } function charselAdd() { - toggleModal('addCharNew') + toggleModal('addCharNew'); } function charselDel() { - toggleModal('confirmCharDelete') + toggleModal('confirmCharDelete'); } function charselLog() {