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 1/4] =?UTF-8?q?=E8=81=94=E6=9C=BA=E6=A8=A1=E5=BC=8F(?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=A4=96)=E9=82=80=E8=AF=B7=E5=8A=9F?= =?UTF-8?q?=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){ From fd9972f6f3f34f8f3dc74b889c79c2477bc62f2f Mon Sep 17 00:00:00 2001 From: shijian <2954700422@qq.com> Date: Fri, 27 Oct 2023 15:50:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=81=94=E6=9C=BA?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F(=E5=BA=94=E7=94=A8=E5=A4=96)=E9=82=80?= =?UTF-8?q?=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 | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/game/game.js b/game/game.js index 8f33c9349..7e4cc606e 100644 --- a/game/game.js +++ b/game/game.js @@ -6609,6 +6609,12 @@ frequent:true, intro:'在用户填写的IP地址没有直接指定使用WS/WSS协议的情况下，默认使用WSS协议，而非WS协议来连接到联机服务器。
请不要轻易勾选此项！', }, + read_clipboard:{ + name:'读取邀请链接', + init:false, + frequent:true, + intro:'读取剪贴板以解析邀请链接自动加入联机房间', + } } }, boss:{ @@ -34866,16 +34872,17 @@ 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)){ + if (caption&&(confirm(`是否通过复制的内容加入${roomId}房间？`)||_status.read_clipboard_text)){ ui.click.connectroom.call(caption); + delete _status.read_clipboard_text; } - }catch(e){console.log(e);} + }catch(e){console.log(e)} } if(_status.read_clipboard_text){ read(_status.read_clipboard_text); }else{ window.focus(); - if(navigator.clipboard){ + if(navigator.clipboard&&lib.node){ navigator.clipboard.readText().then(read).catch(_=>{}); }else{ var input=ui.create.node('textarea',ui.window,{opacity:'0'}); @@ -34883,7 +34890,7 @@ var result=document.execCommand('paste'); input.blur(); ui.window.removeChild(input); - if(result) read(input.value); + if(result||input.value.length>0) read(input.value); //也就小b兼容版不支持直接读取了 else if(confirm('是否输入邀请链接以加入房间？')){ var text=prompt('请输入邀请链接'); @@ -53419,7 +53426,7 @@ ipbar.style.borderRadius='2px'; ipbar.style.position='relative'; - var button=ui.create.div('.menubutton.large.highlight.connectbutton.pointerdiv',game.online?'退出联机':'开始游戏',ui.window,function(){ + var button=ui.create.div('.menubutton.large.highlight.connectbutton.connectbutton1.pointerdiv',game.online?'退出联机':'开始游戏',ui.window,function(){ if(button.clicked) return; if(game.online){ if(game.onlinezhu){ @@ -53455,10 +53462,10 @@ 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){ + if(navigator.clipboard&&lib.node){ navigator.clipboard.writeText(text).then(()=>{ game.alert(`分享内容复制成功`); - }).catch(e => { + }).catch(e=>{ game.alert(`分享内容复制失败${e||''}`); }); }else{ @@ -53521,10 +53528,10 @@ ui.handcards1Container.onmousewheel=ui.click.mousewheel; ui.handcards2Container.onmousewheel=ui.click.mousewheel; } - ui.handcards1Container.ontouchstart = ui.click.touchStart; - ui.handcards2Container.ontouchstart = ui.click.touchStart; - ui.handcards1Container.ontouchmove = ui.click.touchScroll; - ui.handcards2Container.ontouchmove = ui.click.touchScroll; + ui.handcards1Container.ontouchstart=ui.click.touchStart; + ui.handcards2Container.ontouchstart=ui.click.touchStart; + ui.handcards1Container.ontouchmove=ui.click.touchScroll; + ui.handcards2Container.ontouchmove=ui.click.touchScroll; ui.handcards1Container.style.webkitOverflowScrolling='touch'; ui.handcards2Container.style.webkitOverflowScrolling='touch'; From 70852b815fc6aaff6f0aeafd4b1c2ffd0ef82aa2 Mon Sep 17 00:00:00 2001 From: shijian <2954700422@qq.com> Date: Fri, 27 Oct 2023 16:00:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=81=94=E6=9C=BA?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F(=E5=BA=94=E7=94=A8=E5=A4=96)=E9=82=80?= =?UTF-8?q?=E8=AF=B7=E5=8A=9F=E8=83=BD-2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game/game.js | 7 ++++--- mode/connect.js | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/game/game.js b/game/game.js index 7e4cc606e..f2b5f4534 100644 --- a/game/game.js +++ b/game/game.js @@ -34867,12 +34867,14 @@ ui.rooms.push(player); } } - if(get.config('read_clipboard','connect')){ + if(!_status.requestReadClipboard&&get.config('read_clipboard','connect')){ + //每次启动只请求一次 + _status.requestReadClipboard=true; 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)){ + if (caption&&(_status.read_clipboard_text||confirm(`是否通过复制的内容加入${roomId}房间？`))){ ui.click.connectroom.call(caption); delete _status.read_clipboard_text; } @@ -34891,7 +34893,6 @@ input.blur(); ui.window.removeChild(input); if(result||input.value.length>0) read(input.value); - //也就小b兼容版不支持直接读取了 else if(confirm('是否输入邀请链接以加入房间？')){ var text=prompt('请输入邀请链接'); if(typeof text=='string'&&text.length>0) read(text); diff --git a/mode/connect.js b/mode/connect.js index 332684418..ab414ddec 100644 --- a/mode/connect.js +++ b/mode/connect.js @@ -141,7 +141,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }catch(e){console.log(e);} } window.focus(); - if (navigator.clipboard){ + if (navigator.clipboard&&lib.node){ navigator.clipboard.readText().then(read).catch(_=>{}); }else{ var input=ui.create.node('textarea',ui.window,{opacity:'0'}); @@ -149,8 +149,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ var result=document.execCommand('paste'); input.blur(); ui.window.removeChild(input); - if(result) read(input.value); - //也就小b兼容版不支持直接读取了 + if(result||input.value.length>0) read(input.value); else if(confirm('是否输入邀请链接以进入联机地址和房间？')){ ced=true; var text=prompt('请输入邀请链接'); From f12e3c1b6ffdde231ffe95b4b8867dcc66750536 Mon Sep 17 00:00:00 2001 From: shijian <2954700422@qq.com> Date: Wed, 8 Nov 2023 09:02:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?player.when=E5=92=8Clib.init.parsex?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=A0=E9=80=92=E4=BD=9C=E7=94=A8=E5=9F=9F?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game/game.js | 58 ++++++++++++++++++++++++++++++++++++++++++++----- mode/connect.js | 2 +- 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/game/game.js b/game/game.js index c5e91884a..0d2f486fc 100644 --- a/game/game.js +++ b/game/game.js @@ -11441,7 +11441,13 @@ localStorage.removeItem(lib.configprefix+'background'); } }, - parsex:function(item){ + /** + * + * @param {*} item + * @param {Function} [scope] 作用域 + * @returns + */ + parsex:function(item,scope){ //by 诗笺、Tipx-L /** * @param {Function} func @@ -11501,9 +11507,15 @@ } str=`if(event.step==${k}){event.finish();return;}`+str; } - return (new (hasDebugger?GeneratorFunction:Function)('event','step','source','player','target','targets', + if(!scope){ + return (new (hasDebugger?GeneratorFunction:Function)('event','step','source','player','target','targets', 'card','cards','skill','forced','num','trigger','result', '_status','lib','game','ui','get','ai',str)); + }else{ + return scope(`function${hasDebugger?'*':''} anonymous(event,step,source,player,target,targets, + card,cards,skill,forced,num,trigger,result, + _status,lib,game,ui,get,ai){${str}}; anonymous;`); + } } switch(typeof item){ case "object": @@ -11572,7 +11584,7 @@ else lastEvent=currentResult; } } - } + }else if(item._parsed) return item; // falls through default: return Legacy(item); @@ -20893,11 +20905,24 @@ this.markSkill('stratagem_fury'); } /** - * version 1.6 + * version 1.7 * * 链式创建一次性技能的api。 * * 使用者只需要关注技能的效果，而不是技能的本身。 + * + * v1.7 可传递作用域 + * @example + * ```js + * (function () { + * let _var = 1; + * let me = player; + * player.when('drawAfter') + * .apply(code => eval(code)) + * .then(() => console.log(_var)) + * .then('me.gainMaxHp(5)'); + * })(); + * ``` */ when(){ if(!_status.postReconnect.player_when) _status.postReconnect.player_when=[ @@ -20944,6 +20969,11 @@ else if(Array.isArray(trigger.player)) trigger.player.add(after); else if(typeof trigger.player=='string') trigger.player=[trigger.player,after]; const vars={}; + /** + * 作用域 + * @type { (code: string) => any } + */ + let scope; let skill={ trigger:trigger, forced:true, @@ -20998,11 +21028,12 @@ const fun2=skill.contentFuns[i]; const a=fun2.toString(); //防止传入()=>xxx的情况 - const begin=a.indexOf("{")==a.indexOf("}")&&a.indexOf("{")==-1?a.indexOf("=>")+2:a.indexOf("{")+1; + const begin=a.indexOf("{")==a.indexOf("}")&&a.indexOf("{")==-1&&a.indexOf("=>")>-1?a.indexOf("=>")+2:a.indexOf("{")+1; const str2=a.slice(begin,a.lastIndexOf("}")!=-1?a.lastIndexOf("}"):undefined).trim(); str+=`'step ${i}'\n\t${str2}\n\t`; } - skill.content=eval(str+`\n};content;`); + skill.content=lib.init.parsex((scope||eval)(str+`\n};content;`),scope); + skill.content._parsed=true; }; Object.defineProperty(lib.skill,skillName,{ configurable:true, @@ -21077,6 +21108,21 @@ Object.assign(vars,arg); createContent(); return this; + }, + /** + * 传递外部作用域 + * + * 一般是传递一个 code=>eval(code) 函数 + * + * 传递后可在then中使用外部变量(vars的上位替代) + * + * @param {Function} _scope + */ + apply(_scope){ + if(lib.skill[skillName]!=skill) throw `This skill has been destroyed`; + scope=_scope; + if(skill.contentFuns.length>0) createContent(); + return this; } }; } diff --git a/mode/connect.js b/mode/connect.js index 67a1c8044..dc709ecd0 100644 --- a/mode/connect.js +++ b/mode/connect.js @@ -119,7 +119,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }); return uiintro; },220); - if (get.config('read_clipboard', 'connect')) { + if (get.config('read_clipboard','connect')){ var ced=false; function read(text){ try{