diff --git a/Erupe/www/erupe/css/main.css b/Erupe/www/erupe/css/main.css index 68c36a7a6..6132156e3 100644 --- a/Erupe/www/erupe/css/main.css +++ b/Erupe/www/erupe/css/main.css @@ -109,24 +109,12 @@ body{background:#092314; font-family:sans-serif; color:#d1c0a5; font-size:14px; #dev input{width:100%; height:20px; font-size: 16px;} #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; position:absolute; z-index:1000; cursor:pointer;} +#footer .link{padding:4px; display:block; z-index:1000; cursor:pointer;float:left;} -/* 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;} -#launcher_bnr .bnr img{margin-left:1px;} -#launcher_bnr .bnr .frame{width:523px; height:129px; position:absolute; left:0; top:0; background:no-repeat 0px 0px; cursor:pointer;} -#launcher_bnr .dots{width:10px; position:absolute; right:0; top:0; max-height:129px;} -#launcher_bnr .dots ul{position:relative; width:10px; padding-top:6px;} -#launcher_bnr .dots li{display:block; width:10px; height:10px; padding:6px 0; position:relative;} -#launcher_bnr .dots li .dot{width:10px; height:10px; background:no-repeat 0px 0px; cursor:pointer;} -#launcher_bnr .dots li .dot.crr, -#launcher_bnr .dots li .dot:hover{background-position:0px -10px;} -#launcher_bnr .dots li .dot img{display:none;} -#launcher_info_list{width:535px; height:288px; position:absolute; right:38px; top:163px; overflow:hidden; overflow-y:auto;} +#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;} -#launcher_info_list .head .lbl{position:absolute; left:0; top:0; width:513px; height:23px; background:no-repeat 0px 0px;} +#launcher_info_list .head .lbl{position:absolute; left:0; top:0; width:513px; height:23px;} #launcher_info_list .head a{position:absolute; right:10px; top:6px; display:block; width:35px; height:13px; background:no-repeat 0px 0px;} #launcher_info_list .head a:hover{background-position:0px -13px;} #launcher_info_list ul.article{margin-left:18px; width:517px; position:relative;} @@ -140,6 +128,44 @@ body{background:#092314; font-family:sans-serif; color:#d1c0a5; font-size:14px; #launcher_info_list .important_info ul.article li .body a:hover{color:#F8DD81;} #launcher_info_list ul.article li .icon{width:30px; height:14px; background:no-repeat center center;} #launcher_info_list a{cursor:pointer;} + +#launcher_modal{width:100%; height:100%; position:fixed; left:0; top:0;z-index:1000; display:none; } +#launcher_modal .modal{width:100%; height:100%; position:absolute; left:0; top:0;} +#launcher_modal .dialog{position:absolute; left:282px; top:140px; width:560px; height:320px; background:url(../img/modelbg.jpeg) round;} +#launcher_modal .dialog p{color:#d1c0a5; font-size:18px; line-height:36px; width:100%; position:relative; text-align:center; padding-top:60px;} +#launcher_modal .dialog p.alert{line-height:26px; padding-top:90px; font-size:20px;} +#launcher_modal .dialog p span.uid{font-size:12px;} +#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 .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: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.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;} +#launcher_bnr .bnr img{margin-left:1px;} +#launcher_bnr .bnr .frame{width:523px; height:129px; position:absolute; left:0; top:0; background:no-repeat 0px 0px; cursor:pointer;} +#launcher_bnr .dots{width:10px; position:absolute; right:0; top:0; max-height:129px;} +#launcher_bnr .dots ul{position:relative; width:10px; padding-top:6px;} +#launcher_bnr .dots li{display:block; width:10px; height:10px; padding:6px 0; position:relative;} +#launcher_bnr .dots li .dot{width:10px; height:10px; background:no-repeat 0px 0px; cursor:pointer;} +#launcher_bnr .dots li .dot.crr, +#launcher_bnr .dots li .dot:hover{background-position:0px -10px;} +#launcher_bnr .dots li .dot img{display:none;} + #launcher_info_detail{width:532px; height:423px; position:absolute; right:38px; top:30px; background:no-repeat 0px 0px;} #launcher_info_detail .article_frame{width:532px; height:423px; position:absolute; left:0; top:0; overflow:hidden; overflow-y:auto;} #launcher_info_detail .article_frame .article{width:498px; min-height:394px; position:relative; margin:10px 0 10px 13px; padding-top:9px; background-color:#fef5e6; font-family:"MS Pゴシック", "MS PGothic", sans-serif; font-size:14px; line-height:18px; color:#333333;} @@ -150,11 +176,6 @@ body{background:#092314; font-family:sans-serif; color:#d1c0a5; font-size:14px; #launcher_info_detail .btn_back:hover{background-position:0px -18px;} #launcher_info_detail a{cursor:pointer;} -#launcher_menu{height:86px; position:absolute; right:14px; top:467px; overflow:hidden;} -#launcher_menu .btn{width:82px; height:86px; background:no-repeat 0px 0px; float:right; margin:0 2px; cursor:pointer;} -#launcher_menu .btn:hover{background-position:0px -86px;} -#launcher_menu .btn.hangameb,#launcher_menu .btn.hancoin{display:none;} - #launcher_footer{width:100%; height:39px; position:absolute; left:0; bottom:0; overflow:hidden;} #launcher_footer .btn{display:block; position:absolute; z-index:1000; cursor:pointer;} #launcher_footer .btn.capcom{width:101px; height:26px; background:no-repeat 0px 0px; left:31px; top:6px;} @@ -168,24 +189,6 @@ body{background:#092314; font-family:sans-serif; color:#d1c0a5; font-size:14px; #launcher_footer .share .btn.fb{width:28px; height:27px; background-position:-28px 0px;} #launcher_footer .share .btn.yt{width:50px; height:21px; margin-top:3px; background-position:-56px -3px;} -#launcher_modal{width:100%; height:100%; position:fixed; left:0; top:0; display:none; z-index:1000;} -#launcher_modal .modal{width:100%; height:100%; position:absolute; left:0; top:0;} -#launcher_modal .dialog{position:absolute; left:282px; top:140px; width:560px; height:320px; background:url(images/dialog/bg.jpg) no-repeat 0px 0px;} -#launcher_modal .dialog p{color:#d1c0a5; font-size:18px; line-height:36px; width:100%; position:relative; text-align:center; padding-top:105px;} -#launcher_modal .dialog p.alert{line-height:26px; padding-top:90px; font-size:20px;} -#launcher_modal .dialog p span.uid{font-size:12px;} -#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 .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:200px; height:35px; padding-top:9px; position:relative; background: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-position:0px -44px;} -#launcher_modal .dialog .btns ul li div.wait:hover,#launcher_modal .dialog .btns ul li div.wait.hover{background-position:0px 0px; cursor:default;} - .scroll_bar_box{width:10px; position:absolute;} .scroll_bar_box_base{width:10px; height:100%; position:absolute; right:0; top:0; border-radius:5px; background:#000; opacity:0.4; -moz-opacity:0.4; filter: alpha(opacity=40); -ms-filter:"alpha(opacity=40)";} .scroll_bar_box_body{width:6px; position:absolute; right:2px; border-radius:3px; background:#535353; transition:background-color 0.2s linear 0; cursor:pointer; opacity:0.8; -moz-opacity:0.8; filter: alpha(opacity=80); -ms-filter:"alpha(opacity=80)";} diff --git a/Erupe/www/erupe/img/manual.png b/Erupe/www/erupe/img/manual.png new file mode 100644 index 000000000..b1d864c8b Binary files /dev/null and b/Erupe/www/erupe/img/manual.png differ diff --git a/Erupe/www/erupe/img/modelbg.jpeg b/Erupe/www/erupe/img/modelbg.jpeg new file mode 100644 index 000000000..e8787206c Binary files /dev/null and b/Erupe/www/erupe/img/modelbg.jpeg differ diff --git a/Erupe/www/erupe/img/moreinfo.png b/Erupe/www/erupe/img/moreinfo.png new file mode 100644 index 000000000..8fe7d8d34 Binary files /dev/null and b/Erupe/www/erupe/img/moreinfo.png differ diff --git a/Erupe/www/erupe/img/pastebin.png b/Erupe/www/erupe/img/pastebin.png new file mode 100644 index 000000000..0c7169211 Binary files /dev/null and b/Erupe/www/erupe/img/pastebin.png differ diff --git a/Erupe/www/erupe/index.html b/Erupe/www/erupe/index.html index 2b43c058e..0a5dee251 100644 --- a/Erupe/www/erupe/index.html +++ b/Erupe/www/erupe/index.html @@ -1,73 +1,126 @@ - - - - - Monster Hunter Frontier Z Launcher - - - -
-
-
-
-
__
-
+ + + + + + Monster Hunter Frontier Z Launcher + + + + +
+
+
+
+
+
__
+
+
+ +
+
+

Authenticating...

- -
-

Authenticating...

- - - -
-
-
-
Current Weapon
-
-
- -
Add Character
-
Delete Character
-
Log Out
-
Launch
-
-
-
-

-
-
-
- -
-
- - +
+ +
- - +
+
+
Current Weapon
+
+
+ +
Add Character
+
Delete Character
+
Log Out
+
Launch
+
+
+
+

+
+
+
+
+
+
+

Important Updates

+
+ +
+
+
+
Normal Updates
+
+ +
+
+
+
+
+
+ +
+ +
+

+
+
+
+
+
+ + +
+
+
+ + \ No newline at end of file diff --git a/Erupe/www/erupe/js/script.js b/Erupe/www/erupe/js/script.js index ef480aa77..c3553616e 100644 --- a/Erupe/www/erupe/js/script.js +++ b/Erupe/www/erupe/js/script.js @@ -4,6 +4,8 @@ var doingAuto = false; var uids; var selectedUid; var firstChar; +var modalState = false; + function soundSel() { window.external.playSound('IDR_WAV_SEL'); @@ -81,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'; @@ -254,7 +256,7 @@ function switchPrompt() { } } -function doLogin() { +function doLogin(option) { let username = document.getElementById('username').value; let password = document.getElementById('password').value; if (username == '') { @@ -266,7 +268,12 @@ function doLogin() { soundPreLogin(); addLog('Authenticating...', 'normal'); try { - window.external.loginCog(username, password, password); + if (option) { + addLog('Creating new character...', 'normal'); + window.external.loginCog(username+'+', password, password); + } else { + window.external.loginCog(username, password, password); + } } catch (e) { addLog('Error on loginCog: '+e, 'error'); } @@ -350,12 +357,93 @@ function setUidIndex(index) { document.getElementById(selectedUid).classList.add('active'); } +function toggleModal(preset, url) { + let modal = document.getElementById('launcher_modal'); + modalState = !modalState; + if (modalState) { + setModalContent(preset, url); + modal.style.display = 'block'; + } else { + modal.style.display = 'none'; + } +} + +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 = ' \ +
    \ +
  • \ +
    Open
    \ +
  • \ +
  • \ +
    Cancel
    \ +
  • \ +
\ + '; + 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 = ' \ +
    \ +
  • \ +
    Yes
    \ +
  • \ +
  • \ +
    Cancel
    \ +
  • \ +
\ + '; + // Uses the launcher delete + // modal.querySelector(".dialog .btns").innerHTML = "
  • Yes
  • Cancel
"; + 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 = ' \ +
    \ +
  • \ +
    Add Character
    \ +
  • \ +
  • \ +
    Cancel
    \ +
  • \ +
\ + '; + break; + default: + return; + } +} + function charselAdd() { - addLog("Press [Log Out], then add a '+' to the end of your username to create a new character.", 'normal'); + toggleModal('addCharNew'); } function charselDel() { - addLog('Not yet implemented.', 'error'); + toggleModal('confirmCharDelete'); } function charselLog() {