Skip to content

Commit

Permalink
v2.9.17+3
Browse files Browse the repository at this point in the history
  • Loading branch information
cabbagelol committed Jan 2, 2025
1 parent 8220048 commit 242bc15
Show file tree
Hide file tree
Showing 14 changed files with 75 additions and 36 deletions.
1 change: 1 addition & 0 deletions front/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "BFBAN",
"version": "2.9.17",
"backend-version": "0.0.0",
"private": true,
"scripts": {
"serve:development-legacyProvider-windows": "set NODE_OPTIONS=--openssl-legacy-provider && npm run serve:development",
Expand Down
3 changes: 3 additions & 0 deletions front/public/config/backend-package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"version": "0.0.0"
}
6 changes: 6 additions & 0 deletions front/public/config/cheatMethodsGlossary.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
"values": [
"damageChange"
]
},
{
"value": "attackServer",
"values": [
"attackServer"
]
}
]
}
4 changes: 2 additions & 2 deletions front/public/theme/miside/alert.less
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
}

&-info {
border: @border-width-base @border-style-base ~`colorPalette("@{primary-color}", 10)`;
border: @border-width-base @border-style-base ~`colorPalette("@{primary-color}", 3)`;
background-color: fade(@primary-color, 10%);
.@{alert-prefix-cls}-icon {
color: @primary-color;
Expand Down Expand Up @@ -102,4 +102,4 @@
&-with-banner{
border-radius: 0;
}
}
}
2 changes: 1 addition & 1 deletion front/public/theme/miside/card.less
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
background: @card-background;

&:hover {
border-color: #000;
border-color: @border-color-base;
}
}

Expand Down
6 changes: 3 additions & 3 deletions front/public/theme/miside/custom.less
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,19 @@
@border-style-base : solid; // style of a components border

// Background color
@background-color-base : @primary-color; // base
@background-color-base : tint(@primary-color, 60%); // base
@background-color-select-hover: @input-disabled-bg;
@tooltip-bg : rgba(70, 76, 91, .9);
@head-bg : @primary-color;
@table-thead-bg : tint(@primary-color, 50%);
@table-thead-bg : tint(@primary-color, 90%);
@table-td-stripe-bg : #555;
@table-td-hover-bg : #555;
@table-td-highlight-bg : #555;
@menu-dark-title : #515a6e;
@menu-dark-active-bg : #363e4f;
@menu-dark-subsidiary-color : rgba(255,255,255,.7);
@menu-dark-group-title-color : rgba(255,255,255,.36);
@date-picker-cell-hover-bg : tint(@primary-color, 28%);
@date-picker-cell-hover-bg : tint(@primary-color, 20%);

// Shadow
@shadow-color : rgba(0, 0, 0, .2);
Expand Down
6 changes: 6 additions & 0 deletions front/public/theme/miside/pages/body.less
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ body, html {
// header
header {
background-image: linear-gradient(#d78e98, transparent) !important;
position: fixed;
top: 0;
}

#app main > .container {
padding-top: 220px;
}

// nav
Expand Down
14 changes: 7 additions & 7 deletions front/public/theme/miside/steps.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@steps-wait-title-color: #999;
@steps-wait-description-color: @steps-wait-title-color;
@steps-wait-tail-color: @border-color-split;
@steps-title-color: #666;
@steps-title-color: @text-color;

.@{steps-prefix-cls} {
display: -webkit-box;
Expand Down Expand Up @@ -141,7 +141,7 @@
vertical-align: top;
}
.@{steps-prefix-cls}-head {
background: #373838 !important;
background: tint(@primary-color, 98%) !important;
}

.@{steps-prefix-cls}-head-inner {
Expand Down Expand Up @@ -183,11 +183,11 @@
padding-right: 10px;
font-size: 14px;
font-weight: bold;
color: #666;
background: #373838 !important;
color: @text-color;
background: tint(@primary-color, 98%) !important;

> a:first-child:last-child {
color: #666;
color: @text-color;
}
}
.@{steps-prefix-cls}-item-last {
Expand Down Expand Up @@ -247,7 +247,7 @@
.@{steps-prefix-cls}-title {
margin-bottom: 4px;
margin-top: 0;
color: #666;
color: @text-color;
font-size: 12px;
font-weight: bold;
}
Expand Down Expand Up @@ -364,4 +364,4 @@
padding-left: 10px;
margin-left: -10px;
}
}
}
11 changes: 8 additions & 3 deletions front/src/components/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
</Row>
</div>
<div align="center" class="footer-border-top footer-padding">
<p>&copy; {{ new Date(time.appStart()).getFullYear() }}-{{ new Date().getFullYear() }} <u>{{ infos.name || ''}}</u> All Rights Reserved. v:
{{ infos.version || '' }}
<p>&copy; {{ new Date(time.appStart()).getFullYear() }}-{{ new Date().getFullYear() }} <u>{{ infos.name || ''}}</u> All Rights Reserved. v(f):
{{ infos['front-version'] || '' }} v(b): {{ infos['backend-version'] || '' }}
<iframe src="https://status.bfban.com/badge" class="footer-status-badge" allowTransparency="true" frameborder="0" scrolling="no"></iframe>
</p>
</div>
Expand All @@ -122,15 +122,20 @@
import {storage, account_storage, http, time} from "../assets/js";
import packageInfo from '../../package.json';
import backendPackageInfo from '/public/config/backend-package.json';
import footerNavs from '/public/config/footerNavs.json';
import link from '/public/config/link.json';
import Application from "@/assets/js/application";
export default new Application({
data() {
let infos = {
'front-version': packageInfo['version'] || '0.0.0',
'backend-version': backendPackageInfo['version'] || '0.0.0'
};
return {
time,
infos: packageInfo,
infos,
footerNavs: footerNavs.child,
links: link,
logoCount: 0,
Expand Down
4 changes: 2 additions & 2 deletions front/src/components/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- TODO 过期请删除 -->
<a href="https://announcement.bfban.com" target="_blank">
<Card :padding="0" dis-hover
style="padding: 3px 20px; margin: -10px -20px 0px -20px; text-align: center; background: darkred; color: white">
style="padding: 3px 20px; margin: -10px -20px 0 -20px; text-align: center; background: darkred; color: white">
{{
{
'zh-CN': '我们已更新《反作弊准则》,前往查看',
Expand Down Expand Up @@ -76,7 +76,7 @@
<div class="nav">
<Button type="primary" v-show="!isLogin" class="mobile-hide" :to="{name: 'signin'}"
icon="md-log-in"
v-if="$route.name != 'signin'">
v-if="$route.name !== 'signin'">
{{ $t("header.signin") }}
</Button>

Expand Down
43 changes: 29 additions & 14 deletions front/src/components/Lantern.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<template>
<div class="lan" v-if="nowTime >= new Date('2024 12-31').getTime() && nowTime <= new Date('2025 2-4').getTime()" >
<div class="lantern-widget-box" v-if="nowTime >= new Date('2024 12-31').getTime() && nowTime <= new Date('2025 2-4').getTime()">
<div class="lan-header">
<div class="container">🎆 2025 <HtmlLink href="https://en.wikipedia.org/wiki/Chinese_New_Year" text="New Year"></HtmlLink> 🎆</div>
<div class="container">🎆 2025
<HtmlLink href="https://en.wikipedia.org/wiki/Chinese_New_Year" text="New Year"></HtmlLink>
🎆
</div>
</div>
<div class="lan-box">
<div class="lantern-box">
<div v-for="(i, index) in ['left', 'right']" :key="index" :class="`lantern ${i}-lantern`">
<!-- 顶部绳索 -->
<div class="lantern-rope lantern-top-rope "></div>
Expand All @@ -29,7 +32,7 @@
--lantern-yellow: #ecaa2f;
}
.lan:hover {
.lantern-widget-box:hover {
.lan-header {
transition: all 0.25s;
padding: 15px 0;
Expand All @@ -44,7 +47,7 @@
}
}
.lan {
.lantern-widget-box {
.lan-header {
position: absolute;
min-height: 3px;
Expand Down Expand Up @@ -78,8 +81,8 @@
}
}
.lan-box {
.lantern-box {
pointer-events: none;
position: absolute;
width: 100%;
display: flex;
Expand All @@ -94,23 +97,35 @@
}
.left-lantern {
left: 55px;
left: 40px;
}
.right-lantern {
right: 55px;
right: 40px;
}
}
@media screen and (min-width: 1350px) {
.lan {
.lantern-widget-box {
min-width: 1024px;
max-width: 100%;
}
}
@media screen and (max-width: 1740px) {
.lantern-box {
.left-lantern {
left: 0px !important;
}
.right-lantern {
right: 0px !important;
}
}
}
@media screen and (max-width: 1350px) {
.lan {
.lantern-widget-box {
.left-lantern,
.right-lantern {
display: none !important;
Expand All @@ -132,7 +147,7 @@
}
.lantern-top-rope {
height: 85px;
height: 100px;
}
.lantern-bottom-rope {
Expand Down Expand Up @@ -219,9 +234,9 @@ import HtmlLink from "@/components/HtmlLink.vue";
export default {
components: {HtmlLink},
computed: {
nowTime () {
nowTime() {
return new Date().getTime();
}
}
}
</script>
</script>
6 changes: 3 additions & 3 deletions front/src/lang/zh_CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -305,11 +305,11 @@
"title": "自瞄"
},
"attackServer": {
"describe": "恶意攻击服务器",
"describe": "恶意攻击服务器引起玩家高延迟、玩家死亡、重置、服务器无响应等",
"title": "攻击服务器"
},
"damageChange": {
"describe": "修改武器参数",
"describe": "修改武器/载具/技能等参数",
"title": "改伤"
},
"gadgetModify": {
Expand All @@ -329,7 +329,7 @@
"title": "秒杀"
},
"teleport": {
"describe": "传送移动",
"describe": "传送、角色非正常速率移动",
"title": "传送"
},
"wallhack": {
Expand Down
2 changes: 1 addition & 1 deletion front/src/views/Report.vue
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
</Row>
</FormItem>

<Row gutter="10">
<Row :gutter="10">
<Col>
<Button type="primary"
v-voice-button
Expand Down
3 changes: 3 additions & 0 deletions front/vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ module.exports = {
}, {
from: `src/assets/images/achievement`,
to: `images/achievement`
}, {
from: `../backend/package.json`,
to: `config/backend-package.json`
}],
{
// 无论是否修改,全部复制
Expand Down

0 comments on commit 242bc15

Please sign in to comment.