diff --git a/character/sp.js b/character/sp.js index 782862b08..36238387a 100644 --- a/character/sp.js +++ b/character/sp.js @@ -1208,9 +1208,11 @@ character.sp={ } else{ player.draw(2); - player.addSkill(event.list); - player.popup(event.list[0]); - player.storage.zhuSkill_yjixi=event.list; + if(event.list){ + player.addSkill(event.list); + player.popup(event.list[0]); + player.storage.zhuSkill_yjixi=event.list; + } } }, group:['yjixi_count1','yjixi_count2'], diff --git a/game/game.js b/game/game.js index 0b53c41cc..c3042c1bb 100644 --- a/game/game.js +++ b/game/game.js @@ -1661,7 +1661,7 @@ else{ 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('.player>.count{z-index: 3 !important;border-radius: 2px !important;text-align: center !important;}',0); } @@ -5968,7 +5968,7 @@ if(bstyle.indexOf('dragon_')==0){ 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('.player>.count{z-index: 3 !important;border-radius: 2px !important;text-align: center !important;}',0); } @@ -24581,6 +24581,31 @@ avatar.style.transform=''; avatar.classList.add('avatar2'); 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.length==1&&targets[0]==player){ diff --git a/game/update.js b/game/update.js index 516537dfd..4229f9f29 100644 --- a/game/update.js +++ b/game/update.js @@ -25,7 +25,7 @@ window.noname_update={ // 'mode/identity.js', // 'mode/stone.js', // 'theme/woodden/style.css', - // 'layout/default/layout.css', + 'layout/default/layout.css', // 'layout/default/phone.css', // 'layout/default/menu.css', // 'layout/long/layout.css', diff --git a/layout/default/layout.css b/layout/default/layout.css index 42cd1528b..4e4a6dae2 100644 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -467,6 +467,12 @@ not(.removing):not(.dialog):not(.centermenu):not(.popup-container):not(.forceopa line-height: 20px; z-index: 1; } +#historybar>div>.avatar2.avatar3{ + left: 12px; + width: 14px; + top: 31px; + height: 14px; +} #window.rightbar #historybar, #window.rightbar2:not(.leftbar) #historybar { @@ -1904,10 +1910,12 @@ div:not(.handcards)>.card>.info>span, transform-origin: top left; } #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; background-image:url('../../theme/style/player/gold1.png'); } @@ -1916,7 +1924,8 @@ div:not(.handcards)>.card>.info>span, display:block; 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; background-image:url('../../theme/style/player/silver1.png'); } @@ -1925,7 +1934,8 @@ div:not(.handcards)>.card>.info>span, display:block; 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; background-image:url('../../theme/style/player/bronze1.png'); }