This commit is contained in:
libccy
parent
677f21a5a0
commit
93aedd2a99
|
|
@ -24,6 +24,7 @@ character.ow={
|
|||
// ow_luba:['male','shu',4,[]],
|
||||
// ow_wensidun:['male','shu',4,[]],
|
||||
// ow_zhaliya:['female','shu',4,['pingzhang','lichang']],
|
||||
// ow_heiying:['female','wei',3,[]],
|
||||
},
|
||||
skill:{
|
||||
mengji:{
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
window.noname_asset_list=[
|
||||
'1.9.6',
|
||||
'1.9.6.1',
|
||||
'image/background/huangtian_bg.jpg',
|
||||
'image/background/september_bg.jpg',
|
||||
'image/background/shengshi_bg.jpg',
|
||||
'image/background/taoyuan_bg.jpg',
|
||||
'image/background/xueji_bg.jpg',
|
||||
'image/background/yinxiang_bg.jpg',
|
||||
'image/background/zhulian_bg.jpg',
|
||||
|
|
@ -443,6 +445,7 @@ window.noname_asset_list=[
|
|||
'image/character/ow_yuanshi.jpg',
|
||||
'image/character/ow_zhixuzhiguang.jpg',
|
||||
'image/character/ow_falaozhiying.jpg',
|
||||
'image/character/ow_heiying.jpg',
|
||||
'image/character/ow_luxiao.jpg',
|
||||
'image/character/ow_shibing.jpg',
|
||||
'image/character/ow_tianshi.jpg',
|
||||
|
|
|
|||
57
game/game.js
57
game/game.js
|
|
@ -629,6 +629,7 @@
|
|||
document.body.insertBefore(ui.background,document.body.firstChild);
|
||||
if(animate) ui.background.animate('start');
|
||||
if(lib.config.image_background=='default'){
|
||||
document.documentElement.style.backgroundImage='';
|
||||
ui.background.style.backgroundImage="none";
|
||||
}
|
||||
else if(lib.config.image_background=='custom'){
|
||||
|
|
@ -924,25 +925,30 @@
|
|||
}
|
||||
},
|
||||
show_card_prompt:{
|
||||
name:'显示出牌提示',
|
||||
name:'显示出牌信息',
|
||||
init:true,
|
||||
unfrequent:true,
|
||||
},
|
||||
hide_card_prompt_basic:{
|
||||
name:'隐藏基本牌提示',
|
||||
name:'隐藏基本牌信息',
|
||||
init:false,
|
||||
unfrequent:true,
|
||||
},
|
||||
hide_card_prompt_equip:{
|
||||
name:'隐藏装备牌提示',
|
||||
name:'隐藏装备牌信息',
|
||||
init:false,
|
||||
unfrequent:true,
|
||||
},
|
||||
show_phase_prompt:{
|
||||
name:'显示阶段提示',
|
||||
name:'显示阶段信息',
|
||||
init:true,
|
||||
unfrequent:true,
|
||||
},
|
||||
show_phaseuse_prompt:{
|
||||
name:'出牌阶段显示提示',
|
||||
init:true,
|
||||
unfrequent:true,
|
||||
},
|
||||
fold_card:{
|
||||
name:'折叠手牌',
|
||||
init:true,
|
||||
|
|
@ -4008,6 +4014,9 @@
|
|||
layout='mobile';
|
||||
game.saveConfig('layout','mobile');
|
||||
game.saveConfig('phonelayout',true);
|
||||
}
|
||||
if(lib.config.image_background!='default'&&lib.config.image_background!='custom'&&lib.config.theme=='simple'){
|
||||
document.documentElement.style.backgroundImage='url("image/background/'+lib.config.image_background+'.jpg")';
|
||||
}
|
||||
ui.css.layout=lib.init.css(lib.assetURL+'layout/'+layout,'layout');
|
||||
ui.css.phone=lib.init.css();
|
||||
|
|
@ -4310,6 +4319,11 @@
|
|||
{
|
||||
var data = fileLoadedEvent.target.result;
|
||||
ui.background.style.backgroundImage='url('+data+')';
|
||||
if(lib.config.image_background_blur){
|
||||
ui.background.style.filter='blur(8px)';
|
||||
ui.background.style.webkitFilter='blur(8px)';
|
||||
ui.background.style.transform='scale(1.05)';
|
||||
}
|
||||
};
|
||||
fileReader.readAsDataURL(fileToLoad, "UTF-8");
|
||||
});
|
||||
|
|
@ -6168,7 +6182,10 @@
|
|||
},
|
||||
phaseUse:function(){
|
||||
"step 0";
|
||||
player.chooseToUse();
|
||||
var next=player.chooseToUse();
|
||||
if(!lib.config.show_phaseuse_prompt){
|
||||
next.set('prompt',' ');
|
||||
}
|
||||
"step 1"
|
||||
if(result.bool&&!event.skipped){
|
||||
event.goto(0);
|
||||
|
|
@ -26250,12 +26267,12 @@
|
|||
else{
|
||||
if(dev){
|
||||
button3.innerHTML='正在检查更新';
|
||||
button3.disabled=true;
|
||||
}
|
||||
else{
|
||||
button1.innerHTML='正在检查更新';
|
||||
button1.disabled=true;
|
||||
}
|
||||
button3.disabled=true;
|
||||
button1.disabled=true;
|
||||
|
||||
var goupdate=function(files,update){
|
||||
if(game.download){
|
||||
|
|
@ -26344,10 +26361,6 @@
|
|||
|
||||
|
||||
var script=lib.init.js(get.url('version'),'game/update',function(){
|
||||
button1.disabled=false;
|
||||
button1.innerHTML='检查游戏更新';
|
||||
button3.disabled=false;
|
||||
button3.innerHTML='更新到开发版';
|
||||
script.remove();
|
||||
var update=window.noname_update;
|
||||
delete window.noname_update;
|
||||
|
|
@ -26357,7 +26370,7 @@
|
|||
}
|
||||
}
|
||||
game.saveConfig('check_version',update.version);
|
||||
if(update.version!=lib.version||lib.config.debug){
|
||||
if(update.version!=lib.version||dev){
|
||||
var files=null;
|
||||
var version=lib.version;
|
||||
if(Array.isArray(update.files)&&update.update){
|
||||
|
|
@ -26378,7 +26391,7 @@
|
|||
}
|
||||
}
|
||||
var str;
|
||||
if(lib.config.debug){
|
||||
if(dev){
|
||||
str='开发版仅供测试使用，可能存在风险，是否确定更新？'
|
||||
}
|
||||
else{
|
||||
|
|
@ -26402,6 +26415,12 @@
|
|||
if(index==1){
|
||||
goupdate(files,update);
|
||||
}
|
||||
else{
|
||||
button1.disabled=false;
|
||||
button1.innerHTML='检查游戏更新';
|
||||
button3.disabled=false;
|
||||
button3.innerHTML='更新到开发版';
|
||||
}
|
||||
},
|
||||
str,
|
||||
['确定','取消']
|
||||
|
|
@ -26411,10 +26430,20 @@
|
|||
if(confirm(str)){
|
||||
goupdate(files,update);
|
||||
}
|
||||
else{
|
||||
button1.disabled=false;
|
||||
button1.innerHTML='检查游戏更新';
|
||||
button3.disabled=false;
|
||||
button3.innerHTML='更新到开发版';
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
alert('当前版本已是最新');
|
||||
button1.disabled=false;
|
||||
button1.innerHTML='检查游戏更新';
|
||||
button3.disabled=false;
|
||||
button3.innerHTML='更新到开发版';
|
||||
}
|
||||
},function(){
|
||||
if(forcecheck===false){
|
||||
|
|
@ -26522,7 +26551,7 @@
|
|||
button3.onclick=function(){
|
||||
game.checkForUpdate(null,true);
|
||||
};
|
||||
if(false){
|
||||
if(lib.config.debug){
|
||||
li1.lastChild.appendChild(button3);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,8 @@ background.pack={
|
|||
zhulian_bg:'璧合',
|
||||
zhulin_bg:'竹林',
|
||||
shengshi_bg:'盛世',
|
||||
xueji_bg:'雪霁',
|
||||
taoyuan_bg:'桃园',
|
||||
september_bg:'九月',
|
||||
yinxiang_bg:'印象',
|
||||
huangtian_bg:'黄天',
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,30 +1,32 @@
|
|||
window.noname_update={
|
||||
version:'1.9.6.2',
|
||||
update:'1.9.6',
|
||||
version:'1.9.6.3',
|
||||
update:'1.9.6.2',
|
||||
changeLog:[
|
||||
'bug修复',
|
||||
],
|
||||
files:[
|
||||
'game/game.js',
|
||||
'card/swd.js',
|
||||
'game/package.js',
|
||||
'game/asset.js',
|
||||
// 'card/swd.js',
|
||||
'character/ow.js',
|
||||
'character/hearth.js',
|
||||
'character/old.js',
|
||||
'character/rank.js',
|
||||
'character/xianjian.js',
|
||||
'character/shenhua.js',
|
||||
'character/yijiang.js',
|
||||
'mode/chess.js',
|
||||
'mode/versus.js',
|
||||
'mode/guozhan.js',
|
||||
'mode/identity.js',
|
||||
'mode/stone.js',
|
||||
'theme/simple/style.css',
|
||||
'layout/default/layout.css',
|
||||
'layout/long/layout.css',
|
||||
// 'character/hearth.js',
|
||||
// 'character/old.js',
|
||||
// 'character/rank.js',
|
||||
// 'character/xianjian.js',
|
||||
// 'character/shenhua.js',
|
||||
// 'character/yijiang.js',
|
||||
// 'mode/chess.js',
|
||||
// 'mode/versus.js',
|
||||
// 'mode/guozhan.js',
|
||||
// 'mode/identity.js',
|
||||
// 'mode/stone.js',
|
||||
// 'theme/simple/style.css',
|
||||
// 'layout/default/layout.css',
|
||||
// 'layout/long/layout.css',
|
||||
'layout/long2/layout.css',
|
||||
'layout/mobile/layout.css',
|
||||
'layout/newlayout/global.css',
|
||||
'layout/mode/stone.css',
|
||||
// 'layout/mobile/layout.css',
|
||||
// 'layout/newlayout/global.css',
|
||||
// 'layout/mode/stone.css',
|
||||
]
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 216 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 32 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 25 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 56 KiB |
|
|
@ -130,6 +130,9 @@
|
|||
width: 120px !important;
|
||||
height: 220px !important;
|
||||
}
|
||||
#arena>.player:not(.minskin)>.damage.dieidentity{
|
||||
font-size: 60px;
|
||||
}
|
||||
#arena[data-player_height='default']>.player:not(.minskin){
|
||||
height: 200px !important;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue