Skip to content

Commit a4e1500

Browse files
authored
Merge pull request #201 from MaaAssistantArknights/dev
2 parents b833a5d + 32ac2e8 commit a4e1500

File tree

7 files changed

+14
-4
lines changed

7 files changed

+14
-4
lines changed
29 KB
Loading
18.1 KB
Loading

scripts/shared.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ const CHARACTER_TABLE_JSON_URL =
3838
'https://raw.githubusercontent.com/Kengxxiao/ArknightsGameData/master/zh_CN/gamedata/excel/character_table.json'
3939

4040
const CHARACTER_BLOCKLIST = [
41-
'char_512_aprot', // 暮落(集成战略):It's just not gonna be there.
4241
'token_10012_rosmon_shield', // 迷迭香的战术装备:It's just not gonna be there.
4342
]
4443

src/apis/auth.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,16 @@ export const requestResetPasswordToken = (data: { email: string }) => {
137137
export interface ResetPasswordResponse {}
138138

139139
export const requestResetPassword = (data: {
140+
email: string
140141
token: string
141142
password: string
142143
}) => {
143144
return jsonRequest<Response<ResetPasswordResponse>>('/user/password/reset', {
144145
method: 'POST',
145-
json: data,
146+
json: {
147+
email: data.email,
148+
active_code: data.token,
149+
password: data.password,
150+
},
146151
})
147152
}

src/components/OperationCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export const OperationCard = ({
8787
/>
8888
</Tooltip2>
8989
<div className="flex-1" />
90-
<div className="flex flex-col items-end">
90+
<div className="flex flex-col items-end whitespace-nowrap">
9191
<div className="w-full flex justify-end text-zinc-500">
9292
<div className="flex items-center mr-4">
9393
<Icon icon="star" className="mr-1.5" />

src/components/Operations.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const Operations: ComponentType = withSuspensable(() => {
2323
orderBy: 'hot',
2424
})
2525
const debouncedSetQueryParams = useMemo(
26-
() => debounce(setQueryParams, 250),
26+
() => debounce(setQueryParams, 500),
2727
[],
2828
)
2929
const [authState] = useAtom(authAtom)

src/models/generated/operators.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,6 +1169,12 @@
11691169
"alias": "mouersaisi mouersaisai miuersaisi miuersaisai miaoersaisi miaoersaisai muersaisi muersaisai liaoersaisi liaoersaisai mess less 繆爾賽思",
11701170
"alt_name": "Muelsyse"
11711171
},
1172+
{
1173+
"id": "char_512_aprot",
1174+
"name": "暮落",
1175+
"alias": "muluo mula mulao ml 暮落",
1176+
"alt_name": "Shalem"
1177+
},
11721178
{
11731179
"id": "char_185_frncat",
11741180
"name": "慕斯",

0 commit comments

Comments
 (0)