Merge branch 'main' of https://github.com/wormtql/genshin_artifact

wormtql · Jan 4, 2025 · e18c91f · e18c91f
2 parents 930ee60 + a7884f8
commit e18c91f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mona_core/src/weapon/weapons/claymores/a_thousand_blazing_suns.rs b/mona_core/src/weapon/weapons/claymores/a_thousand_blazing_suns.rs
@@ -21,11 +21,11 @@ impl<A: Attribute> WeaponEffect<A> for AThousandBlazingSunsEffect {
         let refine = data.refine as f64;
 
         let crit_dmg_bonus = refine * 0.05 + 0.15;
-        let bonus = crit_dmg_bonus * self.rate1 + 0.75 * self.rate2;
+        let bonus = crit_dmg_bonus * self.rate1 * (1.0 + 0.75 * self.rate2);
         attribute.set_value_by(AttributeName::CriticalDamageBase, "「焚曜千阳」被动", bonus);
 
         let atk_bonus = 0.07 * refine + 0.21;
-        let bonus = atk_bonus * self.rate1 + 0.75 * self.rate2;
+        let bonus = atk_bonus * self.rate1 * (1.0 + 0.75 * self.rate2);
         attribute.add_atk_percentage("「焚曜千阳」被动", bonus);
     }
 }

diff --git a/src/pages/NewArtifactPlanPage/EnemyConfig.vue b/src/pages/NewArtifactPlanPage/EnemyConfig.vue
@@ -5,7 +5,7 @@
             :model-value="modelValue.level"
             @update:modelValue="handleInput('level', $event)"
             :min="60"
-            :max="100"
+            :max="120"
         ></el-input-number>
     </div>