This commit is contained in:
parent
4a9f63553d
commit
ef69bef84c
|
@ -6095,7 +6095,6 @@ character.sp={
|
|||
shushen:'淑慎',
|
||||
shenzhi:'神智',
|
||||
xiongyi:'雄异',
|
||||
shefu:'设伏',
|
||||
junbing:'郡兵',
|
||||
junbing2:'郡兵',
|
||||
quji:'去疾',
|
||||
|
@ -6217,7 +6216,6 @@ character.sp={
|
|||
suishi_info:'每当其他角色进入濒死状态时,伤害来源可以令你摸一张牌;每当其他角色死亡时,伤害来源可以令你失去1点体力',
|
||||
quji_info:'出牌阶段限一次,你可以弃置X张牌(X为你已损失的体力值),然后令至多X名已受伤的角色各回复1点体力。若你以此法弃置的牌中有黑色牌,你失去一点体力。',
|
||||
junbing_info:'一名角色的结束阶段开始时,若其手牌数少于或者等于1,该角色可以摸一张牌。若如此做,该角色须将所有手牌交给你,然后你交给其等量的牌。',
|
||||
shefu_info:'结束阶段开始时,你可以将一张手牌移出游戏,称为“伏兵”。然后为“伏兵”记录一个基本牌或锦囊牌名称(须与其他“伏兵”记录的名称均不同)。你的回合外,当有其他角色使用与你记录的“伏兵”牌名相同的牌时,你可以令此牌无效,然后将该“伏兵”置入弃牌堆。',
|
||||
xiongyi_info:'限定技,出牌阶段,你可以与你势力相同的所有角色各摸3张牌(非国战模式改为任选至多3名角色);若你指定的角色数不超过2,你回复1点体力',
|
||||
shenzhi_info:'回合开始阶段开始时,你可以弃置所有手牌,若你以此法弃置的牌的张数不小于X,你回复1点体力(X为你当前的体力值)。',
|
||||
shushen_info:'当你回复1点体力时,你可以令一名其他角色回复1点体力或摸两张牌',
|
||||
|
|
|
@ -622,7 +622,7 @@ character.yijiang={
|
|||
group:'jiyu2',
|
||||
mod:{
|
||||
cardEnabled:function(card,player){
|
||||
if(player.storage.jiyu2.contains(get.suit(card))) return false;
|
||||
if(player.storage.jiyu2&&player.storage.jiyu2.contains(get.suit(card))) return false;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
43
game/game.js
43
game/game.js
|
@ -26,7 +26,7 @@
|
|||
},5000);
|
||||
var links=document.head.querySelectorAll('link');
|
||||
for(var i=0;i<links.length;i++){
|
||||
if(links[i].href='app/color.css'){
|
||||
if(links[i].href=='app/color.css'){
|
||||
links[i].remove();
|
||||
break;
|
||||
}
|
||||
|
@ -10210,14 +10210,15 @@
|
|||
var ny=parseCalc(node.style.top);
|
||||
nx=nx[0]*ui.arena.offsetWidth/100+nx[1];
|
||||
ny=ny[0]*ui.arena.offsetHeight/100+ny[1];
|
||||
var dx,dy;
|
||||
if(game.chess){
|
||||
var rect=this.getBoundingClientRect();
|
||||
var dx=rect.left+this.offsetWidth/2-52-nx;
|
||||
var dy=rect.top+this.offsetHeight/2-52-ny;
|
||||
dx=rect.left+this.offsetWidth/2-52-nx;
|
||||
dy=rect.top+this.offsetHeight/2-52-ny;
|
||||
}
|
||||
else{
|
||||
var dx=this.offsetLeft+this.offsetWidth/2-52-nx;
|
||||
var dy=this.offsetTop+this.offsetHeight/2-52-ny;
|
||||
dx=this.offsetLeft+this.offsetWidth/2-52-nx;
|
||||
dy=this.offsetTop+this.offsetHeight/2-52-ny;
|
||||
}
|
||||
if(node.style.transform&&node.style.transform!='none'&&node.style.transform.indexOf('translate')==-1){
|
||||
node.style.transform+=' translate('+dx+'px,'+dy+'px)';
|
||||
|
@ -10247,14 +10248,15 @@
|
|||
var ny=[50,-52];
|
||||
nx=nx[0]*ui.arena.offsetWidth/100+nx[1];
|
||||
ny=ny[0]*ui.arena.offsetHeight/100+ny[1];
|
||||
var dx,dy;
|
||||
if(game.chess){
|
||||
var rect=this.getBoundingClientRect();
|
||||
var dx=rect.left+this.offsetWidth/2-52-nx;
|
||||
var dy=rect.top+this.offsetHeight/2-52-ny;
|
||||
dx=rect.left+this.offsetWidth/2-52-nx;
|
||||
dy=rect.top+this.offsetHeight/2-52-ny;
|
||||
}
|
||||
else{
|
||||
var dx=this.offsetLeft+this.offsetWidth/2-52-nx;
|
||||
var dy=this.offsetTop+this.offsetHeight/2-52-ny;
|
||||
dx=this.offsetLeft+this.offsetWidth/2-52-nx;
|
||||
dy=this.offsetTop+this.offsetHeight/2-52-ny;
|
||||
}
|
||||
if(node.style.transform&&node.style.transform!='none'&&node.style.transform.indexOf('translate')==-1){
|
||||
node.style.transform+=' translate('+dx+'px,'+dy+'px)';
|
||||
|
@ -11562,7 +11564,7 @@
|
|||
if(this.childNodes.length){
|
||||
this.style.transition='opacity 0.5s';
|
||||
ui.refresh(this);
|
||||
this.style.transform='translateX(-'+(control.offsetWidth/2)+'px)';
|
||||
this.style.transform='translateX(-'+(this.offsetWidth/2)+'px)';
|
||||
this.style.opacity=1;
|
||||
ui.refresh(this);
|
||||
this.style.transition='';
|
||||
|
@ -12738,7 +12740,7 @@
|
|||
for(var i in mode.ai){
|
||||
if(typeof mode.ai[i]=='object'){
|
||||
if(ai[i]==undefined) ai[i]={};
|
||||
for(j in mode.ai[i]){
|
||||
for(var j in mode.ai[i]){
|
||||
ai[i][j]=lib.init.eval(mode.ai[i][j]);
|
||||
}
|
||||
}
|
||||
|
@ -12814,7 +12816,7 @@
|
|||
for(var i in mode.ai){
|
||||
if(typeof mode.ai[i]=='object'){
|
||||
if(ai[i]==undefined) ai[i]={};
|
||||
for(j in mode.ai[i]){
|
||||
for(var j in mode.ai[i]){
|
||||
ai[i][j]=lib.init.eval(mode.ai[i][j]);
|
||||
}
|
||||
}
|
||||
|
@ -14002,7 +14004,7 @@
|
|||
export:function(textToWrite,name){
|
||||
var textFileAsBlob = new Blob([textToWrite], {type:'text/plain'});
|
||||
var fileNameToSaveAs = name||'noname';
|
||||
fileNameToSaveAs=fileNameToSaveAs.replace(/\\|\/|\:|\?|\"|\*|\<|\>|\|/g,'.');
|
||||
fileNameToSaveAs=fileNameToSaveAs.replace(/\\|\/|\:|\?|\"|\*|<|>|\|/g,'.');
|
||||
|
||||
if(lib.device){
|
||||
var directory;
|
||||
|
@ -14043,7 +14045,7 @@
|
|||
var load=function(img){
|
||||
var blob = zip.generate({type:"blob"});
|
||||
var fileNameToSaveAs = packname||'noname';
|
||||
fileNameToSaveAs=fileNameToSaveAs.replace(/\\|\/|\:|\?|\"|\*|\<|\>|\|/g,'.');
|
||||
fileNameToSaveAs=fileNameToSaveAs.replace(/\\|\/|\:|\?|\"|\*|<|>|\|/g,'.');
|
||||
fileNameToSaveAs+='.zip';
|
||||
|
||||
if(lib.device){
|
||||
|
@ -18641,7 +18643,7 @@
|
|||
if(config.name=='联机昵称'){
|
||||
input.innerHTML=config.init||'无名玩家';
|
||||
input.onblur=function(){
|
||||
input.innerHTML=input.innerHTML.replace(/\<br\>/g,'');
|
||||
input.innerHTML=input.innerHTML.replace(/<br>/g,'');
|
||||
if(!input.innerHTML){
|
||||
input.innerHTML='无名玩家';
|
||||
}
|
||||
|
@ -18655,7 +18657,7 @@
|
|||
if(!input.innerHTML){
|
||||
input.innerHTML=lib.hallURL;
|
||||
}
|
||||
input.innerHTML=input.innerHTML.replace(/\<br\>/g,'');
|
||||
input.innerHTML=input.innerHTML.replace(/<br>/g,'');
|
||||
game.saveConfig('hall_ip',input.innerHTML,'connect');
|
||||
}
|
||||
}
|
||||
|
@ -18698,6 +18700,7 @@
|
|||
updateBanned._buttons=[];
|
||||
var menuUpdates=[];
|
||||
menuContainer=ui.create.div('.menu-container.hidden',ui.window,clickContainer);
|
||||
var menux;
|
||||
if(!connectMenu){
|
||||
ui.menuContainer=menuContainer;
|
||||
ui.click.configMenu=function(){
|
||||
|
@ -18715,7 +18718,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
var menux=createMenu(['开始','选项','武将','卡牌','扩展','其它'],{
|
||||
menux=createMenu(['开始','选项','武将','卡牌','扩展','其它'],{
|
||||
position:menuContainer,bar:40
|
||||
});
|
||||
menu=menux.menu;
|
||||
|
@ -18750,7 +18753,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
var menux=createMenu(['模式','武将','卡牌'],{
|
||||
menux=createMenu(['模式','武将','卡牌'],{
|
||||
position:menuContainer,bar:123
|
||||
});
|
||||
menu=menux.menu;
|
||||
|
@ -21362,7 +21365,7 @@
|
|||
game.multiDownload(updates,function(){
|
||||
n1++;
|
||||
span.innerHTML='正在下载文件('+n1+'/'+n2+')';
|
||||
},function(){
|
||||
},function(e){
|
||||
game.print('下载失败:'+e.source);
|
||||
},function(){
|
||||
setTimeout(finish,500);
|
||||
|
@ -21518,7 +21521,7 @@
|
|||
game.multiDownload(updates,function(){
|
||||
n1++;
|
||||
span.innerHTML='正在下载素材('+n1+'/'+n2+')';
|
||||
},function(){
|
||||
},function(e){
|
||||
game.print('下载失败:'+e.source);
|
||||
},function(){
|
||||
setTimeout(finish,500);
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
window.noname_update={
|
||||
version:'1.8.14.1',
|
||||
version:'1.8.14.2',
|
||||
changeLog:[
|
||||
'修bug',
|
||||
'观战设置'
|
||||
],
|
||||
files:{
|
||||
global:[
|
||||
'character/sp.js',
|
||||
'character/yijiang.js',
|
||||
'mode/guozhan.js',
|
||||
'game/game.js',
|
||||
|
@ -14,6 +14,7 @@ window.noname_update={
|
|||
'theme/simple/style.css',
|
||||
'theme/music/style.css',
|
||||
],
|
||||
'1.8.14':[]
|
||||
'1.8.14':[],
|
||||
'1.8.14.1':[]
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue