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

Add files via upload

This commit is contained in:
Spmario233 2020-03-14 19:25:06 +08:00 committed by GitHub
parent 25a1476f24
commit a0a7560cbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 5297 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
character/gujian.js
View File

@ -1006,7 +1006,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
filter:function(event,player){
if(get.is.converted(event)) return false;
if(!player.countCards('he')) return false;
if(event.card.zhenying_link) return true;
if(event.cards[0]&&event.cards[0].zhenying_link) return true;
return false;
},
popup:false,

77
character/mobile.js
View File

@ -7,11 +7,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
characterSort:{
mobile:{
mobile_default:["miheng","taoqian","liuzan","lingcao","sunru","lifeng","zhuling","liuye","zhaotongzhaoguang","majun","simazhao","wangyuanji","pangdegong","shenpei","hujinding","zhangyì","jiakui"],
mobile_others:["re_jikang","old_bulianshi","old_yuanshu","re_wangyun","re_baosanniang","re_weiwenzhugezhi","re_zhanggong","re_xugong","xin_yuanshao","re_liushan"],
mobile_others:["re_jikang","old_bulianshi","old_yuanshu","re_wangyun","re_baosanniang","re_weiwenzhugezhi","re_zhanggong","re_xugong","xin_yuanshao","re_liushan","xin_xiahoudun"],
mobile_sunben:["re_sunben"],
},
},
character:{
xin_xiahoudun:['male','wei',4,['reganglie','xinqingjian']],
zhangyì:['male','shu',4,['zhiyi']],
jiakui:['male','wei',3,['zhongzuo','wanlan']],
re_jikang:["male","wei",3,["new_qingxian","new_juexiang"]],
@ -90,6 +91,71 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
characterFilter:{},
skill:{
xinqingjian:{
audio:'qingjian',
trigger:{player:'gainEnd'},
direct:true,
usable:1,
filter:function(event,player){
return event.getParent('phaseDraw').player!=player&&player.countCards('he')>0;
},
content:function(){
'step 0'
player.chooseCard(get.prompt2('xinqingjian'),'he',[1,player.countCards('he')]).ai=function(){return -1};
'step 1'
if(result.bool){
player.addSkill('xinqingjian2');
player.storage.xinqingjian2.addArray(result.cards);
game.log(player,'将'+get.cnNumber(player.lose(result.cards,ui.special,'toStorage').cards.length)+'张牌置于其武将牌上');
player.markSkill('xinqingjian2');
}
else player.storage.counttrigger.xinqingjian--;
},
},
xinqingjian2:{
audio:'xinqingjian',
charlotte:true,
trigger:{global:'phaseEnd'},
forced:true,
filter:function(event,player){
return player.storage.xinqingjian2&&player.storage.xinqingjian2.length>0;
},
init:function(player){
if(!player.storage.xinqingjian2) player.storage.xinqingjian2=[];
},
content:function(){
'step 0'
player.chooseTarget(true,lib.filter.notMe).set('createDialog',['清俭：选择一名角色获得这些牌'+(player.storage.xinqingjian2.length>1?'，然后摸一张牌':''),player.storage.xinqingjian2]);
'step 1'
if(result.bool){
var target=result.targets[0];
player.line(target,'thunder');
if(target.gain(player.storage.xinqingjian2,player,'giveAuto','fromStorage').cards.length>1) player.draw();
player.storage.xinqingjian2.length=0;
player.removeSkill('xinqingjian2');
}
},
intro:{
onunmark:'throw',mark:function(dialog,content,player){
if(content&&content.length){
if(player==game.me||player.isUnderControl()){
dialog.addAuto(content);
}
else{
return '共有'+get.cnNumber(content.length)+'张牌';
}
}
},
content:function(content,player){
if(content&&content.length){
if(player==game.me||player.isUnderControl()){
return get.translation(content);
}
return '共有'+get.cnNumber(content.length)+'张牌';
}
}
},
},
zhongzuo:{
audio:2,
trigger:{global:'phaseEnd'},
@ -121,7 +187,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
limited:true,
unique:true,
filter:function(event,player){
return event.player.hp<=0&&player.countCards('h')>0;
return event.player.hp<=0;
},
skillAnimation:true,
animationColor:'thunder',
@ -129,7 +195,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){
'step 0'
player.awakenSkill('wanlan');
player.discard(player.getCards('h'));
var hs=player.getCards('h')
if(hs.length) player.discard(hs);
'step 1'
var num=1-trigger.player.hp;
if(num) trigger.player.recover(num);
@ -1784,6 +1851,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
translate:{
xin_xiahoudun:'手杀夏侯惇',
xinqingjian:'清俭',
xinqingjian2:'清俭',
xinqingjian_info:'每回合限一次。当你不因摸牌阶段的额定摸牌而获得牌时，你可以将任意张牌扣置于武将牌上。回合结束时，你将这些牌交给一名其他角色。若这些牌的数量大于1，你摸一张牌。',
zhangyì:'张翼',
jiakui:'贾逵',
zhiyi:'执义',

2
character/refresh.js
View File

@ -4671,7 +4671,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
olluanji_info:'你可以将两张花色相同的手牌当做【万箭齐发】使用。当你使用【万箭齐发】选择目标后，你可以为此牌减少一个目标。',
olluanji_remove:'乱击',
olxueyi:'血裔',
olxueyi_info:'锁定技，游戏开始时，你获得X个“裔”标记。回合开始时，你可以移去一个“裔”标记，然后摸一张牌。你每有一个“裔”标记，手牌上限便+2。（X为场上群势力角色的数目）',
olxueyi_info:'主公技，锁定技，游戏开始时，你获得X个“裔”标记。回合开始时，你可以移去一个“裔”标记，然后摸一张牌。你每有一个“裔”标记，手牌上限便+2。（X为场上群势力角色的数目）',
olxueyi_draw:'血裔',
olhunzi:'魂姿',
olhunzi_info:'觉醒技，准备阶段，若你的体力值为1，你减1点体力上限并回复1点体力，然后获得技能〖英姿〗和〖英魂〗。',

15
character/sp.js
View File

@ -1607,7 +1607,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{global:'useCardAfter'},
audio:'xpchijie',
filter:function(event,player){
return event.targets.contains(player)&&!player.hasSkill('xpchijie4')&&event.cards.filterInD().length>0&&!game.hasPlayer2(function(current){
return event.player!=player&&event.targets.contains(player)&&!player.hasSkill('xpchijie4')&&event.cards.filterInD().length>0&&!game.hasPlayer2(function(current){
return current.getHistory('damage',function(evt){
return evt.card==event.card;
}).length>0;
@ -3374,6 +3374,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
//新服曹笨
xinshanjia:{
group:["xinshanjia_count"],
locked:false,
mod:{
aiValue:function(player,card,num){
if((player.storage.xinshanjia||0)<3&&get.position(card)=='e') return num/1.5;
},
},
subSkill:{
count:{
forced:true,
@ -4690,6 +4696,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(!target.storage.xianfu_mark) target.storage.xianfu_mark=[];
target.storage.xianfu_mark.add(player);
target.storage.xianfu_mark.sortBySeat();
target.markSkill('xianfu_mark');
target.draw(2);
}
else{
@ -9857,7 +9864,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return player.countCards('h')-player.countCards('h',{type:'equip'})<=player.hp;
},
filter:function(event,player){
if(!event.numFixed||player.storage.tunchu&&player.storage.tunchu.length) return false;
if(event.numFixed||player.storage.tunchu&&player.storage.tunchu.length) return false;
return true;
},
content:function(){
@ -10692,12 +10699,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player:'useCardToPlayered',
},
filter:function(event,player){
if(!['sha','juedou'].contains(event.card.name)) return false;
if(event.targets.length!=1||!['sha','juedou'].contains(event.card.name)) return false;
var evt2=event.getParent('phaseUse');
if(evt2.player!=player) return false;
return player.getHistory('useCard',function(evt){
return ['sha','juedou'].contains(evt.card.name)&&evt.getParent('phaseUse')==evt2;
}).indexOf(event)==0;
}).indexOf(event.getParent())==0;
},
direct:true,
content:function(){

3
game/asset.js
View File

@ -1,5 +1,5 @@
window.noname_asset_list=[
'1.9.98.3.1',
'1.9.98.3.2',
'audio/background/aozhan_chaoming.mp3',
'audio/background/aozhan_online.mp3',
'audio/background/aozhan_rewrite.mp3',
@ -2844,6 +2844,7 @@ window.noname_asset_list=[
'image/character/re_wuguotai.jpg',
'image/character/re_xusheng.jpg',
'image/character/zhangyì.jpg',
'image/character/xin_xiahoudun.jpg',
'image/character/baiwuchang.jpg',
'image/character/baosanniang.jpg',

41
game/game.js
View File

@ -11940,7 +11940,7 @@
if(!event.card2){
if(event.resultOL[target.playerid].skill&&lib.skill[event.resultOL[target.playerid].skill]&&lib.skill[event.resultOL[target.playerid].skill].onCompare){
target.logSkill(event.resultOL[target.playerid].skill);
event.resultOL[target.playerid].cards=lib.skill[target.resultOL[target.playerid].skill].onCompare(player);
event.resultOL[target.playerid].cards=lib.skill[event.resultOL[target.playerid].skill].onCompare(player);
}
event.card2=event.resultOL[target.playerid].cards[0];
}
@ -11950,6 +11950,7 @@
}
catch(e){
console.log(e);
game.print(e);
event.finish();
return;
}
@ -12432,7 +12433,10 @@
if(event.isMine()){
game.check();
game.pause();
if(event.prompt!=false){
if(event.createDialog&&!event.dialog&&Array.isArray(event.createDialog)){
event.dialog=ui.create.dialog.apply(this,event.createDialog);
}
else if(event.prompt!=false){
var str;
if(typeof event.prompt=='string') str=event.prompt;
else{
@ -22184,7 +22188,7 @@
$damagepop:function(num,nature,font,nobroadcast){
if(typeof num=='number'||typeof num=='string'){
game.addVideo('damagepop',this,[num,nature,font]);
if(!nobroadcast) game.broadcast(function(player,num,nature,font){
if(nobroadcast!==false) game.broadcast(function(player,num,nature,font){
player.$damagepop(num,nature,font);
},this,num,nature,font);
var node=ui.create.div('.damage');
@ -26020,7 +26024,7 @@
checkFileList:function(updates,proceed){
var n=updates.length;
if(!n){
proceed();
proceed(n);
}
for(var i=0;i<updates.length;i++){
if(lib.node&&lib.node.fs){
@ -26049,18 +26053,20 @@
}(updates[i])));
}
else{
resolveLocalFileSystemURL(lib.assetURL+updates[i],function(entry){
n--;
updates.remove(entry.toURL().slice(lib.assetURL.length));
if(n==0){
proceed();
}
},function(){
n--;
if(n==0){
proceed();
}
});
resolveLocalFileSystemURL(lib.assetURL+updates[i],(function(name){
return function(entry){
n--;
updates.remove(name);
if(n==0){
proceed();
}
}
}(updates[i])),function(){
n--;
if(n==0){
proceed();
}
});
}
}
},
@ -39165,6 +39171,7 @@
var proceed=function(){
if(updates.length==0){
game.print(updates);
game.saveConfig('asset_version',asset_version);
alert('素材已是最新');
button2.disabled=false;
@ -39751,7 +39758,7 @@
node.link=page;
page.classList.add('menu-sym');
menuUpdates.push(function(){
if(false){
if(_status.connectMode){
node.classList.add('off');
if(node.classList.contains('active')){
node.classList.remove('active');

18
game/update.js
View File

@ -1,6 +1,6 @@
window.noname_update={
version:'1.9.98.3.1',
update:'1.9.98.3',
version:'1.9.98.3.2',
update:'1.9.98.3.1',
changeLog:[
'bug修复',
],
@ -8,7 +8,7 @@ window.noname_update={
//'card/extra.js',
//'card/huanlekapai.js',
//'card/sp.js',
'card/standard.js',
//'card/standard.js',
//'card/swd.js',
//'card/mtg.js',
//'card/guozhan.js',
@ -18,15 +18,15 @@ window.noname_update={
//'character/diy.js',
//'character/extra.js',
//'character/hearth.js',
//'character/gujian.js',
'character/gujian.js',
//'character/gwent.js',
//'character/hearth.js',
//'character/mobile.js',
'character/mobile.js',
//'character/mtg.js',
//'character/old.js',
'character/refresh.js',
//'character/shenhua.js',
//'character/sp.js',
'character/sp.js',
//'character/tw.js',
//'character/standard.js',
//'character/swd.js',
@ -35,7 +35,7 @@ window.noname_update={
//'character/yijiang.js',
//'character/yxs.js',
//'extension/boss/extension.js',
//'layout/default/layout.css',
'layout/default/layout.css',
//'layout/nova/layout.css',
//'mode/identity.js',
//'mode/doudizhu.js',
@ -46,8 +46,8 @@ window.noname_update={
//'mode/stone.js',
//'mode/brawl.js',
//'mode/versus.js',
'mode/boss.js',
//'game/game.js',
//'mode/boss.js',
'game/game.js',
//'game/NoSleep.js',
//'game/config.js',
//'game/package.js',

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 274 KiB

5173
layout/layout.css Normal file
View File

File diff suppressed because it is too large Load Diff

4
mode/guozhan.js
View File

@ -3931,8 +3931,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
jubao:{
mod:{
canBeGained:function(card){
if(get.position(card)=='e'&&get.subtype(card)=='equip5') return false;
canBeGained:function(card,source,player){
if(source!=player&&get.position(card)=='e'&&get.subtype(card)=='equip5') return false;
}
},
trigger:{player:'phaseJieshuBegin'},