v1.9.93.1(Final)
This commit is contained in:
Spmario233
GitHub
parent
b0e1b385b8
commit
81dd1b6162
|
|
@ -1,5 +1,5 @@
|
|||
window.noname_asset_list=[
|
||||
'1.9.93',
|
||||
'1.9.93.1',
|
||||
'audio/background/aozhan_chaoming.mp3',
|
||||
'audio/background/aozhan_online.mp3',
|
||||
'audio/background/music_danji.mp3',
|
||||
|
|
@ -392,6 +392,14 @@ window.noname_asset_list=[
|
|||
'audio/skill/weicheng2.mp3',
|
||||
'audio/skill/daoshu1.mp3',
|
||||
'audio/skill/daoshu2.mp3',
|
||||
'audio/skill/lvli1.mp3',
|
||||
'audio/skill/lvli2.mp3',
|
||||
'audio/skill/choujue1.mp3',
|
||||
'audio/skill/choujue2.mp3',
|
||||
'audio/skill/beishui1.mp3',
|
||||
'audio/skill/beishui2.mp3',
|
||||
'audio/skill/qingjiao1.mp3',
|
||||
'audio/skill/qingjiao2.mp3',
|
||||
|
||||
'audio/skill/anguo1.mp3',
|
||||
'audio/skill/anguo2.mp3',
|
||||
|
|
@ -2790,6 +2798,7 @@ window.noname_asset_list=[
|
|||
'image/character/re_yuanshao.jpg',
|
||||
'image/character/re_yuanshu.jpg',
|
||||
'image/character/re_yuji.jpg',
|
||||
'image/character/re_yujin.jpg',
|
||||
'image/character/re_zhangfei.jpg',
|
||||
'image/character/re_zhangliang.jpg',
|
||||
'image/character/re_zhangliao.jpg',
|
||||
|
|
@ -3164,6 +3173,18 @@ window.noname_asset_list=[
|
|||
'image/mode/boss/card/xuwangzhimian.jpg',
|
||||
'image/mode/boss/card/yihuajiemu.png',
|
||||
'image/mode/boss/card/qicaishenlu.jpg',
|
||||
|
||||
'image/mode/boss/character/boss_bianchengwang.jpg',
|
||||
'image/mode/boss/character/boss_chujiangwang.jpg',
|
||||
'image/mode/boss/character/boss_dushiwang.jpg',
|
||||
'image/mode/boss/character/boss_pingdengwang.jpg',
|
||||
'image/mode/boss/character/boss_qinguangwang.jpg',
|
||||
'image/mode/boss/character/boss_songdiwang.jpg',
|
||||
'image/mode/boss/character/boss_taishanwang.jpg',
|
||||
'image/mode/boss/character/boss_wuguanwang.jpg',
|
||||
'image/mode/boss/character/boss_yanluowang.jpg',
|
||||
'image/mode/boss/character/boss_zhuanlunwang.jpg',
|
||||
|
||||
'image/mode/boss/character/boss_xiangliu.jpg',
|
||||
'image/mode/boss/character/boss_zhuyan.jpg',
|
||||
'image/mode/boss/character/boss_bifang.jpg',
|
||||
|
|
|
|||
167
game/game.js
167
game/game.js
|
|
@ -9490,6 +9490,77 @@
|
|||
},
|
||||
element:{
|
||||
content:{
|
||||
chooseUseTarget:function(){
|
||||
'step 0'
|
||||
if(cards){
|
||||
card=get.copy(card);
|
||||
card.cards=cards.slice(0);
|
||||
event.card=card;
|
||||
}
|
||||
if(!lib.filter.cardEnabled(card,player)){
|
||||
event.finish();
|
||||
return;
|
||||
}
|
||||
var info=get.info(card);
|
||||
var select=get.select(info.selectTarget);
|
||||
if(select[1]==-1||info.notarget){
|
||||
if(select[1]==-1){
|
||||
for(var i=0;i<targets.length;i++){
|
||||
if(!player.canUse(card,targets[i],false)){
|
||||
targets.splice(i--,1);
|
||||
}
|
||||
}
|
||||
if(targets.length){
|
||||
event.targets2=targets;
|
||||
}
|
||||
else event.finish();
|
||||
}
|
||||
else event.targets2=[];
|
||||
if(!event.forced){
|
||||
player.chooseBool('是否'+(event.targets2.length?'对':'')+get.translation(event.targets2)+'使用'+get.translation(card)+'?');
|
||||
}
|
||||
else event._result={bool:true};
|
||||
}
|
||||
else{
|
||||
var next=player.chooseTarget();
|
||||
next._get_card=card;
|
||||
next.filterTarget=function(card,player,target){
|
||||
if(!_status.event.targets.contains(target)) return false;
|
||||
return lib.filter[_status.event.nodistance?'targetEnabled':'filterTarget'].apply(this,arguments);
|
||||
};
|
||||
next.set('ai',event.ai||get.effect);
|
||||
if(typeof info.selectTarget=='function'){
|
||||
next.selectTarget=info.selectTarget;
|
||||
}
|
||||
else{
|
||||
next.selectTarget=get.select(info.selectTarget);
|
||||
}
|
||||
if(event.nodistance) next.nodistance=true;
|
||||
if(event.forced) next.forced=true;
|
||||
next.targets=targets;
|
||||
next.prompt=event.prompt||('选择'+get.translation(card)+'的目标');
|
||||
if(event.prompt2) next.prompt2=event.prompt2;
|
||||
}
|
||||
'step 1'
|
||||
if(result.bool){
|
||||
event._result={
|
||||
bool:true,
|
||||
targets:event.targets2||result.targets,
|
||||
};
|
||||
if(event.logSkill){
|
||||
if(typeof event.logSkill=='string'){
|
||||
player.logSkill(event.logSkill);
|
||||
}
|
||||
else if(Array.isArray(event.logSkill)){
|
||||
player.logSkill.apply(player,event.logSkill);
|
||||
}
|
||||
}
|
||||
var next=player.useCard(card,event.targets2||result.targets,cards);
|
||||
if(event.nopopup) next.nopopup=true;
|
||||
if(event.animate===false) next.animate=false;
|
||||
if(event.addCount===false) next.addCount=false;
|
||||
}
|
||||
},
|
||||
chooseToDuiben:function(){
|
||||
'step 0'
|
||||
game.log(player,'对',target,'发起了','#y对策');
|
||||
|
|
@ -16779,73 +16850,53 @@
|
|||
next._args=Array.from(arguments);
|
||||
return next;
|
||||
},
|
||||
chooseUseTarget:function(card,prompt,includecard){
|
||||
// not online-ready
|
||||
if(typeof card=='string'){
|
||||
card={name:card};
|
||||
}
|
||||
var discard=function(){
|
||||
if(get.itemtype(card)=='card'&&card.discard){
|
||||
card.discard();
|
||||
chooseUseTarget:function(){
|
||||
var next=game.createEvent('chooseUseTarget');
|
||||
next.player=this;
|
||||
for(var i=0;i<arguments.length;i++){
|
||||
if(get.itemtype(arguments[i])=='cards'){
|
||||
next.cards=arguments[i];
|
||||
}
|
||||
};
|
||||
var name=card.name;
|
||||
var info=lib.card[name];
|
||||
if(!info.enable){
|
||||
discard();
|
||||
return false;
|
||||
}
|
||||
var player=this;
|
||||
if(get.select(info.selectTarget)[1]==-1){
|
||||
var targets=game.filterPlayer(function(current){
|
||||
return lib.filter.filterTarget(card,player,current);
|
||||
});
|
||||
if(targets.length){
|
||||
targets.sort(lib.sort.seat);
|
||||
var next=player.useCard(card,targets);
|
||||
if(includecard===false){
|
||||
next.addCount=false;
|
||||
else if(get.itemtype(arguments[i])=='card'){
|
||||
next.card=arguments[i];
|
||||
}
|
||||
else if(typeof arguments[i]=='object'&&arguments[i].name){
|
||||
next.card=arguments[i];
|
||||
}
|
||||
else if(typeof arguments[i]=='string'){
|
||||
if(arguments[i]=='nopopup'){
|
||||
next.nopopup=true;
|
||||
}
|
||||
return next;
|
||||
else if(arguments[i]=='noanimate'){
|
||||
next.animate=false;
|
||||
}
|
||||
else if(arguments[i]=='nodistance'){
|
||||
next.nodistance=true;
|
||||
}
|
||||
else get.evtprompt(next,arguments[i]);
|
||||
}
|
||||
}
|
||||
else if(info.notarget){
|
||||
var next=player.useCard(card);
|
||||
if(includecard===false){
|
||||
else if(arguments[i]===true){
|
||||
next.forced=true;
|
||||
}
|
||||
else if(arguments[i]===false){
|
||||
next.addCount=false;
|
||||
}
|
||||
return next;
|
||||
}
|
||||
else if(game.hasPlayer(function(current){
|
||||
return player.canUse(card,current);
|
||||
})){
|
||||
var next=player.chooseTarget(prompt||'选择'+get.translation(card)+'的目标');
|
||||
next._get_card=card;
|
||||
next.filterTarget=lib.filter.filterTarget;
|
||||
next.ai=get.effect;
|
||||
if(typeof info.selectTarget=='function'){
|
||||
next.selectTarget=info.selectTarget;
|
||||
if(!next.targets) next.targets=game.players.slice(0);
|
||||
if(next.cards==undefined){
|
||||
if(get.itemtype(next.card)=='card'){
|
||||
next.cards=[next.card];
|
||||
}
|
||||
else{
|
||||
next.selectTarget=get.select(info.selectTarget);
|
||||
}
|
||||
next.forced=true;
|
||||
next.onresult=function(result){
|
||||
if(result.bool){
|
||||
if(info.multitarget&&result.targets.length<get.select(info.selectTarget)[0]){
|
||||
discard();
|
||||
return false;
|
||||
}
|
||||
var next=player.useCard(card,result.targets);
|
||||
if(includecard===false){
|
||||
next.addCount=false;
|
||||
}
|
||||
return next;
|
||||
}
|
||||
else next.cards=[];
|
||||
}
|
||||
else if(next.card==undefined){
|
||||
if(next.cards){
|
||||
next.card=next.cards[0];
|
||||
}
|
||||
}
|
||||
discard();
|
||||
return false;
|
||||
next.setContent('chooseUseTarget');
|
||||
return next;
|
||||
// Online-Ready! Enjoy It!
|
||||
},
|
||||
chooseTarget:function(){
|
||||
var next=game.createEvent('chooseTarget');
|
||||
|
|
|
|||
|
|
@ -1,26 +1,28 @@
|
|||
window.noname_update={
|
||||
version:'1.9.93',
|
||||
update:'1.9.92.4.1',
|
||||
version:'1.9.93.1',
|
||||
update:'1.9.93',
|
||||
changeLog:[
|
||||
'useSkill和useCard事件默认支持死后继续结算',
|
||||
'新武将文鸯，部分旧武将加入怀旧',
|
||||
'chooseUseTarget函数可以联机使用了',
|
||||
'BUG修复',
|
||||
],
|
||||
files:[
|
||||
'card/extra.js',
|
||||
//'card/extra.js',
|
||||
'card/sp.js',
|
||||
'card/standard.js',
|
||||
'character/diy.js',
|
||||
//'card/standard.js',
|
||||
'card/guozhan.js',
|
||||
//'character/diy.js',
|
||||
'character/extra.js',
|
||||
'character/mobile.js',
|
||||
'character/old.js',
|
||||
'character/refresh.js',
|
||||
'character/shenhua.js',
|
||||
'character/sp.js',
|
||||
'character/tw.js',
|
||||
//'character/standard.js',
|
||||
'character/xinghuoliaoyuan.js',
|
||||
//'character/yijiang.js',
|
||||
'character/yijiang.js',
|
||||
'mode/guozhan.js',
|
||||
'mode/boss.js',
|
||||
//'mode/boss.js',
|
||||
'game/game.js',
|
||||
]
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue