diff --git a/src/components/GameDemo.vue b/src/components/GameDemo.vue index 0a0a173..0165f61 100644 --- a/src/components/GameDemo.vue +++ b/src/components/GameDemo.vue @@ -15,7 +15,7 @@ const cancelBtn = () => { @@ -378,7 +401,11 @@ onUnmounted(() => { z-index: 3; /* CSS Mask(WebKit + 标准) */ +<<<<<<< Updated upstream -webkit-mask-image: url("../assets/images/new/mask-img.webp"); +======= + -webkit-mask-image: url("../assets/images/new/mask-img.png"); +>>>>>>> Stashed changes -webkit-mask-repeat: no-repeat; -webkit-mask-position: center; -webkit-mask-size: var(--maskSize) var(--maskSize); @@ -386,9 +413,13 @@ onUnmounted(() => { mask-image: url("../assets/images/new/mask-img.webp"); mask-repeat: no-repeat; mask-position: center; +<<<<<<< Updated upstream mask-size: var(--maskSize) var(--maskSize); /* -webkit-clip-path: circle(calc(var(--maskSize) * 0.5) at 50% 50%); clip-path: circle(calc(var(--maskSize) * 0.5) at 50% 50%); */ +======= + mask-size: var(--maskSize) var(--maskSize); +>>>>>>> Stashed changes } /* 可视化的 mask-img.webp:让用户能看到“遮罩在放大”的过程 */ diff --git a/src/components/PopupMore.vue b/src/components/PopupMore.vue index c965dcf..e7e9ed7 100644 --- a/src/components/PopupMore.vue +++ b/src/components/PopupMore.vue @@ -23,7 +23,7 @@ const startNow = () => {