diff --git a/game/game.js b/game/game.js
index be47e0221..73bcde9c2 100644
--- a/game/game.js
+++ b/game/game.js
@@ -1704,7 +1704,7 @@
else{
ui.arena.classList.remove('uslim_player');
}
- if(item=='normal'&&(game.layout=='long'||game.layout=='long2')){
+ if(item=='normal'&&lib.config.mode!='brawl'&&(game.layout=='long'||game.layout=='long2')){
ui.arena.classList.add('lslim_player');
}
else{
@@ -4909,7 +4909,7 @@
'
角色操作
- 受到伤害
player.damage(source,
num)'+
' - 回复体力
player.recover(num) - 摸牌
player.draw(num) - 获得牌
player.gain(cards) - 弃牌
player.discard(cards)'+
' - 使用卡牌
player.useCard(card,
targets) - 死亡
player.die() - 复活
player.revive(hp)
'+
- '游戏操作
- 在命令框中输出结果
game.print(str) - 清除命令框中的内容
cls - 游戏结束
game.over(bool)'+
+ '游戏操作
- 在命令框中输出结果
game.print(str) - 清除命令框中的内容
cls - 上一条/下一条输入的内容
up/down - 游戏结束
game.over(bool)'+
' - 角色资料
lib.character - 卡牌资料
lib.card
',
},
setIntro:function(node,func){
@@ -7095,7 +7095,7 @@
else{
ui.arena.classList.remove('slim_player');
}
- if(lib.config.player_border=='normal'&&(game.layout=='long'||game.layout=='long2')){
+ if(lib.config.player_border=='normal'&&lib.config.mode!='brawl'&&(game.layout=='long'||game.layout=='long2')){
ui.arena.classList.add('lslim_player');
}
else{
@@ -23526,9 +23526,16 @@
});
},
switchMode:function(name,configx){
- if(lib.config.layout!=game.layout&&!lib.layoutfixed.contains(name)){
- lib.init.layout(lib.config.layout);
- }
+ if(!lib.layoutfixed.contains(name)){
+ if(lib.config.layout!=game.layout){
+ lib.init.layout(lib.config.layout);
+ }
+ else if(lib.config.mode=='brawl'){
+ if(lib.config.player_border=='normal'&&(game.layout=='long'||game.layout=='long2')){
+ ui.arena.classList.add('lslim_player');
+ }
+ }
+ }
window.mode={};
var script=lib.init.js(lib.assetURL+'mode',name,function(){
script.remove();
@@ -31598,13 +31605,36 @@
var logindex=-1;
var cheat=lib.cheat;
var runCommand=function(e){
- if(text2.value){
+ if(text2.value&&!['up','down'].contains(text2.value)){
logindex=-1;
logs.unshift(text2.value);
}
if(text2.value=='cls'){
text.innerHTML='';
+ text2.value='';
}
+ else if(text2.value=='up'){
+ if(logindex+1=0){
+ logindex--;
+ if(logindex<0){
+ text2.value='';
+ }
+ else{
+ text2.value=logs[logindex];
+ }
+ }
+ else{
+ text2.value='';
+ }
+ }
else{
try{
var result=eval(text2.value);
@@ -31613,8 +31643,8 @@
catch(e){
game.print(e);
}
+ text2.value='';
}
- text2.value='';
}
text2.addEventListener('keydown',function(e){
if(e.keyCode==13){
@@ -33095,7 +33125,7 @@
if(lib.config.player_border=='slim'){
ui.arena.classList.add('uslim_player');
}
- if(lib.config.player_border=='normal'&&(game.layout=='long'||game.layout=='long2')){
+ if(lib.config.player_border=='normal'&&lib.config.mode!='brawl'&&(game.layout=='long'||game.layout=='long2')){
ui.arena.classList.add('lslim_player');
}
if(lib.config.compatiblemode){
@@ -33589,6 +33619,19 @@
if(item.nature){
node.classList.add(item.nature);
}
+ if(!noclick){
+ if(lib.config.touchscreen){
+ lib.setLongPress(node,ui.click.intro);
+ }
+ else{
+ if(lib.config.hover_all){
+ lib.setHover(node,ui.click.hoverplayer);
+ }
+ if(lib.config.right_info){
+ node.oncontextmenu=ui.click.rightplayer;
+ }
+ }
+ }
break;
case 'vcard':
@@ -39245,6 +39288,9 @@
return;
}
var name=node.name;
+ if(node.link&&node.link.name&&lib.card[node.link.name]){
+ name=node.link.name;
+ }
if(get.position(node)=='j'&&node.viewAs&&node.viewAs!=name){
uiintro.add(get.translation(node.viewAs)+'
('+get.translation(node)+')
');
name=node.viewAs;
@@ -39371,7 +39417,12 @@
uiintro.add('特殊装备
').style.marginTop='-5px';
}
}
- uiintro._place_text=uiintro.add(''+lib.translate[name+'_info']+'
');
+ if(lib.translate[name+'_info']){
+ var placetext=uiintro.add(''+lib.translate[name+'_info']+'
');
+ if(lib.translate[name+'_info'].indexOf('