From 2c5cd401a45a42b46e65c7d77f1503e99aa092b5 Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Sat, 13 Jan 2024 11:10:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=93=84=E8=B0=8B=E6=9C=BA=E5=88=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/jsrg.js | 3 ++- character/offline.js | 2 +- game/game.js | 2 +- image/card/xumou_jsrg.jpg | Bin 0 -> 15290 bytes noname/game/index.js | 2 +- noname/library/element/content.js | 6 +++--- noname/library/index.js | 1 + 7 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 image/card/xumou_jsrg.jpg diff --git a/character/jsrg.js b/character/jsrg.js index 9adfcd317..3b785c45c 100644 --- a/character/jsrg.js +++ b/character/jsrg.js @@ -67,9 +67,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ perfectPair:{}, card:{ xumou_jsrg:{ - type:'delay', + type:'special_delay', allowDuplicate:true, blankCard:true, + fullimage:true, effect:function(){ 'step 0' var card=event.cards[0]; diff --git a/character/offline.js b/character/offline.js index 69cb9a1b4..97b416cd8 100644 --- a/character/offline.js +++ b/character/offline.js @@ -133,7 +133,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ perfectPair:{}, card:{ yanxiao_card:{ - type:'delay', + type:'special_delay', fullimage:true, noEffect:true, ai:{ diff --git a/game/game.js b/game/game.js index 3c111b0bd..a594c43ff 100644 --- a/game/game.js +++ b/game/game.js @@ -91,7 +91,7 @@ new Promise(resolve => { script.async = true script.onerror = (event) => { console.error(event) - const message = `您使用的浏览器或无名杀客户端加载内容失败!\n请检查游戏环境以及"(游戏根目录)/game/entry.js"文件的位置\n若该BUG不为您个人原因造成的,请及时反馈给无名杀开发组!`; + const message = `您使用的浏览器或无名杀客户端加载内容失败!\n若您使用的客户端为旧版“兼容版”或其他内核较低的版本,请及时更新客户端版本!\n请检查游戏环境以及"(游戏根目录)/game/entry.js"文件的位置\n若该BUG不为您个人原因造成的,请及时反馈给无名杀开发组!`; console.error(message); alert(message); exit() diff --git a/image/card/xumou_jsrg.jpg b/image/card/xumou_jsrg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..10958125440f6b5bbf767ed7adee4c93947aead2 GIT binary patch literal 15290 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 literal 0 HcmV?d00001 diff --git a/noname/game/index.js b/noname/game/index.js index a6c9f6d78..b824aff41 100644 --- a/noname/game/index.js +++ b/noname/game/index.js @@ -7399,7 +7399,7 @@ export class Game extends Uninstantable { if (card.ai.basic.value == undefined) card.ai.basic.value = aiBasicValue; if (!card.ai.result.keepAI) card.ai.result.target = aiResultTarget; } - else if (card.type == 'delay') { + else if (card.type == 'delay' || card.type == 'special_delay') { if (card.enable == undefined) card.enable = true; if (card.filterTarget == undefined) card.filterTarget = lib.filter.judge; if (card.content == undefined) card.content = lib.element.content.addJudgeCard; diff --git a/noname/library/element/content.js b/noname/library/element/content.js index 1967adfa1..ecd7a9dc7 100644 --- a/noname/library/element/content.js +++ b/noname/library/element/content.js @@ -5210,7 +5210,7 @@ export const Content = { if (!info || !info.blankCard) return true; return false; }); - if (shown.length < js.length) { + if (shown.length < js.length && !target.isUnderControl(true)) { var hidden = js.filter(card => !shown.includes(card)); var buttons = ui.create.div('.buttons', event.dialog.content); event.dialog.buttons = event.dialog.buttons.concat(ui.create.buttons(shown, 'card', buttons)); @@ -5385,7 +5385,7 @@ export const Content = { if (!info || !info.blankCard) return true; return false; }); - if (shown.length < js.length) { + if (shown.length < js.length && !target.isUnderControl(true)) { var hidden = js.filter(card => !shown.includes(card)); var buttons = ui.create.div('.buttons', event.dialog.content); event.dialog.buttons = event.dialog.buttons.concat(ui.create.buttons(shown, 'card', buttons)); @@ -5585,7 +5585,7 @@ export const Content = { if (!info || !info.blankCard) return true; return false; }); - if (shown.length < js.length) { + if (shown.length < js.length && !target.isUnderControl(true)) { var hidden = js.filter(card => !shown.includes(card)); var buttons = ui.create.div('.buttons', event.dialog.content); event.dialog.buttons = event.dialog.buttons.concat(ui.create.buttons(shown, 'card', buttons)); diff --git a/noname/library/index.js b/noname/library/index.js index 55ac530c5..6d04c9d4c 100644 --- a/noname/library/index.js +++ b/noname/library/index.js @@ -9271,6 +9271,7 @@ export class Library extends Uninstantable { equip: '装备', trick: '锦囊', delay: '延时锦囊', + special_delay: '技能机制', character: '角色', revive: '复活', equip1: '武器',