YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'libccy:PR-Branch' into PR-Branch

This commit is contained in:
157 2024-01-13 14:05:12 +08:00 committed by GitHub
parent 910fd73717 a4bbe5e804
commit eb547a0420
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 330 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
audio/die/caoyu.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/olgongjie1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/olgongjie2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/olxiangxv1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/olxiangxv2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/olxiangzuo1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/olxiangzuo2.mp3 Normal file
View File

Binary file not shown.

3
character/jsrg.js
View File

@ -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];

2
character/offline.js
View File

@ -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:{

230
character/sp.js
View File

@ -18,7 +18,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
sp_zhongdan:["cuiyan","huangfusong"],
sp_guozhan2:["sp_dongzhuo","liqueguosi","zhangren"],
sp_others:["hanba","caiyang"],
sp_waitforsort:['ol_luyusheng','ol_pengyang','ol_tw_zhangji','ol_dingshangwan','ol_liwan','ol_liuyan'],
sp_waitforsort:['ol_luyusheng','ol_pengyang','ol_tw_zhangji','ol_dingshangwan','ol_liwan','ol_liuyan','caoyu'],
},
},
characterFilter:{
@ -30,6 +30,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
character:{
caoyu:['male','wei',3,['olgongjie','olxiangxv','olxiangzuo']],
ol_liwan:['female','wei',3,['ollianju','olsilv']],
ol_dingshangwan:['female','wei',3,['olfudao','olfengyan']],
zhangyan:['male','qun',4,['olsuji','ollangdao']],
@ -201,6 +202,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
luzhi:['male','wei',3,['qingzhong','weijing']]
},
characterIntro:{
caoyu:'曹宇（？－278年），字彭祖，沛国谯县（今安徽亳州）人。三国时期魏国宗室，魏武帝曹操与环夫人之子，邓哀王曹冲同母兄弟。太和六年，封为燕王。魏明帝病危，欲以大将军辅政，不果。其子常道乡公曹奂，是魏国末代皇帝，史称魏元帝。晋朝建立后，降封燕公。咸宁四年（278年），曹宇去世。',
zhangyan:'张燕，本姓褚，生卒年不详，常山真定（今河北正定南）人，东汉末年黑山军首领。张燕剽捍，敏捷过人，军中称为“飞燕”。官渡之战时投降曹操，被任命为平北将军，封安国亭侯。死后其子张方袭爵。',
lushi:'卢氏，五斗米教主张衡妻，张鲁母，擅长驻颜之术，常年令自己保持少女的容颜。常拜访刘焉，与其交好。',
lvboshe:'吕伯奢，东汉成皋（今河南荥阳）人，曹操父亲曹嵩的故友。曹操与陈宫在逃离董卓避祸，返回乡里的途中借宿于吕伯奢家，未伤其人，有贼八人欲捉曹操，曹操杀之，明罗贯中在历史小说《三国演义》中将这段历史进行了丑化加工，也成为小说中曹操名言“宁教我负天下人，休教天下人负我”的出处。',
@ -703,6 +705,113 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
skill:{
//曹宇
olgongjie:{
audio:2,
trigger:{global:'phaseBegin'},
filter(event,player){
if(!player.countCards('he')) return false;
return !game.hasPlayer(current=>{
var history=current.actionHistory;
for(var num=history.length-1;num>=0;num--){
if(history[num].isRound) break;
if(history[num].isSkipped) continue;
return true;
}
return false;
});
},
direct:true,
async content(event,trigger,player){
var num=player.countCards('he'),draws=[];
var {result:{bool,targets}}=await player.chooseTarget(get.prompt2('olgongjie'),[1,num],lib.filter.notMe).set('ai',target=>get.attitude(_status.event.player,target));
if(!bool) return;
targets=targets.sortBySeat();
player.logSkill('gongjie',targets);
for(var target of targets){
var {result:{bool,cards}}=await target.gainPlayerCard(player,true,'he');
if(bool) draws.add(get.suit(cards[0],player));
}
player.draw(draws.length);
},
},
olxiangxv:{
audio:2,
trigger:{
player:'loseAfter',
global:['gainAfter','equipAfter','addJudgeAfter','gainAfter','loseAsyncAfter','addToExpansionAfter'],
},
filter(event,player){
if(!_status.currentPhase||!_status.currentPhase.isIn()) return false;
if(!player.isMinHandcard()) return false;
var evt=event.getl(player);
if(evt&&evt.player==player&&evt.hs&&evt.hs.length>0) return true;
if(event.getg) return game.hasPlayer(current=>{
var cards=event.getg(current);
if(!cards.length) return false;
return current.countCards('h')>=player.countCards('h')&&current.countCards('h')-cards.length<player.countCards('h');
});
return false;
},
check(event,player){
var target=_status.currentPhase;
var cards=target.getCards('h');
if(target.isPhaseUsing()){
var cardx=cards.filter(card=>get.name(card)=='sha');
cardx.sort((a,b)=>target.getUseValue(b)-target.getUseValue(a));
cardx=cardx.slice(Math.min(cardx.length,target.getCardUsable('sha')),cardx.length);
cards.removeArray(cardx);
}
return cards.length-player.countCards('h')>0;
},
logTarget:()=>_status.currentPhase,
async content(event,trigger,player){
player.tempBanSkill('olxiangxv',null,false);
player.when({global:'phaseEnd'}).then(()=>{
if(target&&target.isIn()){
var num=target.countCards('h')!=player.countCards('h');
if(num){
if(num>0){
if(player.countCards('h')<5) player.draw(Math.min(5-player.countCards('h'),num));
}
else player.chooseToDiscard(-num,'h',true);
}
}
}).vars({target:_status.currentPhase});
},
},
olxiangzuo:{
audio:2,
trigger:{player:'dying'},
filter(event,player){
if(!_status.currentPhase||!_status.currentPhase.isIn()) return false;
return player.countCards('he');
},
direct:true,
async content(event,trigger,player){
var target=_status.currentPhase,num=player.countCards('he');
var {result:{bool,cards}}=await player.chooseToGive(get.prompt2('olxiangzuo',target),[1,num],'he').set('ai',card=>{
var player=_status.event.player,target=_status.event.target;
if(player.getHistory('useSkill',evt=>{
return (evt.skill=='olgongjie'||evt.skill=='olxiangxv')&&evt.targets.includes(target);
}).length){
if(get.attitude(player,target)>0) return 1;
if(player.canSaveCard(card,player)) return 0;
if(ui.selected.cards.length+player.hp==player.maxHp) return 0;
return 20-get.value(card);
}
else{
if(get.attitude(player,target)>0&&!player.countCards('he',cardx=>player.canSaveCard(cardx,player))) return 1;
return 0;
}
}).set('target',target).set('complexCard',true).set('logSkill',['olxiangzuo',target]);
if(!bool) return;
player.awakenSkill('olxiangzuo');
if(player.getHistory('useSkill',evt=>{
return (evt.skill=='olgongjie'||evt.skill=='olxiangxv')&&evt.targets.includes(target);
}).length) player.recover(cards.length);
},
},
//OL飞扬
olfeiyang:{
trigger:{player:'phaseZhunbeiBegin'},
@ -877,12 +986,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var num=player.countCards('h');
if(num>0){
player.chooseCardTarget({
prompt:'抚悼：将至多三手张牌交给一名其他角色',
prompt:'抚悼：将至多三张手张牌交给一名其他角色',
selectCard:[1,3],
filterCard:true,
filterTarget:lib.filter.notMe,
position:'h',
forced:true,
ai1:function(card){
if(card.name=='du') return 10;
else if(ui.selected.cards.length&&ui.selected.cards[0].name=='du') return 0;
@ -952,22 +1060,20 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){
'step 0'
var target=lib.skill.olfengyan.logTarget(trigger,player);
if(trigger.name=='damage'){
event.target=target;
var str=get.translation(target);event.target=target;
player.chooseControl().set('choiceList',[
'摸一张牌，然后交给'+str+'一张牌',
'令'+str+'摸一张牌，然后'+str+'弃置两张牌',
]).set('ai',()=>_status.event.att>0?0:1).set('att',get.attitude(player,target));
'step 1'
if(result.index==0){
player.draw();
player.chooseToGive(target,'he',true);
}
else{
target.draw();
target.chooseToDiscard(2,'he',true);
event.finish();
}
'step 1'
var num=player.countCards('he');
if(!num) event.finish();
else if(num==1) event._result={bool:true,cards:player.getCards('he')};
else player.chooseCard('he',true,'交给'+get.translation(target)+'一张牌');
'step 2'
if(result.bool) target.gain(result.cards,player,'giveAuto');
},
},
//张燕
@ -2273,10 +2379,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:2,
enable:'chooseToUse',
hiddenCard:function(player,name){
if(name!='wuxie'&&lib.inpile.includes(name)) return true;
if(name!='wuxie'&&lib.inpile.includes(name)&&lib.skill.olqifan.getNum()) return true;
},
getNum:()=>game.getGlobalHistory('useCard').reduce((list,evt)=>list.add(get.type2(evt.card)),[]).length,
filter:function(event,player){
if(event.responded||event.type=='wuxie'||event.olqifan) return false;
if(event.responded||event.type=='wuxie'||event.olqifan||!lib.skill.olqifan.getNum()) return false;
for(var i of lib.inpile){
if(i!='wuxie'&&event.filterCard({name:i},player,event)) return true;
}
@ -2287,7 +2394,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 0'
var evt=event.getParent(2);
evt.set('olqifan',true);
var cards=get.bottomCards(1+player.getStorage('olqifan').length,true);
var cards=get.bottomCards(lib.skill.olqifan.getNum(),true);
var aozhan=player.hasSkill('aozhan');
player.chooseButton(['器翻：选择要使用的牌',cards]).set('filterButton',function(button){
return _status.event.cards.includes(button.link);
@ -2349,27 +2456,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
}
},
onremove:true,
intro:{
content:'已使用过$牌',
},
subSkill:{
discard:{
trigger:{player:'chooseToUseAfter'},
forced:true,
charlotte:true,
filter:(player)=>{
var num=player.getStorage('olqifan').length,pos=('jeh').slice(0,num);
return num>0&&player.countCards(pos)>0;
},
content:function(){
var pos=('jeh')[event.num],hs=player.countCards(pos);
if(hs>0) player.chooseToDiscard(hs,pos,true);
event.num++;
if(event.num<event.maxNum) event.redo();
},
},
},
},
olqifan_backup:{
sourceSkill:'olqifan',
@ -2381,21 +2467,20 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(rcard.name==name) card=get.autoViewAs(rcard);
else card=get.autoViewAs({name,isCard:true});
event.result.card=card;
player.markAuto('olqifan',[get.type2(card,false)]);
var id=get.id();
player.when('chooseToUseAfter')
.filter((evt)=>evt==event.getParent())
.then(()=>{
if(!lib.skill.olqifan_discard.filter(player)){
event.finish();
}
else{
event.maxNum=Math.min(3,player.getStorage('olqifan').length);
event.num=0;
}
})
.then(lib.skill.olqifan_discard.content)
.translation('器翻');
player.when('chooseToUseAfter').filter((evt)=>evt==event.getParent()).then(()=>{
var num=lib.skill.olqifan.getNum(),pos=('jeh').slice(0,num);
if(num>0&&player.countCards(pos)>0){
event.maxNum=Math.min(3,lib.skill.olqifan.getNum());
event.num=0;
}
else event.finish();
}).then(()=>{
var pos=('jeh')[event.num],hs=player.countCards(pos);
if(hs>0) player.chooseToDiscard(hs,pos,true);
event.num++;
if(event.num<event.maxNum) event.redo();
}).translation('器翻');
},
filterCard:function(){return false},
selectCard:-1,
@ -2428,24 +2513,36 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return order;
},
},
trigger:{player:'useCardAfter'},
forced:true,
trigger:{player:'useCard'},
filter:function(event){
const num=get.number(event.card);
return [1,11,12,13].includes(num);
return [1,11,12,13].includes(get.number(event.card));
},
forced:true,
content:function(){
player.draw(2);
'step 0'
trigger.targets.length=0;
trigger.all_excluded=true;
game.log(trigger.card,'被无效了');
'step 1'
player.draw();
player.addSkill('oltuishi_unlimit');
},
subSkill:{
unlimit:{
charlotte:true,
mod:{
cardUsable:()=>Infinity,
targetInRange:()=>true,
cardUsableTarget:(card,player,target)=>{
if(target.countCards('h')<player.countCards('h')) return true;
},
targetInRange:(card,player,target)=>{
if(target.countCards('h')<player.countCards('h')) return true;
},
},
trigger:{player:'useCard1'},
filter:function(event,player){
if(!event.targets||!event.targets.length) return false;
return event.targets.some(target=>player.countCards('h')+event.cards.length>target.countCards('h'));
},
forced:true,
popup:false,
silent:true,
@ -2461,7 +2558,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
},
mark:true,
intro:{content:'使用的下一张牌无距离次数限制'},
intro:{content:'对手牌数小于你的角色使用的下一张牌无距离次数限制'},
},
},
},
@ -26664,9 +26761,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
ol_pengyang:'OL彭羕',
ol_pengyang_prefix:'OL',
olqifan:'器翻',
olqifan_info:'当你需要使用不为【无懈可击】的牌时，你可以观看牌堆底的X+1张牌并使用其中的一张。此牌结算结束时，你依次弃置以下前X个区域中的所有牌：⒈判定区、⒉装备区、⒊手牌区（X为你因此技能使用过的牌中包含的类型数）。',
olqifan_info:'当你需要使用不为【无懈可击】的牌时，你可以观看牌堆底的X张牌并使用其中的一张。此牌结算结束时，你依次弃置以下前X个区域中的所有牌：⒈判定区、⒉装备区、⒊手牌区（X为本回合使用过的牌中包含的类型数）。',
oltuishi:'侻失',
oltuishi_info:'锁定技。①你不能使用【无懈可击】。②当你使用点数为字母的牌后，你摸两张牌，且你使用的下一张牌无距离和次数限制。',
oltuishi_info:'锁定技。①你不能使用【无懈可击】。②当你使用点数为字母的牌时，你令此牌无效并摸一张牌，且你对手牌数小于你的角色使用的下一张牌无距离和次数限制。',
ol_tw_zhangji:'张既',
skill_zhangji_A:'技能',
skill_zhangji_A_info:'出牌阶段限X次（X为你的体力值），当你使用牌指定一名其他角色为目标后，你可以观看其手牌，然后你选择一项：<br>1.弃置其一张牌，然后若弃置的牌是能造成火焰伤害的牌，你摸一张牌。<br>2.重铸其手牌中的所有【杀】和【决斗】。<br>3.若其没有【闪】，你与其互相对对方造成1点伤害。',
@ -26690,9 +26787,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
ol_dingshangwan:'OL丁尚涴',
ol_dingshangwan_prefix:'OL',
olfudao:'抚悼',
olfudao_info:'①游戏开始时，你摸三张牌并将至多三张手牌交给一名其他角色，然后弃置任意张手牌并记录你的手牌数。②一名角色的回合结束时，若其手牌数和你发动〖抚悼①〗记录的数值相同，则你可以与其各摸一张牌。',
olfudao_info:'①游戏开始时，你摸三张牌，然后可以将至多三张手牌交给一名其他角色，然后可以弃置任意张手牌，最后记录你的手牌数。②一名角色的回合结束时，若其手牌数和你发动〖抚悼①〗记录的数值相同，则你可以与其各摸一张牌。',
olfengyan:'讽言',
olfengyan_info:'锁定技。①当你受到其他角色造成的伤害后，你摸一张牌，然后交给其一张牌。②当你响应其他角色使用的牌时，其摸一张牌，然后弃置两张牌。',
olfengyan_info:'锁定技。当你受到其他角色造成的伤害后或响应其他角色使用的牌时，你选择一项：①摸一张牌，然后交给其一张牌。②令其摸一张牌，然后其弃置两张牌。',
ol_liwan:'OL李婉',
ol_liwan_prefix:'OL',
ollianju:'联句',
@ -26708,6 +26805,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
olfeiyang:'飞扬',
//olfeiyang_info:'限定技。准备阶段，你可以弃置两张牌，然后弃置判定区的一张牌。',
olfeiyang_info:'准备阶段，你可以弃置三张牌，然后弃置判定区的一张牌。',
caoyu:'曹宇',
olgongjie:'恭节',
olgongjie_info:'每轮的首个回合开始时，你可以令任意名角色获得你的一张牌，然后你摸X张牌（X为你本次失去的花色数）。',
olxiangxv:'相胥',
olxiangxv_info:'当你的手牌数变为全场最少时，你可以获得以下效果：本回合结束时，将手牌数调整至与当前回合角色手牌数相同（至多摸至五张）。',
olxiangzuo:'襄胙',
olxiangzuo_info:'限定技，当你进入濒死状态时，你可以交给当前回合角色任意张牌，若如此做，若你本回合已对其发动过〖恭节〗或〖相胥〗，你回复等量的体力。',
sp_tianji:'天极·皇室宗亲',
sp_sibi:'四弼·辅国文曲',

4
character/sp2.js
View File

@ -11189,10 +11189,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
starweilin:'威临',
starweilin_info:'锁定技。当你于回合内对一名其他角色造成伤害时，若其本回合未受到过伤害，且你本回合使用的牌数大于等于其体力值，则此伤害+1。',
starzhangrong:'掌戎',
starzhangrong_info:'准备阶段，你可以选择令至多X名体力值大于等于你的角色各失去1点体力或令至多X名手牌数大于等于你的角色各弃置一张手牌。若如此做，你摸等同于选择角色数的牌，且本回合结束时，若这些角色中存在本回合未受到过伤害的角色，则你失去1点体力。',
starzhangrong_info:'准备阶段，你可以选择令至多X名体力值大于等于你的角色各失去1点体力或令至多X名手牌数大于等于你的角色各弃置一张手牌（X为你的体力值）。若如此做，你摸等同于选择角色数的牌，且本回合结束时，若这些角色中存在本回合未受到过伤害的角色，则你失去1点体力。',
starhaoshou:'豪首',
//starhaoshou_info:'主公技。①其他群势力角色使用【酒】结算完毕后，其可以令你回复1点体力。②当你处于濒死状态时，其他群势力角色可以将【酒】当作【桃】对你使用。',
starhaoshou_info:'主公技。其他群势力角色使用【酒】结算完毕后，其可以令你回复1点体力。。',
starhaoshou_info:'主公技。其他群势力角色使用【酒】结算完毕后，其可以令你回复1点体力。',
sp_whlw:"文和乱武",
sp_zlzy:"逐鹿中原",

2
game/game.js
View File

@ -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()

230
game/source.js
View File

@ -1,5 +1,57 @@
window.noname_source_list=[
'LICENSE',
'noname.js',
'noname/ai/basic.js',
'noname/ai/index.js',
'noname/game/index.js',
'noname/game/promises.js',
'noname/game/dynamic-style/index.js',
'noname/get/index.js',
'noname/get/is.js',
'noname/gnc/index.js',
'noname/gnc/is.js',
'noname/init/cordova.js',
'noname/init/import.js',
'noname/init/index.js',
'noname/init/node.js',
'noname/init/onload.js',
'noname/init/polyfill.js',
'noname/library/path.js',
'noname/library/announce/index.d.ts',
'noname/library/announce/index.js',
'noname/library/channel/index.js',
'noname/library/element/button.js',
'noname/library/element/card.js',
'noname/library/element/client.js',
'noname/library/element/content.js',
'noname/library/element/contents.js',
'noname/library/element/control.js',
'noname/library/element/dialog.js',
'noname/library/element/gameEvent.js',
'noname/library/element/gameEventPromise.js',
'noname/library/element/index.js',
'noname/library/element/nodeWS.js',
'noname/library/element/player.js',
'noname/library/element/vcard.js',
'noname/library/experimental/index.js',
'noname/library/experimental/symbol.js',
'noname/library/init/index.js',
'noname/library/init/promises.js',
'noname/status/index.js',
'noname/ui/index.js',
'noname/util/browser.js',
'noname/util/config.js',
'noname/util/index.js',
'noname/util/mutex.js',
'noname/util/struct/index.js',
'noname/util/struct/interface/index.d.ts',
'noname/util/struct/interface/promise-error-handler.d.ts',
'noname/util/struct/promise-error-handler/chrome.js',
'noname/util/struct/promise-error-handler/firefox.js',
'noname/util/struct/promise-error-handler/index.js',
'noname/util/struct/promise-error-handler/unknown.js',
'card/extra.js',
'card/gujian.js',
'card/guozhan.js',
@ -15,6 +67,7 @@ window.noname_source_list=[
'card/yunchou.js',
'card/zhenfa.js',
'card/zhulu.js',
'character/clan.js',
'character/collab.js',
'character/ddd.js',
@ -30,6 +83,7 @@ window.noname_source_list=[
'character/mtg.js',
'character/offline.js',
'character/old.js',
'character/onlyOL.js',
'character/ow.js',
'character/rank.js',
'character/refresh.js',
@ -49,26 +103,29 @@ window.noname_source_list=[
'character/yingbian.js',
'character/yxs.js',
'character/zhuogui.js',
'font/motoyamaru.woff2',
'font/suits.woff2',
'game/asset.js',
'game/codemirror.js',
'game/config.js',
'game/core-js-bundle.js',
'game/directory.js',
'game/entry.js',
'game/game.js',
'game/http.js',
'game/jszip.js',
'game/keyWords.js',
'game/NoSleep.js',
'game/package.js',
'game/path.js',
'game/phantom.js',
'game/pinyinjs.js',
'game/pressure.js',
'game/source.js',
'game/update.js',
'game/src/lib/announce.js',
'image/card/cardtempname_bg.png',
'image/flappybird/BG.png',
'image/flappybird/botpipe.png',
@ -84,6 +141,7 @@ window.noname_source_list=[
'image/flappybird/ground/g1.png',
'image/flappybird/tap/t0.png',
'image/flappybird/tap/t1.png',
'layout/default/codemirror.css',
'layout/default/layout.css',
'layout/default/menu.css',
@ -100,6 +158,7 @@ window.noname_source_list=[
'layout/newlayout/global.css',
'layout/newlayout/layout.css',
'layout/nova/layout.css',
'mode/boss.js',
'mode/chess.js',
'mode/doudizhu.js',
@ -111,10 +170,12 @@ window.noname_source_list=[
'mode/brawl.js',
'mode/versus.js',
'mode/connect.js',
'extension/boss/extension.js',
'extension/cardpile/extension.js',
'extension/coin/extension.js',
'extension/wuxing/extension.js',
'theme/music/grid.png',
'theme/music/style.css',
'theme/music/wood.png',
@ -197,137 +258,7 @@ window.noname_source_list=[
'theme/style/hp/image/xinround2.png',
'theme/style/hp/image/xinround3.png',
'theme/style/hp/image/xinround4.png',
'node_modules/@types/cordova/index.d.ts',
'node_modules/@types/cordova/LICENSE',
'node_modules/@types/cordova/package.json',
'node_modules/@types/cordova/README.md',
'node_modules/@types/node/assert/strict.d.ts',
'node_modules/@types/node/assert.d.ts',
'node_modules/@types/node/async_hooks.d.ts',
'node_modules/@types/node/buffer.d.ts',
'node_modules/@types/node/child_process.d.ts',
'node_modules/@types/node/cluster.d.ts',
'node_modules/@types/node/console.d.ts',
'node_modules/@types/node/constants.d.ts',
'node_modules/@types/node/crypto.d.ts',
'node_modules/@types/node/dgram.d.ts',
'node_modules/@types/node/diagnostics_channel.d.ts',
'node_modules/@types/node/dns/promises.d.ts',
'node_modules/@types/node/dns.d.ts',
'node_modules/@types/node/dom-events.d.ts',
'node_modules/@types/node/domain.d.ts',
'node_modules/@types/node/events.d.ts',
'node_modules/@types/node/fs/promises.d.ts',
'node_modules/@types/node/fs.d.ts',
'node_modules/@types/node/globals.d.ts',
'node_modules/@types/node/globals.global.d.ts',
'node_modules/@types/node/http.d.ts',
'node_modules/@types/node/http2.d.ts',
'node_modules/@types/node/https.d.ts',
'node_modules/@types/node/index.d.ts',
'node_modules/@types/node/inspector.d.ts',
'node_modules/@types/node/LICENSE',
'node_modules/@types/node/module.d.ts',
'node_modules/@types/node/net.d.ts',
'node_modules/@types/node/os.d.ts',
'node_modules/@types/node/package.json',
'node_modules/@types/node/path.d.ts',
'node_modules/@types/node/perf_hooks.d.ts',
'node_modules/@types/node/process.d.ts',
'node_modules/@types/node/punycode.d.ts',
'node_modules/@types/node/querystring.d.ts',
'node_modules/@types/node/readline/promises.d.ts',
'node_modules/@types/node/readline.d.ts',
'node_modules/@types/node/README.md',
'node_modules/@types/node/repl.d.ts',
'node_modules/@types/node/stream/consumers.d.ts',
'node_modules/@types/node/stream/promises.d.ts',
'node_modules/@types/node/stream/web.d.ts',
'node_modules/@types/node/stream.d.ts',
'node_modules/@types/node/string_decoder.d.ts',
'node_modules/@types/node/test.d.ts',
'node_modules/@types/node/timers/promises.d.ts',
'node_modules/@types/node/timers.d.ts',
'node_modules/@types/node/tls.d.ts',
'node_modules/@types/node/trace_events.d.ts',
'node_modules/@types/node/ts4.8/assert/strict.d.ts',
'node_modules/@types/node/ts4.8/assert.d.ts',
'node_modules/@types/node/ts4.8/async_hooks.d.ts',
'node_modules/@types/node/ts4.8/buffer.d.ts',
'node_modules/@types/node/ts4.8/child_process.d.ts',
'node_modules/@types/node/ts4.8/cluster.d.ts',
'node_modules/@types/node/ts4.8/console.d.ts',
'node_modules/@types/node/ts4.8/constants.d.ts',
'node_modules/@types/node/ts4.8/crypto.d.ts',
'node_modules/@types/node/ts4.8/dgram.d.ts',
'node_modules/@types/node/ts4.8/diagnostics_channel.d.ts',
'node_modules/@types/node/ts4.8/dns/promises.d.ts',
'node_modules/@types/node/ts4.8/dns.d.ts',
'node_modules/@types/node/ts4.8/dom-events.d.ts',
'node_modules/@types/node/ts4.8/domain.d.ts',
'node_modules/@types/node/ts4.8/events.d.ts',
'node_modules/@types/node/ts4.8/fs/promises.d.ts',
'node_modules/@types/node/ts4.8/fs.d.ts',
'node_modules/@types/node/ts4.8/globals.d.ts',
'node_modules/@types/node/ts4.8/globals.global.d.ts',
'node_modules/@types/node/ts4.8/http.d.ts',
'node_modules/@types/node/ts4.8/http2.d.ts',
'node_modules/@types/node/ts4.8/https.d.ts',
'node_modules/@types/node/ts4.8/index.d.ts',
'node_modules/@types/node/ts4.8/inspector.d.ts',
'node_modules/@types/node/ts4.8/module.d.ts',
'node_modules/@types/node/ts4.8/net.d.ts',
'node_modules/@types/node/ts4.8/os.d.ts',
'node_modules/@types/node/ts4.8/path.d.ts',
'node_modules/@types/node/ts4.8/perf_hooks.d.ts',
'node_modules/@types/node/ts4.8/process.d.ts',
'node_modules/@types/node/ts4.8/punycode.d.ts',
'node_modules/@types/node/ts4.8/querystring.d.ts',
'node_modules/@types/node/ts4.8/readline/promises.d.ts',
'node_modules/@types/node/ts4.8/readline.d.ts',
'node_modules/@types/node/ts4.8/repl.d.ts',
'node_modules/@types/node/ts4.8/stream/consumers.d.ts',
'node_modules/@types/node/ts4.8/stream/promises.d.ts',
'node_modules/@types/node/ts4.8/stream/web.d.ts',
'node_modules/@types/node/ts4.8/stream.d.ts',
'node_modules/@types/node/ts4.8/string_decoder.d.ts',
'node_modules/@types/node/ts4.8/test.d.ts',
'node_modules/@types/node/ts4.8/timers/promises.d.ts',
'node_modules/@types/node/ts4.8/timers.d.ts',
'node_modules/@types/node/ts4.8/tls.d.ts',
'node_modules/@types/node/ts4.8/trace_events.d.ts',
'node_modules/@types/node/ts4.8/tty.d.ts',
'node_modules/@types/node/ts4.8/url.d.ts',
'node_modules/@types/node/ts4.8/util.d.ts',
'node_modules/@types/node/ts4.8/v8.d.ts',
'node_modules/@types/node/ts4.8/vm.d.ts',
'node_modules/@types/node/ts4.8/wasi.d.ts',
'node_modules/@types/node/ts4.8/worker_threads.d.ts',
'node_modules/@types/node/ts4.8/zlib.d.ts',
'node_modules/@types/node/tty.d.ts',
'node_modules/@types/node/url.d.ts',
'node_modules/@types/node/util.d.ts',
'node_modules/@types/node/v8.d.ts',
'node_modules/@types/node/vm.d.ts',
'node_modules/@types/node/wasi.d.ts',
'node_modules/@types/node/worker_threads.d.ts',
'node_modules/@types/node/zlib.d.ts',
'node_modules/noname-typings/.github/workflows/release-package.yml',
'node_modules/noname-typings/ArrayEx.d.ts',
'node_modules/noname-typings/cordova-plugin-dialogs.d.ts',
'node_modules/noname-typings/cordova-plugin-file-transfer.d.ts',
'node_modules/noname-typings/cordova-plugin-file.d.ts',
'node_modules/noname-typings/cordova-plugin-local-notifications.d.ts',
'node_modules/noname-typings/DateEx.d.ts',
'node_modules/noname-typings/electron.d.ts',
'node_modules/noname-typings/HTMLDivElementEx.d.ts',
'node_modules/noname-typings/HTMLTableElementEx.d.ts',
'node_modules/noname-typings/index.d.ts',
'node_modules/noname-typings/LICENSE',
'node_modules/noname-typings/MapEx.d.ts',
'node_modules/noname-typings/package.json',
'node_modules/noname-typings/type.d.ts',
'node_modules/noname-typings/windowEx.d.ts',
'node_modules/options/.npmignore',
'node_modules/options/lib/options.js',
'node_modules/options/package.json',
@ -336,41 +267,6 @@ window.noname_source_list=[
'node_modules/ultron/index.js',
'node_modules/ultron/package.json',
'node_modules/ultron/test.js',
'node_modules/undici-types/agent.d.ts',
'node_modules/undici-types/api.d.ts',
'node_modules/undici-types/balanced-pool.d.ts',
'node_modules/undici-types/cache.d.ts',
'node_modules/undici-types/client.d.ts',
'node_modules/undici-types/connector.d.ts',
'node_modules/undici-types/content-type.d.ts',
'node_modules/undici-types/cookies.d.ts',
'node_modules/undici-types/diagnostics-channel.d.ts',
'node_modules/undici-types/dispatcher.d.ts',
'node_modules/undici-types/errors.d.ts',
'node_modules/undici-types/fetch.d.ts',
'node_modules/undici-types/file.d.ts',
'node_modules/undici-types/filereader.d.ts',
'node_modules/undici-types/formdata.d.ts',
'node_modules/undici-types/global-dispatcher.d.ts',
'node_modules/undici-types/global-origin.d.ts',
'node_modules/undici-types/handlers.d.ts',
'node_modules/undici-types/header.d.ts',
'node_modules/undici-types/index.d.ts',
'node_modules/undici-types/interceptors.d.ts',
'node_modules/undici-types/mock-agent.d.ts',
'node_modules/undici-types/mock-client.d.ts',
'node_modules/undici-types/mock-errors.d.ts',
'node_modules/undici-types/mock-interceptor.d.ts',
'node_modules/undici-types/mock-pool.d.ts',
'node_modules/undici-types/package.json',
'node_modules/undici-types/patch.d.ts',
'node_modules/undici-types/pool-stats.d.ts',
'node_modules/undici-types/pool.d.ts',
'node_modules/undici-types/proxy-agent.d.ts',
'node_modules/undici-types/readable.d.ts',
'node_modules/undici-types/README.md',
'node_modules/undici-types/webidl.d.ts',
'node_modules/undici-types/websocket.d.ts',
'node_modules/ws/.npmignore',
'node_modules/ws/.travis.yml',
'node_modules/ws/index.js',

90
game/update.js
View File

@ -1,34 +1,45 @@
window.noname_update={
version:'1.10.5',
update:'1.10.4',
version:'1.10.6',
update:'1.10.5',
changeLog:[
'整合@Rintim @copcap @kuangshen04 @mengxinzxz @Ansolve @PZ157 @Tipx-L @nonameShijian @MDYY1 @S-N-O-R-L-A-X @universe-st 的Pull Request',
'《3D精选》武将包更新',
'鲍信、成济成倅、董昭、贾充、吴班、蒯祺、来敏、李遗、马伶俐、刘伶、哪吒、OL费祎、谋小乔、谋卢植、星袁术、孙桓、孙瑜、诸葛若雪、神华佗、乐蔡邕、庞山明、孙綝、袁胤、手杀向朗、界张梁、界司马朗、界诸葛诞、界曹叡、谋黄月英、谋诸葛亮、OL刘焉、侠刘备、侠夏侯子萼、侠夏侯惇、侠张葳、曹轶、田尚衣',
'英文版身份模式机制、欢乐成双四号位保护',
'整合@nonameShijian @mengxinzxz @PZ157 @Ansolve @Rintim @S-N-O-R-L-A-X @universe-st @copcap 的Pull Request',
'拆分game.js，优化代码逻辑与可读性',
'其他AI优化与bug修复',
],
files:[
'card/extra.js',
'card/gujian.js',
'card/guozhan.js',
'card/gwent.js',
'card/hearth.js',
'card/huanlekapai.js',
'card/mtg.js',
'card/sp.js',
'card/standard.js',
'card/swd.js',
'card/yingbian.js',
'card/yongjian.js',
'card/yunchou.js',
'card/zhenfa.js',
'card/zhulu.js',
'character/clan.js',
'character/collab.js',
'character/ddd.js',
'character/diy.js',
'character/extra.js',
'character/gujian.js',
'character/gwent.js',
'character/hearth.js',
'character/huicui.js',
'character/jiange.js',
'character/jsrg.js',
'character/mobile.js',
'character/mtg.js',
'character/offline.js',
'character/old.js',
'character/onlyOL.js',
'character/ow.js',
'character/rank.js',
'character/refresh.js',
'character/sb.js',
@ -39,27 +50,86 @@ window.noname_update={
'character/standard.js',
'character/swd.js',
'character/tw.js',
'character/xiake.js',
'character/xianding.js',
'character/xianjian.js',
'character/xinghuoliaoyuan.js',
'character/yijiang.js',
'character/yingbian.js',
'character/yxs.js',
'extension/boss/extension.js',
'game/codemirror.js',
'game/config.js',
'game/core-js-bundle.js',
'game/entry.js',
'game/game.js',
'game/pinyinjs.js',
'game/package.js',
'game/source.js',
'game/src/lib/announce.js',
'layout/default/layout.css',
'mode/boss.js',
'mode/brawl.js',
'mode/chess.js',
'mode/connect.js',
'mode/doudizhu.js',
'mode/guozhan.js',
'mode/identity.js',
'mode/realtime.js',
'mode/single.js',
'mode/stone.js',
'mode/tafang.js',
'mode/versus.js',
'noname.js',
'noname/ai/basic.js',
'noname/ai/index.js',
'noname/game/index.js',
'noname/game/promises.js',
'noname/game/dynamic-style/index.js',
'noname/get/index.js',
'noname/get/is.js',
'noname/gnc/index.js',
'noname/gnc/is.js',
'noname/init/cordova.js',
'noname/init/import.js',
'noname/init/index.js',
'noname/init/node.js',
'noname/init/onload.js',
'noname/init/polyfill.js',
'noname/library/path.js',
'noname/library/announce/index.d.ts',
'noname/library/announce/index.js',
'noname/library/channel/index.js',
'noname/library/element/button.js',
'noname/library/element/card.js',
'noname/library/element/client.js',
'noname/library/element/content.js',
'noname/library/element/contents.js',
'noname/library/element/control.js',
'noname/library/element/dialog.js',
'noname/library/element/gameEvent.js',
'noname/library/element/gameEventPromise.js',
'noname/library/element/index.js',
'noname/library/element/nodeWS.js',
'noname/library/element/player.js',
'noname/library/element/vcard.js',
'noname/library/experimental/index.js',
'noname/library/experimental/symbol.js',
'noname/library/init/index.js',
'noname/library/init/promises.js',
'noname/status/index.js',
'noname/ui/index.js',
'noname/util/browser.js',
'noname/util/config.js',
'noname/util/index.js',
'noname/util/mutex.js',
'noname/util/struct/index.js',
'noname/util/struct/interface/index.d.ts',
'noname/util/struct/interface/promise-error-handler.d.ts',
'noname/util/struct/promise-error-handler/chrome.js',
'noname/util/struct/promise-error-handler/firefox.js',
'noname/util/struct/promise-error-handler/index.js',
'noname/util/struct/promise-error-handler/unknown.js',
]
};

BIN
image/card/xumou_jsrg.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
image/character/caoyu.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 47 KiB

2
noname/game/index.js
View File

@ -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;

12
noname/library/element/content.js
View File

@ -2484,6 +2484,12 @@ export const Content = {
event.cancel();
player.turnOver();
player.phaseSkipped = true;
var players = game.players.slice(0).concat(game.dead);
for (var i = 0; i < players.length; i++) {
var current = players[i];
current.getHistory().isSkipped = true;
current.getStat().isSkipped = true;
}
}
else {
player.phaseSkipped = false;
@ -5204,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));
@ -5379,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));
@ -5579,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));

1
noname/library/index.js
View File

@ -9271,6 +9271,7 @@ export class Library extends Uninstantable {
equip: '装备',
trick: '锦囊',
delay: '延时锦囊',
special_delay: '技能机制',
character: '角色',
revive: '复活',
equip1: '武器',

1
noname/ui/index.js
View File

@ -9796,6 +9796,7 @@ class Create extends Uninstantable {
}
if (node._replaceButton) {
var intro = ui.create.div('.button.replaceButton', node);
intro[lib.experimental.symbol.itemType] = 'button';
node.node.replaceButton = intro;
intro.innerHTML = '切换';
intro._node = node;

3
noname/util/struct/promise-error-handler/unknown.js
View File

@ -1,7 +1,7 @@
/**
* 关于除已实现浏览器外其余浏览器的异步错误处理
*
* 很遗憾，对于这类浏览器，因为标准未涉及报错栈堆或地址及行列号，故我们只能直接，暴力的throw出我们捕获道德错误，
* 很遗憾，对于这类浏览器，因为标准未涉及报错栈堆或地址及行列号，故我们只能直接，暴力地throw出我们捕获道德错误，
*
* 尽管我们还是会为了这类浏览器判断是不是捕获到了一个`Error`
*
@ -20,6 +20,7 @@ export class UnknownPromiseErrorHandler {
onHandle(event) {
event.promise.catch((error) => {
if (typeof error === 'object' && error instanceof Error) {
// 很遗憾，因浏览器问题，你只能看到这一段
throw error;
}
});