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

p

This commit is contained in:
libccy 2017-03-21 16:09:10 +08:00
parent 843bd9b380
commit 90c4585941
4 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
character/sp.js
View File

@ -1208,9 +1208,11 @@ character.sp={
} }
else{ else{
player.draw(2); player.draw(2);
player.addSkill(event.list); if(event.list){
player.popup(event.list[0]); player.addSkill(event.list);
player.storage.zhuSkill_yjixi=event.list; player.popup(event.list[0]);
player.storage.zhuSkill_yjixi=event.list;
}
} }
}, },
group:['yjixi_count1','yjixi_count2'], group:['yjixi_count1','yjixi_count2'],

29
game/game.js
View File

@ -1661,7 +1661,7 @@
else{ else{
ui.arena.dataset.framedecoration=''; ui.arena.dataset.framedecoration='';
} }
ui.css.border_stylesheet.sheet.insertRule('#window .player>.framebg{display:block;background-image:url("'+lib.assetURL+'theme/style/player/'+layout+'1.png")}',0); ui.css.border_stylesheet.sheet.insertRule('#window .player>.framebg,#window #arena.long.mobile:not(.fewplayer) .player[data-position="0"]>.framebg{display:block;background-image:url("'+lib.assetURL+'theme/style/player/'+layout+'1.png")}',0);
ui.css.border_stylesheet.sheet.insertRule('#window #arena.long:not(.fewplayer) .player>.framebg, #arena.oldlayout .player>.framebg{background-image:url("'+lib.assetURL+'theme/style/player/'+layout+'3.png")}',0); ui.css.border_stylesheet.sheet.insertRule('#window #arena.long:not(.fewplayer) .player>.framebg, #arena.oldlayout .player>.framebg{background-image:url("'+lib.assetURL+'theme/style/player/'+layout+'3.png")}',0);
ui.css.border_stylesheet.sheet.insertRule('.player>.count{z-index: 3 !important;border-radius: 2px !important;text-align: center !important;}',0); ui.css.border_stylesheet.sheet.insertRule('.player>.count{z-index: 3 !important;border-radius: 2px !important;text-align: center !important;}',0);
} }
@ -5968,7 +5968,7 @@
if(bstyle.indexOf('dragon_')==0){ if(bstyle.indexOf('dragon_')==0){
bstyle=bstyle.slice(7); bstyle=bstyle.slice(7);
} }
ui.css.border_stylesheet.sheet.insertRule('#window .player>.framebg{display:block;background-image:url("'+lib.assetURL+'theme/style/player/'+bstyle+'1.png")}',0); ui.css.border_stylesheet.sheet.insertRule('#window .player>.framebg,#window #arena.long.mobile:not(.fewplayer) .player[data-position="0"]>.framebg{display:block;background-image:url("'+lib.assetURL+'theme/style/player/'+bstyle+'1.png")}',0);
ui.css.border_stylesheet.sheet.insertRule('#window #arena.long:not(.fewplayer) .player>.framebg, #arena.oldlayout .player>.framebg{background-image:url("'+lib.assetURL+'theme/style/player/'+bstyle+'3.png")}',0); ui.css.border_stylesheet.sheet.insertRule('#window #arena.long:not(.fewplayer) .player>.framebg, #arena.oldlayout .player>.framebg{background-image:url("'+lib.assetURL+'theme/style/player/'+bstyle+'3.png")}',0);
ui.css.border_stylesheet.sheet.insertRule('.player>.count{z-index: 3 !important;border-radius: 2px !important;text-align: center !important;}',0); ui.css.border_stylesheet.sheet.insertRule('.player>.count{z-index: 3 !important;border-radius: 2px !important;text-align: center !important;}',0);
} }
@ -24581,6 +24581,31 @@
avatar.style.transform=''; avatar.style.transform='';
avatar.classList.add('avatar2'); avatar.classList.add('avatar2');
node.appendChild(avatar); node.appendChild(avatar);
if(targets&&targets.length==1&&targets[0]!=player&&get.itemtype(targets[0])=='player'){
(function(){
var avatar2;
var target=targets[0];
if(!target.isUnseen(0)){
avatar2=target.node.avatar.cloneNode();
}
else if(!player.isUnseen(1)){
avatar2=target.node.avatar2.cloneNode();
}
else if(get.mode()=='guozhan'&&target.node&&target.node.name_seat){
avatar2=ui.create.div('.avatar.cardbg');
avatar2.innerHTML=target.node.name_seat.innerHTML[0];
}
else{
return;
}
node.node.avatar2=avatar2;
avatar2.style.transform='';
avatar2.classList.add('avatar2');
avatar2.classList.add('avatar3');
node.insertBefore(avatar2,avatar);
}());
}
} }
if(targets&&targets.length){ if(targets&&targets.length){
if(targets.length==1&&targets[0]==player){ if(targets.length==1&&targets[0]==player){

2
game/update.js
View File

@ -25,7 +25,7 @@ window.noname_update={
// 'mode/identity.js', // 'mode/identity.js',
// 'mode/stone.js', // 'mode/stone.js',
// 'theme/woodden/style.css', // 'theme/woodden/style.css',
// 'layout/default/layout.css', 'layout/default/layout.css',
// 'layout/default/phone.css', // 'layout/default/phone.css',
// 'layout/default/menu.css', // 'layout/default/menu.css',
// 'layout/long/layout.css', // 'layout/long/layout.css',

18
layout/default/layout.css
View File

@ -467,6 +467,12 @@ not(.removing):not(.dialog):not(.centermenu):not(.popup-container):not(.forceopa
line-height: 20px; line-height: 20px;
z-index: 1; z-index: 1;
} }
#historybar>div>.avatar2.avatar3{
left: 12px;
width: 14px;
top: 31px;
height: 14px;
}
#window.rightbar #historybar, #window.rightbar #historybar,
#window.rightbar2:not(.leftbar) #historybar { #window.rightbar2:not(.leftbar) #historybar {
@ -1904,10 +1910,12 @@ div:not(.handcards)>.card>.info>span,
transform-origin: top left; transform-origin: top left;
} }
#window #arena.mobile:not(.chess) .player[data-position='0']>.framebg{ #window #arena.mobile:not(.chess) .player[data-position='0']>.framebg{
display: none; /*display: none;*/
width: 120px;
} }
#window .player>.framebg[data-auto="gold"]{ #window .player>.framebg[data-auto="gold"],
#window #arena.long.mobile:not(.fewplayer) .player[data-position='0']>.framebg[data-auto="gold"]{
display:block; display:block;
background-image:url('../../theme/style/player/gold1.png'); background-image:url('../../theme/style/player/gold1.png');
} }
@ -1916,7 +1924,8 @@ div:not(.handcards)>.card>.info>span,
display:block; display:block;
background-image:url('../../theme/style/player/gold3.png'); background-image:url('../../theme/style/player/gold3.png');
} }
#window .player>.framebg[data-auto="silver"]{ #window .player>.framebg[data-auto="silver"],
#window #arena.long.mobile:not(.fewplayer) .player[data-position='0']>.framebg[data-auto="silver"]{
display:block; display:block;
background-image:url('../../theme/style/player/silver1.png'); background-image:url('../../theme/style/player/silver1.png');
} }
@ -1925,7 +1934,8 @@ div:not(.handcards)>.card>.info>span,
display:block; display:block;
background-image:url('../../theme/style/player/silver3.png'); background-image:url('../../theme/style/player/silver3.png');
} }
#window .player>.framebg[data-auto="bronze"]{ #window .player>.framebg[data-auto="bronze"],
#window #arena.long.mobile:not(.fewplayer) .player[data-position='0']>.framebg[data-auto="bronze"]{
display:block; display:block;
background-image:url('../../theme/style/player/bronze1.png'); background-image:url('../../theme/style/player/bronze1.png');
} }