From 1f95f7e919aec245d154c809737078ecbc902328 Mon Sep 17 00:00:00 2001 From: MengXinZXZ <2223529500@qq.com> Date: Sat, 16 Nov 2024 19:29:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B7=A6=E5=8F=B3=E6=89=8B?= =?UTF-8?q?=E5=B8=83=E5=B1=80=EF=BC=88by=20-=20=E9=A3=8E=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=AC=A7=E7=9A=87=EF=BC=89=E5=B9=B6=E5=81=9A=E9=80=82=E9=85=8D?= =?UTF-8?q?=E8=B7=9F=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- equip.css | 2 +- equip_new.css | 2 +- equip_new_new.css | 2 +- extension.js | 27 +++-- layout.css | 14 +-- layout_new.css | 14 +-- shoushaUI/lbtn/main1.css | 79 ++++++++++++ shoushaUI/lbtn/main1.js | 31 ++++- shoushaUI/lbtn/main1_window.css | 79 ++++++++++++ shoushaUI/lbtn/main2.css | 122 +++++++++++++++++++ shoushaUI/lbtn/main2.js | 84 +++++++++---- shoushaUI/lbtn/main2_window.css | 122 +++++++++++++++++++ shoushaUI/lbtn/main3.css | 96 +++++++++++++++ shoushaUI/lbtn/main3.js | 55 +++++++-- shoushaUI/lbtn/main3_window.css | 96 +++++++++++++++ shoushaUI/skill/main1.css | 199 +++++++++++++++++++++++++++++++ shoushaUI/skill/main1.js | 31 +++-- shoushaUI/skill/main1_window.css | 199 +++++++++++++++++++++++++++++++ shoushaUI/skill/main2.css | 108 +++++++++++++++++ shoushaUI/skill/main2.js | 31 +++-- shoushaUI/skill/main2_window.css | 108 +++++++++++++++++ shoushaUI/skill/main3.css | 109 +++++++++++++++++ shoushaUI/skill/main3.js | 32 +++-- shoushaUI/skill/main3_window.css | 109 +++++++++++++++++ 24 files changed, 1663 insertions(+), 88 deletions(-) diff --git a/equip.css b/equip.css index 1d2f562..9db405f 100644 --- a/equip.css +++ b/equip.css @@ -3,7 +3,7 @@ height: 100%; left: auto; min-width: 130px; - right: -16px; + right: 86px; top: auto; } diff --git a/equip_new.css b/equip_new.css index 75d5eb2..c4eb35e 100644 --- a/equip_new.css +++ b/equip_new.css @@ -3,7 +3,7 @@ height: 100%; left: auto; min-width: 130px; - right: -16px; + right: 86px; top: auto; } diff --git a/equip_new_new.css b/equip_new_new.css index 251bf24..3229b55 100644 --- a/equip_new_new.css +++ b/equip_new_new.css @@ -3,7 +3,7 @@ height: 100%; left: auto; min-width: 130px; - right: -16px; + right: 66px; top: auto; } diff --git a/extension.js b/extension.js index a7cc629..4756ddb 100644 --- a/extension.js +++ b/extension.js @@ -10979,10 +10979,22 @@ game.import("extension", function (lib, game, ui, get, ai, _status) { init: false, }, rightLayout: { - name: "右手布局", - init: true, - update: function () { - if (window.decadeUI) ui.arena.dataset.rightLayout = lib.config["extension_十周年UI_rightLayout"] ? "on" : "off"; + name: '左右布局', + init: "on", + intro: "切换完以后自动重启游戏", + item: { + off: "左手", + on: "右手", + }, + update() { + if (lib.config["extension_十周年UI_rightLayout"] == "on" || lib.config["extension_十周年UI_rightLayout"] == "off") { + ui.arena.dataset.rightLayout = lib.config["extension_十周年UI_rightLayout"]; + } + }, + onclick(item) { + lib.config["extension_十周年UI_rightLayout"] = item || "off"; + game.saveConfig("extension_十周年UI_rightLayout", item); + game.reload(); }, }, cardPrettify: { @@ -11649,10 +11661,11 @@ game.import("extension", function (lib, game, ui, get, ai, _status) { "最低适配:v1.10.17 - 待定", "新版适配", "对所有文件进行统一prettier格式化,修复css文件里面的报错属性", - "整合lone的信息页美化并做适配跟进", - "整合u的“一将成名”样式并做适配跟进", - "大幅简化手杀样式技能剩余次数的写法", "挑战模式boss名称显示位置优化(by - 幻翼幽冥)", + "添加“一将成名”界面布局(by - u)并做适配跟进", + "“一将成名”界面布局信息页美化(by - lone)并做适配跟进", + "完善左右手布局(by - 风中的欧皇)并做适配跟进", + "大幅简化手杀样式技能剩余次数的写法", ]; return '点击前往萌修十周年Github仓库

' + log.join("
•") + "

"; })(pack); diff --git a/layout.css b/layout.css index 1f6b805..7b7ae0b 100644 --- a/layout.css +++ b/layout.css @@ -215,10 +215,10 @@ body > .background { #arena > .hand-wrap, #arena > .hand-back { /*手牌区*/ /*左手布局+单独装备栏*/ - left: 180px; - right: 180px; + left: 300px; + right: 225px;/*数值越大手牌右边界区域越往左*/ width: auto; - height: 170px; + height: 150px; bottom: 1%; transition: none; z-index: 3; @@ -235,8 +235,8 @@ body > .background { #arena[data-alone-equip="off"][data-right-layout="off"] > .hand-wrap, #arena[data-alone-equip="off"][data-right-layout="off"] > .hand-back { /*左手布局+非单独装备栏*/ - left: 180px; - right: 30px; + left: 300px; + right: 95px; } #arena[data-alone-equip="off"][data-right-layout="on"] > .hand-wrap, @@ -252,12 +252,12 @@ body > .background { } /*挑战模式小头像*/ .hand-wrap > .fakeme.avatar { - left: -150px; + left: -270px; top: auto; right: auto; bottom: 0; width: 120px; - height: 120px; + height: 130px; border-radius: 8px; background-size: cover; } diff --git a/layout_new.css b/layout_new.css index b8ad4d8..ac6cd63 100644 --- a/layout_new.css +++ b/layout_new.css @@ -215,10 +215,10 @@ body > .background { #arena > .hand-wrap, #arena > .hand-back { /*手牌区*/ /*左手布局+单独装备栏*/ - left: 180px; - right: 180px; + left: 300px; + right: 225px;/*数值越大手牌右边界区域越往左*/ width: auto; - height: 170px; + height: 150px; bottom: 1%; transition: none; z-index: 3; @@ -235,8 +235,8 @@ body > .background { #arena[data-alone-equip="off"][data-right-layout="off"] > .hand-wrap, #arena[data-alone-equip="off"][data-right-layout="off"] > .hand-back { /*左手布局+非单独装备栏*/ - left: 180px; - right: 30px; + left: 300px; + right: 95px; } #arena[data-alone-equip="off"][data-right-layout="on"] > .hand-wrap, @@ -252,12 +252,12 @@ body > .background { } /*挑战模式小头像*/ .hand-wrap > .fakeme.avatar { - left: -150px; + left: -270px;/*数值越小越左*/ top: auto; right: auto; bottom: 0; width: 120px; - height: 120px; + height: 130px; border-radius: 8px; background-size: cover; } diff --git a/shoushaUI/lbtn/main1.css b/shoushaUI/lbtn/main1.css index d6ce8d5..8a393a8 100644 --- a/shoushaUI/lbtn/main1.css +++ b/shoushaUI/lbtn/main1.css @@ -754,3 +754,82 @@ left: 110px; bottom: 60px; } + +/*以下左手模式添加的css*/ +.lbtn-paixu1 { + width: 68px; + height: 55px; + background-image: url("./images/uibutton/btn-paixu.png"); + right: 1.2%; + bottom: 25%; + z-index: 5; + font-size: 18.1px; + background-size: 100% 100%; + background-color: transparent; + line-height: 45px; + text-align: center; + white-space: nowrap; + color: #c5af88; + font-family: "shousha"; + font-weight: bold; + -webkit-text-stroke: 1.1px rgba(43, 31, 25, 0.5); + text-shadow: none; + border-radius: 0px; +} + +.lbtn-controls + .lbtn-controls { + margin-top: 1px; +} + +/*记录*/ +.latn-jilu1 { + display: block; + position: absolute; + right: 1.2%; + background-size: 100% 100%; + border-radius: 1px; + width: 68px; + height: 55px; + /*--w: 68px; + --h: calc(var(--w) * 78/91); + width: var(--w); + height: var(--h);*/ + background-image: url("./images/uibutton/btn-jilu.png"); + bottom: 15%; + z-index: 5; +} + +/*左手手牌量显示*/ +.handcardNumber1 { + bottom: 2px; + left: 0px; /* 将right属性值修改为left属性值 */ + font-family: "HYZLSJ"; + color: #ffffff; + font-weight: 100 !important; + font-size: 13px !important; +} + +.handcardNumber1 > .cardPicture1 { + left: -50px; /* 调整left属性值 */ + bottom: -16px; + --w: 417px; + --h: calc(var(--w) * 235 / 500); /*宽和长*/ + width: var(--w); + height: var(--h); + background-image: url("./images/uibutton/shoupai1.png"); + background-size: 100% 100%; + position: relative; + z-index: -1; + perspective: 800px; /* 设置透视属性值 */ + transform: rotateY(180deg); /* 添加左右翻转效果 */ +} + +.handcardNumber1 > .cardNumber1 { + left: 180px; + bottom: 12px; + height: 8px; + line-height: 25px; + text-align: center; + font-size: 19px; + white-space: nowrap; +} diff --git a/shoushaUI/lbtn/main1.js b/shoushaUI/lbtn/main1.js index c3a3c16..263a9dd 100644 --- a/shoushaUI/lbtn/main1.js +++ b/shoushaUI/lbtn/main1.js @@ -103,7 +103,12 @@ app.import(function (lib, game, ui, get, ai, _status, app) { if (lib.config.extension_十周年UI_LTAN == false) { var liaotian = ui.create.node("img"); liaotian.src = lib.assetURL + "extension/十周年UI/shoushaUI/lbtn/images/uibutton/liaotian.png"; - liaotian.style.cssText = "display: block;--w: 135px;--h: calc(var(--w) * 699/960);width: var(--w);height: var(--h);position: absolute;top: calc(100% - 97px);right: calc(100% - 125px);background-color: transparent;z-index:3"; + if (lib.config["extension_十周年UI_rightLayout"] == "on") { + liaotian.style.cssText = "display: block;--w: 135px;--h: calc(var(--w) * 1019/1400);width: var(--w);height: var(--h);position: absolute;top: calc(100% - 97px);right: calc(100% - 129px);background-color: transparent;z-index:3"; + } else { + //左手模式聊天按钮参数 + liaotian.style.cssText = "display: block; --w: 135px; --h: calc(var(--w) * 1019/1400); width: var(--w); height: var(--h); position: absolute; top: calc(100% - 97px); left: calc(100% - 129px); background-color: transparent; z-index: 3; transform: scaleX(-1);"; + } liaotian.onclick = function () { if (lib.config["extension_说话_enable"]) { game.showChatWordBackground(); @@ -557,7 +562,14 @@ app.import(function (lib, game, ui, get, ai, _status, app) { ui.create.div(".lbtn-control", node2, " "); ui.create.div(".lbtn-control", node2, " "); /*ui.create.div('.lbtn-control1', node2, plugin.click.paixu);*/ - var paixuauto = ui.create.div(".lbtn-paixu", ui.arena); + //左手模式记录和牌序按钮 + if (lib.config["extension_十周年UI_rightLayout"] == "on") { + var paixuauto = ui.create.div(".lbtn-paixu", ui.arena); + var jilu = ui.create.div(".latn-jilu", ui.arena, ui.click.pause); + } else { + var paixuauto = ui.create.div(".lbtn-paixu1", ui.arena); + var jilu = ui.create.div(".latn-jilu1", ui.arena, ui.click.pause); + } paixuauto.onclick = function () { if (window.paixuxx == false) { plugin.click.paixu(); @@ -569,14 +581,21 @@ app.import(function (lib, game, ui, get, ai, _status, app) { window.paixuxx = false; } }; - var jilu = ui.create.div(".latn-jilu", ui.arena, ui.click.pause); + //-----------------// /*ui.create.div('.lbtn-control2', node2, ui.click.pause);*/ //var node4 = ui.create.div('.tuoguanButton', ui.arena, ui.click.auto); - var node = ui.create.div(".handcardNumber", ui.arena).hide(); + //左手模式同上继续加一个显示手牌牌量新的按钮css + if (lib.config["extension_十周年UI_rightLayout"] == "on") { + var node = ui.create.div(".handcardNumber", ui.arena).hide(); + node.node = { + cardPicture: ui.create.div(".cardPicture", node), + cardNumber: ui.create.div(".cardNumber1", node), + }; + } else var node = ui.create.div(".handcardNumber1", ui.arena).hide(); node.node = { - cardPicture: ui.create.div(".cardPicture", node), - cardNumber: ui.create.div(".cardNumber", node), + cardPicture: ui.create.div(".cardPicture1", node), + cardNumber: ui.create.div(".cardNumber1", node), }; //手牌显示·---// node.updateCardnumber = function () { diff --git a/shoushaUI/lbtn/main1_window.css b/shoushaUI/lbtn/main1_window.css index 5410f8e..ff9fbef 100644 --- a/shoushaUI/lbtn/main1_window.css +++ b/shoushaUI/lbtn/main1_window.css @@ -673,3 +673,82 @@ left: 230px; bottom: 80px; } + +/*以下左手模式添加的css*/ +.lbtn-paixu1 { + width: 68px; + height: 55px; + background-image: url("./images/uibutton/btn-paixu.png"); + right: 1.2%; + bottom: 25%; + z-index: 5; + font-size: 18.1px; + background-size: 100% 100%; + background-color: transparent; + line-height: 45px; + text-align: center; + white-space: nowrap; + color: #c5af88; + font-family: "shousha"; + font-weight: bold; + -webkit-text-stroke: 1.1px rgba(43, 31, 25, 0.5); + text-shadow: none; + border-radius: 0px; +} + +.lbtn-controls + .lbtn-controls { + margin-top: 1px; +} + +/*记录*/ +.latn-jilu1 { + display: block; + position: absolute; + right: 1.2%; + background-size: 100% 100%; + border-radius: 1px; + width: 68px; + height: 55px; + /*--w: 68px; + --h: calc(var(--w) * 78/91); + width: var(--w); + height: var(--h);*/ + background-image: url("./images/uibutton/btn-jilu.png"); + bottom: 15%; + z-index: 5; +} + +/*左手手牌量显示*/ +.handcardNumber1 { + bottom: 2px; + left: 0px; /* 将right属性值修改为left属性值 */ + font-family: "HYZLSJ"; + color: #ffffff; + font-weight: 100 !important; + font-size: 13px !important; +} + +.handcardNumber1 > .cardPicture1 { + left: -50px; /* 调整left属性值 */ + bottom: -16px; + --w: 417px; + --h: calc(var(--w) * 235 / 500); /*宽和长*/ + width: var(--w); + height: var(--h); + background-image: url("./images/uibutton/shoupai1.png"); + background-size: 100% 100%; + position: relative; + z-index: -1; + perspective: 800px; /* 设置透视属性值 */ + transform: rotateY(180deg); /* 添加左右翻转效果 */ +} + +.handcardNumber1 > .cardNumber1 { + left: 180px; + bottom: 12px; + height: 8px; + line-height: 25px; + text-align: center; + font-size: 19px; + white-space: nowrap; +} diff --git a/shoushaUI/lbtn/main2.css b/shoushaUI/lbtn/main2.css index 714e267..ae13715 100644 --- a/shoushaUI/lbtn/main2.css +++ b/shoushaUI/lbtn/main2.css @@ -616,3 +616,125 @@ left: calc(100% - 400.5px); bottom: calc(100% - 145px); } + +/*左手模式*/ +/*换肤*/ +.huanfuButton1 { + display: block; + width: 80px; + height: 58.6px; + position: absolute; + bottom: 2%; + right: 0; + background-image: url("./images/uibutton/huanfu.png"); + background-size: 100% 100%; + border-radius: 10px; + z-index: 3; +} + +.jiluButton1 { + display: block; + width: 80px; + height: 58.6px; + position: absolute; + bottom: 14%; + right: 0; + background-image: url("./images/uibutton/jilu.png"); + background-size: 100% 100%; + border-radius: 10px; + z-index: 3; +} + +.huanfuButton_new1 { + display: block; + --w: 79px; + --h: calc(var(--w) * 1080 / 1626); + width: var(--w); + height: var(--h); + bottom: 1%; + position: absolute; + right: 0; + background-image: url("./images/uibutton/huanfu_new.png"); + background-size: 100% 100%; + border-radius: 1px; + z-index: 3; +} + +.jiluButton_new1 { + display: block; + --w: 79px; + --h: calc(var(--w) * 1080 / 1626); + width: var(--w); + height: var(--h); + position: absolute; + bottom: 9.9%; + right: 0; + background-image: url("./images/uibutton/jilu_new.png"); + background-size: 100% 100%; + border-radius: 1px; + z-index: 4; +} + +.meiguiButton_new1 { + display: block; + --w: 79px; + --h: calc(var(--w) * 1080 / 1626); + width: var(--w); + height: var(--h); + position: absolute; + bottom: 18.4%; + right: 0; + background-image: url("./images/uibutton/meigui_new.png"); + background-size: 100% 100%; + z-index: 3; +} + +.xiaolianButton_new1 { + display: block; + --w: 79px; + --h: calc(var(--w) * 1080 / 1626); + width: var(--w); + height: var(--h); + position: absolute; + bottom: 27.1%; + right: 0; + background-image: url("./images/uibutton/xiaolian_new.png"); + background-size: 100% 100%; + z-index: 3; +} + +/*------左手手牌显示---------------*/ +.handcardNumber1 { + bottom: 0px; + left: 0px; + font-family: "yuanli"; + text-shadow: #f5d78e 0 0 1px, black 0 0 2px, black 0 0 2px, black 0 0 2px, black 0 0 2px, black 0 0 2px, black 0 0 2px; + color: #f5d78e; + z-index: 1; +} + +.handcardNumber1 > .cardPicture { + left: 130px; + bottom: -6px; + --w: 130px; + --h: calc(var(--w) * 92 / 400); /*宽和长*/ + width: var(--w); + height: var(--h); + background-image: url("./images/uibutton/count1.png"); + background-size: 100% 100%; + position: relative; + transform: scaleX(-1); + z-index: -1; +} +/*手牌数参数*/ +.handcardNumber1 > .cardNumber { + left: 160px; + bottom: 18px; + height: 8px; + line-height: 25px; + text-align: center; + color: #fffcf5; + font-size: 20px; + white-space: nowrap; + letter-spacing: 0.35px; /*字体间距*/ +} diff --git a/shoushaUI/lbtn/main2.js b/shoushaUI/lbtn/main2.js index b3899ce..07fcf03 100644 --- a/shoushaUI/lbtn/main2.js +++ b/shoushaUI/lbtn/main2.js @@ -74,8 +74,13 @@ app.import(function (lib, game, ui, get, ai, _status, app) { //手牌排序 var head = ui.create.node("img"); head.src = lib.assetURL + "extension/十周年UI/shoushaUI/lbtn/images/uibutton/zhengli.png"; - head.style.cssText = "display: block;--w: 88px;--h: calc(var(--w) * 81/247);width: var(--w);height: var(--h);position: absolute;top: calc(100% - 33px);left: calc(100% - 376.2px);background-color: transparent;z-index:7"; - head.onclick = function () { + //左手整理手牌按钮位置 + if( lib.config['extension_十周年UI_rightLayout']== 'on') { + head.style.cssText = "display: block;--w: 88px;--h: calc(var(--w) * 81/247);width: var(--w);height: var(--h);position: absolute;top: calc(100% - 33px);left: calc(100% - 376.2px);background-color: transparent;z-index:7" + }else{ + head.style.cssText = "display: block;--w: 88px;--h: calc(var(--w) * 81/247);width: var(--w);height: var(--h);position: absolute;top: calc(100% - 33px);right: calc(100% - 367.2px);background-color: transparent;z-index:4;" + }; + head.onclick = function () { //head.onclick=ui.click.sortCard; if (!game.me || game.me.hasSkillTag("noSortCard")) return; var cards = game.me.getCards("hs"); @@ -360,25 +365,62 @@ app.import(function (lib, game, ui, get, ai, _status, app) { var node3 = ui.create.div(".settingButton", ui.arena, plugin.click.setting); /*ui.create.div('.lbtn-controls', ui.arena);*/ - //-------原版---------// - if (lib.config.extension_十周年UI_XPJ == "on") { - var node5 = ui.create.div(".huanfuButton", ui.arena, plugin.click.huanfu); - var node2 = ui.create.div(".jiluButton", ui.arena, ui.click.pause); - //-------------------// - } else { - //-------新版----------// - var node6 = ui.create.div(".huanfuButton_new", ui.arena, plugin.click.huanfu); - var node7 = ui.create.div(".jiluButton_new", ui.arena, ui.click.pause); - var node8 = ui.create.div(".meiguiButton_new", ui.arena); - var node9 = ui.create.div(".xiaolianButton_new", ui.arena); - //---------------------// - } - var node4 = ui.create.div(".tuoguanButton", ui.arena, ui.click.auto); - var node = ui.create.div(".handcardNumber", ui.arena).hide(); - node.node = { - cardPicture: ui.create.div(".cardPicture", node), - cardNumber: ui.create.div(".cardNumber", node), - }; + //-------原版---------// + //左手模式加开关 + if( lib.config['extension_十周年UI_rightLayout']== 'on'){ + if (lib.config.extension_十周年UI_XPJ == "on") { + var node5 = ui.create.div( + ".huanfuButton", + ui.arena, + plugin.click.huanfu + ); + var node2 = ui.create.div(".jiluButton", ui.arena, ui.click.pause); + //-------------------// + } else { + //-------新版----------// + var node6 = ui.create.div( + ".huanfuButton_new", + ui.arena, + plugin.click.huanfu + ); + var node7 = ui.create.div( + ".jiluButton_new", + ui.arena, + ui.click.pause + ); + var node8 = ui.create.div(".meiguiButton_new", ui.arena); + var node9 = ui.create.div(".xiaolianButton_new", ui.arena); + //---------------------// + } + }else{ + if (lib.config.extension_十周年UI_XPJ == "on") { + var node5 = ui.create.div('.huanfuButton1', ui.arena, plugin.click.huanfu); + var node2 = ui.create.div('.jiluButton1', ui.arena, ui.click.pause); + //-------------------// + } else { + //-------新版----------// + var node6 = ui.create.div('.huanfuButton_new1', ui.arena, plugin.click.huanfu); + var node7 = ui.create.div('.jiluButton_new1', ui.arena, ui.click.pause); + var node8 = ui.create.div('.meiguiButton_new1', ui.arena,plugin.click.meigui); + var node9 = ui.create.div('.xiaolianButton_new1', ui.arena,plugin.click.xiaolian); + //---------------------// + } + }; + var node4 = ui.create.div(".tuoguanButton", ui.arena, ui.click.auto); + if( lib.config['extension_十周年UI_rightLayout']== 'on'){ + var node = ui.create.div(".handcardNumber", ui.arena).hide(); + node.node = { + cardPicture: ui.create.div(".cardPicture", node), + cardNumber: ui.create.div(".cardNumber", node), + }; + }else{ + var node = ui.create.div('.handcardNumber1', ui.arena).hide(); + node.node = { + cardPicture: ui.create.div('.cardPicture', node), + cardNumber: ui.create.div('.cardNumber', node), + }; + }; + //结束 node.updateCardnumber = function () { if (!game.me) return; diff --git a/shoushaUI/lbtn/main2_window.css b/shoushaUI/lbtn/main2_window.css index 6117661..05f46a9 100644 --- a/shoushaUI/lbtn/main2_window.css +++ b/shoushaUI/lbtn/main2_window.css @@ -616,3 +616,125 @@ left: calc(100% - 400.5px); bottom: calc(100% - 145px); } + +/*左手模式*/ +/*换肤*/ +.huanfuButton1 { + display: block; + width: 80px; + height: 58.6px; + position: absolute; + bottom: 2%; + right: 0; + background-image: url("./images/uibutton/huanfu.png"); + background-size: 100% 100%; + border-radius: 10px; + z-index: 3; +} + +.jiluButton1 { + display: block; + width: 80px; + height: 58.6px; + position: absolute; + bottom: 14%; + right: 0; + background-image: url("./images/uibutton/jilu.png"); + background-size: 100% 100%; + border-radius: 10px; + z-index: 3; +} + +.huanfuButton_new1 { + display: block; + --w: 79px; + --h: calc(var(--w) * 1080 / 1626); + width: var(--w); + height: var(--h); + bottom: 1%; + position: absolute; + right: 0; + background-image: url("./images/uibutton/huanfu_new.png"); + background-size: 100% 100%; + border-radius: 1px; + z-index: 3; +} + +.jiluButton_new1 { + display: block; + --w: 79px; + --h: calc(var(--w) * 1080 / 1626); + width: var(--w); + height: var(--h); + position: absolute; + bottom: 9.9%; + right: 0; + background-image: url("./images/uibutton/jilu_new.png"); + background-size: 100% 100%; + border-radius: 1px; + z-index: 4; +} + +.meiguiButton_new1 { + display: block; + --w: 79px; + --h: calc(var(--w) * 1080 / 1626); + width: var(--w); + height: var(--h); + position: absolute; + bottom: 18.4%; + right: 0; + background-image: url("./images/uibutton/meigui_new.png"); + background-size: 100% 100%; + z-index: 3; +} + +.xiaolianButton_new1 { + display: block; + --w: 79px; + --h: calc(var(--w) * 1080 / 1626); + width: var(--w); + height: var(--h); + position: absolute; + bottom: 27.1%; + right: 0; + background-image: url("./images/uibutton/xiaolian_new.png"); + background-size: 100% 100%; + z-index: 3; +} + +/*------左手手牌显示---------------*/ +.handcardNumber1 { + bottom: 0px; + left: 0px; + font-family: "yuanli"; + text-shadow: #f5d78e 0 0 1px, black 0 0 2px, black 0 0 2px, black 0 0 2px, black 0 0 2px, black 0 0 2px, black 0 0 2px; + color: #f5d78e; + z-index: 1; +} + +.handcardNumber1 > .cardPicture { + left: 130px; + bottom: -6px; + --w: 130px; + --h: calc(var(--w) * 92 / 400); /*宽和长*/ + width: var(--w); + height: var(--h); + background-image: url("./images/uibutton/count1.png"); + background-size: 100% 100%; + position: relative; + transform: scaleX(-1); + z-index: -1; +} +/*手牌数参数*/ +.handcardNumber1 > .cardNumber { + left: 160px; + bottom: 18px; + height: 8px; + line-height: 25px; + text-align: center; + color: #fffcf5; + font-size: 20px; + white-space: nowrap; + letter-spacing: 0.35px; /*字体间距*/ +} diff --git a/shoushaUI/lbtn/main3.css b/shoushaUI/lbtn/main3.css index 3da857a..2f35fa9 100644 --- a/shoushaUI/lbtn/main3.css +++ b/shoushaUI/lbtn/main3.css @@ -574,3 +574,99 @@ left: calc(100% - 400.5px); bottom: calc(100% - 145px); } + +/*左手模式*/ +/*换肤*/ +.huanfuButton_new1 { + display: block; + --w: 47px; + --h: 47px; + width: var(--w); + height: var(--h); + bottom: 24%; + position: absolute; + right: 0; + background-image: url("./images/uibutton/new_huanfu_new.png"); + background-size: 100% 100%; + border-radius: 1px; + z-index: 3; +} + +.jiluButton_new1 { + display: block; + --w: 47px; + --h: 47px; + width: var(--w); + height: var(--h); + position: absolute; + bottom: 4%; + right: 0; + background-image: url("./images/uibutton/new_jilu_new.png"); + background-size: 100% 100%; + border-radius: 1px; + z-index: 4; +} + +/*.meiguiButton_new1 {*/ +/*display: block;*/ +/*--w: 79px;*/ +/*--h: calc(var(--w) * 1080/1626);*/ +/*width: var(--w);*/ +/*height: var(--h);*/ +/*position: absolute;*/ +/*bottom: 18.4%;*/ +/*right: 0;*/ +/*background-image: url("./images/uibutton/meigui_new.png");*/ +/*background-size: 100% 100%;*/ +/*z-index:3;*/ +/*}*/ +/**/ +.xiaolianButton_new1 { + display: block; + --w: 47px; + --h: 47px; + width: var(--w); + height: var(--h); + position: absolute; + bottom: 14%; + right: 0; + background-image: url("./images/uibutton/new_xiaolian_new.png"); + background-size: 100% 100%; + z-index: 3; +} + +/*------左手手牌显示---------------*/ +.handcardNumber1 { + bottom: 0px; + left: 0px; + font-family: "yuanli"; + text-shadow: #f5d78e 0 0 1px, black 0 0 2px, black 0 0 2px, black 0 0 2px, black 0 0 2px, black 0 0 2px, black 0 0 2px; + color: #f5d78e; + z-index: 1; +} + +.handcardNumber1 > .cardPicture { + left: 130px; + bottom: -6px; + --w: 130px; + --h: calc(var(--w) * 92 / 400); /*宽和长*/ + width: var(--w); + height: var(--h); + background-image: url("./images/uibutton/new_count1.png"); + background-size: 100% 100%; + position: relative; + transform: scaleX(-1); + z-index: -1; +} +/*手牌数参数*/ +.handcardNumber1 > .cardNumber { + left: 160px; + bottom: 18px; + height: 8px; + line-height: 25px; + text-align: center; + color: #fffcf5; + font-size: 20px; + white-space: nowrap; + letter-spacing: 0.35px; /*字体间距*/ +} diff --git a/shoushaUI/lbtn/main3.js b/shoushaUI/lbtn/main3.js index 020ca05..073aaec 100644 --- a/shoushaUI/lbtn/main3.js +++ b/shoushaUI/lbtn/main3.js @@ -139,7 +139,12 @@ app.import(function (lib, game, ui, get, ai, _status, app) { var head = ui.create.node("img"); head.src = lib.assetURL + "extension/十周年UI/shoushaUI/lbtn/images/uibutton/new_zhengli.png"; - head.style.cssText = "display: block;--w: 85px;--h: calc(var(--w) * 81/247);width: var(--w);height: var(--h)+4px;position: absolute;top: calc(100% - 30px);left: calc(100% - 390.2px);background-color: transparent;z-index:4"; + //左手整理手牌按钮位置 + if (lib.config["extension_十周年UI_rightLayout"] == "on") { + head.style.cssText = "display: block;--w: 88px;--h: calc(var(--w) * 81/247);width: var(--w);height: var(--h);position: absolute;top: calc(100% - 33px);left: calc(100% - 376.2px);background-color: transparent;z-index:7"; + } else { + head.style.cssText = "display: block;--w: 88px;--h: calc(var(--w) * 81/247);width: var(--w);height: var(--h);position: absolute;top: calc(100% - 33px);right: calc(100% - 367.2px);background-color: transparent;z-index:4;"; + } head.onclick = function () { //head.onclick=ui.click.sortCard; if (!game.me || game.me.hasSkillTag("noSortCard")) return; @@ -358,18 +363,44 @@ app.import(function (lib, game, ui, get, ai, _status, app) { var node3 = ui.create.div(".settingButton", ui.arena, plugin.click.setting); /*ui.create.div('.lbtn-controls', ui.arena);*/ - //-------新版----------// - var node6 = ui.create.div(".huanfuButton_new", ui.arena, plugin.click.huanfu); - var node7 = ui.create.div(".jiluButton_new", ui.arena, ui.click.pause); - var node8 = ui.create.div(".meiguiButton_new", ui.arena); - var node9 = ui.create.div(".xiaolianButton_new", ui.arena); - //---------------------// + //-------原版---------// + //左手模式加开关 + if (lib.config["extension_十周年UI_rightLayout"] == "on") { + if (lib.config.extension_十周年UI_XPJ == "on") { + var node5 = ui.create.div(".huanfuButton", ui.arena, plugin.click.huanfu); + var node2 = ui.create.div(".jiluButton", ui.arena, ui.click.pause); + //-------------------// + } else { + //-------新版----------// + var node6 = ui.create.div(".huanfuButton_new", ui.arena, plugin.click.huanfu); + var node7 = ui.create.div(".jiluButton_new", ui.arena, ui.click.pause); + var node8 = ui.create.div(".meiguiButton_new", ui.arena); + var node9 = ui.create.div(".xiaolianButton_new", ui.arena); + //---------------------// + } + } else { + //-------新版----------// + var node6 = ui.create.div(".huanfuButton_new1", ui.arena, plugin.click.huanfu); + var node7 = ui.create.div(".jiluButton_new1", ui.arena, ui.click.pause); + var node8 = ui.create.div(".meiguiButton_new1", ui.arena, plugin.click.meigui); + var node9 = ui.create.div(".xiaolianButton_new1", ui.arena, plugin.click.xiaolian); + //---------------------// + } var node4 = ui.create.div(".tuoguanButton", ui.arena, ui.click.auto); - var node = ui.create.div(".handcardNumber", ui.arena).hide(); - node.node = { - cardPicture: ui.create.div(".cardPicture", node), - cardNumber: ui.create.div(".cardNumber", node), - }; + if (lib.config["extension_十周年UI_rightLayout"] == "on") { + var node = ui.create.div(".handcardNumber", ui.arena).hide(); + node.node = { + cardPicture: ui.create.div(".cardPicture", node), + cardNumber: ui.create.div(".cardNumber", node), + }; + } else { + var node = ui.create.div(".handcardNumber1", ui.arena).hide(); + node.node = { + cardPicture: ui.create.div(".cardPicture", node), + cardNumber: ui.create.div(".cardNumber", node), + }; + } + //结束 node.updateCardnumber = function () { if (!game.me) return; diff --git a/shoushaUI/lbtn/main3_window.css b/shoushaUI/lbtn/main3_window.css index 3da857a..2f35fa9 100644 --- a/shoushaUI/lbtn/main3_window.css +++ b/shoushaUI/lbtn/main3_window.css @@ -574,3 +574,99 @@ left: calc(100% - 400.5px); bottom: calc(100% - 145px); } + +/*左手模式*/ +/*换肤*/ +.huanfuButton_new1 { + display: block; + --w: 47px; + --h: 47px; + width: var(--w); + height: var(--h); + bottom: 24%; + position: absolute; + right: 0; + background-image: url("./images/uibutton/new_huanfu_new.png"); + background-size: 100% 100%; + border-radius: 1px; + z-index: 3; +} + +.jiluButton_new1 { + display: block; + --w: 47px; + --h: 47px; + width: var(--w); + height: var(--h); + position: absolute; + bottom: 4%; + right: 0; + background-image: url("./images/uibutton/new_jilu_new.png"); + background-size: 100% 100%; + border-radius: 1px; + z-index: 4; +} + +/*.meiguiButton_new1 {*/ +/*display: block;*/ +/*--w: 79px;*/ +/*--h: calc(var(--w) * 1080/1626);*/ +/*width: var(--w);*/ +/*height: var(--h);*/ +/*position: absolute;*/ +/*bottom: 18.4%;*/ +/*right: 0;*/ +/*background-image: url("./images/uibutton/meigui_new.png");*/ +/*background-size: 100% 100%;*/ +/*z-index:3;*/ +/*}*/ +/**/ +.xiaolianButton_new1 { + display: block; + --w: 47px; + --h: 47px; + width: var(--w); + height: var(--h); + position: absolute; + bottom: 14%; + right: 0; + background-image: url("./images/uibutton/new_xiaolian_new.png"); + background-size: 100% 100%; + z-index: 3; +} + +/*------左手手牌显示---------------*/ +.handcardNumber1 { + bottom: 0px; + left: 0px; + font-family: "yuanli"; + text-shadow: #f5d78e 0 0 1px, black 0 0 2px, black 0 0 2px, black 0 0 2px, black 0 0 2px, black 0 0 2px, black 0 0 2px; + color: #f5d78e; + z-index: 1; +} + +.handcardNumber1 > .cardPicture { + left: 130px; + bottom: -6px; + --w: 130px; + --h: calc(var(--w) * 92 / 400); /*宽和长*/ + width: var(--w); + height: var(--h); + background-image: url("./images/uibutton/new_count1.png"); + background-size: 100% 100%; + position: relative; + transform: scaleX(-1); + z-index: -1; +} +/*手牌数参数*/ +.handcardNumber1 > .cardNumber { + left: 160px; + bottom: 18px; + height: 8px; + line-height: 25px; + text-align: center; + color: #fffcf5; + font-size: 20px; + white-space: nowrap; + letter-spacing: 0.35px; /*字体间距*/ +} diff --git a/shoushaUI/skill/main1.css b/shoushaUI/skill/main1.css index 236092f..ea88f75 100644 --- a/shoushaUI/skill/main1.css +++ b/shoushaUI/skill/main1.css @@ -579,3 +579,202 @@ white-space: nowrap; position: absolute; } + +/*以下左手布局*/ +.skill-controlzuoshou { + /*技能按钮*/ + max-width: 120px; /*同列技能可容纳最大宽度,建议别调180*/ + bottom: 30px; /*整体上移,建议别调*/ + left: 165px; /*技能显示右移,越小越靠右,建议别调*/ + /*border: 3px solid rgb(255, 255, 255);/*调试用*/ + z-index: 5; +} +.skill-controlzuoshou div { + position: relative; + height: 40px; + width: 75px; + display: flex; + justify-content: center; + align-items: center; +} +.skill-controlzuoshou .trigger, +.skill-controlzuoshou .enable { + height: auto; + width: auto; + justify-content: left; /*自动向右对齐*/ +} +.skill-controlzuoshou { + float: right; + white-space: nowrap; + font-family: "HYZLSJ"; + color: yellow; + text-shadow: #f5d78e 0 0 2px, black 0 0 3px, black 0 0 3px, black 0 0 3px, black 0 0 3px, black 0 0 3px, black 0 0 3px; + font-size: 24px; + /*字体渐变色,色调*/ +} +.skill-controlzuoshou > div { + display: flex; + flex-wrap: wrap-reverse; + flex-direction: row-reverse; +} +/*伪类*/ +.skill-controlzuoshou > div::after { + content: ""; /*防止元素浮动*/ + display: block; + clear: both; +} +.skill-controlzuoshou > .enable { + margin: 0 0 0 auto; + max-width: 120px; /*给有三个主动技的武将限制宽度以免遮挡手牌区*/ + font-size: 20.5px; + font-weight: bold; + font-family: "HYZLSJ"; +} + +.skill-controlzuoshou > .trigger > * .skillitem-child { + position: absolute; + -webkit-text-stroke: 4.3px #102030; /*5.1px #40404096*/ + opacity: 0.5; + z-index: -1; +} + +.skill-controlzuoshou > .enable > * .skillitem-child { + position: absolute; + -webkit-text-stroke: 4.3px rgba(2, 3, 2); /*#575755;/*#686860;/*5.1px #40404096*/ + opacity: 0.35; + z-index: -1; +} + +.skill-controlzuoshou > .trigger > div { + margin: -6px 2px; + font-family: "HYZLSJ"; + text-align: center; + -webkit-text-stroke: 0px rgba(38, 37, 34, 0.5); + text-shadow: none; + background-image: linear-gradient(180deg, #f0d775 30%, #ab8c31 57%, #b0a04d 67%); /*字体渐变色,色调*/ + font-weight: lighter; + /*background-image: url("./images/底图.png");*/ + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + white-space: nowrap; + font-size: 22px; + width: auto; +} + +.skill-controlzuoshou > .enable > * { + /*-webkit-text-stroke: 0.8px rgba(38,37,34,0.5); + text-shadow: none;*/ + background-size: 100% 100%; + background-image: linear-gradient(180deg, #f0d775 30%, #ab8c31 57%, #b0a04d 67%); /*字体渐变色,色调*/ + /*background-image: url("./images/底图.png");*/ + -webkit-text-stroke: 0.5px #3e362a; + text-shadow: none; + /*background: linear-gradient(180deg, #fcfcbf 40%, #b58b59 50%);*/ + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + position: relative; + font-size: 22px; + white-space: nowrap; + margin: 1px 9px; /*上下 左右间隔*/ + margin-top: 3px; + /*width: auto;*/ /*此数值控制技能按文本与按钮之间的关联性,但不美观。*/ + index: 4; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} + +/*---司马徽按钮分离--*/ +.skill-controlzuoshou > .enable > .skillitem_smh_lianhuan::before { + z-index: -1; + content: ""; + text-align: center; + display: block; + position: absolute; + margin: 1px 12px; + width: 147%; + height: 170%; + + font-family: "HanYiZhongLiShuFan", "HYZLSJ"; + background-image: url("./images/feng.png"); + background-size: 100% 100%; +} +.skill-controlzuoshou > .enable > *.select:not(.skillitem_smh_yeyan):not(.skillitem_smh_huoji)::before { + background-image: url("./images/feng_selected.png"); +} +.skill-controlzuoshou > .enable > .skillitem_smh_lianhuan:not(.usable):not(.select)::before { + background-image: url("./images/feng_no.png"); +} +/*司马徽火计*/ +.skill-controlzuoshou > .enable > .skillitem_smh_huoji::before { + z-index: -1; + content: ""; + text-align: center; + display: block; + position: absolute; + margin: 1px 12px; + width: 147%; + height: 170%; + + font-family: "HanYiZhongLiShuFan", "HYZLSJ"; + background-image: url("./images/long.png"); + background-size: 100% 100%; +} +.skill-controlzuoshou > .enable > *.select:not(.skillitem_smh_yeyan):not(.skillitem_smh_lianhuan)::before { + background-image: url("./images/long_selected.png"); +} +.skill-controlzuoshou > .enable > .skillitem_smh_huoji:not(.usable):not(.select)::before { + background-image: url("./images/long_no.png"); +} +/*司马徽业炎*/ +.skill-controlzuoshou > .enable > .skillitem_smh_yeyan::before { + z-index: -1; + content: ""; + --w: auto; + --h: calc(var(--w) * 1045 / 669); + line-height: var(--h); + text-align: center; + display: block; + position: absolute; + margin: 1px 12px; + width: 147%; + height: 170%; + font-family: "HanYiZhongLiShuFan", "HYZLSJ"; + background-image: url("./images/longfeng.png"); + background-size: 100% 100%; +} +.skill-controlzuoshou > .enable > *.select:not(.skillitem_smh_huoji):not(.skillitem_smh_lianhuan)::before { + background-image: url("./images/longfeng_selected.png"); +} +.skill-controlzuoshou > .enable > .skillitem_smh_yeyan:not(.usable):not(.select)::before { + background-image: url("./images/longfeng_no.png"); +} +/*-----*/ + +.skill-controlzuoshou > .enable > .skillitem::before { + z-index: -1; + content: ""; + --w: auto; + --h: calc(var(--w) * 1045 / 669); + line-height: var(--h); + text-align: center; + display: block; + position: absolute; + margin: 1px 12px; + width: 147%; + height: 170%; + font-family: "HYZLSJ"; + background-image: url("./images/btn0.png"); + background-size: 100% 100%; + /*border: 1px solid rgb(3,4,5);/*调试用*/ +} + +.skill-controlzuoshou > .enable > *.select:not(.skillitem_smh_yeyan):not(.skillitem_smh_huoji):not(.skillitem_smh_lianhuan)::before { + background-image: url("./images/btn1.png"); + /*filter: grayscale(100%); + -webkit-filter: grayscale(100%);*/ +} +.skill-controlzuoshou > .enable > .skillitem:not(.usable):not(.select)::before { + background-image: url("./images/btn2.png"); + /*filter: grayscale(100%); + -webkit-filter: grayscale(100%);*/ +} diff --git a/shoushaUI/skill/main1.js b/shoushaUI/skill/main1.js index 32c91ea..5a38eaf 100644 --- a/shoushaUI/skill/main1.js +++ b/shoushaUI/skill/main1.js @@ -24,15 +24,30 @@ app.import(function (lib, game, ui, get, ai, _status, app) { }, skillControl: function (clear) { if (!ui.skillControl) { - var node = ui.create.div(".skill-control", ui.arena); - node.node = { - enable: ui.create.div(".enable", node), - trigger: ui.create.div(".trigger", node), - }; - for (var i in plugin.controlElement) { - node[i] = plugin.controlElement[i]; + //左手模式添加新的技能css布局 + if (lib.config["extension_十周年UI_rightLayout"] == "on") { + var node = ui.create.div(".skill-control", ui.arena); + node.node = { + enable: ui.create.div(".enable", node), + trigger: ui.create.div(".trigger", node), + }; + for (var i in plugin.controlElement) { + node[i] = plugin.controlElement[i]; + } + ui.skillControl = node; + //复制一遍 + } else { + var node = ui.create.div(".skill-controlzuoshou", ui.arena); + node.node = { + enable: ui.create.div(".enable", node), + trigger: ui.create.div(".trigger", node), + }; + for (var i in plugin.controlElement) { + node[i] = plugin.controlElement[i]; + } + ui.skillControl = node; } - ui.skillControl = node; + //美化结束 } if (clear) { ui.skillControl.node.enable.innerHTML = ""; diff --git a/shoushaUI/skill/main1_window.css b/shoushaUI/skill/main1_window.css index b123bbe..7963e26 100644 --- a/shoushaUI/skill/main1_window.css +++ b/shoushaUI/skill/main1_window.css @@ -577,3 +577,202 @@ white-space: nowrap; position: absolute; } + +/*以下左手布局*/ +.skill-controlzuoshou { + /*技能按钮*/ + max-width: 120px; /*同列技能可容纳最大宽度,建议别调180*/ + bottom: 30px; /*整体上移,建议别调*/ + left: 165px; /*技能显示右移,越小越靠右,建议别调*/ + /*border: 3px solid rgb(255, 255, 255);/*调试用*/ + z-index: 5; +} +.skill-controlzuoshou div { + position: relative; + height: 40px; + width: 75px; + display: flex; + justify-content: center; + align-items: center; +} +.skill-controlzuoshou .trigger, +.skill-controlzuoshou .enable { + height: auto; + width: auto; + justify-content: left; /*自动向右对齐*/ +} +.skill-controlzuoshou { + float: right; + white-space: nowrap; + font-family: "HYZLSJ"; + color: yellow; + text-shadow: #f5d78e 0 0 2px, black 0 0 3px, black 0 0 3px, black 0 0 3px, black 0 0 3px, black 0 0 3px, black 0 0 3px; + font-size: 24px; + /*字体渐变色,色调*/ +} +.skill-controlzuoshou > div { + display: flex; + flex-wrap: wrap-reverse; + flex-direction: row-reverse; +} +/*伪类*/ +.skill-controlzuoshou > div::after { + content: ""; /*防止元素浮动*/ + display: block; + clear: both; +} +.skill-controlzuoshou > .enable { + margin: 0 0 0 auto; + max-width: 120px; /*给有三个主动技的武将限制宽度以免遮挡手牌区*/ + font-size: 20.5px; + font-weight: bold; + font-family: "HYZLSJ"; +} + +.skill-controlzuoshou > .trigger > * .skillitem-child { + position: absolute; + -webkit-text-stroke: 4.3px #102030; /*5.1px #40404096*/ + opacity: 0.5; + z-index: -1; +} + +.skill-controlzuoshou > .enable > * .skillitem-child { + position: absolute; + -webkit-text-stroke: 4.3px rgba(2, 3, 2); /*#575755;/*#686860;/*5.1px #40404096*/ + opacity: 0.35; + z-index: -1; +} + +.skill-controlzuoshou > .trigger > div { + margin: -6px 2px; + font-family: "HYZLSJ"; + text-align: center; + -webkit-text-stroke: 0px rgba(38, 37, 34, 0.5); + text-shadow: none; + background-image: linear-gradient(180deg, #f0d775 30%, #ab8c31 57%, #b0a04d 67%); /*字体渐变色,色调*/ + font-weight: lighter; + /*background-image: url("./images/底图.png");*/ + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + white-space: nowrap; + font-size: 22px; + width: auto; +} + +.skill-controlzuoshou > .enable > * { + /*-webkit-text-stroke: 0.8px rgba(38,37,34,0.5); + text-shadow: none;*/ + background-size: 100% 100%; + background-image: linear-gradient(180deg, #f0d775 30%, #ab8c31 57%, #b0a04d 67%); /*字体渐变色,色调*/ + /*background-image: url("./images/底图.png");*/ + -webkit-text-stroke: 0.5px #3e362a; + text-shadow: none; + /*background: linear-gradient(180deg, #fcfcbf 40%, #b58b59 50%);*/ + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + position: relative; + font-size: 22px; + white-space: nowrap; + margin: 1px 9px; /*上下 左右间隔*/ + margin-top: 3px; + /*width: auto;*/ /*此数值控制技能按文本与按钮之间的关联性,但不美观。*/ + index: 4; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} + +/*---司马徽按钮分离--*/ +.skill-controlzuoshou > .enable > .skillitem_smh_lianhuan::before { + z-index: -1; + content: ""; + text-align: center; + display: block; + position: absolute; + margin: 1px 12px; + width: 147%; + height: 170%; + + font-family: "HanYiZhongLiShuFan", "HYZLSJ"; + background-image: url("./images/feng.png"); + background-size: 100% 100%; +} +.skill-controlzuoshou > .enable > *.select:not(.skillitem_smh_yeyan):not(.skillitem_smh_huoji)::before { + background-image: url("./images/feng_selected.png"); +} +.skill-controlzuoshou > .enable > .skillitem_smh_lianhuan:not(.usable):not(.select)::before { + background-image: url("./images/feng_no.png"); +} +/*司马徽火计*/ +.skill-controlzuoshou > .enable > .skillitem_smh_huoji::before { + z-index: -1; + content: ""; + text-align: center; + display: block; + position: absolute; + margin: 1px 12px; + width: 147%; + height: 170%; + + font-family: "HanYiZhongLiShuFan", "HYZLSJ"; + background-image: url("./images/long.png"); + background-size: 100% 100%; +} +.skill-controlzuoshou > .enable > *.select:not(.skillitem_smh_yeyan):not(.skillitem_smh_lianhuan)::before { + background-image: url("./images/long_selected.png"); +} +.skill-controlzuoshou > .enable > .skillitem_smh_huoji:not(.usable):not(.select)::before { + background-image: url("./images/long_no.png"); +} +/*司马徽业炎*/ +.skill-controlzuoshou > .enable > .skillitem_smh_yeyan::before { + z-index: -1; + content: ""; + --w: auto; + --h: calc(var(--w) * 1045 / 669); + line-height: var(--h); + text-align: center; + display: block; + position: absolute; + margin: 1px 12px; + width: 147%; + height: 170%; + font-family: "HanYiZhongLiShuFan", "HYZLSJ"; + background-image: url("./images/longfeng.png"); + background-size: 100% 100%; +} +.skill-controlzuoshou > .enable > *.select:not(.skillitem_smh_huoji):not(.skillitem_smh_lianhuan)::before { + background-image: url("./images/longfeng_selected.png"); +} +.skill-controlzuoshou > .enable > .skillitem_smh_yeyan:not(.usable):not(.select)::before { + background-image: url("./images/longfeng_no.png"); +} +/*-----*/ + +.skill-controlzuoshou > .enable > .skillitem::before { + z-index: -1; + content: ""; + --w: auto; + --h: calc(var(--w) * 1045 / 669); + line-height: var(--h); + text-align: center; + display: block; + position: absolute; + margin: 1px 12px; + width: 147%; + height: 170%; + font-family: "HYZLSJ"; + background-image: url("./images/btn0.png"); + background-size: 100% 100%; + /*border: 1px solid rgb(3,4,5);/*调试用*/ +} + +.skill-controlzuoshou > .enable > *.select:not(.skillitem_smh_yeyan):not(.skillitem_smh_huoji):not(.skillitem_smh_lianhuan)::before { + background-image: url("./images/btn1.png"); + /*filter: grayscale(100%); + -webkit-filter: grayscale(100%);*/ +} +.skill-controlzuoshou > .enable > .skillitem:not(.usable):not(.select)::before { + background-image: url("./images/btn2.png"); + /*filter: grayscale(100%); + -webkit-filter: grayscale(100%);*/ +} diff --git a/shoushaUI/skill/main2.css b/shoushaUI/skill/main2.css index 8fee8be..16e96e1 100644 --- a/shoushaUI/skill/main2.css +++ b/shoushaUI/skill/main2.css @@ -206,3 +206,111 @@ filter: grayscale(100%); -webkit-filter: grayscale(100%); } + +/*左手模式*/ +/*技能区*/ +.skill-controlzuoshou { + max-width: 140px; + bottom: 25px; + left: 150px; + z-index: 5; +} +.skill-controlzuoshou div { + position: relative; +} + +/*技能*/ +.skill-controlzuoshou .skillitem { + float: left; + white-space: nowrap; + color: #f5d78e; /*字体颜色*/ + font-size: 20px !important; /*字体大小,有用*/ +} + +.skill-controlzuoshou > div { + display: flex; + flex-wrap: wrap; + flex-direction: row; +} +.skill-controlzuoshou > div::after { + content: ""; + display: block; + clear: both; +} +.skill-controlzuoshou > .enable { + margin: 0 0 0 0; +} + +/*非主动技显示*/ +.skill-controlzuoshou > .trigger > .skillitem { + text-align: center; + background-image: url("./images/skill.png"); + padding: 3px 7px; /*技能背景素材(高度+宽度)* + background-size: 100% 100%; + margin: -1px 0px; /*外边距(纵向间距+横向间距)*/ + font-family: "yuanli"; /*字体样式*/ + font-size: 20px; /*字体大小,没用*/ +} + +/*主动技显示*/ +.skill-controlzuoshou > .enable > .skillitem { + margin: 0px 0px; + --w: 75px; + --h: calc(var(--w) * 85 / 175); + width: var(--w); + height: var(--h); + line-height: var(--h); + text-align: center; + /* line-height: 38px; /*文本下移*/ + /* text-align: center; */ + display: flex; + align-items: center; + align-content: center; + justify-content: center; + font-family: "yuanli"; /*字体样式*/ + font-size: 20px; /*字体大小,没用*/ + background-image: url("./images/btno1.png"); + background-size: 100% 100%; + /*border: 1px solid rgb(3,4,5); /*调试用*/ +} + +.skill-controlzuoshou > .enable > .skillitem.select { + background-image: url("./images/btno3.png"); +} +.skill-controlzuoshou > .enable > .skillitem:not(.usable):not(.select) { + filter: grayscale(100%); + -webkit-filter: grayscale(100%); + background-image: url("./images/btnn2.png"); +} + +.skill-controlzuoshou > .enable > .xiandingji { + /*限定技按钮*/ + margin: -2px -5px; + /*--w: 99px;*/ + /*--h: calc(var(--w) * 91 / 200);*/ + --w: 85px; + --h: 37px; + width: var(--w); + height: var(--h); + line-height: 42px; + text-align: center; + font-family: "yuanli"; + font-weight: 500; /*字粗细*/ + text-shadow: 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, + 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18; + color: #f7f5e7; + font-size: 22px; + background-image: url("./images/btnn4.png"); + background-size: 100% 100%; + /*border: 1px solid rgb(3,4,5);/*调试用*/ +} + +.skill-controlzuoshou > .enable > .xiandingji.select { + background-image: url("./images/btnn4.png"); +} + +.skill-controlzuoshou > .enable > .xiandingji:not(.usable):not(.select) { + /*background-image: url("./images/btn5.png");*/ + filter: grayscale(100%); + -webkit-filter: grayscale(100%); +} diff --git a/shoushaUI/skill/main2.js b/shoushaUI/skill/main2.js index e7edc25..0302595 100644 --- a/shoushaUI/skill/main2.js +++ b/shoushaUI/skill/main2.js @@ -24,15 +24,30 @@ app.import(function (lib, game, ui, get, ai, _status, app) { }, skillControl: function (clear) { if (!ui.skillControl) { - var node = ui.create.div(".skill-control", ui.arena); - node.node = { - enable: ui.create.div(".enable", node), - trigger: ui.create.div(".trigger", node), - }; - for (var i in plugin.controlElement) { - node[i] = plugin.controlElement[i]; + //左手模式添加新的技能按钮位置css + if (lib.config["extension_十周年UI_rightLayout"] == "on") { + var node = ui.create.div(".skill-control", ui.arena); + node.node = { + enable: ui.create.div(".enable", node), + trigger: ui.create.div(".trigger", node), + }; + for (var i in plugin.controlElement) { + node[i] = plugin.controlElement[i]; + } + ui.skillControl = node; + //开始复制一遍 + } else { + var node = ui.create.div(".skill-controlzuoshou", ui.arena); + node.node = { + enable: ui.create.div(".enable", node), + trigger: ui.create.div(".trigger", node), + }; + for (var i in plugin.controlElement) { + node[i] = plugin.controlElement[i]; + } + ui.skillControl = node; } - ui.skillControl = node; + //结束 } if (clear) { ui.skillControl.node.enable.innerHTML = ""; diff --git a/shoushaUI/skill/main2_window.css b/shoushaUI/skill/main2_window.css index e3f2498..0db4dc3 100644 --- a/shoushaUI/skill/main2_window.css +++ b/shoushaUI/skill/main2_window.css @@ -208,3 +208,111 @@ filter: grayscale(100%); -webkit-filter: grayscale(100%); } + +/*左手模式*/ +/*技能区*/ +.skill-controlzuoshou { + max-width: 140px; + bottom: 25px; + left: 150px; + z-index: 5; +} +.skill-controlzuoshou div { + position: relative; +} + +/*技能*/ +.skill-controlzuoshou .skillitem { + float: left; + white-space: nowrap; + color: #f5d78e; /*字体颜色*/ + font-size: 20px !important; /*字体大小,有用*/ +} + +.skill-controlzuoshou > div { + display: flex; + flex-wrap: wrap; + flex-direction: row; +} +.skill-controlzuoshou > div::after { + content: ""; + display: block; + clear: both; +} +.skill-controlzuoshou > .enable { + margin: 0 0 0 0; +} + +/*非主动技显示*/ +.skill-controlzuoshou > .trigger > .skillitem { + text-align: center; + background-image: url("./images/skill.png"); + padding: 3px 7px; /*技能背景素材(高度+宽度)* + background-size: 100% 100%; + margin: -1px 0px; /*外边距(纵向间距+横向间距)*/ + font-family: "yuanli"; /*字体样式*/ + font-size: 20px; /*字体大小,没用*/ +} + +/*主动技显示*/ +.skill-controlzuoshou > .enable > .skillitem { + margin: 0px 0px; + --w: 75px; + --h: calc(var(--w) * 85 / 175); + width: var(--w); + height: var(--h); + line-height: var(--h); + text-align: center; + /* line-height: 38px; /*文本下移*/ + /* text-align: center; */ + display: flex; + align-items: center; + align-content: center; + justify-content: center; + font-family: "yuanli"; /*字体样式*/ + font-size: 20px; /*字体大小,没用*/ + background-image: url("./images/btno1.png"); + background-size: 100% 100%; + /*border: 1px solid rgb(3,4,5); /*调试用*/ +} + +.skill-controlzuoshou > .enable > .skillitem.select { + background-image: url("./images/btno3.png"); +} +.skill-controlzuoshou > .enable > .skillitem:not(.usable):not(.select) { + filter: grayscale(100%); + -webkit-filter: grayscale(100%); + background-image: url("./images/btnn2.png"); +} + +.skill-controlzuoshou > .enable > .xiandingji { + /*限定技按钮*/ + margin: -2px -5px; + /*--w: 99px;*/ + /*--h: calc(var(--w) * 91 / 200);*/ + --w: 85px; + --h: 37px; + width: var(--w); + height: var(--h); + line-height: 42px; + text-align: center; + font-family: "yuanli"; + font-weight: 500; /*字粗细*/ + text-shadow: 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, + 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18, 0.3px 0px 1.8px #332c18; + color: #f7f5e7; + font-size: 22px; + background-image: url("./images/btnn4.png"); + background-size: 100% 100%; + /*border: 1px solid rgb(3,4,5);/*调试用*/ +} + +.skill-controlzuoshou > .enable > .xiandingji.select { + background-image: url("./images/btnn4.png"); +} + +.skill-controlzuoshou > .enable > .xiandingji:not(.usable):not(.select) { + /*background-image: url("./images/btn5.png");*/ + filter: grayscale(100%); + -webkit-filter: grayscale(100%); +} diff --git a/shoushaUI/skill/main3.css b/shoushaUI/skill/main3.css index a709f4e..04c9431 100644 --- a/shoushaUI/skill/main3.css +++ b/shoushaUI/skill/main3.css @@ -200,3 +200,112 @@ filter: grayscale(100%); -webkit-filter: grayscale(100%); } + +/*左手模式*/ +/*技能区*/ +.skill-controlzuoshou { + max-width: 140px; + bottom: 25px; + left: 150px; + z-index: 5; +} +.skill-controlzuoshou div { + position: relative; +} + +/*技能*/ +.skill-controlzuoshou .skillitem { + float: left; + white-space: nowrap; + color: #f5d78e; /*字体颜色,这个还有用*/ + font-size: 20px !important; /*字体大小,有用*/ +} + +.skill-controlzuoshou > div { + display: flex; + flex-wrap: wrap; + flex-direction: row; +} +.skill-controlzuoshou > div::after { + content: ""; + display: block; + clear: both; +} +.skill-controlzuoshou > .enable { + margin: 0 0 0 0; +} + +/*非主动技显示*/ +.skill-controlzuoshou > .trigger > .skillitem { + text-align: center; + margin: 0px 5px; + background-color: #3a2819; /* 棕色背景 */ + border: 0.3px solid #b69d4d; /* 棕色边框 */ + border-radius: 50px; /* 生成椭圆形状 */ + position: relative; /* 定位参照 */ + padding: 3px 7px; /*技能背景素材(高度+宽度)* + background-size: 100% 100%; + margin: -1px 0px; /*外边距(纵向间距+横向间距)*/ + font-family: "yuanli"; /*字体样式*/ + font-size: 20px; /*字体大小,没用*/ + text-shadow: 0.5px 0px 0.5px #ffffff; +} + +/*主动技显示*/ +.skill-controlzuoshou > .enable > .skillitem { + margin: 0px 5px; + --w: 75px; + --h: calc(var(--w) * 85 / 175); + width: var(--w); + height: var(--h); + line-height: var(--h); + text-align: center; + /* line-height: 38px; /*文本下移*/ + /* text-align: center; */ + display: flex; + align-items: center; + align-content: center; + justify-content: center; + font-family: "yuanli"; /*字体样式*/ + font-size: 20px; /*字体大小,没用*/ + background-image: url("./images/new_btnn1.png"); + background-size: 100% 100%; + /*border: 1px solid rgb(3,4,5); /*调试用*/ +} + +.skill-controlzuoshou > .enable > .skillitem.select { + background-image: url("./images/new_btnn3.png"); +} +.skill-controlzuoshou > .enable > .skillitem:not(.usable):not(.select) { + filter: grayscale(100%); + -webkit-filter: grayscale(100%); + /*background-image: url("./images/btnn2.png");*/ +} + +.skill-controlzuoshou > .enable > .xiandingji { + /*限定技按钮*/ + margin: 0px 5px; /*上下和左右距离*/ + --w: 75px; + --h: 38.1px; + width: var(--w); + height: var(--h); + line-height: 42px; + text-align: center; + font-family: "yuanli"; + font-weight: 500; /*字粗细*/ + color: #f7f5e7; + font-size: 22px; + background-image: url("./images/new_btnn4.png"); + background-size: 100% 100%; + /*border: 1px solid rgb(3,4,5);/*调试用*/ +} + +.skill-controlzuoshou > .enable > .xiandingji.select { + background-image: url("./images/new_btnn4.png"); +} + +.skill-controlzuoshou > .enable > .xiandingji:not(.usable):not(.select) { + /*background-image: url("./images/btn5.png");*/ + filter: grayscale(100%); + -webkit-filter: grayscale(100%); +} diff --git a/shoushaUI/skill/main3.js b/shoushaUI/skill/main3.js index e7edc25..9ca910c 100644 --- a/shoushaUI/skill/main3.js +++ b/shoushaUI/skill/main3.js @@ -24,15 +24,30 @@ app.import(function (lib, game, ui, get, ai, _status, app) { }, skillControl: function (clear) { if (!ui.skillControl) { - var node = ui.create.div(".skill-control", ui.arena); - node.node = { - enable: ui.create.div(".enable", node), - trigger: ui.create.div(".trigger", node), - }; - for (var i in plugin.controlElement) { - node[i] = plugin.controlElement[i]; + //左手模式添加新的技能按钮位置css + if (lib.config["extension_十周年UI_rightLayout"] == "on") { + var node = ui.create.div(".skill-control", ui.arena); + node.node = { + enable: ui.create.div(".enable", node), + trigger: ui.create.div(".trigger", node), + }; + for (var i in plugin.controlElement) { + node[i] = plugin.controlElement[i]; + } + ui.skillControl = node; + //开始复制一遍 + } else { + var node = ui.create.div(".skill-controlzuoshou", ui.arena); + node.node = { + enable: ui.create.div(".enable", node), + trigger: ui.create.div(".trigger", node), + }; + for (var i in plugin.controlElement) { + node[i] = plugin.controlElement[i]; + } + ui.skillControl = node; } - ui.skillControl = node; + //结束 } if (clear) { ui.skillControl.node.enable.innerHTML = ""; @@ -41,7 +56,6 @@ app.import(function (lib, game, ui, get, ai, _status, app) { return ui.skillControl; }, }); - Object.assign(ui, { updateSkillControl: function (player, clear) { var eSkills = player.getSkills("e", true, false).slice(0); diff --git a/shoushaUI/skill/main3_window.css b/shoushaUI/skill/main3_window.css index a709f4e..04c9431 100644 --- a/shoushaUI/skill/main3_window.css +++ b/shoushaUI/skill/main3_window.css @@ -200,3 +200,112 @@ filter: grayscale(100%); -webkit-filter: grayscale(100%); } + +/*左手模式*/ +/*技能区*/ +.skill-controlzuoshou { + max-width: 140px; + bottom: 25px; + left: 150px; + z-index: 5; +} +.skill-controlzuoshou div { + position: relative; +} + +/*技能*/ +.skill-controlzuoshou .skillitem { + float: left; + white-space: nowrap; + color: #f5d78e; /*字体颜色,这个还有用*/ + font-size: 20px !important; /*字体大小,有用*/ +} + +.skill-controlzuoshou > div { + display: flex; + flex-wrap: wrap; + flex-direction: row; +} +.skill-controlzuoshou > div::after { + content: ""; + display: block; + clear: both; +} +.skill-controlzuoshou > .enable { + margin: 0 0 0 0; +} + +/*非主动技显示*/ +.skill-controlzuoshou > .trigger > .skillitem { + text-align: center; + margin: 0px 5px; + background-color: #3a2819; /* 棕色背景 */ + border: 0.3px solid #b69d4d; /* 棕色边框 */ + border-radius: 50px; /* 生成椭圆形状 */ + position: relative; /* 定位参照 */ + padding: 3px 7px; /*技能背景素材(高度+宽度)* + background-size: 100% 100%; + margin: -1px 0px; /*外边距(纵向间距+横向间距)*/ + font-family: "yuanli"; /*字体样式*/ + font-size: 20px; /*字体大小,没用*/ + text-shadow: 0.5px 0px 0.5px #ffffff; +} + +/*主动技显示*/ +.skill-controlzuoshou > .enable > .skillitem { + margin: 0px 5px; + --w: 75px; + --h: calc(var(--w) * 85 / 175); + width: var(--w); + height: var(--h); + line-height: var(--h); + text-align: center; + /* line-height: 38px; /*文本下移*/ + /* text-align: center; */ + display: flex; + align-items: center; + align-content: center; + justify-content: center; + font-family: "yuanli"; /*字体样式*/ + font-size: 20px; /*字体大小,没用*/ + background-image: url("./images/new_btnn1.png"); + background-size: 100% 100%; + /*border: 1px solid rgb(3,4,5); /*调试用*/ +} + +.skill-controlzuoshou > .enable > .skillitem.select { + background-image: url("./images/new_btnn3.png"); +} +.skill-controlzuoshou > .enable > .skillitem:not(.usable):not(.select) { + filter: grayscale(100%); + -webkit-filter: grayscale(100%); + /*background-image: url("./images/btnn2.png");*/ +} + +.skill-controlzuoshou > .enable > .xiandingji { + /*限定技按钮*/ + margin: 0px 5px; /*上下和左右距离*/ + --w: 75px; + --h: 38.1px; + width: var(--w); + height: var(--h); + line-height: 42px; + text-align: center; + font-family: "yuanli"; + font-weight: 500; /*字粗细*/ + color: #f7f5e7; + font-size: 22px; + background-image: url("./images/new_btnn4.png"); + background-size: 100% 100%; + /*border: 1px solid rgb(3,4,5);/*调试用*/ +} + +.skill-controlzuoshou > .enable > .xiandingji.select { + background-image: url("./images/new_btnn4.png"); +} + +.skill-controlzuoshou > .enable > .xiandingji:not(.usable):not(.select) { + /*background-image: url("./images/btn5.png");*/ + filter: grayscale(100%); + -webkit-filter: grayscale(100%); +}