From 985a64e2181debd189b84abfb73304a5886a16de Mon Sep 17 00:00:00 2001 From: shijian <2954700422@qq.com> Date: Fri, 27 Oct 2023 02:51:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E6=9C=BA=E6=A8=A1=E5=BC=8F(=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=A4=96)=E9=82=80=E8=AF=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game/game.js | 59 +++++++++++++++++++++++++++++++++++++++ layout/default/layout.css | 7 ++++- mode/connect.js | 39 ++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 1 deletion(-) diff --git a/game/game.js b/game/game.js index 7fc6f30da..8f33c9349 100644 --- a/game/game.js +++ b/game/game.js @@ -34861,6 +34861,37 @@ ui.rooms.push(player); } } + if(get.config('read_clipboard','connect')){ + function read(text){ + try{ + var roomId=text.split('\n')[1].match(/\d+/); + var caption=ui.rooms.find(caption=>caption.key==roomId); + if (caption && (confirm(`是否通过复制的内容加入${roomId}房间?`) || _status.read_clipboard_text)){ + ui.click.connectroom.call(caption); + } + }catch(e){console.log(e);} + } + if(_status.read_clipboard_text){ + read(_status.read_clipboard_text); + }else{ + window.focus(); + if(navigator.clipboard){ + navigator.clipboard.readText().then(read).catch(_=>{}); + }else{ + var input=ui.create.node('textarea',ui.window,{opacity:'0'}); + input.select(); + var result=document.execCommand('paste'); + input.blur(); + ui.window.removeChild(input); + if(result) read(input.value); + //也就小b兼容版不支持直接读取了 + else if(confirm('是否输入邀请链接以加入房间?')){ + var text=prompt('请输入邀请链接'); + if(typeof text=='string'&&text.length>0) read(text); + } + } + } + } } lib.message.client.updateclients(clients,true); }, @@ -35377,6 +35408,10 @@ ui.connectStartBar.delete(); delete ui.connectStartBar; } + if(ui.connectShareButton){ + ui.connectShareButton.delete(); + delete ui.connectShareButton; + } if(ui.roomInfo){ ui.roomInfo.remove(); delete ui.roomInfo; @@ -53410,13 +53445,37 @@ } button.delete(); bar.delete(); + shareButton.delete(); delete ui.connectStartButton; delete ui.connectStartBar; + delete ui.connectShareButton; button.clicked=true; }); + var shareButton=ui.create.div('.menubutton.large.highlight.connectbutton.connectbutton2.pointerdiv','分享房间',ui.window,function(){ + var text=`无名杀-联机-${lib.translate[get.mode()]}-${game.connectPlayers.filter(p=>p.avatar).length}/${game.connectPlayers.filter(p=>!p.classList.contains('unselectable2')).length}\n${get.connectNickname()}邀请你加入${game.roomId}房间\n联机地址:${game.ip}\n请先通过游戏内菜单-开始-联机中启用“读取邀请链接”选项`; + window.focus(); + if(navigator.clipboard){ + navigator.clipboard.writeText(text).then(()=>{ + game.alert(`分享内容复制成功`); + }).catch(e => { + game.alert(`分享内容复制失败${e||''}`); + }); + }else{ + var input=ui.create.node('textarea',ui.window,{opacity:'0'}); + input.value=text; + input.focus(); + input.select(); + var result=document.execCommand('copy'); + input.blur(); + ui.window.removeChild(input); + game.alert(`分享内容复制${result?'成功':'失败'}`); + } + }); + ui.connectStartButton=button; ui.connectStartBar=bar; + ui.connectShareButton=shareButton; }, players:numberOfPlayers=>{ if(numberOfPlayers===0){ diff --git a/layout/default/layout.css b/layout/default/layout.css index 65b5ea108..35369dc59 100644 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -3374,7 +3374,12 @@ div:not(.handcards)>.card>.info>span, .connectbutton { top: calc(400% / 7 - 35px); width: 130px; - left: calc(50% - 70px); +} +.connectbutton1 { + left: calc(50% - 200px); +} +.connectbutton2 { + left: calc(50% + 60px); } .connectevents { left: auto; diff --git a/mode/connect.js b/mode/connect.js index 928aed2c0..332684418 100644 --- a/mode/connect.js +++ b/mode/connect.js @@ -119,6 +119,45 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }); return uiintro; },220); + if (get.config('read_clipboard', 'connect')) { + var ced=false; + function read(text){ + try{ + var text2=text.split('\n')[2]; + var ip=text2.slice(5); + if(ip.length>0&&text2.startsWith("联机地址:")&&(ced||confirm('是否根据剪贴板的邀请链接以进入联机地址和房间?'))){ + node.innerHTML=ip; + event.textnode.innerHTML='正在连接...'; + clearTimeout(event.timeout); + game.saveConfig('last_ip',node.innerHTML); + game.connect(node.innerHTML,function(success){ + if(!success&&event.textnode){ + alert('邀请链接解析失败'); + event.textnode.innerHTML='输入联机地址'; + } + if (success) _status.read_clipboard_text=text; + }); + } + }catch(e){console.log(e);} + } + window.focus(); + if (navigator.clipboard){ + navigator.clipboard.readText().then(read).catch(_=>{}); + }else{ + var input=ui.create.node('textarea',ui.window,{opacity:'0'}); + input.select(); + var result=document.execCommand('paste'); + input.blur(); + ui.window.removeChild(input); + if(result) read(input.value); + //也就小b兼容版不支持直接读取了 + else if(confirm('是否输入邀请链接以进入联机地址和房间?')){ + ced=true; + var text=prompt('请输入邀请链接'); + if(typeof text=='string'&&text.length>0) read(text); + } + } + } lib.init.onfree(); } if(window.isNonameServer){