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

h

This commit is contained in:
libccy 2017-04-06 20:01:31 +08:00
parent cea7587cb7
commit 4f354e9bc5
4 changed files with 59 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
character/hearth.js
View File

@ -6458,7 +6458,7 @@ character.hearth={
enze_info_alter:'出牌阶段限一次，你可以指定一名角色令其手牌数与你相等（最多摸或弃两张牌）',
chongsheng:'重生',
chongsheng_bg:'生',
chongsheng_info:'濒死阶段，你可弃置所有牌，将体力回复至2-X，并摸X张牌，X为你本局发动此技能的次数。每局最多发动2次',
chongsheng_info:'濒死阶段，你可弃置所有牌，将体力回复至2-X，并摸2-X张牌，X为你本局发动此技能的次数。每局最多发动2次',
s_tuteng:'神谕',
s_tuteng_info:'锁定技，准备阶段，你随机获得一个图腾，若你已有至少3个图腾，则改为随机替换一个图腾',
guozai:'过载',

70
game/game.js
View File

@ -2306,11 +2306,14 @@
if(link!='default'){
node.style.fontFamily=link;
}
else{
node.style.fontFamily="'STHeiti','SimHei','Microsoft JhengHei','Microsoft YaHei','WenQuanYi Micro Hei',Helvetica,Arial,sans-serif";
}
node.style.fontSize='20px';
},
onclick:function(font){
game.saveConfig('global_font',font);
ui.arena.dataset.global_font=font;
ui.window.dataset.global_font=font;
}
},
// font_size:{
@ -2463,7 +2466,12 @@
if(get.is.phoneLayout()){
map.show_time2.show();
map.show_time.hide();
map.watchface.show();
if(lib.config.show_time2){
map.watchface.show();
}
else{
map.watchface.hide();
}
}
else{
map.show_time2.hide();
@ -2680,27 +2688,45 @@
intro:'移动对话框后新的对话框也将在移动后的位置显示',
init:false,
unfrequent:true,
},
reset_dialog:{
name:'重置对话框位置',
clear:true,
unfrequent:true,
onclick:function(){
if(ui.dialog){
var dialog=ui.dialog;
dialog.style.transform='';
dialog._dragtransform=[0,0];
dialog.style.transition='all 0.3s';
dialog._dragtouches;
dialog._dragorigin;
dialog._dragorigintransform;
setTimeout(function(){
dialog.style.transition='';
},500);
onclick:function(bool){
game.saveConfig('remember_dialog',bool);
if(!bool){
if(ui.dialog){
var dialog=ui.dialog;
dialog.style.transform='';
dialog._dragtransform=[0,0];
dialog.style.transition='all 0.3s';
dialog._dragtouches;
dialog._dragorigin;
dialog._dragorigintransform;
setTimeout(function(){
dialog.style.transition='';
},500);
}
game.saveConfig('dialog_transform',[0,0]);
}
game.saveConfig('dialog_transform',[0,0]);
}
},
// reset_dialog:{
// name:'重置对话框位置',
// clear:true,
// unfrequent:true,
// onclick:function(){
// if(ui.dialog){
// var dialog=ui.dialog;
// dialog.style.transform='';
// dialog._dragtransform=[0,0];
// dialog.style.transition='all 0.3s';
// dialog._dragtouches;
// dialog._dragorigin;
// dialog._dragorigintransform;
// setTimeout(function(){
// dialog.style.transition='';
// },500);
// }
// game.saveConfig('dialog_transform',[0,0]);
// }
// },
remember_round_button:{
name:'记住按钮位置',
intro:'重新开始后触屏按钮将保存的上一局的位置',
@ -20796,7 +20822,6 @@
},
multiDownload2:function(list,onsuccess,onerror,onfinish,process,dev){
list=list.slice(0);
if(lib.config.dev) game.print(get.url());
var download=function(){
if(list.length){
var current=list.shift();
@ -20831,6 +20856,7 @@
download();
},
multiDownload:function(list,onsuccess,onerror,onfinish,process,dev){
if(lib.config.dev) game.print(get.url());
var args=Array.from(arguments);
if(list.length<=3){
game.multiDownload2.apply(this,args);
@ -33978,7 +34004,7 @@
ui.arena.dataset.name_font=lib.config.name_font||'xinwei';
ui.arena.dataset.identity_font=lib.config.identity_font||'huangcao';
ui.arena.dataset.cardtext_font=lib.config.cardtext_font||'default';
ui.arena.dataset.global_font=lib.config.global_font||'default';
ui.window.dataset.global_font=lib.config.global_font||'default';
// ui.arena.dataset.font_size=lib.config.font_size||'16';
ui.arena.dataset.glow_phase=lib.config.glow_phase;
ui.backgroundMusic=document.createElement('audio');

4
game/update.js
View File

@ -15,7 +15,7 @@ window.noname_update={
// 'card/sp.js',
// 'card/yunchou.js',
// 'character/*',
// 'character/sp.js',
'character/hearth.js',
'character/gwent.js',
// 'mode/boss.js',
// 'mode/versus.js',
@ -28,7 +28,7 @@ window.noname_update={
// 'theme/music/style.css',
// 'theme/woodden/style.css',
// 'theme/simple/style.css',
// 'layout/default/layout.css',
'layout/default/layout.css',
// 'layout/default/phone.css',
// 'layout/default/menu.css',
// 'theme/style/cardback/*',

16
layout/default/layout.css
View File

@ -290,23 +290,23 @@ not(.removing):not(.dialog):not(.centermenu):not(.popup-container):not(.forceopa
border-radius: 12px;
}
#arena[data-global_font='xiaozhuan'] {
#window[data-global_font='xiaozhuan'] {
font-family: 'xiaozhuan';
}
#arena[data-global_font='lishu'] {
#window[data-global_font='lishu'] {
font-family: 'lishu';
}
#arena[data-global_font='xinwei'] {
#window[data-global_font='xinwei'] {
font-family: 'xinwei';
}
#arena[data-global_font='huangcao'] {
#window[data-global_font='huangcao'] {
font-family: 'huangcao','xinwei';
}
#arena[data-global_font='xiaozhuan'] #control,
#arena[data-global_font='lishu'] #control,
#arena[data-global_font='xinwei'] #control,
#arena[data-global_font='huangcao'] #control {
#window[data-global_font='xiaozhuan'] #control,
#window[data-global_font='lishu'] #control,
#window[data-global_font='xinwei'] #control,
#window[data-global_font='huangcao'] #control {
font-family: 'STHeiti','SimHei','Microsoft JhengHei','Microsoft YaHei','WenQuanYi Micro Hei',Helvetica,Arial,sans-serif
}