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

g1

This commit is contained in:
libccy 2017-01-31 23:18:53 +08:00
parent cc193d0bf2
commit 272e71c1ef
7 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
card/gujian.js
View File

@ -2,11 +2,15 @@
card.gujian={ card.gujian={
card:{ card:{
chunbing:{ chunbing:{
fullskin:true fullskin:true,
},
fulingbing:{
fullskin:true,
} }
}, },
skill:{}, skill:{},
translate:{ translate:{
chunbing:'春饼' chunbing:'春饼',
fulingbing:'茯苓饼',
} }
}; };

2
character/hearth.js
View File

@ -2232,7 +2232,7 @@ character.hearth={
} }
}, },
mark:true, mark:true,
marktext:'封', marktext:'瘴',
intro:{ intro:{
content:'下个回合无法使用锦囊牌' content:'下个回合无法使用锦囊牌'
} }

4
game/asset.js
View File

@ -1,5 +1,5 @@
window.noname_asset_list=[ window.noname_asset_list=[
'1.9.6.1', '1.9.6.6',
'image/background/huangtian_bg.jpg', 'image/background/huangtian_bg.jpg',
'image/background/september_bg.jpg', 'image/background/september_bg.jpg',
'image/background/shengshi_bg.jpg', 'image/background/shengshi_bg.jpg',
@ -21,6 +21,7 @@ window.noname_asset_list=[
'image/card/chilongya.png', 'image/card/chilongya.png',
'image/card/chiyuxi.png', 'image/card/chiyuxi.png',
'image/card/chuansongmen.png', 'image/card/chuansongmen.png',
'image/card/chunbing.png',
'image/card/cixiong.png', 'image/card/cixiong.png',
'image/card/daihuofenglun.png', 'image/card/daihuofenglun.png',
'image/card/dawan.png', 'image/card/dawan.png',
@ -36,6 +37,7 @@ window.noname_asset_list=[
'image/card/fengxueren.png', 'image/card/fengxueren.png',
'image/card/fengyinzhidan.png', 'image/card/fengyinzhidan.png',
'image/card/fudichouxin.png', 'image/card/fudichouxin.png',
'image/card/fulingbing.png',
'image/card/fuxiqin.png', 'image/card/fuxiqin.png',
'image/card/fuxiqin2.png', 'image/card/fuxiqin2.png',
'image/card/gouhunluo.png', 'image/card/gouhunluo.png',

2
game/config.js
View File

@ -26,7 +26,7 @@ window.config={
forbidchess:['hetaihou','swd_kangnalishi'], forbidchess:['hetaihou','swd_kangnalishi'],
forbidboss:['caiwenji','gjqt_aruan','pal_xuanxiao','swd_hupo'], forbidboss:['caiwenji','gjqt_aruan','pal_xuanxiao','swd_hupo'],
forbiddouble:['zhugedan','swd_kangnalishi','dongzhuo','wutugu','jg_simayi','hs_siwangzhiyi','hs_ronghejuren','hs_shanlingjuren'], forbiddouble:['zhugedan','swd_kangnalishi','dongzhuo','wutugu','jg_simayi','hs_siwangzhiyi','hs_ronghejuren','hs_shanlingjuren'],
layoutfixed:['chess','brawl'], layoutfixed:['chess','stone'],
all:{ all:{
stockmode:['identity','guozhan','versus','boss','chess','stone','connect','brawl','tafang','hearthstone'], stockmode:['identity','guozhan','versus','boss','chess','stone','connect','brawl','tafang','hearthstone'],
stockextension:['boss','cardpile','character','coin','soldier','weather','wuxing','hs_mod'], stockextension:['boss','cardpile','character','coin','soldier','weather','wuxing','hs_mod'],

68
game/game.js
View File

@ -498,7 +498,7 @@
long2:'手杀', long2:'手杀',
}, },
onclick:function(layout){ onclick:function(layout){
if(lib.config.layoutfixed.contains(lib.config.mode)&&layout=='default'){ if(lib.config.layoutfixed.contains(lib.config.mode)){
game.saveConfig('layout',layout); game.saveConfig('layout',layout);
} }
else{ else{
@ -743,7 +743,7 @@
var style=ui.css.hp_style; var style=ui.css.hp_style;
ui.css.hp_style=lib.init.css(lib.assetURL+'theme/style/hp',lib.config.hp_style); ui.css.hp_style=lib.init.css(lib.assetURL+'theme/style/hp',lib.config.hp_style);
style.remove(); style.remove();
if(lib.config.layout=='default'&&lib.config.hp_style=='official'){ if(game.layout=='default'&&lib.config.hp_style=='official'){
ui.arena.classList.add('hpimage'); ui.arena.classList.add('hpimage');
} }
else{ else{
@ -854,7 +854,7 @@
}, },
onclick:function(item){ onclick:function(item){
game.saveConfig('player_border',item); game.saveConfig('player_border',item);
if(item!='wide'||lib.config.layout=='long'||lib.config.layout=='long2'){ if(item!='wide'||game.layout=='long'||game.layout=='long2'){
ui.arena.classList.add('slim_player'); ui.arena.classList.add('slim_player');
} }
else{ else{
@ -1286,7 +1286,7 @@
linked=true; linked=true;
} }
game.saveConfig('cardshape',item); game.saveConfig('cardshape',item);
if(item=='oblong'&&(lib.config.layout=='long'||lib.config.layout=='mobile')){ if(item=='oblong'&&(game.layout=='long'||game.layout=='mobile')){
ui.arena.classList.add('oblongcard'); ui.arena.classList.add('oblongcard');
} }
else{ else{
@ -1314,7 +1314,7 @@
}, },
onclick:function(item){ onclick:function(item){
game.saveConfig('textequip',item); game.saveConfig('textequip',item);
if(item=='text'&&(lib.config.layout=='long'||lib.config.layout=='mobile')){ if(item=='text'&&(game.layout=='long'||game.layout=='mobile')){
ui.arena.classList.add('textequip'); ui.arena.classList.add('textequip');
} }
else{ else{
@ -3652,22 +3652,18 @@
dialog.style.top=idealtop+'px'; dialog.style.top=idealtop+'px';
}, },
isMobileMe:function(player){ isMobileMe:function(player){
return (lib.config.layout=='mobile'||lib.config.layout=='long')&&!game.chess&&player.dataset.position==0; return (game.layout=='mobile'||game.layout=='long')&&!game.chess&&player.dataset.position==0;
}, },
isNewLayout:function(){ isNewLayout:function(){
if(lib.config.layout!='default') return true; if(game.layout!='default') return true;
if(lib.config.layoutfixed.contains(lib.config.mode)) return true;
return false; return false;
}, },
isPhoneLayout:function(){ isPhoneLayout:function(){
if(!lib.config.phonelayout) return false; if(!lib.config.phonelayout) return false;
return (lib.config.layout=='mobile'||lib.config.layout=='long'||lib.config.layout=='long2'); return (game.layout=='mobile'||game.layout=='long'||game.layout=='long2');
}, },
isSingleHandcard:function(){ isSingleHandcard:function(){
if(game.singleHandcard||lib.config.layout=='mobile'||lib.config.layout=='long'||lib.config.layout=='long2'){ if(game.singleHandcard||game.layout=='mobile'||game.layout=='long'||game.layout=='long2'){
return true;
}
if(lib.config.layout=='default'&&lib.config.layoutfixed.contains(lib.config.mode)){
return true; return true;
} }
return false; return false;
@ -4023,15 +4019,14 @@
lib.init.css(lib.assetURL+'layout/default','menu'); lib.init.css(lib.assetURL+'layout/default','menu');
var layout=lib.config.layout; var layout=lib.config.layout;
if(lib.config.layoutfixed.indexOf(lib.config.mode)!==-1){ if(lib.config.layoutfixed.indexOf(lib.config.mode)!==-1){
if(layout=='default'){
layout='mobile'; layout='mobile';
} }
}
if(layout=='phone'){ if(layout=='phone'){
layout='mobile'; layout='mobile';
game.saveConfig('layout','mobile'); game.saveConfig('layout','mobile');
game.saveConfig('phonelayout',true); game.saveConfig('phonelayout',true);
} }
game.layout=layout;
if(lib.config.image_background!='default'&&lib.config.image_background!='custom'&&lib.config.theme=='simple'){ 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")'; document.documentElement.style.backgroundImage='url("image/background/'+lib.config.image_background+'.jpg")';
} }
@ -4918,10 +4913,11 @@
}, },
layout:function(layout,nosave){ layout:function(layout,nosave){
if(!nosave) game.saveConfig('layout',layout); if(!nosave) game.saveConfig('layout',layout);
game.layout=layout;
ui.arena.hide(); ui.arena.hide();
setTimeout(function(){ setTimeout(function(){
ui.css.layout.href=lib.assetURL+'layout/'+lib.config.layout+'/layout.css'; ui.css.layout.href=lib.assetURL+'layout/'+game.layout+'/layout.css';
if(lib.config.layout=='mobile'||lib.config.layout=='long'){ if(game.layout=='mobile'||game.layout=='long'){
ui.arena.classList.add('mobile'); ui.arena.classList.add('mobile');
if(game.me&&game.me.node.handcards2.childNodes.length){ if(game.me&&game.me.node.handcards2.childNodes.length){
while(game.me.node.handcards2.childNodes.length){ while(game.me.node.handcards2.childNodes.length){
@ -4932,25 +4928,25 @@
else{ else{
ui.arena.classList.remove('mobile'); ui.arena.classList.remove('mobile');
} }
if(lib.config.layout=='default'){ if(game.layout=='default'){
ui.arena.classList.add('oldlayout'); ui.arena.classList.add('oldlayout');
} }
else{ else{
ui.arena.classList.remove('oldlayout'); ui.arena.classList.remove('oldlayout');
} }
if(lib.config.layout=='default'&&lib.config.hp_style=='official'){ if(game.layout=='default'&&lib.config.hp_style=='official'){
ui.arena.classList.add('hpimage'); ui.arena.classList.add('hpimage');
} }
else{ else{
ui.arena.classList.remove('hpimage'); ui.arena.classList.remove('hpimage');
} }
if(lib.config.cardshape=='oblong'&&(lib.config.layout=='long'||lib.config.layout=='mobile')){ if(lib.config.cardshape=='oblong'&&(game.layout=='long'||game.layout=='mobile')){
ui.arena.classList.add('oblongcard'); ui.arena.classList.add('oblongcard');
} }
else{ else{
ui.arena.classList.remove('oblongcard'); ui.arena.classList.remove('oblongcard');
} }
if(lib.config.textequip=='text'&&(lib.config.layout=='long'||lib.config.layout=='mobile')){ if(lib.config.textequip=='text'&&(game.layout=='long'||game.layout=='mobile')){
ui.arena.classList.add('textequip'); ui.arena.classList.add('textequip');
} }
else{ else{
@ -4978,13 +4974,13 @@
} }
} }
} }
if(lib.config.layout=='long'||lib.config.layout=='long2'){ if(game.layout=='long'||game.layout=='long2'){
ui.arena.classList.add('long'); ui.arena.classList.add('long');
} }
else{ else{
ui.arena.classList.remove('long'); ui.arena.classList.remove('long');
} }
if(lib.config.player_border!='wide'||lib.config.layout=='long'||lib.config.layout=='long2'){ if(lib.config.player_border!='wide'||game.layout=='long'||game.layout=='long2'){
ui.arena.classList.add('slim_player'); ui.arena.classList.add('slim_player');
} }
else{ else{
@ -9472,7 +9468,7 @@
if(this.maxHp==Infinity){ if(this.maxHp==Infinity){
hp.innerHTML='∞'; hp.innerHTML='∞';
} }
else if(lib.config.layout=='default'&&this.maxHp>14){ else if(game.layout=='default'&&this.maxHp>14){
hp.innerHTML=this.hp+'/'+this.maxHp; hp.innerHTML=this.hp+'/'+this.maxHp;
hp.classList.add('text'); hp.classList.add('text');
} }
@ -9480,7 +9476,7 @@
( (
this.maxHp>9|| this.maxHp>9||
(this.maxHp>5&&this.classList.contains('minskin'))|| (this.maxHp>5&&this.classList.contains('minskin'))||
((lib.config.layout=='mobile'||lib.config.layout=='long')&&this.dataset.position==0&&this.maxHp>7) ((game.layout=='mobile'||game.layout=='long')&&this.dataset.position==0&&this.maxHp>7)
)){ )){
hp.innerHTML=this.hp+'<br>/<br>'+this.maxHp; hp.innerHTML=this.hp+'<br>/<br>'+this.maxHp;
hp.classList.add('text'); hp.classList.add('text');
@ -20181,8 +20177,8 @@
}); });
}, },
switchMode:function(name,configx){ switchMode:function(name,configx){
if(lib.config.layout=='default'&&lib.config.layoutfixed.contains(lib.config.mode)&&!lib.config.layoutfixed.contains(name)){ if(lib.config.layout!=game.layout&&!lib.config.layoutfixed.contains(name)){
lib.init.layout('default'); lib.init.layout(lib.config.layout);
} }
window.mode={}; window.mode={};
var script=lib.init.js(lib.assetURL+'mode',name,function(){ var script=lib.init.js(lib.assetURL+'mode',name,function(){
@ -28264,29 +28260,29 @@
} }
} }
if(lib.config.layout=='mobile'||lib.config.layout=='long'){ if(game.layout=='mobile'||game.layout=='long'){
ui.arena.classList.add('mobile'); ui.arena.classList.add('mobile');
} }
if(lib.config.layout=='long'||lib.config.layout=='long2'){ if(game.layout=='long'||game.layout=='long2'){
ui.arena.classList.add('long'); ui.arena.classList.add('long');
} }
if(lib.config.layout=='default'){ if(game.layout=='default'){
ui.arena.classList.add('oldlayout'); ui.arena.classList.add('oldlayout');
} }
if(lib.config.low_performance){ if(lib.config.low_performance){
ui.arena.classList.add('low_performance'); ui.arena.classList.add('low_performance');
} }
if(lib.config.player_border!='wide'||lib.config.layout=='long'||lib.config.layout=='long2'){ if(lib.config.player_border!='wide'||game.layout=='long'||game.layout=='long2'){
ui.arena.classList.add('slim_player'); ui.arena.classList.add('slim_player');
} }
if(lib.config.player_border=='slim'){ if(lib.config.player_border=='slim'){
ui.arena.classList.add('uslim_player'); ui.arena.classList.add('uslim_player');
} }
ui.window.dataset.radius_size=lib.config.radius_size||'default'; ui.window.dataset.radius_size=lib.config.radius_size||'default';
if(lib.config.layout=='default'&&lib.config.hp_style=='official'){ if(game.layout=='default'&&lib.config.hp_style=='official'){
ui.arena.classList.add('hpimage'); ui.arena.classList.add('hpimage');
} }
if(lib.config.layout=='long'||lib.config.layout=='mobile'){ if(game.layout=='long'||game.layout=='mobile'){
if(lib.config.textequip=='text') ui.arena.classList.add('textequip'); if(lib.config.textequip=='text') ui.arena.classList.add('textequip');
if(lib.config.cardshape=='oblong') ui.arena.classList.add('oblongcard'); if(lib.config.cardshape=='oblong') ui.arena.classList.add('oblongcard');
} }
@ -28610,7 +28606,7 @@
var left2='calc(100% - 245px)'; var left2='calc(100% - 245px)';
var top1='210px'; var top1='210px';
var top2='calc(100% - 245px)'; var top2='calc(100% - 245px)';
if(lib.config.layout=='default'){ if(game.layout=='default'){
left1='265px'; left1='265px';
top1='160px'; top1='160px';
left2='calc(100% - 330px)'; left2='calc(100% - 330px)';
@ -31736,7 +31732,7 @@
ui.dialog.classList.remove('nobutton'); ui.dialog.classList.remove('nobutton');
} }
} }
if(false&&lib.config.layout=='mobile'){ if(false&&game.layout=='mobile'){
ui.dialog.style.height=''; ui.dialog.style.height='';
if(ui.dialog.contentContainer.offsetHeight>=ui.dialog.content.offsetHeight){ if(ui.dialog.contentContainer.offsetHeight>=ui.dialog.content.offsetHeight){
ui.dialog.style.height=ui.dialog.content.offsetHeight+'px'; ui.dialog.style.height=ui.dialog.content.offsetHeight+'px';
@ -31781,7 +31777,7 @@
linked2:function(player){ linked2:function(player){
if(lib.config.link_style=='mark') return true; if(lib.config.link_style=='mark') return true;
if(game.chess) return false; if(game.chess) return false;
if(lib.config.layout=='long'||lib.config.layout=='long2') return true; if(game.layout=='long'||game.layout=='long2') return true;
if(player.dataset.position=='0'){ if(player.dataset.position=='0'){
return ui.arena.classList.contains('oblongcard'); return ui.arena.classList.contains('oblongcard');
} }

BIN
image/card/chunbing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
image/card/fulingbing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB