v1.9.116.1
This commit is contained in:
Spmario233
parent
857f53d8f1
commit
3159e08176
|
|
@ -1623,8 +1623,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
if(event.current&&event.current.countCards('he')){
|
||||
if(player.hasSkill('mobileyanzhu')||event.targets2.length==1) event.current.chooseCard('选择一张牌置于牌堆顶','he',true);
|
||||
else event.current.chooseCardTarget({
|
||||
prompt:'选择一张牌置于牌堆顶，或交给其他目标角色',
|
||||
prompt:'将一张牌置于牌堆顶，或交给其他目标角色',
|
||||
filterCard:true,
|
||||
position:'he',
|
||||
filterTarget:function(card,player,target){
|
||||
return target!=player&&_status.event.getParent().targets2.contains(target);
|
||||
},
|
||||
|
|
@ -16372,7 +16373,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
list2.add(get.suit(card));
|
||||
});
|
||||
list2.removeArray(list);
|
||||
return list2.length;
|
||||
return Math.max(1,list2.length);
|
||||
}()],function(card,player){
|
||||
return !player.countCards('s',function(cardx){
|
||||
return cardx.hasGaintag('gnjinfan')&&get.suit(cardx,false)==get.suit(card,player);
|
||||
|
|
|
|||
|
|
@ -873,7 +873,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
cards.addArray(cardsx);
|
||||
list.push([current,cardsx]);
|
||||
current.$throw(cardsx);
|
||||
game.log(current,'将',cardsx,'化作“'+(color==''?'':'')+'”良缘')
|
||||
game.log(current,'将',cardsx,'化作“'+(color=='black'?'灵杉':'玉树')+'”良缘')
|
||||
}
|
||||
});
|
||||
event.result.cards=cards;
|
||||
|
|
|
|||
|
|
@ -17426,7 +17426,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
mouni:'谋逆',
|
||||
mouni_info:'准备阶段，你可对一名其他角色依次使用你手牌中所有的【杀】（若其进入了濒死状态，则终止此流程）。然后若这些【杀】中有未造成伤害的【杀】，则你跳过本回合的出牌阶段和弃牌阶段。',
|
||||
zongfan:'纵反',
|
||||
zongfan_info:'觉醒技，结束阶段，若你本回合内因〖谋逆〗使用过【杀】且未跳过本回合的出牌阶段，则你将任意张牌交给一名其他角色，然后加X点体力上限并回复X点体力（X为你以此法给出的牌数）。最后失去〖谋逆〗并获得〖战孤〗。',
|
||||
zongfan_info:'觉醒技。结束阶段，若你本回合内因〖谋逆〗使用过【杀】且未跳过本回合的出牌阶段，则你将任意张牌交给一名其他角色，然后加X点体力上限并回复X点体力（X为你以此法给出的牌数且至多为5）。最后失去〖谋逆〗并获得〖战孤〗。',
|
||||
zhangu:'战孤',
|
||||
zhangu_info:'锁定技，准备阶段，若你的体力上限大于1且没有手牌/装备区内没有牌，则你减1点体力上限，然后从牌堆中获得三张类型不同的牌。',
|
||||
re_niujin:'牛金',
|
||||
|
|
|
|||
31
game/game.js
31
game/game.js
|
|
@ -2836,6 +2836,15 @@
|
|||
lib.init.cssstyles();
|
||||
}
|
||||
},
|
||||
suits_font:{
|
||||
name:'替换花色字体',
|
||||
init:true,
|
||||
unfrequent:true,
|
||||
intro:'使用全角字符的花色替代系统自带的花色（重启游戏后生效）',
|
||||
onclick:function(bool){
|
||||
game.saveConfig('suits_font',bool);
|
||||
}
|
||||
},
|
||||
update:function(config,map){
|
||||
if(lib.config.custom_button){
|
||||
map.custom_button_system_top.show();
|
||||
|
|
@ -7585,9 +7594,8 @@
|
|||
lib.configMenu.appearence.config.cardtext_font.item[i]=pack.font[i];
|
||||
lib.configMenu.appearence.config.global_font.item[i]=pack.font[i];
|
||||
ui.css.fontsheet.sheet.insertRule("@font-face {font-family: '"+i+"'; src: url('"+lib.assetURL+"font/"+i+".ttf');}",0);
|
||||
ui.css.fontsheet.sheet.insertRule("@font-face {font-family: '"+i+"'; src: url('"+lib.assetURL+"font/suits.ttf');}",0);
|
||||
}
|
||||
ui.css.fontsheet.sheet.insertRule("@font-face {font-family: 'Suits'; src: url('"+lib.assetURL+"font/suits.ttf');}",0);
|
||||
if(lib.config.suits_font) ui.css.fontsheet.sheet.insertRule("@font-face {font-family: 'Suits'; src: url('"+lib.assetURL+"font/suits.ttf');}",0);
|
||||
lib.configMenu.appearence.config.cardtext_font.item.default='默认';
|
||||
lib.configMenu.appearence.config.global_font.item.default='默认';
|
||||
}
|
||||
|
|
@ -7650,8 +7658,12 @@
|
|||
extensionlist.push(lib.config.plays[i]);
|
||||
}
|
||||
}
|
||||
var alerted=false;
|
||||
for(var i=0;i<lib.config.extensions.length;i++){
|
||||
if(window.bannedExtensions.contains(lib.config.extensions[i])) continue;
|
||||
if(!alerted&&window.bannedExtensions.contains(lib.config.extensions[i])){
|
||||
alerted=true;
|
||||
alert('读取某些扩展时出现问题。');
|
||||
};
|
||||
var extcontent=localStorage.getItem(lib.configprefix+'extension_'+lib.config.extensions[i]);
|
||||
if(extcontent){
|
||||
_status.evaluatingExtension=true;
|
||||
|
|
@ -9286,7 +9298,7 @@
|
|||
}
|
||||
if(lib.config.global_font&&lib.config.global_font!='default'){
|
||||
ui.css.styles.sheet.insertRule('#window {font-family: '+lib.config.global_font+',xinwei}',0);
|
||||
ui.css.styles.sheet.insertRule('#window #control{font-family: STHeiti,SimHei,Microsoft JhengHei,Microsoft YaHei,WenQuanYi Micro Hei,Helvetica,Arial,sans-serif}',0);
|
||||
ui.css.styles.sheet.insertRule('#window #control{font-family: STHeiti,SimHei,Microsoft JhengHei,Microsoft YaHei,WenQuanYi Micro Hei,Suits,Helvetica,Arial,sans-serif}',0);
|
||||
}
|
||||
switch(lib.config.glow_phase){
|
||||
case 'yellow':ui.css.styles.sheet.insertRule('#arena .player:not(.selectable):not(.selected).glow_phase {box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px, rgb(217, 152, 62) 0 0 15px, rgb(217, 152, 62) 0 0 15px !important;}',0);break;
|
||||
|
|
@ -10617,6 +10629,7 @@
|
|||
},event.chooseTime);
|
||||
}
|
||||
if(event.isMine()){
|
||||
ui.arena.classList.add('choose-to-move');
|
||||
delete ui.selected.guanxing_button;
|
||||
var list=event.list,filterMove=event.filterMove,filterOk=event.filterOk;
|
||||
_status.imchoosing=true;
|
||||
|
|
@ -10642,6 +10655,7 @@
|
|||
event.dialog.classList.add('scroll1');
|
||||
event.dialog.classList.add('scroll2');
|
||||
event.dialog.classList.add('fullwidth');
|
||||
event.dialog.classList.add('fullheight');
|
||||
|
||||
event.moved=[];
|
||||
var buttonss=[];
|
||||
|
|
@ -10670,7 +10684,8 @@
|
|||
};
|
||||
|
||||
for(var i=0;i<list.length;i++){
|
||||
event.dialog.add('<div class="text center">'+list[i][0]+'</div>');
|
||||
var tex=event.dialog.add('<div class="text center">'+list[i][0]+'</div>');
|
||||
tex.classList.add('choosetomove');
|
||||
var buttons=ui.create.div('.buttons',event.dialog.content,clickButtons);
|
||||
buttonss.push(buttons);
|
||||
buttons.classList.add('popup');
|
||||
|
|
@ -10689,6 +10704,9 @@
|
|||
}
|
||||
if(list[i][2]&&typeof list[i][2]=='function') buttons.textPrompt=list[i][2];
|
||||
}
|
||||
var tex=event.dialog.add('<div class="text center">点击两张牌以交换位置；点击一张牌并点击其他区域以移动卡牌</div>');
|
||||
tex.classList.add('choosetomove');
|
||||
|
||||
event.dialog.open();
|
||||
updateButtons();
|
||||
|
||||
|
|
@ -10723,6 +10741,9 @@
|
|||
if(ui.confirm) ui.confirm.close();
|
||||
game.resume();
|
||||
_status.imchoosing=false;
|
||||
setTimeout(function(){
|
||||
ui.arena.classList.remove('choose-to-move');
|
||||
},500);
|
||||
};
|
||||
|
||||
game.pause();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
window.noname_update={
|
||||
version:'1.9.116',
|
||||
update:'1.9.115.3',
|
||||
version:'1.9.116.1',
|
||||
update:'1.9.116',
|
||||
changeLog:[
|
||||
'派对浪客、樱庭星罗入选稿公布',
|
||||
'OL曹宪曹华、十周年刘巴、陆凯、夏侯令女',
|
||||
|
|
@ -8,13 +8,13 @@ window.noname_update={
|
|||
'技能调整与bug修复',
|
||||
],
|
||||
files:[
|
||||
'card/extra.js',
|
||||
//'card/extra.js',
|
||||
//'card/gujian.js',
|
||||
'card/guozhan.js',
|
||||
//'card/guozhan.js',
|
||||
//'card/gwent.js',
|
||||
//'card/huanlekapai.js',
|
||||
//'card/mtg.js',
|
||||
'card/sp.js',
|
||||
//'card/sp.js',
|
||||
//'card/standard.js',
|
||||
//'card/swd.js',
|
||||
//'card/yunchou.js',
|
||||
|
|
@ -22,8 +22,8 @@ window.noname_update={
|
|||
//'card/yongjian.js',
|
||||
//'card/zhenfa.js',
|
||||
//'card/zhulu.js',
|
||||
'character/diy.js',
|
||||
'character/extra.js',
|
||||
//'character/diy.js',
|
||||
//'character/extra.js',
|
||||
//'character/hearth.js',
|
||||
//'character/gujian.js',
|
||||
//'character/gwent.js',
|
||||
|
|
@ -31,35 +31,37 @@ window.noname_update={
|
|||
'character/mobile.js',
|
||||
//'character/mtg.js',
|
||||
//'character/offline.js',
|
||||
'character/old.js',
|
||||
//'character/old.js',
|
||||
//'character/ow.js',
|
||||
'character/rank.js',
|
||||
'character/refresh.js',
|
||||
//'character/rank.js',
|
||||
//'character/refresh.js',
|
||||
//'character/sb.js',
|
||||
'character/shenhua.js',
|
||||
//'character/shenhua.js',
|
||||
'character/sp.js',
|
||||
'character/sp2.js',
|
||||
//'character/standard.js',
|
||||
'character/tw.js',
|
||||
//'character/tw.js',
|
||||
//'character/swd.js',
|
||||
//'character/xianjian.js',
|
||||
//'character/xinghuoliaoyuan.js',
|
||||
//'character/yingbian.js',
|
||||
'character/yijiang.js',
|
||||
//'character/yijiang.js',
|
||||
//'character/yxs.js',
|
||||
//'extension/boss/extension.js',
|
||||
'font/suits.ttf',
|
||||
//'font/suits.ttf',
|
||||
'layout/default/layout.css',
|
||||
//'layout/newlayout/global.css',
|
||||
//'layout/default/menu.css',
|
||||
//'layout/nova/layout.css',
|
||||
'layout/long2/layout.css',
|
||||
//'layout/mobile/equip.css',
|
||||
'layout/mobile/layout.css',
|
||||
'layout/newlayout/global.css',
|
||||
'layout/nova/layout.css',
|
||||
//'mode/boss.js',
|
||||
//'mode/brawl.js',
|
||||
//'mode/chess.js',
|
||||
//'mode/connect.js',
|
||||
//'mode/doudizhu.js',
|
||||
'mode/guozhan.js',
|
||||
//'mode/guozhan.js',
|
||||
//'mode/identity.js',
|
||||
//'mode/single.js',
|
||||
//'mode/stone.js',
|
||||
|
|
@ -68,16 +70,16 @@ window.noname_update={
|
|||
'game/game.js',
|
||||
//'game/keyWords.js',
|
||||
//'game/NoSleep.js',
|
||||
'game/config.js',
|
||||
//'game/config.js',
|
||||
//'game/package.js',
|
||||
//'game/asset.js',
|
||||
'game/source.js',
|
||||
//'game/source.js',
|
||||
//'theme/style/hp/custom.css',
|
||||
//'theme/style/hp/emotion.css',
|
||||
//'theme/style/hp/glass.css',
|
||||
//'theme/style/hp/image',
|
||||
//'theme/style/hp/official.css',
|
||||
'theme/style/hp/ol.css',
|
||||
//'theme/style/hp/ol.css',
|
||||
//'theme/style/hp/round.css',
|
||||
//'theme/style/hp/xinglass.css',
|
||||
//'theme/style/hp/xinround.css',
|
||||
|
|
|
|||
|
|
@ -1156,7 +1156,7 @@ body>.background.land {
|
|||
background-size:cover;
|
||||
}
|
||||
|
||||
.popup {
|
||||
.popup:not(.guanxing) {
|
||||
padding: 5px;
|
||||
}
|
||||
.forcehide {
|
||||
|
|
@ -1449,8 +1449,9 @@ div:not(.handcards)>.card>.info>span,
|
|||
top: 69px;
|
||||
}
|
||||
.buttons.guanxing {
|
||||
min-height: 110px;
|
||||
min-height: 106px;
|
||||
width: 90%;
|
||||
margin: 0px;
|
||||
}
|
||||
.buttons.smallzoom {
|
||||
display: block;
|
||||
|
|
@ -1724,7 +1725,6 @@ div:not(.handcards)>.card>.info>span,
|
|||
height: 100%;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.content>table {
|
||||
width: 100%
|
||||
}
|
||||
|
|
@ -1769,6 +1769,10 @@ div:not(.handcards)>.card>.info>span,
|
|||
.content {
|
||||
display: block;
|
||||
width: 100%;
|
||||
font-size: 0px;
|
||||
}
|
||||
.content>*{
|
||||
font-size: 16px;
|
||||
}
|
||||
.dialog:not(.popped) .content {
|
||||
vertical-align: top;
|
||||
|
|
@ -1841,6 +1845,10 @@ div:not(.handcards)>.card>.info>span,
|
|||
font-size: 20px;
|
||||
display: block;
|
||||
}
|
||||
.caption.choosetomove{
|
||||
margin: 5px;
|
||||
padding: 0px !important;
|
||||
}
|
||||
.caption:only-child {
|
||||
padding-bottom: 8px;
|
||||
}
|
||||
|
|
@ -2058,6 +2066,9 @@ div:not(.handcards)>.card>.info>span,
|
|||
position: absolute;
|
||||
left: 50%;
|
||||
}
|
||||
#arena.choose-to-move>#control{
|
||||
top: calc(80%) !important;
|
||||
}
|
||||
/*--------角色--------*/
|
||||
.player>.avatar>.action {
|
||||
margin: 5px;
|
||||
|
|
|
|||
|
|
@ -187,13 +187,16 @@
|
|||
#arena.ipad.choose-character>.dialog{
|
||||
bottom:96px;
|
||||
}
|
||||
#arena.choose-to-move>#control,
|
||||
#arena.choose-character>#control{
|
||||
bottom: 30px;
|
||||
transition: all 0s;
|
||||
}
|
||||
#arena.phone.choose-to-move>#control,
|
||||
#arena.phone.choose-character>#control{
|
||||
bottom: 43px;
|
||||
}
|
||||
#arena.ipad.choose-to-move>#control,
|
||||
#arena.ipad.choose-character>#control{
|
||||
bottom: 45px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,16 @@
|
|||
bottom:150px;
|
||||
height: 40px;
|
||||
}
|
||||
#arena.choose-to-move>#control{
|
||||
bottom: 30px;
|
||||
transition: all 0s;
|
||||
}
|
||||
#arena.phone.choose-to-move>#control{
|
||||
bottom: 43px;
|
||||
}
|
||||
#arena.ipad.choose-to-move>#control{
|
||||
bottom: 45px;
|
||||
}
|
||||
#arena:not(.chess)>#me,
|
||||
#arena:not(.chess)>#mebg,
|
||||
#arena:not(.chess)>#autonode{
|
||||
|
|
|
|||
|
|
@ -517,6 +517,16 @@
|
|||
width: calc(100% - 300px);
|
||||
left:150px;
|
||||
}
|
||||
#arena.choose-to-move>#control{
|
||||
bottom: 30px;
|
||||
transition: all 0s;
|
||||
}
|
||||
#arena.phone.choose-to-move>#control{
|
||||
bottom: 43px;
|
||||
}
|
||||
#arena.ipad.choose-to-move>#control{
|
||||
bottom: 45px;
|
||||
}
|
||||
.popup{z-index:6}
|
||||
.dialog.scroll1,
|
||||
.dialog.scroll2,
|
||||
|
|
|
|||
|
|
@ -187,13 +187,16 @@
|
|||
#arena.ipad.choose-character>.dialog{
|
||||
bottom:96px;
|
||||
}
|
||||
#arena.choose-to-move>#control,
|
||||
#arena.choose-character>#control{
|
||||
bottom: 30px;
|
||||
transition: all 0s;
|
||||
}
|
||||
#arena.phone.choose-to-move>#control,
|
||||
#arena.phone.choose-character>#control{
|
||||
bottom: 43px;
|
||||
}
|
||||
#arena.ipad.choose-to-move>#control,
|
||||
#arena.ipad.choose-character>#control{
|
||||
bottom: 45px;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue