Skip to content

Commit

Permalink
A lot of trivial things
Browse files Browse the repository at this point in the history
  • Loading branch information
wormtql committed May 15, 2022
1 parent 99b049e commit f97daeb
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 14 deletions.
5 changes: 5 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
> 1%
last 2 versions
not dead
not ie 11
chrome > 58
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ impl TargetFunctionMetaTrait for JeanDefaultTargetFunction {
ItemConfig {
name: "recharge_demand",
title: ItemConfig::DEFAULT_RECHARGE_TITLE,
config: ItemConfigType::Float { min: 0.0, max: 1.0, default: 1.6 }
config: ItemConfigType::Float { min: 1.0, max: 3.0, default: 1.0 }
}
]);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,10 @@ impl TargetFunction for KeqingDefaultTargetFunction {
let dmg_q = Keqing::damage::<SimpleDamageBuilder>(&context, S::Q2, &config).normal.expectation;
let dmg_charged = Keqing::damage::<SimpleDamageBuilder>(&context, S::Charged11, &config).normal.expectation;

let recharge = attribute.get_value(AttributeName::Recharge);
let r = recharge.min(1.4);
// let recharge = attribute.get_value(AttributeName::Recharge);
// let r = recharge.min(1.4);

r * dmg_q * 19.53 * 0.2 + dmg_charged * 2.094 * 0.8
// r * dmg_q * 19.53 * 0.2 + dmg_charged * 2.094 * 0.8
dmg_q * 19.53 * 0.2 + dmg_charged * 2.094 * 0.8
}
}
9 changes: 2 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "genshin_artifacts",
"version": "5.4.0",
"version": "5.4.2",
"private": true,
"scripts": {
"serve": "cross-env ENV_FILE=.env.development.yaml vue-cli-service serve",
Expand Down Expand Up @@ -77,10 +77,5 @@
"parser": "babel-eslint"
},
"rules": {}
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead"
]
}
}
2 changes: 1 addition & 1 deletion src/assets/_gen_tf.js
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ export default {

{"default":0.5,"max":1.0,"min":0.0,"name":"damage_weight","title":"治疗-伤害比重(0:纯治疗,1:纯伤害)","type":"float"},

{"default":1.6,"max":1.0,"min":0.0,"name":"recharge_demand","title":"充能需求","type":"float"},
{"default":1.0,"max":3.0,"min":1.0,"name":"recharge_demand","title":"充能需求","type":"float"},

],
},
Expand Down
6 changes: 4 additions & 2 deletions src/components/select/SelectCharacter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ import qualityColors from "@const/quality_colors";
export default {
name: "SelectCharacter",
props: ["value"],
created() {
this.characterByElement = characterByElement;
data() {
return {
characterByElement
}
},
methods: {
element2Chs(element) {
Expand Down
4 changes: 4 additions & 0 deletions src/pages/MainPage/MainPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ export default {
<style scoped lang="scss">
$contentPadding: 24px;
.main {
//background-color: #faf6ff;
}
@media only screen and (min-width: 992px) {
.root-div {
display: flex;
Expand Down
9 changes: 9 additions & 0 deletions src/pages/MainPage/SideBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,15 @@ export default {
doRoute: {
type: Boolean,
default: true,
},
enableMinimize: {
type: Boolean,
default: false
}
},
data() {
return {
minimized: false,
}
},
methods: {
Expand Down

0 comments on commit f97daeb

Please sign in to comment.