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

v1.9.93(Final Part)

This commit is contained in:
Spmario233 2019-09-20 23:20:54 +08:00 committed by GitHub
parent b2269521a3
commit 474b300c6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
game/asset.js
View File

@ -1,5 +1,5 @@
window.noname_asset_list=[ window.noname_asset_list=[
'1.9.92.4', '1.9.93',
'audio/background/aozhan_chaoming.mp3', 'audio/background/aozhan_chaoming.mp3',
'audio/background/aozhan_online.mp3', 'audio/background/aozhan_online.mp3',
'audio/background/music_danji.mp3', 'audio/background/music_danji.mp3',
@ -1879,6 +1879,7 @@ window.noname_asset_list=[
'image/background/wangshi_bg.jpg', 'image/background/wangshi_bg.jpg',
'image/background/xiongxin_bg.jpg', 'image/background/xiongxin_bg.jpg',
'image/background/zhanyun_bg.jpg', 'image/background/zhanyun_bg.jpg',
'image/background/xinsha_bg.jpg',
'image/card/db_atk1.jpg', 'image/card/db_atk1.jpg',
'image/card/db_atk2.jpg', 'image/card/db_atk2.jpg',
@ -2217,6 +2218,14 @@ window.noname_asset_list=[
'image/character/shenpei.jpg', 'image/character/shenpei.jpg',
'image/character/re_menghuo.jpg', 'image/character/re_menghuo.jpg',
'image/character/re_zhurong.jpg', 'image/character/re_zhurong.jpg',
'image/character/diy_wenyang.jpg',
'image/character/jsp_caoren.jpg',
'image/character/old_caoren.jpg',
'image/character/old_guanzhang.jpg',
'image/character/old_huatuo.jpg',
'image/character/old_zhangfei.jpg',
'image/character/old_zhoutai.jpg',
'image/character/wenyang.jpg',
'image/character/baiwuchang.jpg', 'image/character/baiwuchang.jpg',
'image/character/baosanniang.jpg', 'image/character/baosanniang.jpg',
@ -3155,18 +3164,6 @@ window.noname_asset_list=[
'image/mode/boss/card/xuwangzhimian.jpg', 'image/mode/boss/card/xuwangzhimian.jpg',
'image/mode/boss/card/yihuajiemu.png', 'image/mode/boss/card/yihuajiemu.png',
'image/mode/boss/card/qicaishenlu.jpg', '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_xiangliu.jpg',
'image/mode/boss/character/boss_zhuyan.jpg', 'image/mode/boss/character/boss_zhuyan.jpg',
'image/mode/boss/character/boss_bifang.jpg', 'image/mode/boss/character/boss_bifang.jpg',

41
game/game.js
View File

@ -9568,11 +9568,11 @@
}, },
chooseToPSS:function(){ chooseToPSS:function(){
'step 0' 'step 0'
game.log(player,'对',target,'发起了石头剪刀布'); game.log(player,'对',target,'发起了猜拳');
if(_status.connectMode){ if(_status.connectMode){
player.chooseButtonOL([ player.chooseButtonOL([
[player,['石头剪刀布：请选择一种手势',[[['','','pss_stone'],['','','pss_scissor'],['','','pss_paper']],'vcard']],true], [player,['猜拳：请选择一种手势',[[['','','pss_stone'],['','','pss_scissor'],['','','pss_paper']],'vcard']],true],
[target,['石头剪刀布：请选择一种手势',[[['','','pss_stone'],['','','pss_scissor'],['','','pss_paper']],'vcard']],true] [target,['猜拳：请选择一种手势',[[['','','pss_stone'],['','','pss_scissor'],['','','pss_paper']],'vcard']],true]
],function(){},function(){return 1+Math.random()}).set('switchToAuto',function(){ ],function(){},function(){return 1+Math.random()}).set('switchToAuto',function(){
_status.event.result='ai'; _status.event.result='ai';
}).set('processAI',function(){ }).set('processAI',function(){
@ -9590,11 +9590,11 @@
event.goto(4); event.goto(4);
} }
else{ else{
player.chooseButton(['石头剪刀布：请选择一种手势',[[['','','pss_stone'],['','','pss_scissor'],['','','pss_paper']],'vcard']],true).ai=function(){return 1+Math.random()}; player.chooseButton(['猜拳：请选择一种手势',[[['','','pss_stone'],['','','pss_scissor'],['','','pss_paper']],'vcard']],true).ai=function(){return 1+Math.random()};
} }
'step 2' 'step 2'
event.mes=result.links[0][2]; event.mes=result.links[0][2];
target.chooseButton(['石头剪刀布：请选择一种手势',[[['','','pss_stone'],['','','pss_scissor'],['','','pss_paper']],'vcard']],true).ai=function(){return 1+Math.random()}; target.chooseButton(['猜拳：请选择一种手势',[[['','','pss_stone'],['','','pss_scissor'],['','','pss_paper']],'vcard']],true).ai=function(){return 1+Math.random()};
'step 3' 'step 3'
event.tes=result.links[0][2]; event.tes=result.links[0][2];
'step 4' 'step 4'
@ -9615,7 +9615,7 @@
str='二人平局'; str='二人平局';
player.popup('平','metal'); player.popup('平','metal');
target.popup('平','metal'); target.popup('平','metal');
game.log('石头剪刀布的结果为','#g平局'); game.log('猜拳的结果为','#g平局');
event.result={tie:true}; event.result={tie:true};
} }
else{ else{
@ -9992,7 +9992,7 @@
} }
player.chooseControl('顺时针','逆时针',function(event,player){ player.chooseControl('顺时针','逆时针',function(event,player){
return _status.event.choice||'逆时针'; return _status.event.choice||'逆时针';
}).set('prompt','选择'+get.translation(card)+'的结算方向').set('choice',choice); }).set('prompt','选择'+get.translation(card)+'的结算方向').set('choice',choice).set('forceDie',true);
"step 2" "step 2"
if(result&&result.control=='顺时针'){ if(result&&result.control=='顺时针'){
var evt=event.getParent(); var evt=event.getParent();
@ -13026,6 +13026,7 @@
event.finish(); event.finish();
return; return;
} }
if(!get.info(card).noForceDie) event.forceDie=true;
var next=player.lose(cards).set('type','use'); var next=player.lose(cards).set('type','use');
for(var i=0;i<cards.length;i++){ for(var i=0;i<cards.length;i++){
if(!next.cards.contains(cards[i])){ if(!next.cards.contains(cards[i])){
@ -13226,6 +13227,7 @@
next.cards=cards; next.cards=cards;
next.player=player; next.player=player;
next.type='precard'; next.type='precard';
if(event.forceDie) next.forceDie=true;
} }
else if(info.reverseOrder&&get.is.versus()&&targets.length>1){ else if(info.reverseOrder&&get.is.versus()&&targets.length>1){
var next=game.createEvent(card.name+'ContentBefore'); var next=game.createEvent(card.name+'ContentBefore');
@ -13235,6 +13237,7 @@
next.cards=cards; next.cards=cards;
next.player=player; next.player=player;
next.type='precard'; next.type='precard';
if(event.forceDie) next.forceDie=true;
} }
"step 2" "step 2"
var info=get.info(card); var info=get.info(card);
@ -13269,6 +13272,7 @@
next.skill=event.skill; next.skill=event.skill;
next.multitarget=info.multitarget; next.multitarget=info.multitarget;
next.preResult=event.preResult; next.preResult=event.preResult;
if(event.forceDie) next.forceDie=true;
if(event.addedTargets){ if(event.addedTargets){
next.addedTargets=event.addedTargets; next.addedTargets=event.addedTargets;
next.addedTarget=event.addedTarget; next.addedTarget=event.addedTarget;
@ -13318,6 +13322,7 @@
next.player=player; next.player=player;
next.preResult=event.preResult; next.preResult=event.preResult;
next.type='postcard'; next.type='postcard';
if(event.forceDie) next.forceDie=true;
} }
"step 5" "step 5"
if(event.postAi){ if(event.postAi){
@ -13339,6 +13344,7 @@
useSkill:function(){ useSkill:function(){
"step 0" "step 0"
var info=get.info(event.skill); var info=get.info(event.skill);
if(!info.noForceDie) event.forceDie=true;
event._skill=event.skill; event._skill=event.skill;
game.trySkillAudio(event.skill,player); game.trySkillAudio(event.skill,player);
var checkShow=player.checkShow(event.skill); var checkShow=player.checkShow(event.skill);
@ -13463,6 +13469,7 @@
next.targets=targets; next.targets=targets;
next.cards=cards; next.cards=cards;
next.player=player; next.player=player;
if(event.forceDie) next.forceDie=true;
} }
"step 2" "step 2"
if(!event.skill){ if(!event.skill){
@ -13504,6 +13511,7 @@
} }
} }
next.target=targets[num]; next.target=targets[num];
if(event.forceDie) next.forceDie=true;
if(next.target&&!info.multitarget){ if(next.target&&!info.multitarget){
if(num==0&&targets.length>1){ if(num==0&&targets.length>1){
// var ttt=next.target; // var ttt=next.target;
@ -13538,6 +13546,7 @@
next.targets=targets; next.targets=targets;
next.cards=cards; next.cards=cards;
next.player=player; next.player=player;
if(event.forceDie) next.forceDie=true;
} }
"step 4" "step 4"
if(player.getStat().allSkills>200){ if(player.getStat().allSkills>200){
@ -13805,7 +13814,7 @@
if(cards){ if(cards){
var owner=event.source||get.owner(cards[0]); var owner=event.source||get.owner(cards[0]);
if(owner){ if(owner){
owner.lose(cards,ui.special).set('type','gain'); owner.lose(cards,ui.special).set('type','gain').set('forceDie',true);
} }
} }
else{ else{
@ -14654,7 +14663,7 @@
"step 0" "step 0"
var judgestr=get.translation(player)+'的'+event.judgestr+'判定'; var judgestr=get.translation(player)+'的'+event.judgestr+'判定';
event.videoId=lib.status.videoId++; event.videoId=lib.status.videoId++;
player.judging.unshift(get.cards()[0]); player.judging.unshift(event.directresult||get.cards()[0]);
game.addVideo('judge1',player,[get.cardInfo(player.judging[0]),judgestr,event.videoId]); game.addVideo('judge1',player,[get.cardInfo(player.judging[0]),judgestr,event.videoId]);
game.broadcastAll(function(player,card,str,id,cardid){ game.broadcastAll(function(player,card,str,id,cardid){
var event; var event;
@ -14688,9 +14697,14 @@
number:get.number(player.judging[0]), number:get.number(player.judging[0]),
suit:get.suit(player.judging[0]), suit:get.suit(player.judging[0]),
color:get.color(player.judging[0]), color:get.color(player.judging[0]),
judge:event.judge(player.judging[0]),
node:event.node, node:event.node,
}; };
if(event.fixedResult){
for(var i in event.fixedResult){
event.result[i]=event.fixedResult[i];
}
}
event.result.judge=event.judge(event.result);
if(event.result.judge>0) event.result.bool=true; if(event.result.judge>0) event.result.bool=true;
else if(event.result.judge<0) event.result.bool=false; else if(event.result.judge<0) event.result.bool=false;
else event.result.bool=null; else event.result.bool=null;
@ -17682,6 +17696,7 @@
lose:function(){ lose:function(){
var next=game.createEvent('lose'); var next=game.createEvent('lose');
next.player=this; next.player=this;
next.forceDie=true;
for(var i=0;i<arguments.length;i++){ for(var i=0;i<arguments.length;i++){
if(get.itemtype(arguments[i])=='player'){ if(get.itemtype(arguments[i])=='player'){
next.source=arguments[i]; next.source=arguments[i];
@ -46786,12 +46801,6 @@
} }
}, },
number:function(card){ number:function(card){
if(_status.event.name=='judge'){
var owner=get.owner(card);
if(owner){
if(owner.hasSkill('zhenyi_spade_red')||owner.hasSkill('zhenyi_spade_black')) return 5;
}
}
return card.number; return card.number;
}, },
nature:function(card){ nature:function(card){

16
game/update.js
View File

@ -1,24 +1,26 @@
window.noname_update={ window.noname_update={
version:'1.9.92.4.1', version:'1.9.93',
update:'1.9.92.4', update:'1.9.92.4.1',
changeLog:[ changeLog:[
'武将技能和装备技能支持在死亡后结算', 'useSkill和useCard事件默认支持死后继续结算',
'新武将文鸯，部分旧武将加入怀旧',
'BUG修复', 'BUG修复',
], ],
files:[ files:[
'card/extra.js',
'card/sp.js', 'card/sp.js',
'card/standard.js',
'character/diy.js',
'character/extra.js', 'character/extra.js',
'character/old.js', 'character/old.js',
'character/refresh.js', 'character/refresh.js',
'character/shenhua.js', 'character/shenhua.js',
'character/sp.js', 'character/sp.js',
'character/standard.js', //'character/standard.js',
'character/xinghuoliaoyuan.js', 'character/xinghuoliaoyuan.js',
'character/yijiang.js', //'character/yijiang.js',
'mode/guozhan.js', 'mode/guozhan.js',
'mode/boss.js', 'mode/boss.js',
'game/game.js', 'game/game.js',
'game/source.js',
'layout/default/layout.css',
] ]
}; };