Merge branch 'dev' into feat/sortByRarity

Author: guansss

public/assets/operator-avatars/char_4123_ela.png

@@ -29,8 +29,6 @@ export const useLevels = ({ suspense }: { suspense?: boolean } = {}) => {
 
       res.data = res.data.filter((level) => {
         if (
-          // 引航者试炼
-          level.levelId.includes('bossrush') ||
           // 肉鸽
           level.levelId.includes('roguelike') ||
           // 保全派驻

public/assets/operator-avatars/char_4124_iana.png

@@ -3,6 +3,7 @@ import {
   NumericInput,
   NumericInputProps,
 } from '@blueprintjs/core'
+import { useRef, useState } from 'react'
 
 type MixedNumericInputProps = HTMLInputProps & NumericInputProps
 
@@ -13,20 +14,34 @@ export interface NumericInput2Props extends MixedNumericInputProps {
 export const NumericInput2 = ({
   intOnly,
   min,
+  minorStepSize,
+  value,
   onValueChange,
   ...props
 }: NumericInput2Props) => {
   const allowNegative = min === undefined || min < 0
 
+  const inputRef = useRef<HTMLInputElement>(null)
+  const [endsWithDot, setEndsWithDot] = useState(false)
+
+  if (minorStepSize && minorStepSize < 0.001) {
+    // not yet fixed in current version: https://github.com/palantir/blueprint/issues/4497
+    process.env.NODE_ENV === 'development' &&
+      console.warn('minorStepSize cannot be smaller than 0.001')
+
+    minorStepSize = 0.001
+  }
+
   return (
     <NumericInput
       allowNumericCharactersOnly
       min={min}
+      minorStepSize={minorStepSize}
+      inputRef={inputRef}
+      value={endsWithDot ? value + '.' : value}
+      onBlur={() => setEndsWithDot(false)}
+      onButtonClick={(num, str) => onValueChange?.(num, str, inputRef.current)}
       onValueChange={(num, str, inputEl) => {
-        if (!onValueChange) {
-          return
-        }
-
         // count hyphens to determine the sign, so that user can toggle the sign
         // by pressing hyphen key, regardless of the cursor position
         let hyphens = 0
@@ -36,6 +51,14 @@ export const NumericInput2 = ({
           return ''
         })
 
+        const dots = str.split('.').length - 1
+
+        if (dots > 1 || (dots === 1 && intOnly)) {
+          return
+        }
+
+        setEndsWithDot(str.endsWith('.'))
+
         num = parseFloat(str)
 
         if (Number.isNaN(num) || !Number.isFinite(num)) {
@@ -50,7 +73,7 @@ export const NumericInput2 = ({
           num = ~~num
         }
 
-        onValueChange(num, str, inputEl)
+        onValueChange?.(num, str, inputEl)
       }}
       {...props}
     />

public/assets/operator-avatars/char_4125_rdoc.png

@@ -71,11 +71,10 @@ export const EditorActionDistance = ({
     >
       <div className="flex">
         <NumericInput2
-          intOnly
           selectAllOnFocus
           className="mr-2"
           placeholder="X 距离"
-          minorStepSize={0.5}
+          stepSize={0.5}
           onValueChange={(value) => onChange(transform.fromX(value))}
           onBlur={onBlur}
           value={value?.[0]?.toString() ?? ''}
@@ -88,10 +87,9 @@ export const EditorActionDistance = ({
         />
 
         <NumericInput2
-          intOnly
           selectAllOnFocus
           placeholder="Y 距离"
-          minorStepSize={0.5}
+          stepSize={0.5}
           onValueChange={(value) => onChange(transform.fromY(value))}
           onBlur={onBlur}
           value={value?.[1]?.toString() ?? ''}

public/assets/operator-avatars/char_4126_fuze.png

@@ -22,6 +22,7 @@ export const EditorOperatorSkillTimes = <
 
   return (
     <NumericInput2
+      intOnly
       defaultValue={0}
       onValueChange={(val) => onChange(Math.min(val, 100))}
       onBlur={onBlur}

public/assets/operator-avatars/token_10033_ela_grzmot.png

@@ -3,15 +3,16 @@
  *
  * With other fields conflicting, the stageId will be different in three ways:
  * 1. a001_ex04 / a001_ex04#f#
- * 2. ro1_e_1_1 / ro1_n_1_1
- * 3. act1bossrush_01 / act1bossrush_tm01
+ * 2. act1bossrush_01 / act1bossrush_tm01
+ * 3. ro1_e_1_1 / ro1_n_1_1
  *
- * Normally, levels of the last two kinds will never be used in Copilot,
- * so we do not care about them and just remove them from the list.
+ * Only the first two kinds are supported in MAA Copilot.
  */
 import { Level, OpDifficulty } from './operation'
 
 const HARD_MODE_SUFFIX = '#f#'
+const BOSSRUSH_NORMAL_INFIX = 'bossrush_'
+const BOSSRUSH_HARD_INFIX = 'bossrush_tm'
 
 const customLevelKey = '__customLevel'
 
@@ -34,16 +35,32 @@ export function isCustomLevel(level: Level): boolean {
 }
 
 export function isHardMode(stageId: string) {
-  return stageId.endsWith(HARD_MODE_SUFFIX)
+  return (
+    stageId.endsWith(HARD_MODE_SUFFIX) || stageId.includes(BOSSRUSH_HARD_INFIX)
+  )
 }
 
 export function toHardMode(stageId: string) {
-  return isHardMode(stageId) ? stageId : stageId + HARD_MODE_SUFFIX
+  if (isHardMode(stageId)) {
+    return stageId
+  }
+
+  const replacedStageId = stageId.replace(
+    BOSSRUSH_NORMAL_INFIX,
+    BOSSRUSH_HARD_INFIX,
+  )
+  if (replacedStageId !== stageId) {
+    return replacedStageId
+  }
+
+  return stageId + HARD_MODE_SUFFIX
 }
 
 export function toNormalMode(stageId: string) {
   return isHardMode(stageId)
-    ? stageId.slice(0, -HARD_MODE_SUFFIX.length)
+    ? stageId
+        .replace(HARD_MODE_SUFFIX, '')
+        .replace(BOSSRUSH_HARD_INFIX, BOSSRUSH_NORMAL_INFIX)
     : stageId
 }
 
@@ -108,7 +125,9 @@ export function matchStageIdIgnoringDifficulty(id1: string, id2: string) {
   return (
     id1 === id2 ||
     id1 === id2 + HARD_MODE_SUFFIX ||
-    id1 + HARD_MODE_SUFFIX === id2
+    id1 + HARD_MODE_SUFFIX === id2 ||
+    id1.replace(BOSSRUSH_HARD_INFIX, BOSSRUSH_NORMAL_INFIX) === id2 ||
+    id1.replace(BOSSRUSH_NORMAL_INFIX, BOSSRUSH_HARD_INFIX) === id2
   )
 }