From 1c32d30fca4f1cfd909dfa610fa6244c71bb095e Mon Sep 17 00:00:00 2001 From: MengXinZXZ <2223529500@qq.com> Date: Sun, 24 Nov 2024 04:26:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88=E9=A3=8E=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=AC=A7=E7=9A=87=E7=9A=84=E5=B0=8F=E9=85=8D=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=92=8C=E9=9C=B2=E5=A4=B4=E5=8F=82=E6=95=B0=E8=A1=A5?= =?UTF-8?q?=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dialog.css | 11 ++++++++++- extension.js | 17 ++++++++++++----- layout.css | 19 ++++++++++++++----- layout_new.css | 21 +++++++++++++++------ player1.css | 21 ++++++++++++++------- player2.css | 21 ++++++++++++++------- player3.css | 21 ++++++++++++++------- player4.css | 26 +++++++++++++++++++------- shoushaUI/lbtn/main3.js | 20 ++++++-------------- 9 files changed, 118 insertions(+), 59 deletions(-) diff --git a/dialog.css b/dialog.css index 70f2965..e5d1239 100644 --- a/dialog.css +++ b/dialog.css @@ -457,12 +457,21 @@ border-radius: 8px; } -#arena[data-outcrop-skin="on"] > .skill-dialog.compare > .content > .player-character > .image { +/* 拼点框露头高度 */ +/* 十周年露头高度 */ +#arena[data-outcrop-skin="shizhounian"] > .skill-dialog.compare > .content > .player-character > .image { height: 192px; clip-path: url(#solo-clip); -webkit-clip-path: url(#solo-clip); } +/* 手杀露头高度 */ +#arena[data-outcrop-skin="shousha"] > .skill-dialog.compare > .content > .player-character > .image { + height: 207px; + clip-path: url(#soloss-clip); + -webkit-clip-path: url(#soloss-clip); +} + .skill-dialog.compare > .content > .vs { order: 3; width: 70px; diff --git a/extension.js b/extension.js index dd4ff31..56231da 100644 --- a/extension.js +++ b/extension.js @@ -3882,7 +3882,8 @@ game.import("extension", function (lib, game, ui, get, ai, _status) { campWrap.appendChild(player.node.name); campWrap.node.avatarName.className = "avatar-name"; - campWrap.node.avatarDefaultName.innerHTML = "主将"; + campWrap.node.avatarDefaultName.innerHTML = get.mode() === "guozhan" ? "主将" : "隐匿"; + //结束 var node = { mask: player.insertBefore(decadeUI.element.create("mask"), player.node.identity), @@ -11182,9 +11183,14 @@ game.import("extension", function (lib, game, ui, get, ai, _status) { }, outcropSkin: { name: "露头皮肤(需对应素材)", - init: false, + init: "off", + item: { + shizhounian: "十周年露头", + shousha: "手杀露头", + off: "关闭", + }, update: function () { - if (window.decadeUI) ui.arena.dataset.outcropSkin = lib.config["extension_十周年UI_outcropSkin"] ? "on" : "off"; + if (window.decadeUI) ui.arena.dataset.outcropSkin = lib.config["extension_十周年UI_outcropSkin"]; }, }, showTemp: { @@ -11660,8 +11666,9 @@ game.import("extension", function (lib, game, ui, get, ai, _status) { let log = [ "魔改十周年 萌修 " + pack.version, "最低适配：v1.10.17", - '继续修复u的遗留问题+整合u的部分优化', - '修复拼点点数异常问题', + "继续修复u的遗留问题+整合u的部分优化", + "修复拼点点数异常问题", + "整合风中的欧皇的小配件修复和露头参数补充", ]; return '点击前往萌修十周年Github仓库

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

"; })(pack); diff --git a/layout.css b/layout.css index 7b7ae0b..62fedc5 100644 --- a/layout.css +++ b/layout.css @@ -215,8 +215,8 @@ body > .background { #arena > .hand-wrap, #arena > .hand-back { /*手牌区*/ /*左手布局+单独装备栏*/ - left: 300px; - right: 225px;/*数值越大手牌右边界区域越往左*/ + left: 300px; + right: 225px; /*数值越大手牌右边界区域越往左*/ width: auto; height: 150px; bottom: 1%; @@ -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: 300px; - right: 95px; + left: 300px; + right: 95px; } #arena[data-alone-equip="off"][data-right-layout="on"] > .hand-wrap, @@ -731,12 +731,21 @@ body > .background { transition: none; } -#arena[data-outcrop-skin="on"] .button.character > .character { +/* 游戏开局前选将框露头高度调整 */ +/* 十周年露头*/ +#arena[data-outcrop-skin="shizhounian"] .button.character > .character { height: 128px; clip-path: url(#solo-clip); -webkit-clip-path: url(#solo-clip); } +/* 手杀露头 */ +#arena[data-outcrop-skin="shousha"] .button.character > .character { + height: 140px; + clip-path: url(#soloss-clip); + -webkit-clip-path: url(#soloss-clip); +} + #arena > .card > .judge-mark { visibility: hidden; } diff --git a/layout_new.css b/layout_new.css index a91d7b3..48dde19 100644 --- a/layout_new.css +++ b/layout_new.css @@ -215,8 +215,8 @@ body > .background { #arena > .hand-wrap, #arena > .hand-back { /*手牌区*/ /*左手布局+单独装备栏*/ - left: 300px; - right: 225px;/*数值越大手牌右边界区域越往左*/ + left: 300px; + right: 225px; /*数值越大手牌右边界区域越往左*/ width: auto; height: 150px; bottom: 1%; @@ -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: 300px; - right: 95px; + left: 300px; + right: 95px; } #arena[data-alone-equip="off"][data-right-layout="on"] > .hand-wrap, @@ -252,7 +252,7 @@ body > .background { } /*挑战模式小头像*/ .hand-wrap > .fakeme.avatar { - left: -270px;/*数值越小越左*/ + left: -270px; /*数值越小越左*/ top: auto; right: auto; bottom: 0; @@ -737,12 +737,21 @@ body > .background { transition: none; } -#arena[data-outcrop-skin="on"] .button.character > .character { +/* 游戏开局前选将框露头高度调整 */ +/* 十周年露头*/ +#arena[data-outcrop-skin="shizhounian"] .button.character > .character { height: 128px; clip-path: url(#solo-clip); -webkit-clip-path: url(#solo-clip); } +/* 手杀露头 */ +#arena[data-outcrop-skin="shousha"] .button.character > .character { + height: 140px; + clip-path: url(#soloss-clip); + -webkit-clip-path: url(#soloss-clip); +} + #arena > .card > .judge-mark { visibility: hidden; } diff --git a/player1.css b/player1.css index 212fdb8..292142e 100644 --- a/player1.css +++ b/player1.css @@ -568,21 +568,28 @@ opacity: 0.3; } -#arena[data-outcrop-skin="on"] > .player > .primary-avatar { +/*单将露头*/ +#arena[data-outcrop-skin="shizhounian"] > .player > .primary-avatar { height: 192px; clip-path: url(#solo-clip); /*新增*/ -webkit-clip-path: url(#solo-clip); } +#arena[data-outcrop-skin="shousha"] > .player > .primary-avatar { + height: 207px; + clip-path: url(#solo-clip); /*新增*/ + -webkit-clip-path: url(#solo-clip); +} -#arena[data-outcrop-skin="on"] > .player > .deputy-avatar { +/*双将露头*/ +#arena[data-outcrop-skin="shizhounian"] > .player > .deputy-avatar { height: 192px; - clip-path: url(#duor-clip); /*新增*/ + clip-path: url(#solo-clip); /*新增*/ -webkit-clip-path: url(#duor-clip); } - -#arena[data-outcrop-skin="on"] > .player.fullskin2 > .primary-avatar { - clip-path: url(#doul-clip); /*新增*/ - -webkit-clip-path: url(#duol-clip); +#arena[data-outcrop-skin="shousha"] > .player > .deputy-avatar { + height: 207px; + clip-path: url(#solo-clip); /*新增*/ + -webkit-clip-path: url(#duor-clip); } /*武将牌动皮显示*/ diff --git a/player2.css b/player2.css index 7245961..d06e893 100644 --- a/player2.css +++ b/player2.css @@ -625,21 +625,28 @@ opacity: 0.3; } -#arena[data-outcrop-skin="on"] > .player > .primary-avatar { +/*单将露头*/ +#arena[data-outcrop-skin="shizhounian"] > .player > .primary-avatar { height: 183px; clip-path: url(#solo-clip); /*新增*/ -webkit-clip-path: url(#solo-clip); } +#arena[data-outcrop-skin="shousha"] > .player > .primary-avatar { + height: 195px; + clip-path: url(#solo-clip); /*新增*/ + -webkit-clip-path: url(#solo-clip); +} -#arena[data-outcrop-skin="on"] > .player > .deputy-avatar { +/*双将露头*/ +#arena[data-outcrop-skin="shizhounian"] > .player > .deputy-avatar { height: 183px; - clip-path: url(#duor-clip); /*新增*/ + clip-path: url(#solo-clip); /*新增*/ -webkit-clip-path: url(#duor-clip); } - -#arena[data-outcrop-skin="on"] > .player.fullskin2 > .primary-avatar { - clip-path: url(#duol-clip); /*新增*/ - -webkit-clip-path: url(#duol-clip); +#arena[data-outcrop-skin="shousha"] > .player > .deputy-avatar { + height: 195px; + clip-path: url(#solo-clip); /*新增*/ + -webkit-clip-path: url(#duor-clip); } /*武将牌动皮显示*/ diff --git a/player3.css b/player3.css index a49c655..0db833b 100644 --- a/player3.css +++ b/player3.css @@ -588,21 +588,28 @@ opacity: 0.3; } -#arena[data-outcrop-skin="on"] > .player > .primary-avatar { +/*单将露头*/ +#arena[data-outcrop-skin="shizhounian"] > .player > .primary-avatar { height: 183px; clip-path: url(#solo-clip); /*新增*/ -webkit-clip-path: url(#solo-clip); } +#arena[data-outcrop-skin="shousha"] > .player > .primary-avatar { + height: 195px; + clip-path: url(#solo-clip); /*新增*/ + -webkit-clip-path: url(#solo-clip); +} -#arena[data-outcrop-skin="on"] > .player > .deputy-avatar { +/*双将露头*/ +#arena[data-outcrop-skin="shizhounian"] > .player > .deputy-avatar { height: 183px; - clip-path: url(#duor-clip); /*新增*/ + clip-path: url(#solo-clip); /*新增*/ -webkit-clip-path: url(#duor-clip); } - -#arena[data-outcrop-skin="on"] > .player.fullskin2 > .primary-avatar { - clip-path: url(#duol-clip); /*新增*/ - -webkit-clip-path: url(#duol-clip); +#arena[data-outcrop-skin="shousha"] > .player > .deputy-avatar { + height: 195px; + clip-path: url(#solo-clip); /*新增*/ + -webkit-clip-path: url(#duor-clip); } /*武将牌动皮显示*/ diff --git a/player4.css b/player4.css index 2649d26..1dcd90c 100644 --- a/player4.css +++ b/player4.css @@ -536,20 +536,32 @@ #arena:not(.observe) > .player[data-position="0"].unseen2 > .deputy-avatar { opacity: 0.3; } -#arena[data-outcrop-skin="on"] > .player > .primary-avatar { + +/*单将露头*/ +#arena[data-outcrop-skin="shizhounian"] > .player > .primary-avatar { height: 192px; clip-path: url(#solo-clip); /*新增*/ -webkit-clip-path: url(#solo-clip); } -#arena[data-outcrop-skin="on"] > .player > .deputy-avatar { +#arena[data-outcrop-skin="shousha"] > .player > .primary-avatar { + height: 207px; + clip-path: url(#solo-clip); /*新增*/ + -webkit-clip-path: url(#solo-clip); +} + +/*双将露头*/ +#arena[data-outcrop-skin="shizhounian"] > .player > .deputy-avatar { height: 192px; - clip-path: url(#duor-clip); /*新增*/ + clip-path: url(#solo-clip); /*新增*/ -webkit-clip-path: url(#duor-clip); } -#arena[data-outcrop-skin="on"] > .player.fullskin2 > .primary-avatar { - clip-path: url(#doul-clip); /*新增*/ - -webkit-clip-path: url(#duol-clip); -} /*武将牌动皮显示*/ +#arena[data-outcrop-skin="shousha"] > .player > .deputy-avatar { + height: 207px; + clip-path: url(#solo-clip); /*新增*/ + -webkit-clip-path: url(#duor-clip); +} + +/*武将牌动皮显示*/ .player > .dynamic-wrap { display: block; position: absolute; diff --git a/shoushaUI/lbtn/main3.js b/shoushaUI/lbtn/main3.js index 54b5450..44114bd 100644 --- a/shoushaUI/lbtn/main3.js +++ b/shoushaUI/lbtn/main3.js @@ -366,23 +366,15 @@ app.import(function (lib, game, ui, get, ai, _status, app) { //-------原版---------// //左手模式加开关 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); - //---------------------// - } + 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 node8 = ui.create.div(".meiguiButton_new1", ui.arena, plugin.click.meigui); var node9 = ui.create.div(".xiaolianButton_new1", ui.arena, plugin.click.xiaolian); //---------------------// }